diff --git a/app/Http/Controllers/ExplorePageController.php b/app/Http/Controllers/ExplorePageController.php index 19c6750..fc79e14 100644 --- a/app/Http/Controllers/ExplorePageController.php +++ b/app/Http/Controllers/ExplorePageController.php @@ -51,7 +51,7 @@ protected function deals(?ExplorePageFilters $sortBy) $query->orderBy('total_redirection', 'desc'); } else { $query->orderByRaw( - '(COALESCE(total_likes, 0) / 70.0) + (COALESCE(total_redirection, 0) / 30.0) DESC' + '((COALESCE(total_likes, 0) * 70.0)/100.0) + ((COALESCE(total_redirection, 0) * 30.0)/100.0) DESC' ); } diff --git a/resources/js/nav-menu.js b/resources/js/nav-menu.js index 3e6041b..b135c36 100644 --- a/resources/js/nav-menu.js +++ b/resources/js/nav-menu.js @@ -4,13 +4,13 @@ const mobileMenu = document.getElementById('mobileMenu'); const body = document.body; openBtn.addEventListener('click', () => { - mobileMenu.classList.remove('translate-x-[100vw]'); + mobileMenu.classList.remove('translate-x-full'); mobileMenu.classList.add('translate-x-0'); body.style.overflow = 'hidden'; }) closeBtn.addEventListener('click', () => { - mobileMenu.classList.add('translate-x-[100vw]'); + mobileMenu.classList.add('translate-x-full'); mobileMenu.classList.remove('translate-x-0'); body.style.overflow = 'visible'; }) diff --git a/resources/js/sidebar.js b/resources/js/sidebar.js index f69116f..b4b9109 100644 --- a/resources/js/sidebar.js +++ b/resources/js/sidebar.js @@ -1,26 +1,23 @@ -const sidebar = document.getElementById('sidebar'); const sidebarWrapper = document.getElementById('sidebarWrapper'); -const openBtn = document.getElementById('openSidebarBtn') -const closeBtn = document.getElementById('closeSidebarBtn') +const closeBtn = document.getElementById('closeSidebarBtn'); +const openBtn = document.getElementById('openSidebarBtn'); +const sidebarTexts = document.querySelectorAll('.sidebar-text'); +closeBtn.addEventListener('click', () => { + sidebarWrapper.classList.remove('w-64'); + sidebarWrapper.classList.add('w-20'); -const classList = ['md:w-50', 'lg:w-60']; + closeBtn.classList.add('hidden'); + openBtn.classList.remove('hidden'); -openBtn.addEventListener('click', () => openSidebar()); -closeBtn.addEventListener('click', () => closeSidebar()); + sidebarTexts.forEach(el => el.classList.add('opacity-0')); +}); -function openSidebar() { - classList.forEach(cl => sidebarWrapper.classList.toggle(cl)) +openBtn.addEventListener('click', () => { + sidebarWrapper.classList.remove('w-20'); + sidebarWrapper.classList.add('w-64'); - sidebar.classList.toggle('hidden'); + openBtn.classList.add('hidden'); + closeBtn.classList.remove('hidden'); - closeBtn.classList.toggle('hidden') - openBtn.classList.toggle('hidden') -} - -function closeSidebar() { - classList.forEach(cl => sidebarWrapper.classList.toggle(cl)) - openBtn.classList.toggle('hidden') - closeBtn.classList.toggle('hidden') - - sidebar.classList.toggle('hidden'); -} + sidebarTexts.forEach(el => el.classList.remove('opacity-0')); +}); diff --git a/resources/views/components/dashboard/broker/layout.blade.php b/resources/views/components/dashboard/broker/layout.blade.php index 587f57f..ca7bf32 100644 --- a/resources/views/components/dashboard/broker/layout.blade.php +++ b/resources/views/components/dashboard/broker/layout.blade.php @@ -1,10 +1,10 @@ @props(['title' => '']) -
-