From 66ccb3caf85052ebc46b1adebc09bbc5487b0cae Mon Sep 17 00:00:00 2001 From: Ota Prokopec Date: Tue, 6 Dec 2022 19:32:03 +0100 Subject: [PATCH 1/4] map fix --- .../NavigationBarLayout.svelte} | 40 ++++--- src/lib/Components/Map/Circle.svelte | 2 +- src/lib/Components/Map/Erantmap.svelte | 69 ++++++++++++ src/lib/Components/Map/Map.svelte | 2 +- src/lib/Components/common/NavBar_Item.svelte | 46 ++++---- src/routes/game/Forms/Renderer.svelte | 1 + src/routes/game/game.svelte | 2 +- src/routes/homepage/homepage.svelte | 13 +-- src/routes/map.svelte | 101 +----------------- 9 files changed, 127 insertions(+), 149 deletions(-) rename src/lib/Components/{common/NavigationBar.svelte => Layouts/NavigationBarLayout.svelte} (91%) create mode 100644 src/lib/Components/Map/Erantmap.svelte diff --git a/src/lib/Components/common/NavigationBar.svelte b/src/lib/Components/Layouts/NavigationBarLayout.svelte similarity index 91% rename from src/lib/Components/common/NavigationBar.svelte rename to src/lib/Components/Layouts/NavigationBarLayout.svelte index 8398517..da6b2f1 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) + items.forEach((i) => (i.active = false)) + active = true + }} + {active} + {name} + {url} + > + {#if active} + + {:else} + + {/if} + + {/each} +
diff --git a/src/lib/Components/Map/Map.svelte b/src/lib/Components/Map/Map.svelte index c5e0590..7c38c26 100644 --- a/src/lib/Components/Map/Map.svelte +++ b/src/lib/Components/Map/Map.svelte @@ -6,7 +6,7 @@ let className = '' export { className as class } - let user = { lat: 0, lng: 0 } + export let user = { lat: 0, lng: 0 } const dispatch = createEventDispatcher() 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/routes/game/Forms/Renderer.svelte b/src/routes/game/Forms/Renderer.svelte index 3e9e63d..dc67b87 100644 --- a/src/routes/game/Forms/Renderer.svelte +++ b/src/routes/game/Forms/Renderer.svelte @@ -1,4 +1,5 @@ -
+ @@ -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' }, ]} /> -
- - + + -- 2.40.1 From 4b1bd3c5ddc69b2060f1b8dd399a338ff0717d6b Mon Sep 17 00:00:00 2001 From: Ota Prokopec Date: Fri, 9 Dec 2022 16:33:59 +0100 Subject: [PATCH 2/4] map-fix --- .../Layouts/NavigationBarLayout.svelte | 14 +--- src/lib/Components/Map/Erantmap.svelte | 69 +++++++++++-------- src/lib/Components/Map/Map.svelte | 10 +-- src/routes/game/Forms/Renderer.svelte | 16 ++--- src/routes/game/game.svelte | 10 +-- src/routes/map.svelte | 17 +++-- 6 files changed, 65 insertions(+), 71 deletions(-) diff --git a/src/lib/Components/Layouts/NavigationBarLayout.svelte b/src/lib/Components/Layouts/NavigationBarLayout.svelte index da6b2f1..561ad95 100644 --- a/src/lib/Components/Layouts/NavigationBarLayout.svelte +++ b/src/lib/Components/Layouts/NavigationBarLayout.svelte @@ -40,24 +40,14 @@ "data:image/svg+xml,%3Csvg width='19' height='24' viewBox='0 0 19 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cmask id='mask0_1515_2027' style='mask-type:alpha' maskUnits='userSpaceOnUse' x='0' y='14' width='19' height='10'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0.166626 14.9121H18.6465V23.5151H0.166626V14.9121Z' fill='white'/%3E%3C/mask%3E%3Cg mask='url(%23mask0_1515_2027)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M9.40767 16.6621C4.4365 16.6621 1.9165 17.5161 1.9165 19.2019C1.9165 20.9029 4.4365 21.7651 9.40767 21.7651C14.3777 21.7651 16.8965 20.9111 16.8965 19.2253C16.8965 17.5243 14.3777 16.6621 9.40767 16.6621ZM9.40767 23.5151C7.12217 23.5151 0.166504 23.5151 0.166504 19.2019C0.166504 15.3566 5.441 14.9121 9.40767 14.9121C11.6932 14.9121 18.6465 14.9121 18.6465 19.2253C18.6465 23.0706 13.3732 23.5151 9.40767 23.5151Z' fill='%2361646B'/%3E%3C/g%3E%3Cmask id='mask1_1515_2027' style='mask-type:alpha' maskUnits='userSpaceOnUse' x='3' y='0' width='13' height='13'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M3.21143 0.333008H15.6015V12.7214H3.21143V0.333008Z' fill='white'/%3E%3C/mask%3E%3Cg mask='url(%23mask1_1515_2027)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M9.40763 1.99901C6.9098 1.99901 4.87746 4.03017 4.87746 6.52801C4.8693 9.01767 6.88646 11.0477 9.3738 11.057L9.40763 11.89V11.057C11.9043 11.057 13.9355 9.02467 13.9355 6.52801C13.9355 4.03017 11.9043 1.99901 9.40763 1.99901ZM9.40763 12.7218H9.3703C5.9613 12.7113 3.1998 9.93117 3.21146 6.52451C3.21146 3.11201 5.99046 0.333008 9.40763 0.333008C12.8236 0.333008 15.6015 3.11201 15.6015 6.52801C15.6015 9.94401 12.8236 12.7218 9.40763 12.7218Z' fill='%2361646B'/%3E%3C/g%3E%3C/svg%3E ", }, ] - $: console.log(items)
{#each items as { active, name, url, image_url }} - { - navigate(url) - items.forEach((i) => (i.active = false)) - active = true - }} - {active} - {name} - {url} - > - {#if active} + navigate(url)} {active} {name} {url}> + {#if location.pathname === url} {:else} diff --git a/src/lib/Components/Map/Erantmap.svelte b/src/lib/Components/Map/Erantmap.svelte index 9a42921..bc4864e 100644 --- a/src/lib/Components/Map/Erantmap.svelte +++ b/src/lib/Components/Map/Erantmap.svelte @@ -1,42 +1,51 @@ - - - - + + + -
- - -
- +
+ + +
+ \ No newline at end of file diff --git a/src/routes/explore/Components/Filter.svelte b/src/routes/explore/Components/Filter.svelte new file mode 100644 index 0000000..d2dc87e --- /dev/null +++ b/src/routes/explore/Components/Filter.svelte @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/routes/explore/Components/Result.svelte b/src/routes/explore/Components/Result.svelte new file mode 100644 index 0000000..b71cfe9 --- /dev/null +++ b/src/routes/explore/Components/Result.svelte @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/src/routes/explore/Components/Search.svelte b/src/routes/explore/Components/Search.svelte new file mode 100644 index 0000000..eabf720 --- /dev/null +++ b/src/routes/explore/Components/Search.svelte @@ -0,0 +1,74 @@ + + +
+
+ + +
+ +
+ + \ No newline at end of file diff --git a/src/routes/explore/Components/Top.svelte b/src/routes/explore/Components/Top.svelte new file mode 100644 index 0000000..e110de3 --- /dev/null +++ b/src/routes/explore/Components/Top.svelte @@ -0,0 +1,88 @@ + + +
+
+ + + +
+
+ + +
+
+ + \ No newline at end of file diff --git a/src/routes/explore/explore.svelte b/src/routes/explore/explore.svelte new file mode 100644 index 0000000..5450bda --- /dev/null +++ b/src/routes/explore/explore.svelte @@ -0,0 +1,91 @@ + + +
+ + +
+ {#each search(Search) as result} + + {/each} + +
+ +
+
+
+ + + + \ No newline at end of file diff --git a/src/routes/map.svelte b/src/routes/map.svelte index 336f0d8..3b6ba8c 100644 --- a/src/routes/map.svelte +++ b/src/routes/map.svelte @@ -27,6 +27,7 @@ { name: 'Explore', active: false, + url: '/explore', image_url: "data:image/svg+xml,%3Csvg width='26' height='25' viewBox='0 0 26 25' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M11.58 11.0798L10.3585 14.9846L14.2622 13.7619L15.4848 9.85711L11.58 11.0798ZM9.02384 17.1931C8.79517 17.1931 8.57117 17.1033 8.40434 16.9376C8.17451 16.7066 8.09051 16.3671 8.18851 16.0579L10.047 10.1208C10.1322 9.84545 10.3468 9.63195 10.6198 9.54678L16.557 7.68828C16.8685 7.58911 17.2068 7.67428 17.4378 7.90411C17.6677 8.13511 17.7517 8.47461 17.6537 8.78378L15.7963 14.7209C15.7112 14.9951 15.4953 15.2098 15.2223 15.2949L9.28517 17.1534C9.19884 17.1803 9.11017 17.1931 9.02384 17.1931Z' fill='%2361646B'/%3E%3Cmask id='mask0_1515_2517' style='mask-type:alpha' maskUnits='userSpaceOnUse' x='0' y='0' width='26' height='25'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0.833374 0.333008H25.0088V24.5083H0.833374V0.333008Z' fill='white'/%3E%3C/mask%3E%3Cg mask='url(%23mask0_1515_2517)'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M12.921 2.08301C7.22063 2.08301 2.58313 6.72167 2.58313 12.4208C2.58313 18.1212 7.22063 22.7587 12.921 22.7587C18.6213 22.7587 23.2588 18.1212 23.2588 12.4208C23.2588 6.72167 18.6213 2.08301 12.921 2.08301M12.921 24.5087C6.2558 24.5087 0.83313 19.086 0.83313 12.4208C0.83313 5.75567 6.2558 0.333008 12.921 0.333008C19.5861 0.333008 25.0088 5.75567 25.0088 12.4208C25.0088 19.086 19.5861 24.5087 12.921 24.5087' fill='%2361646B'/%3E%3C/g%3E%3C/svg%3E ", }, -- 2.40.1 From fe64861cfa91e1cbd5e452ff73299a01985d705e Mon Sep 17 00:00:00 2001 From: Ota Prokopec Date: Sat, 10 Dec 2022 18:54:41 +0100 Subject: [PATCH 4/4] map fix --- src/lib/Components/Map/Erantmap.svelte | 14 ++++++++++++-- src/lib/Components/Map/Map.svelte | 4 +++- src/routes/game/game.svelte | 1 - src/routes/map.svelte | 16 ++-------------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/lib/Components/Map/Erantmap.svelte b/src/lib/Components/Map/Erantmap.svelte index bc4864e..cb23aea 100644 --- a/src/lib/Components/Map/Erantmap.svelte +++ b/src/lib/Components/Map/Erantmap.svelte @@ -1,8 +1,11 @@ - {#if center} - - {/if} + -- 2.40.1