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->announcement->created_at->format('l, j F Y') }}
{{ $this->staticPage->created_at->format('l, j F Y') }}