diff --git a/src/App.svelte b/src/App.svelte index 40e425e..233065a 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -8,9 +8,8 @@ import Game from './routes/game/game.svelte' import Index from './routes/homepage/homepage.svelte' import Test from './routes/test.svelte' - import map from './routes/map.svelte' + import Test2 from './routes/map.svelte' import LogIn from './routes/log_in.svelte' - import Explore from './routes/explore/explore.svelte' if ('serviceWorker' in window.navigator) { window.navigator.serviceWorker.register('/serviceworker.js', { @@ -27,9 +26,7 @@ - - - + diff --git a/src/lib/Components/common/NavigationBar.svelte b/src/lib/Components/Layouts/NavigationBarLayout.svelte similarity index 92% rename from src/lib/Components/common/NavigationBar.svelte rename to src/lib/Components/Layouts/NavigationBarLayout.svelte index dd655aa..561ad95 100644 --- a/src/lib/Components/common/NavigationBar.svelte +++ b/src/lib/Components/Layouts/NavigationBarLayout.svelte @@ -1,8 +1,9 @@ -
- {#each items as item} - - {#if item.active} - - {:else} - - {/if} - - {/each} +
+
+
+ {#each items as { active, name, url, image_url }} + navigate(url)} {active} {name} {url}> + {#if location.pathname === url} + + {:else} + + {/if} + + {/each} +
diff --git a/src/lib/Components/Map/Map.svelte b/src/lib/Components/Map/Map.svelte index c5e0590..c2e7f48 100644 --- a/src/lib/Components/Map/Map.svelte +++ b/src/lib/Components/Map/Map.svelte @@ -6,13 +6,9 @@ let className = '' export { className as class } - let user = { lat: 0, lng: 0 } - - const dispatch = createEventDispatcher() - export let radius = false export let center = { lng: 0, lat: 0 } - export const geo = (e) => { + /*export const geo = (e) => { geolocateControl.dispatchEvent('geolocate') if (navigator.geolocation) { navigator.geolocation.getCurrentPosition((position) => { @@ -23,7 +19,7 @@ } else { alert("Can't load your location!") } - } + }*/
@@ -38,7 +34,7 @@ }} zoom={14} > - +
@@ -50,7 +46,9 @@ border-radius: 25px; } } - + :global(.mapboxgl-ctrl-top-left) { + display: none; + } :global(.mapboxgl-marker) { cursor: pointer; } diff --git a/src/lib/Components/common/NavBar_Item.svelte b/src/lib/Components/common/NavBar_Item.svelte index 6903dfb..122e877 100644 --- a/src/lib/Components/common/NavBar_Item.svelte +++ b/src/lib/Components/common/NavBar_Item.svelte @@ -1,29 +1,21 @@ - \ No newline at end of file + diff --git a/src/lib/svg/Search.svelte b/src/lib/svg/Search.svelte deleted file mode 100644 index 18c9a16..0000000 --- a/src/lib/svg/Search.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/routes/explore/Components/Filter.svelte b/src/routes/explore/Components/Filter.svelte deleted file mode 100644 index d2dc87e..0000000 --- a/src/routes/explore/Components/Filter.svelte +++ /dev/null @@ -1,32 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/routes/explore/Components/Result.svelte b/src/routes/explore/Components/Result.svelte deleted file mode 100644 index b71cfe9..0000000 --- a/src/routes/explore/Components/Result.svelte +++ /dev/null @@ -1,163 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/routes/explore/Components/Search.svelte b/src/routes/explore/Components/Search.svelte deleted file mode 100644 index eabf720..0000000 --- a/src/routes/explore/Components/Search.svelte +++ /dev/null @@ -1,74 +0,0 @@ - - -
-
- - -
- -
- - \ No newline at end of file diff --git a/src/routes/explore/Components/Top.svelte b/src/routes/explore/Components/Top.svelte deleted file mode 100644 index e110de3..0000000 --- a/src/routes/explore/Components/Top.svelte +++ /dev/null @@ -1,88 +0,0 @@ - - -
-
- - - -
-
- - -
-
- - \ No newline at end of file diff --git a/src/routes/explore/explore.svelte b/src/routes/explore/explore.svelte deleted file mode 100644 index 5450bda..0000000 --- a/src/routes/explore/explore.svelte +++ /dev/null @@ -1,91 +0,0 @@ - - -
- - -
- {#each search(Search) as result} - - {/each} - -
- -
-
-
- - - - \ No newline at end of file diff --git a/src/routes/game/Forms/Renderer.svelte b/src/routes/game/Forms/Renderer.svelte index 3e9e63d..ad193a1 100644 --- a/src/routes/game/Forms/Renderer.svelte +++ b/src/routes/game/Forms/Renderer.svelte @@ -1,4 +1,5 @@ {#if !startQuestion} - + (startQuestion = true)} {lat} {lng} {user} /> - { - const { latitude, longitude } = e.detail.coords - const user = { lat: latitude, lng: longitude } - console.log(user) - }} - /> - + {/if} {#if page && startQuestion} diff --git a/src/routes/game/game.svelte b/src/routes/game/game.svelte index 6ba35c7..fbc5558 100644 --- a/src/routes/game/game.svelte +++ b/src/routes/game/game.svelte @@ -11,7 +11,6 @@ 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 FullWidthRow from '../../lib/Components/common/FullWidthRow.svelte' import Renderer from './Forms/Renderer.svelte' import Redirect from '../../lib/Components/common/Redirect.svelte' import ImageSlider from '../../lib/Components/common/ImageSlider.svelte' @@ -59,14 +58,14 @@
- +
- +
- +
{#each $gameData.data.questions as { lat, lng }} @@ -81,7 +80,7 @@ />
- +
diff --git a/src/routes/homepage/homepage.svelte b/src/routes/homepage/homepage.svelte index d8ab317..b108037 100644 --- a/src/routes/homepage/homepage.svelte +++ b/src/routes/homepage/homepage.svelte @@ -1,12 +1,12 @@ -
+ @@ -22,9 +22,7 @@ { price: '$10.00', location: 'Prag, Czech Republic', name: 'Hometown', image: 'https://cdn.pixabay.com/photo/2015/04/23/22/00/tree-736885__480.jpg' }, ]} /> -
- - + + + +