diff --git a/src/App.vue b/src/App.vue index 698b59e..d6e1430 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ import NavBar from '@/components/Navbar/NavBar.vue' - + diff --git a/src/components/Navbar/NavBar.vue b/src/components/Navbar/NavBar.vue index 52dd025..d8774fb 100644 --- a/src/components/Navbar/NavBar.vue +++ b/src/components/Navbar/NavBar.vue @@ -12,10 +12,6 @@ const showMobileMenu = ref(false) const route = useRoute() const activeKey = ref('collection') -// watch(() => authStore.isAuthenticated, (newVal) => { -// console.log('Auth state changed:', newVal) -// }, { immediate: true }) - const mainMenu = computed(() => { return [ { label: 'Collection', key: 'collection' }, @@ -121,10 +117,9 @@ const renderLabel = (option) => { padding: 0 20px; height: 60px; background: #fff; - border-bottom: 1px solid #eee; + border-bottom: 2px solid #18a058; position: relative; z-index: 10; - margin-bottom: 10px; } .logo { diff --git a/src/styles/styles.css b/src/styles/styles.css index 4b5e318..b8994a0 100644 --- a/src/styles/styles.css +++ b/src/styles/styles.css @@ -52,3 +52,51 @@ .text-center { text-align: center; } + +.sticky-search-container { + position: sticky; + top: 0; + z-index: 10; + padding: 8px 0; +} + +.toolbar { + display: flex; + align-items: center; + gap: 10px; + padding: 8px; + background-color: #eeeeee; + border-bottom: 1px solid #c8c8c8; + border-radius: 8px; + flex-wrap: wrap; +} + +.toolbar-item { + flex-shrink: 0; +} + +.search-wrapper { + flex-grow: 1; + min-width: 200px; +} + +.selector { + min-width: 220px; +} + +@media (max-width: 768px) { + .selector { + flex-basis: 100%; + margin-left: auto; + } +} + +@media (max-width: 768px) { + .search-wrapper { + flex-basis: 100%; + } +} + +:deep(.mobile-full-width) { + width: 100%; +} diff --git a/src/views/ChartsView.vue b/src/views/ChartsView.vue index da203ec..6b5e365 100644 --- a/src/views/ChartsView.vue +++ b/src/views/ChartsView.vue @@ -6,7 +6,6 @@ import ChartsCard from '@/views/ChartsView/ChartsCard.vue' import router from '@/router/index.js' import ChartsSearch from '@/views/ChartsView/ChartsSearch.vue' - const { getChartsPrices } = useChartsApi() const pricesList = ref([]) @@ -40,22 +39,21 @@ function handleSelectDays(days) { fetchPrices(days) } -const searchQuery = ref(''); - +const searchQuery = ref('') const filteredPrices = computed(() => { if (!searchQuery.value.trim()) { - return pricesList.value; + return pricesList.value } - const q = searchQuery.value.toLowerCase(); - return pricesList.value.filter(item => - item.name.toLowerCase().includes(q) - ); -}); + const q = searchQuery.value.toLowerCase() + return pricesList.value.filter((item) => item.name.toLowerCase().includes(q)) +}) diff --git a/src/views/ChartsView/ChartsSearch.vue b/src/views/ChartsView/ChartsSearch.vue index 304f693..ad99184 100644 --- a/src/views/ChartsView/ChartsSearch.vue +++ b/src/views/ChartsView/ChartsSearch.vue @@ -25,17 +25,11 @@ watch(localValue, (newVal) => { diff --git a/src/views/CollectionView.vue b/src/views/CollectionView.vue index 2fdd1cd..d453717 100644 --- a/src/views/CollectionView.vue +++ b/src/views/CollectionView.vue @@ -26,22 +26,21 @@ onMounted(() => { fetchMerch() }) -const searchQuery = ref(''); - +const searchQuery = ref('') const filteredMerch = computed(() => { if (!searchQuery.value.trim()) { - return merchList.value; + return merchList.value } - const q = searchQuery.value.toLowerCase(); - return merchList.value.filter(item => - item.name.toLowerCase().includes(q) - ); -}); + const q = searchQuery.value.toLowerCase() + return merchList.value.filter((item) => item.name.toLowerCase().includes(q)) +}) - + diff --git a/src/views/CollectionView/CollectionToolbar.vue b/src/views/CollectionView/CollectionToolbar.vue index 9a55a60..e2ac70d 100644 --- a/src/views/CollectionView/CollectionToolbar.vue +++ b/src/views/CollectionView/CollectionToolbar.vue @@ -57,44 +57,5 @@ watch(localValue, (newVal) => {