From 117d8fc45dcdd4a3817a1fa5a839a8d805e55f8f Mon Sep 17 00:00:00 2001 From: matthieu42morin Date: Tue, 21 Feb 2023 14:16:14 +0100 Subject: [PATCH 1/4] Update to animation speed Changes to be committed: modified: package-lock.json modified: package.json modified: src/routes/homepage/Components/Animation.svelte modified: src/routes/homepage/homepage.svelte --- package-lock.json | 27 +++++++++++++ package.json | 9 +++-- .../homepage/Components/Animation.svelte | 40 ++++++++++++++++--- src/routes/homepage/homepage.svelte | 2 +- 4 files changed, 67 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfc45db..4477c1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@beyonk/svelte-mapbox": "^8.1.4", "@bytemd/plugin-gfm": "^1.17.4", + "@lottiefiles/svelte-lottie-player": "^0.3.0", "appwrite": "^10.1.0", "bytemd": "^1.17.4", "html5-qrcode": "^2.3.0", @@ -135,6 +136,14 @@ "npm": ">= 5.0.0" } }, + "node_modules/@lottiefiles/svelte-lottie-player": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@lottiefiles/svelte-lottie-player/-/svelte-lottie-player-0.3.0.tgz", + "integrity": "sha512-u7kwq6YlNYCN7pRO3er+1/uDDwBX12c8hnKFxmRejAW78d3Ps6Hdq9XDUYHNAr+0euEf9p2RvpDmZaKQzcJXVw==", + "dependencies": { + "lottie-web": "^5.10.0" + } + }, "node_modules/@mapbox/geojson-rewind": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", @@ -1919,6 +1928,11 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/lottie-web": { + "version": "5.10.2", + "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.10.2.tgz", + "integrity": "sha512-d0PFIGiwuMsJYaF4uPo+qG8dEorlI+xFI2zrrFtE1bGO4WoLIz+NjremxEq1swpR7juR10aeOtmNh3d6G3ub0A==" + }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -4207,6 +4221,14 @@ "resolved": "https://registry.npmjs.org/@icon-park/svg/-/svg-1.4.2.tgz", "integrity": "sha512-1X0DA+1e0R0liYvw+Nb2BQmF1oEo/wS3o/JYkQYifPJXCGYij2vN9sJf/NNhbzDsJWTg4W2bbzZjJvC7Q4w4oQ==" }, + "@lottiefiles/svelte-lottie-player": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@lottiefiles/svelte-lottie-player/-/svelte-lottie-player-0.3.0.tgz", + "integrity": "sha512-u7kwq6YlNYCN7pRO3er+1/uDDwBX12c8hnKFxmRejAW78d3Ps6Hdq9XDUYHNAr+0euEf9p2RvpDmZaKQzcJXVw==", + "requires": { + "lottie-web": "^5.10.0" + } + }, "@mapbox/geojson-rewind": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", @@ -5451,6 +5473,11 @@ "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz", "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==" }, + "lottie-web": { + "version": "5.10.2", + "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.10.2.tgz", + "integrity": "sha512-d0PFIGiwuMsJYaF4uPo+qG8dEorlI+xFI2zrrFtE1bGO4WoLIz+NjremxEq1swpR7juR10aeOtmNh3d6G3ub0A==" + }, "lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", diff --git a/package.json b/package.json index 5ef1f13..4778b77 100644 --- a/package.json +++ b/package.json @@ -22,16 +22,17 @@ "vite": "^3.2.3" }, "dependencies": { + "@beyonk/svelte-mapbox": "^8.1.4", "@bytemd/plugin-gfm": "^1.17.4", + "@lottiefiles/svelte-lottie-player": "^0.3.0", "appwrite": "^10.1.0", "bytemd": "^1.17.4", - "svelte-appwrite-client": "^0.2.3", - "svelte-i18n": "^3.6.0", - "svelte-routing": "^1.6.0", - "@beyonk/svelte-mapbox": "^8.1.4", "html5-qrcode": "^2.3.0", "mapbox": "^1.0.0-beta10", "mapbox-gl": "^2.10.0", + "svelte-appwrite-client": "^0.2.3", + "svelte-i18n": "^3.6.0", + "svelte-routing": "^1.6.0", "yallist": "^4.0.0" } } diff --git a/src/routes/homepage/Components/Animation.svelte b/src/routes/homepage/Components/Animation.svelte index 78e0937..bf6d8f0 100644 --- a/src/routes/homepage/Components/Animation.svelte +++ b/src/routes/homepage/Components/Animation.svelte @@ -1,10 +1,38 @@ - - - - + + + + diff --git a/src/routes/homepage/homepage.svelte b/src/routes/homepage/homepage.svelte index 783b00d..f4bea8c 100644 --- a/src/routes/homepage/homepage.svelte +++ b/src/routes/homepage/homepage.svelte @@ -14,7 +14,7 @@ setTimeout(() => { fitstTime = false localStorage.setItem('ErantFirstTime', "false"); - }, 15000) + }, 11000) } }) From 3883f46537037b111032d237961168e0b77f2890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludv=C3=ADk=20Prokopec?= Date: Thu, 23 Feb 2023 16:47:37 +0100 Subject: [PATCH 2/4] add workflow --- .github/workflows/main.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..1a3b8eb --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,27 @@ +on: + push: + branches: [ "deploy/prod" ] + pull_request: + branches: [ "deploy/prod" ] + +name: 🚀 Deploy website on push +jobs: + web-deploy: + 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/ From f43fa76778f1b6edda4b7c228bea0f9430c25843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludv=C3=ADk=20Prokopec?= Date: Thu, 23 Feb 2023 16:54:22 +0100 Subject: [PATCH 3/4] Fix naming --- src/lib/components/Cookies/CookiesPopUp.svelte | 4 ++-- src/routes/error.svelte | 6 +++--- src/routes/explore/explore.svelte | 2 +- src/routes/game/Components/Layout.svelte | 6 +++--- src/routes/game/Forms/Finish.svelte | 4 ++-- src/routes/game/Forms/IntervalForm.svelte | 2 +- src/routes/game/Forms/MultiChoiceForm.svelte | 2 +- src/routes/game/Forms/NumberForm.svelte | 2 +- src/routes/game/Forms/SingleChoiceForm.svelte | 2 +- src/routes/game/Forms/TextForm.svelte | 2 +- src/routes/game/game.svelte | 18 +++++++++--------- src/routes/homepage/homepage.svelte | 2 +- src/routes/log_in.svelte | 2 +- src/routes/map.svelte | 4 ++-- src/routes/profile/payment_history.svelte | 8 ++++---- src/routes/profile/profile.svelte | 8 ++++---- src/routes/register.svelte | 2 +- src/routes/test.svelte | 2 +- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/lib/components/Cookies/CookiesPopUp.svelte b/src/lib/components/Cookies/CookiesPopUp.svelte index 9c99d4c..cf5ab2a 100644 --- a/src/lib/components/Cookies/CookiesPopUp.svelte +++ b/src/lib/components/Cookies/CookiesPopUp.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/explore/explore.svelte b/src/routes/explore/explore.svelte index f16dea6..04a23ad 100644 --- a/src/routes/explore/explore.svelte +++ b/src/routes/explore/explore.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/game/Forms/IntervalForm.svelte b/src/routes/game/Forms/IntervalForm.svelte index 93617a0..d94db22 100644 --- a/src/routes/game/Forms/IntervalForm.svelte +++ b/src/routes/game/Forms/IntervalForm.svelte @@ -1,6 +1,6 @@ From bfc98c3ff89d42d3cab8886484572a64a0083c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludv=C3=ADk=20Prokopec?= Date: Thu, 23 Feb 2023 16:58:45 +0100 Subject: [PATCH 4/4] fix cases --- src/lib/components/Layouts/NavigationBarLayout.svelte | 2 +- src/routes/error.svelte | 3 ++- src/routes/game/Components/Layout.svelte | 4 ++-- src/routes/game/Forms/IntervalForm.svelte | 4 ++++ src/routes/game/game.svelte | 8 ++++---- src/routes/log_in.svelte | 2 ++ src/routes/profile/payment_history.svelte | 4 ++-- src/routes/profile/profile.svelte | 4 ++-- src/routes/register.svelte | 4 ++++ src/routes/test.svelte | 2 +- 10 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/lib/components/Layouts/NavigationBarLayout.svelte b/src/lib/components/Layouts/NavigationBarLayout.svelte index 977ef19..f82b1b7 100644 --- a/src/lib/components/Layouts/NavigationBarLayout.svelte +++ b/src/lib/components/Layouts/NavigationBarLayout.svelte @@ -1,6 +1,6 @@ +
Erant diff --git a/src/routes/game/Components/Layout.svelte b/src/routes/game/Components/Layout.svelte index 250ac5e..5e132d6 100644 --- a/src/routes/game/Components/Layout.svelte +++ b/src/routes/game/Components/Layout.svelte @@ -1,7 +1,7 @@