From 91e716adc0cd5348f0ebe049d15c65eb96ca78ce Mon Sep 17 00:00:00 2001 From: Julian Prieber Date: Thu, 19 Dec 2024 15:13:37 +0100 Subject: [PATCH] Refactor pages for wire:navigate --- resources/ckeditor/ckeditor.js | 2 +- .../config/advanced-config.blade.php | 76 +- resources/views/layouts/sidebar.blade.php | 148 ++-- resources/views/panel/users.blade.php | 10 +- resources/views/studio/links.blade.php | 21 +- resources/views/studio/page.blade.php | 764 ++++++++++-------- resources/views/studio/theme.blade.php | 527 ++++++------ 7 files changed, 866 insertions(+), 682 deletions(-) diff --git a/resources/ckeditor/ckeditor.js b/resources/ckeditor/ckeditor.js index 6eea7fa..3a1fabf 100644 --- a/resources/ckeditor/ckeditor.js +++ b/resources/ckeditor/ckeditor.js @@ -2,7 +2,7 @@ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved. For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/ */ -(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"M2G9",version:"4.18.0",revision:"5fe059002f3",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d{{__('messages.AC.description')}}

+

{{ __('messages.AC.description') }}

- @csrf -
- - -
{{ file_get_contents('config/advanced-config.php') }}
-
- - {{__('messages.Restore defaults')}} + @csrf +
+ + +
+ {{ file_get_contents('config/advanced-config.php') }}
+
+ + {{ __('messages.Restore defaults') }}
- - +@endpush +@push('sidebar-scripts') + + if (isAdvancedConfig) { + $('#editForm').append( + ''); + } + + if (confirm(confirmationMessage)) { + $('#editForm').submit(); + } + }); + }; + + document.addEventListener('DOMContentLoaded', () => { + if (typeof Livewire === 'undefined') { + performOperation(); + } + }); + + document.addEventListener('livewire:navigated', () => { + performOperation(); + }); + +@endpush diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index af707b5..62b9032 100755 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -94,6 +94,78 @@ + + + + + + + + + + + + + + + + + {{-- --}} + + + + + + + + + {{-- + --}} + + + + + + + + + + + + {{-- @@ -224,7 +296,7 @@
  • + href="{{ url('admin/users') }}" wire:current="active" wire:navigate> {{ __('messages.Manage Users') }} @@ -1162,82 +1234,14 @@ MODAL; // <-- Indentation breaks my code editor :/ }); }); --}} - - - - - - - - - - - - - - + - - {{-- --}} - - - - - - - - - {{-- - --}} - - - - - - - - - - - - @stack('sidebar-scripts') + {{-- --}} + --}} - + @if(false) + @livewireScripts + + @endif - - + @endsection diff --git a/resources/views/studio/page.blade.php b/resources/views/studio/page.blade.php index 71b3ef1..6f58cdc 100755 --- a/resources/views/studio/page.blade.php +++ b/resources/views/studio/page.blade.php @@ -3,357 +3,433 @@ @section('content') -
    -
    - -
    -
    -
    -
    -
    +
    +
    - - - -
    -

    {{__('messages.My Profile')}}

    - @if($errors->any()) - - @endif -
    - -
    - @foreach($pages as $page) -
    - @csrf - @if($page->littlelink_name != '') -
    - - -
    - @endif - - - -
    - You do not have a Page URL'; ?> -
    - -
    - {{str_replace(['http://', 'https://'], '', url(''))}}/@ - -
    - - @include('auth.url-validation') - - -
    - {{--
    +
    +
    +
    +
    +
    + + + + +
    +

    + {{ __('messages.My Profile') }}

    + @if ($errors->any()) + + @endif +
    + +
    + @foreach ($pages as $page) + + @csrf + @if ($page->littlelink_name != '') +
    + + +
    + @endif + + + +
    + You do not have a Page URL'; + } ?> +
    + +
    + {{ str_replace(['http://', 'https://'], '', url('')) }}/@ + +
    + + @include('auth.url-validation') + + +
    + {{--
    {{__('messages.Name')}}
    --}} - -
    -
    - -
    - - -
    - - @if(auth()->user()->role == 'admin' || auth()->user()->role == 'vip') -
    -
    {{__('messages.Show checkmark')}}
    -

    {{__('messages.disableverified')}}

    -
    - id, 'checkmark') == true){echo 'checked';} ?> /> - -
    - - @endif - @endforeach + +
    +
    -
    -
    {{__('messages.Show share button')}}
    -

    {{__('messages.disablesharebutton')}}

    -
    - id, 'disable-sharebtn') != "true"){echo 'checked';} ?> /> - -
    +
    + + +
    + + @if (auth()->user()->role == 'admin' || auth()->user()->role == 'vip') +
    +
    {{ __('messages.Show checkmark') }} +
    +

    {{ __('messages.disableverified') }}

    +
    + id, 'checkmark') == true) { + echo 'checked'; + } ?> /> + +
    + + @endif + @endforeach + +
    +
    {{ __('messages.Show share button') }}
    +

    {{ __('messages.disablesharebutton') }}

    +
    + id, 'disable-sharebtn') != 'true') { + echo 'checked'; + } ?> /> + +
    + +
    +
    {{ __('messages.Open links in new tab') }} +
    +

    {{ __('messages.openlinksnewtab') }}

    +
    + id, 'links-new-tab') != false) { + echo 'checked'; + } ?> /> + +
    + + + + + @if (env('ALLOW_USER_HTML') === true) + @push('sidebar-stylesheets') + + + @endpush + @endif +
    + +
    +
    -
    -
    {{__('messages.Open links in new tab')}}
    -

    {{__('messages.openlinksnewtab')}}

    -
    - id, 'links-new-tab') != false){echo 'checked';} ?> /> -
    - - - - - @if(env('ALLOW_USER_HTML') === true) - - - - @endif +
    +
    - -
    -
    - -
    -
    -
    -
    -
    +
    +
    -
    @endsection diff --git a/resources/views/studio/theme.blade.php b/resources/views/studio/theme.blade.php index bd22d80..81b78a8 100644 --- a/resources/views/studio/theme.blade.php +++ b/resources/views/studio/theme.blade.php @@ -1,217 +1,277 @@ @extends('layouts.sidebar') @section('content') +
    +
    -
    -
    - -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    - @foreach($pages as $page) + @foreach ($pages as $page) +
    +

    {{ __('messages.Select a theme') }}

    +
    -
    -

    {{__('messages.Select a theme')}}

    -
    - - @if($errors->any()) -
    - @endif +
    +
    +
    - - -
    -
    - -
    -
    -
    -
    -

    {{__('messages.Preview')}}

    -
    -
    -
    - @if(env('USE_THEME_PREVIEW_IFRAME') === false or $page->littlelink_name == '') -
    - @else - +
    +
    +
    +
    +
    + @if (env('ALLOW_CUSTOM_BACKGROUNDS') == true) +
    + @csrf +

    {{ __('messages.Custom background') }}

    + +
    +
    + @if (!file_exists(base_path('assets/img/background-img/' . findBackground(Auth::user()->id)))) +

    {{ __('messages.No image selected') }}

    + @endif +
    + @if (file_exists(base_path('assets/img/background-img/' . findBackground(Auth::user()->id)))) +
    + @endif + {{--
    A caption for the above image.
    --}} +
    +
    +

    +
    +
    +
    +
    + +
    @endif -
    -
    - -
    -
    +
    +
    +
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - @if(env('ALLOW_CUSTOM_BACKGROUNDS') == true) -
    - @csrf -

    {{__('messages.Custom background')}}

    - -
    -
    - @if(!file_exists(base_path('assets/img/background-img/'.findBackground(Auth::user()->id))))

    {{__('messages.No image selected')}}

    @endif -
    - @if(file_exists(base_path('assets/img/background-img/'.findBackground(Auth::user()->id))))
    @endif - {{--
    A caption for the above image.
    --}} -
    -
    -

    -
    -
    + @if (auth()->user()->role == 'admin') +
    +
    +
    +
    +
    +

    {{ __('messages.Manage themes') }}

    + @if (env('ENABLE_THEME_UPDATER') == 'true') +
    + +


    +
    +
    +

    + +

    +
    +
    +
    +
    +
    + +
    +
    + @endif + +


    + + @csrf + {{--

    {{__('messages.Upload themes')}}

    --}} + +
    + + +


    +
    + + + +
    + + +
    - - - @endif -
    -
    -
    -
    -
    - - @if(auth()->user()->role == 'admin') -
    -
    -
    -
    -
    -

    {{__('messages.Manage themes')}}

    - @if(env('ENABLE_THEME_UPDATER') == 'true') - -
    - -


    -
    -
    -

    - -

    -
    -
    -
    -
    -
    -
    -
    - @endif - -


    -
    - @csrf - {{--

    {{__('messages.Upload themes')}}

    --}} - -
    - - -


    -
    - - - -
    -
    - -
    -
    -
    -
    +
    -
    - @endif + @endif + @endforeach -@endforeach + + - - + - + `; + iframeDocument.head.appendChild(style); + }; + -@push('sidebar-scripts') -