Commit Graph

158 Commits

Author SHA1 Message Date
matthieu42morin cacee53686 Edited preferencesPage.svelte, added fonts and css files
On branch Matthieu/Fonts-preferences
 Changes to be committed:
	new file:   public/fonts/Redacted_Script/OFL.txt
	new file:   public/fonts/Redacted_Script/RedactedScript-Bold.ttf
	new file:   public/fonts/Redacted_Script/RedactedScript-Light.ttf
	new file:   public/fonts/Redacted_Script/RedactedScript-Regular.ttf
	new file:   public/fonts/Source_Sans_Pro/OFL.txt
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-BlackItalic.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-BoldItalic.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLight.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLightItalic.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-Italic.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-Light.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-LightItalic.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf
	new file:   public/fonts/Source_Sans_Pro/SourceSansPro-SemiBoldItalic.ttf
	new file:   src/colors.css
	renamed:    src/lib/components/Categories/category3InRow.svelte -> src/lib/components/Categories/preference.svelte
	modified:   src/routes/onboarding/preferencesPage.svelte
	new file:   src/typography.css
2023-03-23 17:27:31 +01:00
matthieu42morin a7c6f29e04 Debug
Changes to be committed:
	modified:   src/lib/utils/database/experience.ts
2023-03-22 16:31:27 +01:00
matthieu42morin d28e4c4def Merge branch 'master' of https://github.com/erant-s-r-o/erant 2023-03-22 16:26:59 +01:00
matthieu42morin 573b1a9cec Fucking zavorka
Changes to be committed:
	modified:   src/routes/onboarding/preferencesPage.svelte
2023-03-22 16:26:13 +01:00
Jakub Schenk 8aae6464cd
Merge pull request #78 from Erant-s-r-o/Kuba/profil
Update 22.3.2023
2023-03-22 14:11:24 +01:00
Schenky 9668864d6c Update 22.3.2023 2023-03-22 14:10:01 +01:00
matthieu42morin e56983dc4f preferencesPage updated - solved fetching, selection functionality needed
Changes to be committed:
	modified:   .eslintrc.cjs
	modified:   public/serviceworker.js
	modified:   public/serviceworker_notused.js
	modified:   src/__routes.svelte
	modified:   src/lib/collections.ts
	modified:   src/lib/components/Categories/category2InRow.svelte
	modified:   src/lib/components/Categories/category3InRow.svelte
	new file:   src/lib/router/LazyRoute.svelte
	new file:   src/lib/router/ProtectedRouteGuard.svelte
	new file:   src/lib/router/routes.ts
	modified:   src/lib/utils/database/experience.ts
	modified:   src/lib/utils/database/preferences.ts
	modified:   src/lib/utils/parseQuestion.js
	modified:   src/main.js
	modified:   src/routes/onboarding/interestsPage.svelte
	new file:   src/routes/onboarding/preferencesPage.svelte
	modified:   src/routes/profile/functions/Interests-Update.svelte
	modified:   tailwind.config.cjs
2023-03-22 07:20:30 +01:00
Ota Prokopec 9aab42db08 Layout 2023-03-21 17:40:58 +01:00
Ota Prokopec 823e15f671 Layouting + game->experience renaming 2023-03-21 17:33:06 +01:00
Matthieu Morin c0de14399f
Merge pull request #77 from Erant-s-r-o/Matt/preferenceUPD
Matt/preference upd
2023-03-20 08:51:10 +01:00
matthieu42morin 261895a38e Merge branch 'master' of https://github.com/erant-s-r-o/erant into Matt/preferenceUPD 2023-03-20 08:50:03 +01:00
matthieu42morin 5e5c9eee93 Update categories, preferences, and experience, indentation, and other minor changes
Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
	modified:   src/__routes.svelte
	renamed:    src/lib/components/Interests/category.svelte -> src/lib/components/Categories/category.svelte
	new file:   src/lib/components/Categories/category2InRow.svelte
	new file:   src/lib/components/Categories/category3InRow.svelte
	renamed:    src/lib/components/Interests/Interests.svelte -> src/lib/components/Categories/interests.svelte
	modified:   src/lib/router/Router.svelte
	renamed:    src/lib/stores/game.js -> src/lib/stores/stores.js
	modified:   src/lib/utils/IdGenerator.js
	modified:   src/lib/utils/api.js
	renamed:    src/lib/utils/database/game.ts -> src/lib/utils/database/experience.ts
	new file:   src/lib/utils/database/preferences.ts
	modified:   src/lib/utils/stores.js
	new file:   src/locales/cz.json
	new file:   src/locales/en.json
	new file:   src/locales/i18n.ts
	new file:   src/locales/languages.ts
	modified:   src/routes/authorization/register/register.svelte
	modified:   src/routes/explore/explore.svelte
	modified:   src/routes/game/Forms/MultiChoiceForm.svelte
	modified:   src/routes/game/Forms/NumberForm.svelte
	modified:   src/routes/game/Forms/Renderer.svelte
	modified:   src/routes/game/Forms/SingleChoiceForm.svelte
	modified:   src/routes/game/Forms/TextForm.svelte
	renamed:    src/routes/game/game.svelte -> src/routes/game/experience.svelte
	modified:   src/routes/homepage/homepage.svelte
	modified:   src/routes/map/map.svelte
	modified:   src/routes/onboarding/interestsPage.svelte
	modified:   src/routes/profile/functions/Interests-Update.svelte

 Changes not staged for commit:
	modified:   src/lib/utils/parseQuestion.js
2023-03-20 08:44:21 +01:00
Ota Prokopec bf65e8508f better experiece 2023-03-19 22:33:14 +01:00
Ota Prokopec 86f95a52a4 experience fix bug 2023-03-19 19:13:51 +01:00
Ota Prokopec 385217c666 explore fix 2023-03-19 15:24:37 +01:00
Ota Prokopec e48f3d3caf finish fix 2023-03-19 15:19:43 +01:00
Ota Prokopec 7465ad6713 game fix, home page fix 2023-03-19 14:47:43 +01:00
Ota Prokopec f499cfff22 game fix 2023-03-19 14:05:50 +01:00
Ota Prokopec e67a66c7ae register-login fix / Erant map scaling fix 2023-03-19 13:52:36 +01:00
Ota Prokopec e629d598d4 map fix 2023-03-19 13:32:53 +01:00
matthieu42morin e9402c2825 On branch Matt/preferenceUPD
Changes to be committed:
	modified:   index.html
	modified:   postcss.config.cjs
	modified:   public/serviceworker.js
	modified:   src/__routes.svelte
	modified:   src/lib/collections.ts
	modified:   src/lib/components/Interests/Interests.svelte
	new file:   src/lib/components/Interests/category.svelte
	new file:   src/routes/onboarding/interestsPage.svelte
	modified:   src/routes/profile/functions/Interests-Update.svelte
2023-03-19 03:26:11 +01:00
Ota Prokopec b4df394e29 err 2023-03-17 18:47:41 +01:00
matthieu42morin dbf90f8028 legal s malym l :DDDDDDDDDDDDDD xd
Changes to be committed:
	new file:   src/routes/legal/cookie-policy.svelte
	new file:   src/routes/legal/privacy-policy.svelte
	new file:   src/routes/legal/terms-and-conditions.svelte
2023-03-16 16:09:05 +01:00
matthieu42morin 716e5471c8 fokin hell legal
Changes to be committed:
	deleted:    src/routes/Legal/cookie-policy.svelte
	deleted:    src/routes/Legal/privacy-policy.svelte
	deleted:    src/routes/Legal/terms-and-conditions.svelte
2023-03-16 16:07:54 +01:00
matthieu42morin 2ebd7030eb Vite modifications for PWA
Changes to be committed:
	modified:   public/manifest.json
	modified:   public/serviceworker.js
	modified:   tsconfig.json
	renamed:    vite.config.js -> vite.config.ts
2023-03-16 14:52:11 +01:00
Matthieu Morin 9ce38e2197
Merge pull request #76 from Erant-s-r-o/package-upd
package-upd
2023-03-15 21:07:22 +01:00
matthieu42morin e2297f774a package-upd
Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
2023-03-15 21:05:25 +01:00
matthieu42morin 4dd52db9b6 Changes to be committed:
modified:   package-lock.json
	modified:   package.json
	renamed:    tests/example.spec.ts -> tests/test.ts
2023-03-15 19:34:04 +01:00
matthieu42morin e2cd6455b0 Merge branch 'master' of https://github.com/erant-s-r-o/erant 2023-03-15 18:41:34 +01:00
matthieu42morin 75dfeb1e11 Fuckoff gite nesnasim te
Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
	modified:   src/routes/Legal/terms-and-conditions.svelte
	modified:   vite.config.js
2023-03-15 18:40:04 +01:00
Ota Prokopec a497dc80e5 svelte-check 2023-03-15 18:31:20 +01:00
matthieu42morin 20d1807ab1 Merge branch 'master' of https://github.com/erant-s-r-o/erant 2023-03-15 18:16:57 +01:00
matthieu42morin 7a539dedc2 2023-03-15 18:16:41 +01:00
Ota Prokopec 00098cbbd0 images experiences 2023-03-15 18:09:46 +01:00
Ota Prokopec 4a1147ab06 error fix 2023-03-15 18:06:28 +01:00
Ota Prokopec 50b731341a erant map - checkpoint, fix future problems in exp 2023-03-15 17:27:54 +01:00
Ota Prokopec a8b376e369 register-login-location-new directory 2023-03-15 16:56:17 +01:00
Ota Prokopec 74d2cf607e map error fix 2023-03-14 22:07:03 +01:00
Ota Prokopec 2eb444c8bd QR fast game load 2023-03-14 19:02:05 +01:00
Ota Prokopec f24a7b8a76 Oprava Profile (routes), Layouts in Profile 2023-03-14 18:57:59 +01:00
Ota-Prokopec 2a781be8e0
Merge pull request #73 from Erant-s-r-o/otafix
fix
2023-03-14 18:36:58 +01:00
Ota Prokopec 21cb4e4da7 fix 2023-03-14 18:35:03 +01:00
Jakub Schenk 0015ae6b63
Merge pull request #72 from Erant-s-r-o/Kuba/profil
Update 14.3.2023
2023-03-14 15:44:25 +01:00
Schenky 8cc6ca417a Update 14.3.2023 2023-03-14 15:38:51 +01:00
Ota Prokopec 4eafb2f123 auth path / verification only 2023-03-13 17:26:32 +01:00
matthieu42morin 37755eeac9 Forgot password page added
Changes to be committed:
 	modified:   src/__routes.svelte
 	new file:   src/routes/login/forgot-pswd.svelte
 	modified:   src/routes/login/log_in.svelte
 	modified:   src/routes/register/register.svelte
2023-03-12 19:02:07 +01:00
matthieu42morin 543f6a3d7c Legal pages added, must be reviewed and formatted.
Changes to be committed:
	new file:   public/legal/cookie-policy.pdf
	deleted:    public/legal/cookie_policy.pdf
	new file:   public/legal/terms-and-conditions.pdf
	modified:   src/__routes.svelte
	new file:   src/routes/Legal/cookie-policy.svelte
	new file:   src/routes/Legal/privacy-policy.svelte
	new file:   src/routes/Legal/terms-and-conditions.svelte
	modified:   src/routes/register/register.svelte
2023-03-12 18:19:58 +01:00
matthieu42morin 0f670ef68e Permissions API is read only, updating LocationRequest, map.svelte
Changes to be committed:
	modified:   src/lib/components/Map/LocationRequest.svelte
	modified:   src/routes/map.svelte
2023-03-12 16:57:53 +01:00
matthieu42morin 000835a34a Adding LocationRequest permission to store as a cookie and in localstorage so that it doesn't keep asking for permission to use location
Changes to be committed:
	modified:   src/lib/components/Map/LocationRequest.svelte
	modified:   src/routes/map.svelte
2023-03-11 20:11:03 +01:00
matthieu42morin a1da093c84 Location permission update
Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
	modified:   src/lib/components/Map/LocationRequest.svelte
	modified:   src/routes/game/game.svelte
	modified:   src/routes/map.svelte
2023-03-11 19:19:27 +01:00