diff --git a/.eslintrc.cjs b/.eslintrc.cjs index ceaea72..35e5471 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,13 +1,13 @@ module.exports = { - env: { - browser: true, - es2021: true, - }, - extends: 'standard-with-typescript', - overrides: [], - parserOptions: { - ecmaVersion: 'latest', - sourceType: 'module', - }, - rules: {}, + env: { + browser: true, + es2021: true + }, + extends: 'standard-with-typescript', + overrides: [], + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module' + }, + rules: {} } diff --git a/index.html b/index.html index e875a96..57691c6 100644 --- a/index.html +++ b/index.html @@ -1,66 +1,80 @@ + + + + + + Erant - - - - - - Erant + + - - + + + + - - - - + + + - - gtag('config', 'G-8RCL0H1Q7V'); - + + + + - - - - - - - - - - - -
- - + + + + +
+ + diff --git a/package-lock.json b/package-lock.json index d763249..fe6e383 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,9 +39,10 @@ "eslint-plugin-promise": "^6.1.1", "flowbite-svelte": "^0.28.11", "postcss": "^8.4.19", - "sass": "^1.56.1", + "sass": "^1.59.3", "svelte": "^3.52.0", "svelte-preprocess": "^4.10.7", + "svelte-preprocess-sass": "^2.0.1", "tailwindcss": "^3.2.4", "typescript": "^4.9.5", "vite": "^3.2.3" @@ -5823,6 +5824,24 @@ } } }, + "node_modules/svelte-preprocess-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svelte-preprocess-filter/-/svelte-preprocess-filter-1.0.0.tgz", + "integrity": "sha512-92innv59nyEx24xbfcSurB5ocwC8qFdDtGli/JVMHzJsxyvV2yjQKIcbUqU9VIV5mKUWO2PoY93nncS2yF4ULQ==", + "dev": true + }, + "node_modules/svelte-preprocess-sass": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/svelte-preprocess-sass/-/svelte-preprocess-sass-2.0.1.tgz", + "integrity": "sha512-0y4FjRsRWcN7rJeNJnSfZ7LVAz6S7/j9Dg24XFRelr/rjMMjXORdEvXy4r38fUYmyk9Y7yjwlHCiqyGxMHhEbg==", + "dev": true, + "dependencies": { + "svelte-preprocess-filter": "^1.0.0" + }, + "peerDependencies": { + "sass": "^1.35.2" + } + }, "node_modules/svelte-preprocess/node_modules/magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -10417,6 +10436,21 @@ } } }, + "svelte-preprocess-filter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svelte-preprocess-filter/-/svelte-preprocess-filter-1.0.0.tgz", + "integrity": "sha512-92innv59nyEx24xbfcSurB5ocwC8qFdDtGli/JVMHzJsxyvV2yjQKIcbUqU9VIV5mKUWO2PoY93nncS2yF4ULQ==", + "dev": true + }, + "svelte-preprocess-sass": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/svelte-preprocess-sass/-/svelte-preprocess-sass-2.0.1.tgz", + "integrity": "sha512-0y4FjRsRWcN7rJeNJnSfZ7LVAz6S7/j9Dg24XFRelr/rjMMjXORdEvXy4r38fUYmyk9Y7yjwlHCiqyGxMHhEbg==", + "dev": true, + "requires": { + "svelte-preprocess-filter": "^1.0.0" + } + }, "svelte-routing": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/svelte-routing/-/svelte-routing-1.6.0.tgz", diff --git a/package.json b/package.json index b960c41..cce22a2 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,10 @@ "eslint-plugin-promise": "^6.1.1", "flowbite-svelte": "^0.28.11", "postcss": "^8.4.19", - "sass": "^1.56.1", + "sass": "^1.59.3", "svelte": "^3.52.0", "svelte-preprocess": "^4.10.7", + "svelte-preprocess-sass": "^2.0.1", "tailwindcss": "^3.2.4", "typescript": "^4.9.5", "vite": "^3.2.3" diff --git a/postcss.config.cjs b/postcss.config.cjs index bafe175..5f0853f 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -2,5 +2,5 @@ const autoprefixer = require('autoprefixer') const tailwind = require('tailwindcss') module.exports = { - plugins: [tailwind(), autoprefixer()], + plugins: [tailwind(), autoprefixer()] } diff --git a/public/fonts/Redacted_Script/OFL.txt b/public/fonts/Redacted_Script/OFL.txt new file mode 100644 index 0000000..fe1a1a6 --- /dev/null +++ b/public/fonts/Redacted_Script/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2013 The Redacted Project Authors (https://github.com/christiannaths/redacted-font) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Redacted_Script/RedactedScript-Bold.ttf b/public/fonts/Redacted_Script/RedactedScript-Bold.ttf new file mode 100644 index 0000000..9009f27 Binary files /dev/null and b/public/fonts/Redacted_Script/RedactedScript-Bold.ttf differ diff --git a/public/fonts/Redacted_Script/RedactedScript-Light.ttf b/public/fonts/Redacted_Script/RedactedScript-Light.ttf new file mode 100644 index 0000000..7aa7b12 Binary files /dev/null and b/public/fonts/Redacted_Script/RedactedScript-Light.ttf differ diff --git a/public/fonts/Redacted_Script/RedactedScript-Regular.ttf b/public/fonts/Redacted_Script/RedactedScript-Regular.ttf new file mode 100644 index 0000000..e8f3285 Binary files /dev/null and b/public/fonts/Redacted_Script/RedactedScript-Regular.ttf differ diff --git a/public/fonts/Source_Sans_Pro/OFL.txt b/public/fonts/Source_Sans_Pro/OFL.txt new file mode 100644 index 0000000..bce8032 --- /dev/null +++ b/public/fonts/Source_Sans_Pro/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf new file mode 100644 index 0000000..1c93e9e Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-Black.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-BlackItalic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-BlackItalic.ttf new file mode 100644 index 0000000..928aa37 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-BlackItalic.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf new file mode 100644 index 0000000..b8879af Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-Bold.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-BoldItalic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-BoldItalic.ttf new file mode 100644 index 0000000..b38bae9 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-BoldItalic.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLight.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLight.ttf new file mode 100644 index 0000000..8074e3a Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLight.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLightItalic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLightItalic.ttf new file mode 100644 index 0000000..db759e0 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-ExtraLightItalic.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-Italic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-Italic.ttf new file mode 100644 index 0000000..7dbece7 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-Italic.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-Light.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-Light.ttf new file mode 100644 index 0000000..9b0e83d Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-Light.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-LightItalic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-LightItalic.ttf new file mode 100644 index 0000000..5af0659 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-LightItalic.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf new file mode 100644 index 0000000..98e8579 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-Regular.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf new file mode 100644 index 0000000..99dcc81 Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBold.ttf differ diff --git a/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBoldItalic.ttf b/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBoldItalic.ttf new file mode 100644 index 0000000..9c3891b Binary files /dev/null and b/public/fonts/Source_Sans_Pro/SourceSansPro-SemiBoldItalic.ttf differ diff --git a/public/serviceworker.js b/public/serviceworker.js index 4b2d31b..47999f8 100644 --- a/public/serviceworker.js +++ b/public/serviceworker.js @@ -1,53 +1,4 @@ -// This is the service worker with the combined offline experience (Offline page + Offline copy of pages) -import { workbox } from 'https://storage.googleapis.com/workbox-cdn/releases/5.1.4/workbox-sw.js' -const CACHE = 'pwabuilder-offline-page' +self.addEventListener('install', (e) => { }) -importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.4/workbox-sw.js') -// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html"; -const offlineFallbackPage = '/offline.html' - -self.addEventListener('message', (event) => { - if (event.data && event.data.type === 'SKIP_WAITING') { - self.skipWaiting() - } -}) - -self.addEventListener('install', async (event) => { - event.waitUntil( - caches.open(CACHE) - .then((cache) => cache.add(offlineFallbackPage)) - ) -}) - -if (workbox.navigationPreload.isSupported()) { - workbox.navigationPreload.enable() -} - -workbox.routing.registerRoute( - /\/*/, - new workbox.strategies.StaleWhileRevalidate({ - cacheName: CACHE - }) -) - -self.addEventListener('fetch', (event) => { - if (event.request.mode === 'navigate') { - event.respondWith((async () => { - try { - const preloadResp = await event.preloadResponse - - if (preloadResp) { - return preloadResp - } - - const networkResp = await fetch(event.request) - return networkResp - } catch (error) { - const cache = await caches.open(CACHE) - const cachedResp = await cache.match(offlineFallbackPage) - return cachedResp - } - })()) - } -}) +self.addEventListener('fetch', (e) => { }) diff --git a/public/serviceworker_notused.js b/public/serviceworker_notused.js index e1b62bc..3a1ae7e 100644 --- a/public/serviceworker_notused.js +++ b/public/serviceworker_notused.js @@ -1,4 +1,55 @@ -//self.addEventListener("install", (e) => { }) +// This is the service worker with the combined offline experience (Offline page + Offline copy of pages) +import workbox from 'workbox-sw' -//self.addEventListener('fetch', (e) => { }) +const CACHE = 'pwabuilder-offline-page' + +importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.4/workbox-sw.js') + +// TODO: replace the following with the correct offline fallback page i.e.: const offlineFallbackPage = "offline.html"; +const offlineFallbackPage = '/offline.html' + +self.addEventListener('message', (event) => { + if (event.data && event.data.type === 'SKIP_WAITING') { + self.skipWaiting() + } +}) + +self.addEventListener('install', async (event) => { + event.waitUntil( + caches.open(CACHE) + .then((cache) => cache.add(offlineFallbackPage)) + ) +}) + +if (workbox.navigationPreload.isSupported()) { + workbox.navigationPreload.enable() +} + +workbox.routing.registerRoute( + /\/*/, + new workbox.strategies.StaleWhileRevalidate({ + cacheName: CACHE + }) +) + +self.addEventListener('fetch', (event) => { + if (event.request.mode === 'navigate') { + event.respondWith((async () => { + try { + const preloadResp = await event.preloadResponse + + if (preloadResp) { + return preloadResp + } + + const networkResp = await fetch(event.request) + return networkResp + } catch (error) { + const cache = await caches.open(CACHE) + const cachedResp = await cache.match(offlineFallbackPage) + return cachedResp + } + })()) + } +}) diff --git a/src/__routes.svelte b/src/__routes.svelte index 0f05871..fdb8155 100644 --- a/src/__routes.svelte +++ b/src/__routes.svelte @@ -13,46 +13,12 @@ loading={Loading} error={Error} routes={[ + //experience { - path: '/', - component: () => import('$routes/homepage/homepage.svelte'), - layout: NavigationBarLayout, - }, - { - path: '/error', - component: () => import('$routes/error.svelte'), - }, - { - path: '/scanner', - component: () => import('$routes/qrscanner/qrscanner.svelte'), - }, - { - path: '/test', - component: () => import('$routes/test.svelte'), - }, - { - path: '/map', - component: () => import('$root/src/routes/map/map.svelte'), - }, - { - path: '/explore', - component: () => import('$routes/explore/explore.svelte'), - layout: NavigationBarLayout, - }, - { - path: '/profile/', - component: () => import('$src/__error.svelte'), - }, - { - path: '/profile/:erantId', - component: () => import('$routes/profile/profile.svelte'), - layout: NavigationBarLayout, - }, - { - path: '/profile/setting/:function', - component: () => import('$routes/profile/profile-functions.svelte'), - layout: ArrowBackLayout, + path: '/:gameurl', + component: () => import('$routes/game/experience.svelte'), }, + //authorization { path: '/login', component: () => import('$routes/authorization/login/log_in.svelte'), @@ -65,7 +31,6 @@ path: '/register/failed', component: () => import('$routes/authorization/register/registerFailed.svelte'), }, - { path: '/register/emailverification/:erantId', component: () => import('$routes/authorization/register/emailVerification.svelte'), @@ -75,9 +40,54 @@ component: () => import('$routes/authorization/register/createAccount.svelte'), }, { - path: '/:gameurl', - component: () => import('$routes/game/game.svelte'), + path: '/forgot-pswd', + component: () => import('$routes/authorization/forgottonPassword/forgot-pswd.svelte'), }, + ...[ + { + path: '/', + component: () => import('$routes/homepage/homepage.svelte'), + }, + { + path: '/explore', + component: () => import('$routes/explore/explore.svelte'), + }, + { + path: '/profile/:erantId', + component: () => import('$routes/profile/profile.svelte'), + }, + ].map((routes) => { + return { ...routes, layout: NavigationBarLayout } + }), + ...[ + { + path: '/profile/setting/:function', + component: () => import('$routes/profile/profile-functions.svelte'), + }, + ].map((routes) => { + return { ...routes, layout: ArrowBackLayout } + }), + { + path: '/error', + component: () => import('$routes/error.svelte'), + }, + { + path: '/scanner', + component: () => import('$routes/qrscanner/qrscanner.svelte'), + }, + /*{ + path: '/test', + component: () => import('$routes/test.svelte'), + },*/ + { + path: '/map', + component: () => import('$root/src/routes/map/map.svelte'), + }, + { + path: '/profile/', + component: () => import('$src/__error.svelte'), + }, + //policy { path: '/terms-and-conditions', component: () => import('$routes/legal/terms-and-conditions.svelte'), @@ -89,10 +99,6 @@ { path: '/cookie-policy', component: () => import('$routes/legal/cookie-policy.svelte'), - }, - { - path: '/forgot-pswd', - component: () => import('$routes/authorization/forgottonPassword/forgot-pswd.svelte'), - }, + } ]} /> diff --git a/src/colors.css b/src/colors.css new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/TStypes/experiences.ts b/src/lib/TStypes/experiences.ts index 56fcfd1..a740e9e 100644 --- a/src/lib/TStypes/experiences.ts +++ b/src/lib/TStypes/experiences.ts @@ -1,5 +1,10 @@ export type CheckPoint = { $id: string + $collectionId: string + $createdAt: string + $databaseId: string + $permissions: string + $updatedAt: string CPAfter: string CPAnswerID: string CPHint: string @@ -13,8 +18,14 @@ export type CheckPoint = { } export type Experience = { + $id: string + $collectionId: string + $createdAt: string + $databaseId: string + $permissions: string + $updatedAt: string ExpApproved: boolean - ExpCpsID: string[] + ExpCPsID: string[] ExpCategory?: string ExpEnd0: string ExpEnd60: string @@ -27,5 +38,6 @@ export type Experience = { ExpTestingCode: string ExpURL: string UserID: string - checkPoint: Array + checkPoints: Array + rating: number } diff --git a/src/lib/collections.ts b/src/lib/collections.ts index b6272ae..57ccfdc 100644 --- a/src/lib/collections.ts +++ b/src/lib/collections.ts @@ -2,8 +2,16 @@ import { Collection } from './appwrite' const experiences = new Collection('63cef30d6da945dd4250', '63cef4bd210fdf2e5888') const users = new Collection('63ded6c18e8493bffc83', 'Users') +const interests = new Collection('6417cf1de159d094b370', '6417cf29f2118829b3b4') +const travel_with = new Collection('6417cf1de159d094b370', '6417d0429843609a2f49') +const recommended_by = new Collection('6417cf1de159d094b370', '6417d00e40701375978b') +const usersAnswers = new Collection('63cef30d6da945dd4250', 'users-answers') export default { experiences, users, + interests, + travel_with, + recommended_by, + usersAnswers, } diff --git a/src/lib/components/Buttons/Button.svelte b/src/lib/components/Buttons/Button.svelte index 413989d..20bc686 100644 --- a/src/lib/components/Buttons/Button.svelte +++ b/src/lib/components/Buttons/Button.svelte @@ -41,6 +41,11 @@ color: white; background-color: rgb(66, 99, 235); + &.disabled { + &:hover { + background-color: rgb(107 114 128); + } + } &:hover { background-color: rgba(66, 99, 235, 0.8); } diff --git a/src/lib/components/Categories/category.svelte b/src/lib/components/Categories/category.svelte new file mode 100644 index 0000000..addf887 --- /dev/null +++ b/src/lib/components/Categories/category.svelte @@ -0,0 +1,55 @@ + + + +
+
+ {name} +
+
{name}
+
+ + + \ No newline at end of file diff --git a/src/lib/components/Categories/category2InRow.svelte b/src/lib/components/Categories/category2InRow.svelte new file mode 100644 index 0000000..7b50c49 --- /dev/null +++ b/src/lib/components/Categories/category2InRow.svelte @@ -0,0 +1,17 @@ + + +
+ {#each preferences as preference} +
onPreferenceSelect(preference)} + > + {preference.name} +
+ {/each} +
+ \ No newline at end of file diff --git a/src/lib/components/Interests/Interests.svelte b/src/lib/components/Categories/interests.svelte similarity index 98% rename from src/lib/components/Interests/Interests.svelte rename to src/lib/components/Categories/interests.svelte index fd7f953..028cefa 100644 --- a/src/lib/components/Interests/Interests.svelte +++ b/src/lib/components/Categories/interests.svelte @@ -3,6 +3,7 @@ import collections from '$lib/collections' import { Query } from 'appwrite' import { navigate } from 'svelte-routing' + import Category from "$lib/components/Categories/category.svelte"; export let current_state = 1 diff --git a/src/lib/components/Categories/preference.svelte b/src/lib/components/Categories/preference.svelte new file mode 100644 index 0000000..ec75b73 --- /dev/null +++ b/src/lib/components/Categories/preference.svelte @@ -0,0 +1,32 @@ + + +
+
dispatch('selected')} + > + sample 1 + {name} +
+
+ + + \ No newline at end of file diff --git a/src/lib/components/Common/PopUp.svelte b/src/lib/components/Common/PopUp.svelte new file mode 100644 index 0000000..95f3019 --- /dev/null +++ b/src/lib/components/Common/PopUp.svelte @@ -0,0 +1,190 @@ + + +
+
+

+ {headline} +

+ +
+ {#each options as option} + + {/each} +
+ +
+ + +
+
+
+ + \ No newline at end of file diff --git a/src/lib/components/Layouts/LayoutImg.svelte b/src/lib/components/Layouts/LayoutImg.svelte index 751137c..052ba4b 100644 --- a/src/lib/components/Layouts/LayoutImg.svelte +++ b/src/lib/components/Layouts/LayoutImg.svelte @@ -34,8 +34,8 @@ height: auto; width: 100%; overflow-y: auto; - position: absolute; - top: 25%; + position: relative; + top: -10%; border-radius: 70px 70px 0 0; padding: 52px; display: flex; @@ -49,7 +49,7 @@ z-index: 4; width: 100%; height: auto; - position: absolute; + position: relative; } .shareButton { width: 100%; diff --git a/src/lib/components/Layouts/NavigationBarLayout.svelte b/src/lib/components/Layouts/NavigationBarLayout.svelte index 36bbb90..fdfb90c 100644 --- a/src/lib/components/Layouts/NavigationBarLayout.svelte +++ b/src/lib/components/Layouts/NavigationBarLayout.svelte @@ -6,7 +6,6 @@ import FooterItem from '../Common/NavBar_Item.svelte' $: [userInfo] = collections.users.getDocument([Query.equal('userId', $user?.$id || '')]) - $: console.log($user) $: items = [ { diff --git a/src/lib/components/Map/Erantmap.svelte b/src/lib/components/Map/Erantmap.svelte index 0b7fa10..76f70ea 100644 --- a/src/lib/components/Map/Erantmap.svelte +++ b/src/lib/components/Map/Erantmap.svelte @@ -1,21 +1,37 @@ - + + {#if center} - setTimeout(() => userCenter(), 40)} {center} bind:mapComponent class={className} on:move> + setTimeout(() => userCenter(), 100)} {center} bind:mapComponent class={className} on:move> {}} on:geolocate={(e) => { + // @ts-ignore const { latitude, longitude } = e.detail.coords - user = { lat: latitude, lng: longitude } + userLocation = { lat: latitude, lng: longitude } }} /> diff --git a/src/lib/components/Map/LocationRequest.svelte b/src/lib/components/Map/LocationRequest.svelte index 2c51103..b5eaeaf 100644 --- a/src/lib/components/Map/LocationRequest.svelte +++ b/src/lib/components/Map/LocationRequest.svelte @@ -13,15 +13,17 @@ {#if granted === false} - - This is a info alert -
-
To advance through your experience you need to enable the location access, without it the app won't work.
-
- +
+ + This is a info alert +
+
To advance through your experience you need to enable the location access, without it the app won't work.
+
+ +
-
- + +
{/if}