diff --git a/.eslintrc.js b/.eslintrc.js index 0d2e94d..68ebfe8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -17,7 +17,7 @@ module.exports = { sourceType: 'module', }, rules: { - 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-console': 'warn', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'import/extensions': 'off', camelcase: ['error', { properties: 'never', ignoreDestructuring: true }], 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 2b32a9c..40eb6bc 100644 --- a/app/src/components/CommandlistPart.vue +++ b/app/src/components/CommandlistPart.vue @@ -1,7 +1,13 @@ 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(() => {
× -

- Quest Completed! +

+ + 關卡完成！

您已成功完成挑戰，真的非常感謝您的參與！
如果您能撥冗填寫這份問卷，我們將不勝感激，這對我們非常重要！

-import { createSession } from '../store/session' - -const reset = async () => { - console.log('resetting...') - await createSession() -} - - + + diff --git a/app/src/components/GameHeaderPart.vue b/app/src/components/GameHeaderPart.vue index e145471..34a88cf 100644 --- a/app/src/components/GameHeaderPart.vue +++ b/app/src/components/GameHeaderPart.vue @@ -15,7 +15,17 @@ const handleLogout = async () => { reset() router.push({ name: 'login' }) } catch (err) { - toast.error('Failed to logout') + // toast.error('Failed to logout') + toast.error('登出失敗') + console.error(err) + } +} +const handleMap = async () => { + try { + router.push({ name: 'map' }) + } catch (err) { + // toast.error('Failed to load map') + toast.error('無法讀取地圖') console.error(err) } } @@ -38,7 +48,9 @@ const handleLogout = async () => { /> -->

{{ sessionStore.quest.title }} @@ -63,6 +75,12 @@ const handleLogout = async () => { class="text-text-primary h-full w-full" /> --> + { :icon="['far', 'lightbulb']" class="text-yellow-200 p-2 content-center" /> -

Hint

-
+

+ + 提示 +

+