Skip to content

Commit

Permalink
Merge pull request #191 from OpenSynergic/fix-error-caching-view
Browse files Browse the repository at this point in the history
fix error caching view
  • Loading branch information
rahmanramsi authored Jan 13, 2024
2 parents a9a20bc + f074cf2 commit 7fc7be4
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion app/Providers/ConferenceServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function register(): void
*/
public function boot(): void
{
Blade::anonymousComponentPath(resource_path('views/conference/components'), 'conference');
// Blade::anonymousComponentPath(resource_path('views/conference/components'), 'conference');

// Livewire::addPersistentMiddleware([
// IdentifyCurrentConference::class,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ class="flex w-full bg-white md:flex-row hover:bg-gray-100 gap-x-2 p-1 group">
@endforelse
</div>
</div>
</x-conference::layouts.main>
</x-website::layouts.main>
2 changes: 1 addition & 1 deletion resources/views/conference/pages/announcement.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
{{ new Illuminate\Support\HtmlString($this->announcement->getMeta('content')) }}
</div>
</div>
</x-conference::layouts.main>
</x-website::layouts.main>
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
{{ new Illuminate\Support\HtmlString($currentConference->getMeta('privacy_statement')) }}
</div>
</div>
</x-conference::layouts.main>
</x-website::layouts.main>
2 changes: 1 addition & 1 deletion resources/views/website/components/breadcrumbs.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class="link link-hover link-primary"
{{-- wire:navigate --}}
>
{{ $label }}
</x-conference::link>
</x-website::link>
@else
{{ $label }}
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/website/components/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
{{-- Load Footer Layout --}}
<x-website::layouts.footer />
</div>
</x-conference::layouts.base>
</x-website::layouts.base>
6 changes: 3 additions & 3 deletions resources/views/website/components/layouts/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<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="$panelUrl" :spa="false" class="btn btn-sm bg-white rounded px-4 font-normal text-gray-900">Dashboard</x-conference::link>
<x-website::link :href="$panelUrl" :spa="false" class="btn btn-sm bg-white rounded px-4 font-normal text-gray-900">Dashboard</x-website::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>
<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-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>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/website/components/logo.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
>
<img src="{{ $headerLogo }}" alt="{{ $headerLogoAltText }}"
class="max-h-12 w-auto">
</x-conference::link>
</x-website::link>
@else
<x-website::link
:href="$homeUrl"
{{ $attributes->merge(['class' => 'text-lg sm:text-lg']) }}
>
{{ $headerLogoAltText }}
</x-conference::link>
</x-website::link>
@endif
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
'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>
</x-website::link>
@else
<x-website::link @class([
'text-primary font-semibold' => request()->url() === $item->getUrl(),
'text-slate-900 font-medium' => request()->url() !== $item->getUrl(),
]) :href="$item->getUrl()">
{{ $item->getLabel() }}
</x-conference::link>
</x-website::link>
@endif
</li>
@if ($item->hasChildren())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ class="z-50 min-w-[8rem] overflow-hidden" />
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() }}
</x-conference::link>
</x-website::link>
@endforeach
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
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>
</x-website::link>
</li>
@else
<x-website::navigation.dropdown.trigger :key="$key" :item="$item" />
Expand Down
4 changes: 2 additions & 2 deletions resources/views/website/pages/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</button>
<x-website::link class="btn btn-outline btn-sm" :href="url('register')">
Register
</x-conference::link>
</x-website::link>
</div>
</form>
</div>
</x-conference::layouts.main>
</x-website::layouts.main>
6 changes: 3 additions & 3 deletions resources/views/website/pages/register.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
<p class="label-text">
I accept and approve according to <x-website::link
href="{{ route('livewirePageGroup.current-conference.pages.privacy-statement') }}"
class="link link-primary link-hover">Privacy Statement.</x-conference::link>
class="link link-primary link-hover">Privacy Statement.</x-website::link>
</p>
</label>
</div>
Expand All @@ -133,11 +133,11 @@ class="link link-primary link-hover">Privacy Statement.</x-conference::link>
</button>
<x-website::link class="btn btn-outline btn-sm" :href="url('login')">
Login
</x-conference::link>
</x-website::link>
</div>
</form>
@else
<p>This conference is currently closing user registrations</p>
@endif
</div>
</x-conference::layouts.main>
</x-website::layouts.main>
2 changes: 1 addition & 1 deletion resources/views/website/pages/static-page.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ class="user-content"
{{ new Illuminate\Support\HtmlString($this->staticPage->getMeta('content')) }}
</div>
</div>
</x-conference::layouts.main>
</x-website::layouts.main>

0 comments on commit 7fc7be4

Please sign in to comment.