diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 4ed25a8..7f801a9 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -2,6 +2,15 @@ name: CI Checks on: workflow_call: + secrets: + GOOGLE_CLIENT_ID: + required: true + GOOGLE_CLIENT_SECRET: + required: true + GH_CLIENT_ID: + required: true + GH_CLIENT_SECRET: + required: true jobs: ci: @@ -40,6 +49,6 @@ jobs: env: GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} - GITHUB_CLIENT_ID: ${{ secrets.GITHUB_CLIENT_ID }} - GITHUB_CLIENT_SECRET: ${{ secrets.GITHUB_CLIENT_SECRET }} + GITHUB_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }} + GITHUB_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }} run: docker-compose -f docker-compose.testing.yml run cypress diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 9768d1e..394004e 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -12,6 +12,7 @@ concurrency: jobs: ci-checks: uses: ./.github/workflows/ci-checks.yml + secrets: inherit build: needs: ci-checks diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index fb72580..35ddc0f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,6 +10,7 @@ concurrency: jobs: ci-checks: uses: ./.github/workflows/ci-checks.yml + secrets: inherit code_review: permissions: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c2b5818..e65c376 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -12,6 +12,7 @@ concurrency: jobs: ci-checks: uses: ./.github/workflows/ci-checks.yml + secrets: inherit build: needs: ci-checks diff --git a/app/src/components/AuthForm.vue b/app/src/components/AuthForm.vue index 99b72ec..ad3d1a6 100644 --- a/app/src/components/AuthForm.vue +++ b/app/src/components/AuthForm.vue @@ -41,7 +41,7 @@ const hasSocialLogins = computed(() => { }) const success = () => { - router.push({ name: 'game', params: { questId: 'helloworld' } }) + router.push({ name: 'map' }) } const error = (err) => { @@ -100,6 +100,7 @@ const handleChange = () => {
{ :icon="['fab', 'google']" class="text-text-secondary px-3 text-lg" /> - Continue with Google + + + 以 Google 繼續 + { :icon="['fab', 'github']" class="text-text-secondary px-3 text-lg" /> - Continue with GitHub + + + 以 GitHub 繼續 +

- or + + 或

- { required @input="handleChange()" autocomplete="username" + /> --> +
- { required @input="handleChange()" autocomplete="email" + /> --> +
- { v-model="password" required @input="handleChange()" + /> --> +
-

+

{{ errorMessage }}

-

- Already have an account? - - Log in +

+ + + 已經有帳號了嗎? + + + + 登入 + - Don't have an account? - - Sign up + + + 還沒有帳號嗎? + + + + 註冊 +

diff --git a/app/src/components/CommandlistPart.vue b/app/src/components/CommandlistPart.vue index 6cb8796..8e05bc1 100644 --- a/app/src/components/CommandlistPart.vue +++ b/app/src/components/CommandlistPart.vue @@ -2,8 +2,14 @@ diff --git a/app/src/components/CompleteModal.vue b/app/src/components/CompleteModal.vue index 404cfd8..628e11f 100644 --- a/app/src/components/CompleteModal.vue +++ b/app/src/components/CompleteModal.vue @@ -18,14 +18,19 @@ setTimeout(() => {