Madmin
/
Erant-OldApp
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Update 14.2.2023

This commit is contained in:
Schenky 2023-02-14 15:10:00 +01:00
parent 3f631636e2
commit b7d3720e2f
9 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/animation/ERANT.json Normal file
View File

File diff suppressed because one or more lines are too long

BIN
public/legal/cookie_policy.pdf Normal file
View File

Binary file not shown.

BIN
public/legal/privacy_policy.pdf Normal file
View File

Binary file not shown.

2
src/App.svelte
View File

@ -13,7 +13,7 @@
$: if (isReady && !$user) { $: if (isReady && !$user) {
if (!(location.pathname.startsWith('/login') || location.pathname.startsWith('/register'))) { if (!(location.pathname.startsWith('/login') || location.pathname.startsWith('/register'))) {
navigate('/login') //navigate('/login')
} }
} }

18
src/lib/components/Cookies/CookiesPopUp.svelte
View File

@ -3,7 +3,7 @@
import Setting from './../../svg/Setting.svelte' import Setting from './../../svg/Setting.svelte'
import { navigate } from 'svelte-routing' import { navigate } from 'svelte-routing'
import { onMount } from 'svelte' import { onMount } from 'svelte'
let showCookiePopUp = localStorage.getItem('cookies') !== 'dismissed' let showCookiePopUp = localStorage.getItem('cookies') !== 'accepted'
let animation = false let animation = false
let url = window.location.href let url = window.location.href
onMount(() => { onMount(() => {
@ -28,17 +28,23 @@
<button on:click={() => navigate('cookies/settings')} class="w-min h-min flex-grow-0"><Setting /></button> <button on:click={() => navigate('cookies/settings')} class="w-min h-min flex-grow-0"><Setting /></button>
<div class="flex flex-wrap flex-row gap-2"> <div class="flex flex-wrap flex-row gap-2">
<div class="text-[28px] font-semibold">Cookies settings</div> <div class="text-[28px] font-semibold">Cookies settings</div>
<div>Our website uses cookies to operate, by continuing you agree to our <a class="text-[#4263EB]" href="/cookies/policy">cookie policy</a>.</div> <div>Our website uses cookies to operate, by continuing you agree to our <a class="text-[#4263EB]" href="/legal/cookie_policy.pdf">cookie policy</a>.</div>
</div> </div>
<button on:click={() => (showCookiePopUp = false)} class="w-min h-min relative flex-grow-0"><Times /></button>
</div> </div>
<div class="w-full h-auto flex justify-end bg-[#F3F4F6] p-[16px]"> <div class="w-full h-auto flex justify-end bg-[#F3F4F6] p-[16px] gap-[20px]">
<button <button
on:click={() => { on:click={() => {
showCookiePopUp = false showCookiePopUp = false
localStorage.setItem('cookies', 'dismissed') localStorage.setItem('cookies', 'declined')
}} }}
class="w-[84px] h-[37px] bg-[#09205D] text-white rounded-[8px] text-[18px]">Dismiss</button class="w-[84px] h-[37px] bg-[#OOO] text-black rounded-[8px] text-[18px]">Decline</button
>
<button
on:click={() => {
showCookiePopUp = false
localStorage.setItem('cookies', 'accepted')
}}
class="w-[84px] h-[37px] bg-[#09205D] text-white rounded-[8px] text-[18px]">Accept</button
> >
</div> </div>
</div> </div>

6
src/lib/components/Layouts/NavigationBarLayout.svelte
View File

@ -21,12 +21,6 @@
image_url: image_url:
"data:image/svg+xml,%3Csvg width='18' height='24' viewBox='0 0 18 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0.833496 8.80925C0.833496 4.29425 4.48516 0.642578 9.00016 0.642578C13.5152 0.642578 17.1668 4.29425 17.1668 8.80925C17.1668 13.6742 12.0102 20.3826 9.8985 22.9376C9.43183 23.4976 8.58016 23.4976 8.1135 22.9376C5.99016 20.3826 0.833496 13.6742 0.833496 8.80925ZM6.0835 8.80925C6.0835 10.4192 7.39016 11.7259 9.00016 11.7259C10.6102 11.7259 11.9168 10.4192 11.9168 8.80925C11.9168 7.19924 10.6102 5.89258 9.00016 5.89258C7.39016 5.89258 6.0835 7.19924 6.0835 8.80925Z' fill='%2361646B' /%3E%3C/svg%3E%0A", "data:image/svg+xml,%3Csvg width='18' height='24' viewBox='0 0 18 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0.833496 8.80925C0.833496 4.29425 4.48516 0.642578 9.00016 0.642578C13.5152 0.642578 17.1668 4.29425 17.1668 8.80925C17.1668 13.6742 12.0102 20.3826 9.8985 22.9376C9.43183 23.4976 8.58016 23.4976 8.1135 22.9376C5.99016 20.3826 0.833496 13.6742 0.833496 8.80925ZM6.0835 8.80925C6.0835 10.4192 7.39016 11.7259 9.00016 11.7259C10.6102 11.7259 11.9168 10.4192 11.9168 8.80925C11.9168 7.19924 10.6102 5.89258 9.00016 5.89258C7.39016 5.89258 6.0835 7.19924 6.0835 8.80925Z' fill='%2361646B' /%3E%3C/svg%3E%0A",
}, },
{
name: 'Trips',
url: '/trips',
image_url:
"data:image/svg+xml,%3Csvg width='26' height='22' viewBox='0 0 26 22' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.3662 5.53348C14.8832 5.53348 14.4912 5.14148 14.4912 4.65848V1.83398C14.4912 1.35098 14.8832 0.958984 15.3662 0.958984C15.8492 0.958984 16.2412 1.35098 16.2412 1.83398V4.65848C16.2412 5.14148 15.8492 5.53348 15.3662 5.53348Z' fill='%2361646B'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.3662 20.8318C14.8832 20.8318 14.4912 20.4398 14.4912 19.9568V17.5967C14.4912 17.1125 14.8832 16.7217 15.3662 16.7217C15.8492 16.7217 16.2412 17.1125 16.2412 17.5967V19.9568C16.2412 20.4398 15.8492 20.8318 15.3662 20.8318Z' fill='%2361646B'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.3662 14.4634C14.8832 14.4634 14.4912 14.0714 14.4912 13.5884V7.96387C14.4912 7.48087 14.8832 7.08887 15.3662 7.08887C15.8492 7.08887 16.2412 7.48087 16.2412 7.96387V13.5884C16.2412 14.0714 15.8492 14.4634 15.3662 14.4634Z' fill='%2361646B'/%3E%3Cmask id='mask0_1515_513' style='mask-type:alpha' maskUnits='userSpaceOnUse' x='0' y='0' width='26' height='22'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0.666626 0.666992H25.75V21.0833H0.666626V0.666992Z' fill='white'/%3E%3C/mask%3E%3Cg mask='url(%23mask0_1515_513)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M2.41663 14.1467V16.4088C2.41663 18.0212 3.75013 19.3337 5.38929 19.3337H21.0273C22.6665 19.3337 24 18.0212 24 16.4088V14.1467C22.5405 13.7628 21.4601 12.4422 21.4601 10.8765C21.4601 9.30966 22.5393 7.99016 24 7.60633L23.9988 5.34183C23.9988 3.72949 22.6653 2.41699 21.0261 2.41699H5.39046C3.75129 2.41699 2.41779 3.72949 2.41779 5.34183L2.41663 7.69616C3.89479 8.05899 4.95646 9.32599 4.95646 10.8765C4.95646 12.4422 3.87613 13.7628 2.41663 14.1467ZM21.0273 21.0837H5.38929C2.78529 21.0837 0.666626 18.986 0.666626 16.4088V13.3848C0.666626 12.9018 1.05863 12.5098 1.54163 12.5098C2.45979 12.5098 3.20646 11.7772 3.20646 10.8765C3.20646 10.0015 2.49013 9.34116 1.54163 9.34116C1.30946 9.34116 1.08663 9.24899 0.923293 9.08449C0.758793 8.92116 0.666626 8.69716 0.666626 8.46616L0.667793 5.34183C0.667793 2.76466 2.78646 0.666992 5.39046 0.666992H21.0261C23.6301 0.666992 25.7488 2.76466 25.7488 5.34183L25.75 8.36816C25.75 8.59916 25.6578 8.82316 25.4933 8.98649C25.33 9.15099 25.1071 9.24316 24.875 9.24316C23.9568 9.24316 23.2101 9.97583 23.2101 10.8765C23.2101 11.7772 23.9568 12.5098 24.875 12.5098C25.358 12.5098 25.75 12.9018 25.75 13.3848V16.4088C25.75 18.986 23.6313 21.0837 21.0273 21.0837Z' fill='%2361646B'/%3E%3C/g%3E%3C/svg%3E ",
},
{ {
name: 'Profile', name: 'Profile',
url: '/profile', url: '/profile',

1
src/routes/explore/explore.svelte
View File

@ -27,6 +27,7 @@
<style lang="scss"> <style lang="scss">
.content { .content {
width: 100%; width: 100%;
height: 100%;
max-height: 100vh; max-height: 100vh;
overflow-y: scroll; overflow-y: scroll;

10
src/routes/homepage/Components/Animation.svelte
View File

@ -0,0 +1,10 @@
<script></script>
<svelte:head>
<script src="https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js" ></script>
</svelte:head>
<lottie-player src="/animation/ERANT.json" background="transparent" speed="1" style="width: 100%; height: 100%" autoplay>
</lottie-player>

4
src/routes/homepage/homepage.svelte
View File

@ -14,7 +14,7 @@
setTimeout(() => { setTimeout(() => {
fitstTime = false fitstTime = false
localStorage.setItem('ErantFirstTime', "false"); localStorage.setItem('ErantFirstTime', "false");
}, 5000) }, 29000)
} }
}) })
@ -64,7 +64,7 @@
<style> <style>
.content { .content {
height: calc(100% - 94px); height: calc(100% );
width: 100%; width: 100%;
margin-bottom: 94px; margin-bottom: 94px;