Skip to content

Navbar / Home Page Rework #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SethSharp merged 1 commit into from
Apr 5, 2026
Merged

Navbar / Home Page Rework #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Support/Traits/GoogleApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ trait GoogleApi
public function getRecentReviews(): Collection
{
if (app()->environment('local')) {
return collect($this->getLocalReviews()['reviews'])->sortByDesc('rating')->take(3)->values();
return collect($this->getLocalReviews()['reviews'])->sortByDesc('rating')->take(5)->values();
}

return cache()->remember(CacheKeys::googleReviews(), (24 * 60) * 7,
fn () => collect($this->retrieveReviews())->sortByDesc('rating')->take(3)->values());
fn () => collect($this->retrieveReviews())->sortByDesc('rating')->take(5)->values());
}

protected function getLocalReviews(): array
Expand Down
2 changes: 1 addition & 1 deletion config/framed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
|
*/

'copyright' => '© 1997-2025 All rights reserved.',
'copyright' => '© 1997-2026 All rights reserved.',

/*
|--------------------------------------------------------------------------
Expand Down
Binary file added public/images/framing/arrowheads.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/framing/cat-painting.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/framing/emu-art.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/framing/shadow-box.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logo-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

html {
scroll-behavior: smooth;
}
2 changes: 1 addition & 1 deletion resources/views/components/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function gtag(){dataLayer.push(arguments);}
<script src="{{ asset('js/analytics.js') }}"></script>
</head>
<body class="font-mont font-medium antialiased">
<main class="bg-secondary-100">
<main class="bg-white">
<x-banners.container />

<div>
Expand Down
291 changes: 142 additions & 149 deletions resources/views/components/layouts/footer.blade.php
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/views/components/links/mega-menu-link.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<a
{{
$attributes->merge([
'class' => 'text-secondary-500 flex text-md my-4 items-center hover:underline decoration-secondary-500 underline-offset-2 ' . ($active ? '!underline' : '')
'class' => 'flex text-sm my-3 items-center transition-colors ' . ($active ? 'text-primary-500 font-medium' : 'text-secondary-600 hover:text-primary-500')
])
}}
href="{{$href}}"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/links/nav.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<a
href="{{$href}}"
class="text-white flex text-lg decoration-2 items-center hover:underline underline-offset-2 {{ $active ? '!underline' : '' }}"
class="flex text-base font-medium items-center transition-colors {{ $active ? 'text-primary-500 font-semibold' : 'text-secondary-700 hover:text-primary-500' }}"
>
{{ $slot }}
</a>
11 changes: 4 additions & 7 deletions resources/views/components/links/services-mega-menu.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
>
<div x-on:click="open = !open" x-on:mouseenter="open = true">
<span
class="text-white mt-1.5 flex text-lg cursor-pointer decoration-2 items-center hover:underline underline-offset-4"
class="flex text-base font-medium items-center cursor-pointer transition-colors text-secondary-700 hover:text-primary-500"
>
Services
<div x-bind:class="{ 'rotate-180': open }" class="ml-0.5 mt-0.5 transform duration-300">
Expand All @@ -69,13 +69,12 @@ class="text-white mt-1.5 flex text-lg cursor-pointer decoration-2 items-center h
{{-- Mobile --}}
<div x-show="open" x-on:click="open = false" x-cloak class="flex lg:hidden">
<div class="flex w-full pl-2">
<div class="grid sm:grid-cols-2 w-full border-secondary-200">
<div class="grid sm:grid-cols-2 w-full">
<div>
@foreach ($customLinks_1 as $link)
<x-links.mega-menu-link
href="{{$link['href']}}"
active="{{$link['active']}}"
class="!text-secondary-200 !decoration-secondary-200"
>
{{ $link['name'] }}
</x-links.mega-menu-link>
Expand All @@ -87,15 +86,13 @@ class="!text-secondary-200 !decoration-secondary-200"
<x-links.mega-menu-link
href="{{$link['href']}}"
active="{{$link['active']}}"
class="!text-secondary-200 !decoration-secondary-200"
>
{{ $link['name'] }}
</x-links.mega-menu-link>
@endforeach
<x-links.mega-menu-link
href="{{route('services.other')}}"
active="{{request()->route()?->getName() === 'services.other'}}"
class="!text-secondary-200 !decoration-secondary-200"
>
Other
</x-links.mega-menu-link>
Expand All @@ -112,10 +109,10 @@ class="absolute right-24 z-50 hidden lg:flex"
>
<div class="w-fit ml-auto shadow-2xl">
<div
class="bg-secondary-50 rounded-lg shadow-xl px-4 mx-auto md:flex hidden max-w-7xl w-full"
class="bg-white rounded-lg shadow-xl px-4 mx-auto md:flex hidden max-w-7xl w-full border border-secondary-200"
>
<div class="flex w-full">
<div class="grid grid-cols-2 gap-y-4 w-full border-secondary-200">
<div class="grid grid-cols-2 gap-y-4 w-full">
<div>
@foreach ($customLinks_1 as $link)
<x-links.mega-menu-link
Expand Down
91 changes: 43 additions & 48 deletions resources/views/components/navigation.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,59 @@
<nav>
<nav class="sticky top-0 z-40 bg-white border-b border-secondary-200 shadow-sm">
<div
x-data="{
sidebarOpen: false
}"
>
<div class="bg-gradient-to-r from-primary-700 to-primary-500">
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
<div
class="relative flex w-full items-center justify-between lg:border-b lg:border-primary-400 lg:border-opacity-25"
class="flex items-center justify-between h-16 md:h-20"
>
<div class="grid grid-cols-3 w-full">
<div class="w-52 md:w-72 col-span-1 px-2 pb-2">
<x-app-logo/>
</div>
<div class="w-48 md:w-56 shrink-0">
<x-app-logo/>
</div>

<div class="hidden lg:block my-auto col-span-2">
<div class="flex gap-4 xl:gap-x-8 justify-end pr-8">
<x-links.nav
href="{{ route('home') }}"
active="{{ request()->route()?->getName() === 'home' }}"
>
Home
</x-links.nav>
<div class="hidden lg:flex items-center gap-6 xl:gap-8">
<x-links.nav
href="{{ route('home') }}"
active="{{ request()->route()?->getName() === 'home' }}"
>
Home
</x-links.nav>

<x-links.nav
href="{{ route('about') }}"
active="{{ request()->route()?->getName() === 'about' }}"
>
About
</x-links.nav>
<x-links.nav
href="{{ route('about') }}"
active="{{ request()->route()?->getName() === 'about' }}"
>
About
</x-links.nav>

<x-links.nav
href="{{ route('custom-framing') }}"
active="{{ request()->route()?->getName() === 'custom-framing' }}"
>
Custom Framing
</x-links.nav>
<x-links.nav
href="{{ route('custom-framing') }}"
active="{{ request()->route()?->getName() === 'custom-framing' }}"
>
Custom Framing
</x-links.nav>

<x-links.nav
href="{{ route('printing') }}"
active="{{ request()->route()?->getName() === 'printing' }}"
>
Printing
</x-links.nav>
<x-links.nav
href="{{ route('printing') }}"
active="{{ request()->route()?->getName() === 'printing' }}"
>
Printing
</x-links.nav>

<x-links.services-mega-menu/>
<x-links.services-mega-menu/>

<a
href="{{ route('contact') }}"
class="bg-primary-600 p-2 rounded text-white hover:bg-primary-700 transition"
>
Contact
</a>
</div>
</div>
<a
href="{{ route('contact') }}"
class="bg-primary-500 px-4 py-2 rounded-lg text-white font-medium hover:bg-primary-600 transition-colors"
>
Contact
</a>
</div>

<div class="flex lg:hidden pr-5">
<!-- Mobile menu button -->
<div class="flex lg:hidden">
<button
class="relative inline-flex items-center justify-center rounded-md bg-primary-600 p-2 text-primary-200 hover:bg-primary-500 hover:bg-opacity-75 hover:text-white focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-2 focus:ring-offset-primary-600"
class="relative inline-flex items-center justify-center rounded-md p-2 text-secondary-600 hover:bg-secondary-100 hover:text-secondary-800 transition-colors focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-offset-2"
>
<span class="sr-only">Open main menu</span>

Expand All @@ -74,9 +69,9 @@ class="relative inline-flex items-center justify-center rounded-md bg-primary-60
</div>
</div>

<div x-show="sidebarOpen" x-transition class="lg:hidden absolute w-full z-30 bg-primary-600">
<div>
<div class="space-y-4 px-2 my-4">
<div x-show="sidebarOpen" x-transition class="lg:hidden absolute w-full z-30 bg-white border-b border-secondary-200 shadow-lg">
<div class="max-w-7xl mx-auto px-4 sm:px-6">
<div class="space-y-3 py-4">
<x-links.nav
href="{{ route('home') }}"
active="{{ request()->route()?->getName() === 'home' }}"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/pages/about.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@section('description', 'Meet the team of Framed Just For You and find out how this Australian owned & operated business started.')

<x-layouts.app>
<x-section.section class="!bg-gradient-to-tl !from-white !to-primary-50">
<x-section.section class="py-16">
<x-section.wrapper>
<x-section.content>
<x-slot name="title">
Expand Down
Loading
Loading