move context conference to website

OpenSynergic · Sep 26, 2023 · c949017 · c949017
1 parent 898c98a
commit c949017
Show file tree

Hide file tree

Showing 37 changed files with 80 additions and 80 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
   }
 }
diff --git a/resources/views/conference/components/layouts/header.blade.php b/resources/views/conference/components/layouts/header.blade.php
diff --git a/resources/views/conference/pages/about.blade.php b/resources/views/conference/pages/about.blade.php
@@ -1,6 +1,6 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body flex gap-3">
-        <x-conference::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
+        <x-website::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
         <h2 class="card-title">{{ $this->getTitle() }} </h2>
 
         <div class="user-content">

diff --git a/resources/views/conference/pages/announcement-list.blade.php b/resources/views/conference/pages/announcement-list.blade.php
@@ -1,4 +1,4 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body">
         <h1 class="text-xl mb-2 ml-2 text-gray-900">{{ 'Announcements' }}</h1>
         <div class="divide-y overflow-y-auto">

diff --git a/resources/views/conference/pages/announcement.blade.php b/resources/views/conference/pages/announcement.blade.php
@@ -1,4 +1,4 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body text-gray-800">
         <p class="text-xs text-gray-500 font-medium">{{ $this->announcement->created_at->format('l, j F Y') }}</p>
         <h1 class="card-title">{{ $this->announcement->title }}</h1>

diff --git a/resources/views/conference/pages/home.blade.php b/resources/views/conference/pages/home.blade.php
@@ -1,4 +1,4 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
 
     <div class="card px-5 py-4">
         <div class="card-body space-y-2 bg-gray-50 border">

diff --git a/resources/views/conference/pages/privacy-statement.blade.php b/resources/views/conference/pages/privacy-statement.blade.php
@@ -1,6 +1,6 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body space-y-2">
-        <x-conference::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
+        <x-website::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
         <h2 class="card-title">{{ $this->getTitle() }}</h2>
         <div class="user-content">
             {{ new Illuminate\Support\HtmlString($currentConference->getMeta('privacy_statement')) }}

diff --git a/...nference/components/breadcrumbs.blade.php → .../website/components/breadcrumbs.blade.php b/...nference/components/breadcrumbs.blade.php → .../website/components/breadcrumbs.blade.php
@@ -8,7 +8,7 @@
         @foreach ($breadcrumbs as $url => $label)
         <li>
             @if(!is_int($url))
-            <x-conference::link 
+            <x-website::link 
                 :href="$url" 
                 class="link link-hover link-primary"
                 {{-- wire:navigate --}}

diff --git a/...nference/components/layouts/app.blade.php → .../website/components/layouts/app.blade.php b/...nference/components/layouts/app.blade.php → .../website/components/layouts/app.blade.php
@@ -1,13 +1,13 @@
-<x-conference::layouts.base :livewire="$livewire">
+<x-website::layouts.base :livewire="$livewire">
     <div class="flex flex-col h-full gap-3 min-h-screen">
 
         {{-- Load Header Layout --}}
-        <x-conference::layouts.header />
+        <x-website::layouts.header />
 
         {{-- Load Main Layout --}}
         {{ $slot }}
 
         {{-- Load Footer Layout --}}
-        <x-conference::layouts.footer />
+        <x-website::layouts.footer />
     </div>    
 </x-conference::layouts.base>
diff --git a/...ference/components/layouts/base.blade.php → ...website/components/layouts/base.blade.php b/...ference/components/layouts/base.blade.php → ...website/components/layouts/base.blade.php
@@ -11,7 +11,7 @@
 
     <title>
         {{ filled($title = strip_tags($livewire->getTitle())) ? "{$title} - " : null }}
-        {{ isset($currentConference) ? $currentConference->name : config('app.name') }}
+        {{ $contextName ?? config('app.name') }}
     </title>
 
     <link rel="preconnect" href="https://fonts.googleapis.com">
@@ -23,7 +23,7 @@
             display: none !important;
         }
     </style>
-    @vite(['resources/conference/css/conference.css', 'resources/conference/js/conference.js'])
+    @vite(['resources/website/css/website.css', 'resources/website/js/website.js'])
 </head>
 
 <body class="page page-{{ strtolower($livewire->getTitle()) }} antialiased" x-data>

diff --git a/...rence/components/layouts/footer.blade.php → ...bsite/components/layouts/footer.blade.php b/...rence/components/layouts/footer.blade.php → ...bsite/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
@@ -0,0 +1,20 @@
+@php($primaryNavigationItems = app()->getNavigationItems('primary-navigation-menu'))
+
+
+<div class="navbar-container sticky top-0 z-[60] bg-sky-400 text-white">
+    <div class="navbar mx-auto max-w-7xl">
+        <div class="navbar-start items-center w-auto sm:w-1/2 gap-2">
+            <x-website::navigation-mobile :items="$primaryNavigationItems"/>
+            <x-website::logo/>
+        </div>
+        <x-website::navigation :items="$primaryNavigationItems"/>
+        <div class="navbar-end gap-x-4 hidden lg:inline-flex">
+            @if (\Filament\Facades\Filament::getDefaultPanel()->auth()->user())
+                <x-website::link :href="route('filament.panel.tenant')" :spa="false" class="btn btn-sm btn-white rounded px-4 font-normal text-gray-900">Dashboard</x-conference::link>
+            @else
+                <x-website::link :href="route('livewirePageGroup.website.pages.register')" :spa="false" class="btn btn-sm btn-ghost rounded px-4 font-normal text-white">Register</x-conference::link>
+                <x-website::link :href="route('livewirePageGroup.website.pages.login')" :spa="false" class="btn btn-sm rounded px-4 font-normal text-gray-900">Login</x-conference::link>
+            @endif
+        </div>
+    </div>
+</div>
diff --git a/...ence/components/layouts/leftbar.blade.php → ...site/components/layouts/leftbar.blade.php b/...ence/components/layouts/leftbar.blade.php → ...site/components/layouts/leftbar.blade.php
diff --git a/...ference/components/layouts/main.blade.php → ...website/components/layouts/main.blade.php b/...ference/components/layouts/main.blade.php → ...website/components/layouts/main.blade.php
@@ -1,8 +1,8 @@
 <div class="page-main mx-auto max-w-7xl flex flex-col lg:grid grid-cols-12 gap-3 grow w-full">
-    <x-conference::layouts.leftbar />
+    <x-website::layouts.leftbar />
     <div class="page-content col-span-12">
         {{ $slot }}
     </div>
-    <x-conference::layouts.rightbar />
+    <x-website::layouts.rightbar />
 </div>
 
diff --git a/...nce/components/layouts/rightbar.blade.php → ...ite/components/layouts/rightbar.blade.php b/...nce/components/layouts/rightbar.blade.php → ...ite/components/layouts/rightbar.blade.php
diff --git a/...iews/conference/components/link.blade.php → ...s/views/website/components/link.blade.php b/...iews/conference/components/link.blade.php → ...s/views/website/components/link.blade.php
diff --git a/...iews/conference/components/logo.blade.php → ...s/views/website/components/logo.blade.php b/...iews/conference/components/logo.blade.php → ...s/views/website/components/logo.blade.php
@@ -1,13 +1,13 @@
 @if ($headerLogo)
-    <x-conference::link 
+    <x-website::link 
         {{ $attributes }}
         :href="$homeUrl"
     >
         <img src="{{ $headerLogo }}" alt="{{ $headerLogoAltText }}"
         class="max-h-12 w-auto">
     </x-conference::link>
 @else
-    <x-conference::link 
+    <x-website::link 
         :href="$homeUrl" 
         {{ $attributes->merge(['class' => 'text-lg sm:text-lg']) }}
     >

diff --git a/...ponents/navigation-mobile/index.blade.php → ...ponents/navigation-mobile/index.blade.php b/...ponents/navigation-mobile/index.blade.php → ...ponents/navigation-mobile/index.blade.php
@@ -18,16 +18,16 @@ class="fixed inset-0 backdrop-blur-[2px]"></div>
                             class="w-screen max-w-xs">
                             <div
                                 class="flex flex-col h-full pt-[5rem] pb-5 px-4 sm:px-6 overflow-y-scroll bg-white border-r shadow-lg border-neutral-100/70 justify-between">
-                                <x-conference::navigation-mobile.items :items="$items" />
+                                <x-website::navigation-mobile.items :items="$items" />
                                 <div class="flex flex-col gap-2">
                                     @if (\Filament\Facades\Filament::getDefaultPanel()->auth()->user())
-                                        <x-conference::link :href="route('filament.panel.tenant')" :spa="false"
-                                            class="btn btn-sm btn-primary rounded px-4 font-normal">Dashboard</x-conference::link>
+                                        <x-website::link :href="route('filament.panel.tenant')" :spa="false"
+                                            class="btn btn-sm btn-primary rounded px-4 font-normal">Dashboard</x-website::link>
                                     @else
-                                        <x-conference::link :href="route('livewirePageGroup.website.pages.register')" :spa="false"
-                                            class="btn btn-sm btn-primary rounded px-4 font-normal">Register</x-conference::link>
-                                        <x-conference::link :href="route('livewirePageGroup.website.pages.login')" :spa="false"
-                                            class="btn btn-sm rounded px-4 font-normal text-gray-900">Login</x-conference::link>
+                                        <x-website::link :href="route('livewirePageGroup.website.pages.register')" :spa="false"
+                                            class="btn btn-sm btn-primary rounded px-4 font-normal">Register</x-website::link>
+                                        <x-website::link :href="route('livewirePageGroup.website.pages.login')" :spa="false"
+                                            class="btn btn-sm rounded px-4 font-normal text-gray-900">Login</x-website::link>
                                     @endif
                                 </div>
                             </div>

diff --git a/...ponents/navigation-mobile/items.blade.php → ...ponents/navigation-mobile/items.blade.php b/...ponents/navigation-mobile/items.blade.php → ...ponents/navigation-mobile/items.blade.php
@@ -11,15 +11,15 @@
             @php($item = new App\Classes\NavigationItem(...$item))
             <li class="relative">
                 @if ($level >= 1)
-                    <x-conference::link @class([
+                    <x-website::link @class([
                         'block w-full pl-3.5 before:pointer-events-none before:absolute before:-left-1 before:top-1/2 before:h-1.5 before:w-1.5 before:-translate-y-1/2 before:rounded-full hover:before:block',
                         'font-semibold text-primary before:bg-primary' => request()->url() === $item->getUrl(),
                         'before:hidden before:bg-slate-300 text-slate-500 hover:text-slate-600' => request()->url() !== $item->getUrl(),
                     ]) :href="$item->getUrl()">
                         {{ $item->getLabel() }}
                     </x-conference::link>
                 @else
-                    <x-conference::link @class([
+                    <x-website::link @class([
                         'text-primary font-semibold' => request()->url() === $item->getUrl(),
                         'text-slate-900 font-medium' => request()->url() !== $item->getUrl(),
                     ]) :href="$item->getUrl()">
@@ -28,7 +28,7 @@
                 @endif
             </li>
             @if ($item->hasChildren())
-                <x-conference::navigation-mobile.items 
+                <x-website::navigation-mobile.items 
                         :items="$item->getChildren()" 
                         :level="$level + 1"
                         @class([

diff --git a/...nents/navigation/dropdown/items.blade.php → ...nents/navigation/dropdown/items.blade.php b/...nents/navigation/dropdown/items.blade.php → ...nents/navigation/dropdown/items.blade.php
@@ -20,15 +20,15 @@ class="w-4 h-4 ml-auto">
                 </div>
                 <div data-submenu
                     class="absolute top-0 right-0 invisible mr-1 duration-200 ease-out translate-x-full opacity-0 group-hover:mr-0 group-hover:visible group-hover:opacity-100">
-                    <x-conference::navigation.dropdown.items :items="$item->getChildren()" :level="$level + 1"
+                    <x-website::navigation.dropdown.items :items="$item->getChildren()" :level="$level + 1"
                         class="z-50 min-w-[8rem] overflow-hidden" />
                 </div>
             </div>
             @continue
         @endif
 
 
-        <x-conference::link
+        <x-website::link
             class="relative flex hover:bg-neutral-100 items-center py-1.5 px-4 pr-6 text-sm outline-none transition-colors gap-4 w-full"
             :href="$item->getUrl()">
             {{ $item->getLabel() }}

diff --git a/...nts/navigation/dropdown/trigger.blade.php → ...nts/navigation/dropdown/trigger.blade.php b/...nts/navigation/dropdown/trigger.blade.php → ...nts/navigation/dropdown/trigger.blade.php
diff --git a/...nce/components/navigation/index.blade.php → ...ite/components/navigation/index.blade.php b/...nce/components/navigation/index.blade.php → ...ite/components/navigation/index.blade.php
@@ -10,14 +10,14 @@
 
                 @if (!$item->hasChildren())
                     <li>
-                        <x-conference::link
+                        <x-website::link
                             class="btn btn-ghost btn-sm rounded-full inline-flex items-center justify-center px-4 transition-colors hover:text-primary-content focus:outline-none disabled:opacity-50 disabled:pointer-events-none group w-max"
                             :href="$item->getUrl()">
                             {{ $item->getLabel() }}
                         </x-conference::link>
                     </li>
                 @else
-                    <x-conference::navigation.dropdown.trigger :key="$key" :item="$item" />
+                    <x-website::navigation.dropdown.trigger :key="$key" :item="$item" />
                 @endif
             @endforeach
         </ul>
@@ -33,7 +33,7 @@ class="navbar-dropdown absolute -top-2 duration-200 ease-out -translate-x-1/2 tr
                 @continue
             @endif
             <div class="navbar-dropdown-content" x-navigation:dropdown-content="{{ $key }}">
-                <x-conference::navigation.dropdown.items :items="$item->getChildren()" />
+                <x-website::navigation.dropdown.items :items="$item->getChildren()" />
             </div>
         @endforeach
     </div>

diff --git a/resources/views/website/pages/home.blade.php b/resources/views/website/pages/home.blade.php
@@ -1,4 +1,4 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="px-6 py-4">
         <h1 class="card-title mt-4">Highlight Conference</h1>
         <div class="h-1 w-20 rounded bg-primary"></div>
@@ -98,4 +98,4 @@ class="btn btn-primary btn-sm btn-outline rounded mt-3 font-normal">Enrol</butto
         </div>
     </div>
 
-</x-conference::layouts.main>
+</x-website::layouts.main>
diff --git a/resources/views/website/pages/login.blade.php b/resources/views/website/pages/login.blade.php
@@ -1,6 +1,6 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body space-y-2">
-        <x-conference::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
+        <x-website::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
         <form wire:submit='login' class="space-y-4">
             <div class="form-control sm:col-span-6 gap-2">
                 <label class="label-text">
@@ -35,7 +35,7 @@
                     <span class="loading loading-spinner loading-xs" wire:loading></span>
                     Login
                 </button>
-                <x-conference::link class="btn btn-outline btn-sm" :href="url('register')">
+                <x-website::link class="btn btn-outline btn-sm" :href="url('register')">
                     Register
                 </x-conference::link>
             </div>

diff --git a/resources/views/website/pages/register.blade.php b/resources/views/website/pages/register.blade.php
@@ -1,6 +1,6 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
     <div class="card-body space-y-2">
-        <x-conference::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
+        <x-website::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
         <h2 class="card-title">{{ $this->getTitle() }}</h2>
 
         <form wire:submit='register' class="space-y-4">
@@ -92,7 +92,7 @@
                         <label class="label justify-normal gap-2">
                             <input type="checkbox" class="checkbox checkbox-primary checkbox-sm" wire:model="privacy_statement_agree" required/>
                             <p class="label-text">
-                                I accept and approve according to <x-conference::link href="#" class="link link-primary link-hover">Privacy Statement.</x-conference::link>
+                                I accept and approve according to <x-website::link href="#" class="link link-primary link-hover">Privacy Statement.</x-conference::link>
                             </p>
                         </label>
                     </div>
@@ -108,7 +108,7 @@
                     <span class="loading loading-spinner loading-xs" wire:loading></span>
                     Register
                 </button>
-                <x-conference::link class="btn btn-outline btn-sm" :href="url('login')">
+                <x-website::link class="btn btn-outline btn-sm" :href="url('login')">
                     Login
                 </x-conference::link>
             </div>

diff --git a/resources/views/website/pages/static-page.blade.php b/resources/views/website/pages/static-page.blade.php
@@ -1,4 +1,4 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
         <div class="card-body text-gray-800">
             <p class="text-xs text-gray-500 font-medium">{{ $this->staticPage->created_at->format('l, j F Y') }}</p>
             <h1 class="card-title">{{ $this->staticPage->title }}</h1>

diff --git a/resources/conference/css/tailwind.config.js → resources/website/css/tailwind.config.js b/resources/conference/css/tailwind.config.js → resources/website/css/tailwind.config.js
diff --git a/resources/conference/css/conference.css → resources/website/css/website.css b/resources/conference/css/conference.css → resources/website/css/website.css
diff --git a/...erence/js/alpine/components/navigation.js → ...ebsite/js/alpine/components/navigation.js b/...erence/js/alpine/components/navigation.js → ...ebsite/js/alpine/components/navigation.js
diff --git a/...erence/js/alpine/components/slide-over.js → ...ebsite/js/alpine/components/slide-over.js b/...erence/js/alpine/components/slide-over.js → ...ebsite/js/alpine/components/slide-over.js
diff --git a/...rces/conference/js/alpine/installation.js → resources/website/js/alpine/installation.js b/...rces/conference/js/alpine/installation.js → resources/website/js/alpine/installation.js
diff --git a/resources/conference/js/conference.js → resources/website/js/website.js b/resources/conference/js/conference.js → resources/website/js/website.js
diff --git a/stubs/livewire-page-group/PageView.stub b/stubs/livewire-page-group/PageView.stub
@@ -1,6 +1,6 @@
-<x-conference::layouts.main>
+<x-website::layouts.main>
         <div class="card-body space-y-2">
-            <x-conference::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
+            <x-website::breadcrumbs :breadcrumbs="$this->getBreadcrumbs()" />
             <h2 class="card-title">{{$this->getTitle()}}</h2>
         </div>
 </x-conference::layouts.main>
diff --git 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,
         }),