Update 25.2.2023 #57

Merged
Sch3nky merged 8 commits from master into deploy/prod 2023-02-25 15:37:11 +00:00
23 changed files with 145 additions and 51 deletions
Showing only changes of commit 347bf4141c - Show all commits

27
.github/workflows/main.yml vendored Normal file
View File

@ -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/

27
package-lock.json generated
View File

@ -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",

View File

@ -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"
}
}

View File

@ -1,6 +1,6 @@
<script>
import Times from './../../svg/Times.svelte'
import Setting from './../../svg/Setting.svelte'
import Times from '../../svg/Times.svelte'
import Setting from '../../svg/Setting.svelte'
import { navigate } from 'svelte-routing'
import { onMount } from 'svelte'
let showCookiePopUp = localStorage.getItem('cookies') !== 'accepted'

View File

@ -1,6 +1,6 @@
<script>
import { navigate } from 'svelte-routing'
import FooterItem from '../common/NavBar_Item.svelte'
import FooterItem from '../Common/NavBar_Item.svelte'
let items = [
{

View File

@ -1,9 +1,10 @@
<script>
import Overlay from '../lib/Components/Layouts/LayoutImg.svelte'
import Section from '../lib/Components/common/Section.svelte'
import Button from '../lib/Components/Buttons/Button.svelte'
import Overlay from '../lib/components/Layouts/LayoutImg.svelte'
import Section from '../lib/components/Common/Section.svelte'
import Button from '../lib/components/Buttons/Button.svelte'
</script>
<Overlay img="/assets/images/main.jpg">
<div>
<span>Erant</span>

View File

@ -1,5 +1,5 @@
<script lang="ts">
import NavigationBarLayout from './../../lib/Components/Layouts/NavigationBarLayout.svelte'
import NavigationBarLayout from '../../lib/components/Layouts/NavigationBarLayout.svelte'
import Result from './Components/Result.svelte'
import Top from './Components/Top.svelte'

View File

@ -1,7 +1,7 @@
<script>
import Section from '../../../lib/Components/common/Section.svelte'
import Button from '../../../lib/Components/Buttons/Button.svelte'
import Image from '../../../lib/Components/common/Image.svelte'
import Section from '../../../lib/components/Common/Section.svelte'
import Button from '../../../lib/components/Buttons/Button.svelte'
import Image from '../../../lib/components/Common/Image.svelte'
export let control, nextQuestion
export let imgSrc

View File

@ -1,6 +1,6 @@
<script>
import LayoutImg from './../../../lib/Components/Layouts/LayoutImg.svelte'
import Button from '../../../lib/Components/Buttons/Button.svelte'
import LayoutImg from '../../../lib/components/Layouts/LayoutImg.svelte'
import Button from '../../../lib/components/Buttons/Button.svelte'
export let img
</script>

View File

@ -1,6 +1,10 @@
<script>
import Layout from '../Components/Layout.svelte'
import Input from '../../../lib/Components/Inputs/Input.svelte'
import Input from '../../../lib/components/Inputs/Input.svelte'
let title = 'title' //exportovat ze zhora
export let params // { type: 'interval', correct: [0, 3], quesion: 'text otazky', description: '', options: null },

View File

@ -1,6 +1,6 @@
<script lang="ts">
import Layout from '../Components/Layout.svelte'
import CheckBox from '../../../lib/Components/Inputs/Checkbox.svelte'
import CheckBox from '../../../lib/components/Inputs/Checkbox.svelte'
import { checkPoint } from '$lib/TStypes/expiriences'
import { answer } from '$lib/utils/database/game'

View File

@ -1,6 +1,6 @@
<script lang="ts">
import Layout from '../Components/Layout.svelte'
import Input from '../../../lib/Components/Inputs/Input.svelte'
import Input from '../../../lib/components/Inputs/Input.svelte'
import { checkPoint } from '$lib/TStypes/expiriences'
import { answer } from '$lib/utils/database/game'

View File

@ -1,5 +1,5 @@
<script lang="ts">
import Radio from '../../../lib/Components/Inputs/Radio.svelte'
import Radio from '../../../lib/components/Inputs/Radio.svelte'
import Layout from '../Components/Layout.svelte'
import { checkPoint } from '$lib/TStypes/expiriences'
import { answer } from '$lib/utils/database/game'

View File

@ -1,6 +1,6 @@
<script lang="ts">
import Layout from '../Components/Layout.svelte'
import Input from '../../../lib/Components/Inputs/Input.svelte'
import Input from '../../../lib/components/Inputs/Input.svelte'
import { checkPoint } from '$lib/TStypes/expiriences'
import { answer } from '$lib/utils/database/game'

View File

@ -1,18 +1,18 @@
<script lang="ts">
import Overlay from '../../lib/Components/Layouts/LayoutImg.svelte'
import Section from '../../lib/Components/common/Section.svelte'
import Button from '../../lib/Components/Buttons/Button.svelte'
import Bubble from '../../lib/Components/common/Bubble.svelte'
import Overlay from '../../lib/components/Layouts/LayoutImg.svelte'
import Section from '../../lib/components/Common/Section.svelte'
import Button from '../../lib/components/Buttons/Button.svelte'
import Bubble from '../../lib/components/Common/Bubble.svelte'
import IconStar from '../../lib/svg/Star.svelte'
import IconPoint from '../../lib/svg/Point.svelte'
import Loading from '../../lib/Components/common/Loading.svelte'
import Loading from '../../lib/components/Common/Loading.svelte'
import { data } from '../../lib/stores/game'
import GeolocateControl from '@beyonk/svelte-mapbox/src/lib/map/controls/GeolocateControl.svelte'
import Map from '../../lib/Components/Map/Map.svelte'
import Map from '../../lib/components/Map/Map.svelte'
import Renderer from './Forms/Renderer.svelte'
import Redirect from '../../lib/Components/common/Redirect.svelte'
import ImageSlider from '../../lib/Components/common/ImageSlider.svelte'
import Marker from '../../lib/Components/Map/Marker.svelte'
import Redirect from '../../lib/components/Common/Redirect.svelte'
import ImageSlider from '../../lib/components/Common/ImageSlider.svelte'
import Marker from '../../lib/components/Map/Marker.svelte'
import collections from '$lib/collections'
import { Query } from 'appwrite'
import { onMount } from 'svelte'

View File

@ -1,10 +1,38 @@
<script></script>
<svelte:head>
<script>
import { LottiePlayer } from '@lottiefiles/svelte-lottie-player';
let controlsLayout = [
'previousFrame',
'playpause',
'stop',
'nextFrame',
'progress',
'frame',
'loop',
'spacer',
'background',
'snapshot',
'zoom',
'info',
];
</script>
<LottiePlayer
src="/animation/ERANT.json"
autoplay="{true}"
loop="{true}"
controls="{true}"
renderer="svg"
background="transparent"
style="width: 100%; height: 100%"
speed="2.5"
controlsLayout="{controlsLayout}"
/>
<!--<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 src="/animation/ERANT.json" background="transparent" speed="1" autoplay>
</lottie-player>
</lottie-player>
-->

View File

@ -1,5 +1,5 @@
<script>
import NavigationBarLayout from '../../lib/Components/Layouts/NavigationBarLayout.svelte'
import NavigationBarLayout from '../../lib/components/Layouts/NavigationBarLayout.svelte'
import Discover from './Components/Discover.svelte'
import Top from './Components/Top.svelte'
import Categories from './Components/Categories.svelte'
@ -18,7 +18,7 @@
setTimeout(() => {
fitstTime = false
localStorage.setItem('ErantFirstTime', 'false')
}, 15000)
}, 11000)
}
})

View File

@ -1,7 +1,9 @@
<script>
import { account, user } from '$lib/appwrite'
import { navigate } from 'svelte-routing'
import HiddenInput from '../lib/Components/Inputs/Hidden_Input.svelte'
import HiddenInput from '../lib/components/Inputs/Hidden_Input.svelte'
import GoogleLogo from '../lib/svg/GoogleLogo.svelte'
import TopImage from '../lib/svg/Top-Image.svelte'

View File

@ -1,6 +1,6 @@
<script>
import Erantmap from '$lib/Components/Map/Erantmap.svelte'
import NavigationBarLayout from '$lib/Components/Layouts/NavigationBarLayout.svelte'
import Erantmap from '$lib/components/Map/Erantmap.svelte'
import NavigationBarLayout from '$lib/components/Layouts/NavigationBarLayout.svelte'
let user = { lat: 50.073658, lng: 14.41854 }

View File

@ -1,9 +1,9 @@
<script lang="ts">
import NavigationBarLayout from './../../lib/Components/Layouts/NavigationBarLayout.svelte'
import Line from '$lib/Components/common/Line.svelte'
import NavigationBarLayout from '../../lib/components/Layouts/NavigationBarLayout.svelte'
import Line from '$lib/components/Common/Line.svelte'
import Help from './../../lib/svg/Help.svelte'
import SettingRow from '$lib/Components/common/SettingRow.svelte'
import SettingRow from '$lib/components/Common/SettingRow.svelte'
import Profile from '$lib/svg/Profile.svelte'
import Wallet from '$lib/svg/Wallet-Headline.svelte'
@ -75,4 +75,4 @@
min-height: 30px;
}
}
</style>
</style>

View File

@ -1,17 +1,17 @@
<script>
import Logout from './../../lib/svg/Logout.svelte'
import Help from './../../lib/svg/Help.svelte'
import Line from '$lib/Components/common/Line.svelte'
import SettingRow from '$lib/Components/common/SettingRow.svelte'
import Line from '$lib/components/Common/Line.svelte'
import SettingRow from '$lib/components/Common/SettingRow.svelte'
import Profile from '$lib/svg/Profile.svelte'
import Wallet from '$lib/svg/Wallet.svelte'
import Setting2 from '$lib/svg/Setting2.svelte'
import { Link } from 'svelte-routing'
import NavigationBarLayout from './../../lib/Components/Layouts/NavigationBarLayout.svelte'
import NavigationBarLayout from '../../lib/components/Layouts/NavigationBarLayout.svelte'
import Earth from '$lib/svg/Earth.svelte'
import Warning from '$lib/svg/Warning.svelte'
import PointSmall from '$lib/svg/PointSmall.svelte'
import InputPicture from '$lib/Components/Inputs/InputPicture.svelte'
import InputPicture from '$lib/components/Inputs/InputPicture.svelte'
import { account, user } from '$lib/appwrite'
$: console.log($user)

View File

@ -1,7 +1,11 @@
<script>
import { account } from '$lib/appwrite'
import { ID } from 'appwrite'
import HiddenInput from '../lib/Components/Inputs/Hidden_Input.svelte'
import HiddenInput from '../lib/components/Inputs/Hidden_Input.svelte'
import GoogleLogo from '../lib/svg/GoogleLogo.svelte'
import TopImage from '../lib/svg/Top-Image.svelte'

View File

@ -1,5 +1,5 @@
<script>
import Carousel from '../lib/Components/common/Carousel.svelte'
import Carousel from '../lib/components/Common/Carousel.svelte'
</script>
<Carousel />