diff --git a/app/Http/Middleware/DefaultViewData.php b/app/Http/Middleware/DefaultViewData.php index 12a95415a..7e1c019ba 100644 --- a/app/Http/Middleware/DefaultViewData.php +++ b/app/Http/Middleware/DefaultViewData.php @@ -21,13 +21,13 @@ public function handle(Request $request, Closure $next): Response View::share('currentConference', $currentConference); View::share('headerLogo', $currentConference->getFirstMedia('logo')?->getAvailableUrl(['thumb','thumb-xl'])); View::share('headerLogoAltText', $currentConference->name); - View::share('logoText', $currentConference->name); + View::share('contextName', $currentConference->name); View::share('footer', $currentConference->getMeta('footer')); } else { $site = app()->getSite(); View::share('headerLogo', $site->getFirstMedia('logo')?->getAvailableUrl(['thumb','thumb-xl'])); View::share('headerLogoAltText', $site->getMeta('name')); - View::share('logoText', $site->getMeta('name')); + View::share('contextName', $site->getMeta('name')); View::share('footer', $site->getMeta('footer')); } View::share('homeUrl', match($currentConference?->status){ diff --git a/app/Providers/ConferenceServiceProvider.php b/app/Providers/ConferenceServiceProvider.php index acabe93b5..ed9fa77dd 100644 --- a/app/Providers/ConferenceServiceProvider.php +++ b/app/Providers/ConferenceServiceProvider.php @@ -40,7 +40,7 @@ protected function currentConference(PageGroup $pageGroup): PageGroup return $pageGroup ->id('current-conference') ->path('current') - ->layout('conference.components.layouts.app') + ->layout('website.components.layouts.app') ->homePage(Home::class) ->middleware([ 'web', diff --git a/app/Providers/WebsiteServiceProvider.php b/app/Providers/WebsiteServiceProvider.php index 25984f584..24b129abd 100644 --- a/app/Providers/WebsiteServiceProvider.php +++ b/app/Providers/WebsiteServiceProvider.php @@ -23,7 +23,7 @@ public function pageGroup(PageGroup $pageGroup): PageGroup return $pageGroup ->id('website') ->path('') - ->layout('conference.components.layouts.app') + ->layout('website.components.layouts.app') ->homePage(Home::class) ->bootUsing(function () { app()->scopeCurrentConference(); diff --git a/public/build/manifest.json b/public/build/manifest.json index d530dd8cb..94afd73e6 100644 --- a/public/build/manifest.json +++ b/public/build/manifest.json @@ -3,16 +3,6 @@ "file": "assets/logo-913f6b43.png", "src": "resources/assets/images/logo.png" }, - "resources/conference/css/conference.css": { - "file": "assets/conference-ddc9a1df.css", - "isEntry": true, - "src": "resources/conference/css/conference.css" - }, - "resources/conference/js/conference.js": { - "file": "assets/conference-b4ec506a.js", - "isEntry": true, - "src": "resources/conference/js/conference.js" - }, "resources/panel/css/panel.css": { "file": "assets/panel-b715b443.css", "isEntry": true, @@ -22,5 +12,15 @@ "file": "assets/panel-540e3665.js", "isEntry": true, "src": "resources/panel/js/panel.js" + }, + "resources/website/css/website.css": { + "file": "assets/website-fbf287d6.css", + "isEntry": true, + "src": "resources/website/css/website.css" + }, + "resources/website/js/website.js": { + "file": "assets/website-b4ec506a.js", + "isEntry": true, + "src": "resources/website/js/website.js" } } \ No newline at end of file diff --git a/resources/views/conference/components/layouts/header.blade.php b/resources/views/conference/components/layouts/header.blade.php deleted file mode 100644 index 18fde5b90..000000000 --- a/resources/views/conference/components/layouts/header.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@php($primaryNavigationItems = app()->getNavigationItems('primary-navigation-menu')) - - - diff --git a/resources/views/conference/pages/about.blade.php b/resources/views/conference/pages/about.blade.php index ba601ff54..9f8ca8eb4 100644 --- a/resources/views/conference/pages/about.blade.php +++ b/resources/views/conference/pages/about.blade.php @@ -1,6 +1,6 @@ - +
- +

{{ $this->getTitle() }}

diff --git a/resources/views/conference/pages/announcement-list.blade.php b/resources/views/conference/pages/announcement-list.blade.php index ae4d88ef2..ac5ba1863 100644 --- a/resources/views/conference/pages/announcement-list.blade.php +++ b/resources/views/conference/pages/announcement-list.blade.php @@ -1,4 +1,4 @@ - +

{{ 'Announcements' }}

diff --git a/resources/views/conference/pages/announcement.blade.php b/resources/views/conference/pages/announcement.blade.php index 6d59e8121..1c9e70144 100644 --- a/resources/views/conference/pages/announcement.blade.php +++ b/resources/views/conference/pages/announcement.blade.php @@ -1,4 +1,4 @@ - +

{{ $this->announcement->created_at->format('l, j F Y') }}

{{ $this->announcement->title }}

diff --git a/resources/views/conference/pages/home.blade.php b/resources/views/conference/pages/home.blade.php index 47a0bc614..c0f3b4c80 100644 --- a/resources/views/conference/pages/home.blade.php +++ b/resources/views/conference/pages/home.blade.php @@ -1,4 +1,4 @@ - +
diff --git a/resources/views/conference/pages/privacy-statement.blade.php b/resources/views/conference/pages/privacy-statement.blade.php index 83af0aa6c..3e556e958 100644 --- a/resources/views/conference/pages/privacy-statement.blade.php +++ b/resources/views/conference/pages/privacy-statement.blade.php @@ -1,6 +1,6 @@ - +
- +

{{ $this->getTitle() }}

{{ new Illuminate\Support\HtmlString($currentConference->getMeta('privacy_statement')) }} diff --git a/resources/views/conference/components/breadcrumbs.blade.php b/resources/views/website/components/breadcrumbs.blade.php similarity index 94% rename from resources/views/conference/components/breadcrumbs.blade.php rename to resources/views/website/components/breadcrumbs.blade.php index b7256f374..5e7b2fcc1 100644 --- a/resources/views/conference/components/breadcrumbs.blade.php +++ b/resources/views/website/components/breadcrumbs.blade.php @@ -8,7 +8,7 @@ @foreach ($breadcrumbs as $url => $label)
  • @if(!is_int($url)) - +
    {{-- Load Header Layout --}} - + {{-- Load Main Layout --}} {{ $slot }} {{-- Load Footer Layout --}} - +
    \ No newline at end of file diff --git a/resources/views/conference/components/layouts/base.blade.php b/resources/views/website/components/layouts/base.blade.php similarity index 81% rename from resources/views/conference/components/layouts/base.blade.php rename to resources/views/website/components/layouts/base.blade.php index c417ddb8c..d19ede4b1 100644 --- a/resources/views/conference/components/layouts/base.blade.php +++ b/resources/views/website/components/layouts/base.blade.php @@ -11,7 +11,7 @@ {{ filled($title = strip_tags($livewire->getTitle())) ? "{$title} - " : null }} - {{ isset($currentConference) ? $currentConference->name : config('app.name') }} + {{ $contextName ?? config('app.name') }} @@ -23,7 +23,7 @@ display: none !important; } - @vite(['resources/conference/css/conference.css', 'resources/conference/js/conference.js']) + @vite(['resources/website/css/website.css', 'resources/website/js/website.js']) diff --git a/resources/views/conference/components/layouts/footer.blade.php b/resources/views/website/components/layouts/footer.blade.php similarity index 100% rename from resources/views/conference/components/layouts/footer.blade.php rename to resources/views/website/components/layouts/footer.blade.php diff --git a/resources/views/website/components/layouts/header.blade.php b/resources/views/website/components/layouts/header.blade.php new file mode 100644 index 000000000..630a551db --- /dev/null +++ b/resources/views/website/components/layouts/header.blade.php @@ -0,0 +1,20 @@ +@php($primaryNavigationItems = app()->getNavigationItems('primary-navigation-menu')) + + + diff --git a/resources/views/conference/components/layouts/leftbar.blade.php b/resources/views/website/components/layouts/leftbar.blade.php similarity index 100% rename from resources/views/conference/components/layouts/leftbar.blade.php rename to resources/views/website/components/layouts/leftbar.blade.php diff --git a/resources/views/conference/components/layouts/main.blade.php b/resources/views/website/components/layouts/main.blade.php similarity index 69% rename from resources/views/conference/components/layouts/main.blade.php rename to resources/views/website/components/layouts/main.blade.php index 708efebb0..5fb969227 100644 --- a/resources/views/conference/components/layouts/main.blade.php +++ b/resources/views/website/components/layouts/main.blade.php @@ -1,8 +1,8 @@
    - +
    {{ $slot }}
    - +
    diff --git a/resources/views/conference/components/layouts/rightbar.blade.php b/resources/views/website/components/layouts/rightbar.blade.php similarity index 100% rename from resources/views/conference/components/layouts/rightbar.blade.php rename to resources/views/website/components/layouts/rightbar.blade.php diff --git a/resources/views/conference/components/link.blade.php b/resources/views/website/components/link.blade.php similarity index 100% rename from resources/views/conference/components/link.blade.php rename to resources/views/website/components/link.blade.php diff --git a/resources/views/conference/components/logo.blade.php b/resources/views/website/components/logo.blade.php similarity index 88% rename from resources/views/conference/components/logo.blade.php rename to resources/views/website/components/logo.blade.php index 69347e6df..9cd8571ed 100644 --- a/resources/views/conference/components/logo.blade.php +++ b/resources/views/website/components/logo.blade.php @@ -1,5 +1,5 @@ @if ($headerLogo) - @@ -7,7 +7,7 @@ class="max-h-12 w-auto"> @else - merge(['class' => 'text-lg sm:text-lg']) }} > diff --git a/resources/views/conference/components/navigation-mobile/index.blade.php b/resources/views/website/components/navigation-mobile/index.blade.php similarity index 77% rename from resources/views/conference/components/navigation-mobile/index.blade.php rename to resources/views/website/components/navigation-mobile/index.blade.php index a5dfc4bf2..3b3620509 100644 --- a/resources/views/conference/components/navigation-mobile/index.blade.php +++ b/resources/views/website/components/navigation-mobile/index.blade.php @@ -18,16 +18,16 @@ class="fixed inset-0 backdrop-blur-[2px]">
  • class="w-screen max-w-xs">
    - +
    @if (\Filament\Facades\Filament::getDefaultPanel()->auth()->user()) - Dashboard + Dashboard @else - Register - Login + Register + Login @endif
    diff --git a/resources/views/conference/components/navigation-mobile/items.blade.php b/resources/views/website/components/navigation-mobile/items.blade.php similarity index 91% rename from resources/views/conference/components/navigation-mobile/items.blade.php rename to resources/views/website/components/navigation-mobile/items.blade.php index 7c771362f..dd836da11 100644 --- a/resources/views/conference/components/navigation-mobile/items.blade.php +++ b/resources/views/website/components/navigation-mobile/items.blade.php @@ -11,7 +11,7 @@ @php($item = new App\Classes\NavigationItem(...$item))
  • @if ($level >= 1) - request()->url() === $item->getUrl(), 'before:hidden before:bg-slate-300 text-slate-500 hover:text-slate-600' => request()->url() !== $item->getUrl(), @@ -19,7 +19,7 @@ {{ $item->getLabel() }} @else - request()->url() === $item->getUrl(), 'text-slate-900 font-medium' => request()->url() !== $item->getUrl(), ]) :href="$item->getUrl()"> @@ -28,7 +28,7 @@ @endif
  • @if ($item->hasChildren()) -
    @@ -28,7 +28,7 @@ class="z-50 min-w-[8rem] overflow-hidden" /> @endif - {{ $item->getLabel() }} diff --git a/resources/views/conference/components/navigation/dropdown/trigger.blade.php b/resources/views/website/components/navigation/dropdown/trigger.blade.php similarity index 100% rename from resources/views/conference/components/navigation/dropdown/trigger.blade.php rename to resources/views/website/components/navigation/dropdown/trigger.blade.php diff --git a/resources/views/conference/components/navigation/index.blade.php b/resources/views/website/components/navigation/index.blade.php similarity index 88% rename from resources/views/conference/components/navigation/index.blade.php rename to resources/views/website/components/navigation/index.blade.php index 59fb09169..0e2ffe3b8 100644 --- a/resources/views/conference/components/navigation/index.blade.php +++ b/resources/views/website/components/navigation/index.blade.php @@ -10,14 +10,14 @@ @if (!$item->hasChildren())
  • - {{ $item->getLabel() }}
  • @else - + @endif @endforeach @@ -33,7 +33,7 @@ class="navbar-dropdown absolute -top-2 duration-200 ease-out -translate-x-1/2 tr @continue @endif @endforeach
    diff --git a/resources/views/website/pages/home.blade.php b/resources/views/website/pages/home.blade.php index e52815913..729419e4b 100644 --- a/resources/views/website/pages/home.blade.php +++ b/resources/views/website/pages/home.blade.php @@ -1,4 +1,4 @@ - +

    Highlight Conference

    @@ -98,4 +98,4 @@ class="btn btn-primary btn-sm btn-outline rounded mt-3 font-normal">Enrol
    -
    +
    diff --git a/resources/views/website/pages/login.blade.php b/resources/views/website/pages/login.blade.php index 15f593b7d..3d92a6b3c 100644 --- a/resources/views/website/pages/login.blade.php +++ b/resources/views/website/pages/login.blade.php @@ -1,6 +1,6 @@ - +
    - +
    diff --git a/resources/views/website/pages/register.blade.php b/resources/views/website/pages/register.blade.php index 2911efddc..a607c37c4 100644 --- a/resources/views/website/pages/register.blade.php +++ b/resources/views/website/pages/register.blade.php @@ -1,6 +1,6 @@ - +
    - +

    {{ $this->getTitle() }}

    @@ -92,7 +92,7 @@
    @@ -108,7 +108,7 @@ Register - + Login
    diff --git a/resources/views/website/pages/static-page.blade.php b/resources/views/website/pages/static-page.blade.php index cdfab39bb..2475b1580 100644 --- a/resources/views/website/pages/static-page.blade.php +++ b/resources/views/website/pages/static-page.blade.php @@ -1,4 +1,4 @@ - +

    {{ $this->staticPage->created_at->format('l, j F Y') }}

    {{ $this->staticPage->title }}

    diff --git a/resources/conference/css/tailwind.config.js b/resources/website/css/tailwind.config.js similarity index 100% rename from resources/conference/css/tailwind.config.js rename to resources/website/css/tailwind.config.js diff --git a/resources/conference/css/conference.css b/resources/website/css/website.css similarity index 100% rename from resources/conference/css/conference.css rename to resources/website/css/website.css diff --git a/resources/conference/js/alpine/components/navigation.js b/resources/website/js/alpine/components/navigation.js similarity index 100% rename from resources/conference/js/alpine/components/navigation.js rename to resources/website/js/alpine/components/navigation.js diff --git a/resources/conference/js/alpine/components/slide-over.js b/resources/website/js/alpine/components/slide-over.js similarity index 100% rename from resources/conference/js/alpine/components/slide-over.js rename to resources/website/js/alpine/components/slide-over.js diff --git a/resources/conference/js/alpine/installation.js b/resources/website/js/alpine/installation.js similarity index 100% rename from resources/conference/js/alpine/installation.js rename to resources/website/js/alpine/installation.js diff --git a/resources/conference/js/conference.js b/resources/website/js/website.js similarity index 100% rename from resources/conference/js/conference.js rename to resources/website/js/website.js diff --git a/stubs/livewire-page-group/PageView.stub b/stubs/livewire-page-group/PageView.stub index 2ea80f11c..8a19293e7 100644 --- a/stubs/livewire-page-group/PageView.stub +++ b/stubs/livewire-page-group/PageView.stub @@ -1,6 +1,6 @@ - +
    - +

    {{$this->getTitle()}}

    \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 073c2ff8a..b70519da4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,8 +7,8 @@ export default defineConfig({ input: [ "resources/panel/css/panel.css", "resources/panel/js/panel.js", - "resources/conference/css/conference.css", - "resources/conference/js/conference.js", + "resources/website/css/website.css", + "resources/website/js/website.js", ], refresh: true, }),