Browse Source

Merge branch 'search-map-fix'

master
Trent Larson 12 hours ago
parent
commit
573e4b206a
  1. BIN
      assets/icon.png
  2. BIN
      assets/splash-dark.png
  3. BIN
      assets/splash.png
  4. 12
      src/App.vue
  5. 2
      src/components/TopMessage.vue
  6. 55
      src/views/DiscoverView.vue

BIN
assets/icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 279 KiB

BIN
assets/splash-dark.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
assets/splash.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

12
src/App.vue

@ -4,7 +4,7 @@
<!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
<NotificationGroup group="alert">
<div
class="fixed top-[calc(env(safe-area-inset-top)+1rem)] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
class="fixed z-[90] top-[max(1rem,env(safe-area-inset-top))] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
>
<Notification
v-slot="{ notifications, close }"
@ -541,13 +541,13 @@ export default class App extends Vue {
<style>
#Content {
padding-left: 1.5rem;
padding-right: 1.5rem;
padding-top: calc(env(safe-area-inset-top) + 1.5rem);
padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
padding-left: max(1.5rem, env(safe-area-inset-left));
padding-right: max(1.5rem, env(safe-area-inset-right));
padding-top: max(1.5rem, env(safe-area-inset-top));
padding-bottom: max(1.5rem, env(safe-area-inset-bottom));
}
#QuickNav ~ #Content {
padding-bottom: calc(env(safe-area-inset-bottom) + 6rem);
padding-bottom: calc(env(safe-area-inset-bottom) + 6.333rem);
}
</style>

2
src/components/TopMessage.vue

@ -1,5 +1,5 @@
<template>
<div class="absolute right-5 top-[calc(env(safe-area-inset-top)+0.75rem)]">
<div class="absolute right-5 top-[max(0.75rem,env(safe-area-inset-top))]">
<span class="align-center text-red-500 mr-2">{{ message }}</span>
<span class="ml-2">
<router-link

55
src/views/DiscoverView.vue

@ -11,30 +11,9 @@
<OnboardingDialog ref="onboardingDialog" />
<!-- Quick Search -->
<div
id="QuickSearch"
class="mt-8 mb-4 flex"
:style="{ visibility: isSearchVisible ? 'visible' : 'hidden' }"
>
<input
v-model="searchTerms"
type="text"
placeholder="Search…"
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
@keyup.enter="searchSelected()"
/>
<button
class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
@click="searchSelected()"
>
<font-awesome icon="magnifying-glass" class="fa-fw"></font-awesome>
</button>
</div>
<!-- Result Tabs -->
<!-- Top Level Selection -->
<div class="text-center text-slate-500 border-b border-slate-300 mb-4">
<div class="text-center text-slate-500 border-b border-slate-300 mt-4 mb-2">
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
<li>
<a
@ -146,6 +125,27 @@
</ul>
</div>
<!-- Quick Search -->
<div
id="QuickSearch"
class="mt-6 mb-4 flex"
:style="{ display: isSearchVisible ? 'flex' : 'none' }"
>
<input
v-model="searchTerms"
type="text"
placeholder="Search…"
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
@keyup.enter="searchSelected()"
/>
<button
class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
@click="searchSelected()"
>
<font-awesome icon="magnifying-glass" class="fa-fw"></font-awesome>
</button>
</div>
<div v-if="isLocalActive">
<div class="text-center">
<button
@ -159,7 +159,7 @@
</div>
<div v-if="isMappedActive && !tempSearchBox">
<div class="mt-4 h-96 w-5/6 mx-auto">
<div class="mt-6 h-96 w-full mx-auto">
<l-map
ref="projectMap"
@ready="onMapReady"
@ -167,6 +167,7 @@
@movestart="onMoveStart"
@zoomend="onZoomEnd"
@zoomstart="onZoomStart"
class="z-40"
>
<l-tile-layer
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
@ -197,14 +198,18 @@
-->
</span>
<span v-else-if="isAnywhereActive"
>No projects were found with that search.</span
>No {{ isProjectsActive ? 'projects' : 'people' }} were found with that search.</span
>
</p>
</div>
<!-- Results List -->
<InfiniteScroll @reached-bottom="loadMoreData">
<ul id="listDiscoverResults">
<ul
id="listDiscoverResults"
class="border-t border-slate-300 mt-6"
v-if="projects.length > 0 || userProfiles.length > 0"
>
<!-- Projects List -->
<template v-if="isProjectsActive">
<li

Loading…
Cancel
Save