diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1a3b8eb..6020c1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,8 +1,8 @@ on: push: - branches: [ "deploy/prod" ] + branches: ['deploy/prod'] pull_request: - branches: [ "deploy/prod" ] + branches: ['deploy/prod'] name: 🚀 Deploy website on push jobs: @@ -10,18 +10,18 @@ jobs: name: 🎉 Deploy runs-on: ubuntu-latest steps: - - name: 🚚 Get latest code - uses: actions/checkout@v3 - - - name: 🔨 Build Project - run: | - npm ci - npm run build - - - name: 📂 Sync files - uses: SamKirkland/FTP-Deploy-Action@4.3.2 - with: - server: 305244.w44.wedos.net - username: w305244_BOT007 - password: ${{ secrets.FTP_PASSWORD }} - local-dir: ./dist/ + - name: 🚚 Get latest code + uses: actions/checkout@v3 + + - name: 🔨 Build Project + run: | + npm ci + npm run build + + - name: 📂 Sync files + uses: SamKirkland/FTP-Deploy-Action@4.3.2 + with: + server: 305244.w44.wedos.net + username: w305244_BOT007 + password: ${{ secrets.FTP_PASSWORD }} + local-dir: ./dist/ diff --git a/src/App.svelte b/src/App.svelte index f4b1975..1c37889 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -13,7 +13,7 @@ $: if (isReady && !$user) { if (!(location.pathname.startsWith('/login') || location.pathname.startsWith('/register'))) { - //navigate('/login') + navigate('/login') } } diff --git a/src/routes/game/Components/Layout.svelte b/src/routes/game/Components/Layout.svelte index 5e132d6..9b529af 100644 --- a/src/routes/game/Components/Layout.svelte +++ b/src/routes/game/Components/Layout.svelte @@ -1,9 +1,10 @@ - @@ -23,7 +24,7 @@
- {#if control !== null} + {#if control !== null || control === 'not-control'} {:else} @@ -31,9 +32,11 @@
- {#if control} + {#if control === 'not-control' || control === null} + + {:else if control} správně - {:else if control !== null} + {:else} špatně {/if}
diff --git a/src/routes/game/Forms/Info.svelte b/src/routes/game/Forms/Info.svelte new file mode 100644 index 0000000..6a407b2 --- /dev/null +++ b/src/routes/game/Forms/Info.svelte @@ -0,0 +1,27 @@ + + + { + nextQuestion() + myAnswer = '' + }} +> + {name} + {@html checkPoint.CPText} + + + diff --git a/src/routes/game/Forms/Renderer.svelte b/src/routes/game/Forms/Renderer.svelte index 49cc6e2..728e32b 100644 --- a/src/routes/game/Forms/Renderer.svelte +++ b/src/routes/game/Forms/Renderer.svelte @@ -10,6 +10,7 @@ import Finish from './Finish.svelte' import { data } from '$lib/stores/game' import Erantmap from '$lib/components/Map/Erantmap.svelte' + import Info from './Info.svelte' const components = { TEXT: TextForm, @@ -18,6 +19,7 @@ CHECKBOX: MultiplyForm, interval: IntervalForm, qrcode: QrCode, + INFO: Info, } let control = null // if true => spravne if false spatne