From 16856f6c25612d702426adc0ba84540807bcb27a Mon Sep 17 00:00:00 2001 From: ro Date: Thu, 8 May 2025 18:25:57 -0600 Subject: [PATCH] cleaned up page edit template, fix formatting cleaned up the page edit template a bit to make it easier to convert to the new editor UI. php formatting also needed to be updated, so the php cs fixer file was updated and added some setting to prettier to handle blade files --- .php-cs-fixer.php | 7 +- .prettierrc | 10 +- app/Http/Controllers/DashController.php | 48 +++- resources/views/back/page.blade.php | 265 ++++++------------ resources/views/includes/files-list.blade.php | 50 ++++ resources/views/includes/media-list.blade.php | 32 +++ resources/views/includes/options.blade.php | 24 +- 7 files changed, 221 insertions(+), 215 deletions(-) create mode 100644 resources/views/includes/files-list.blade.php create mode 100644 resources/views/includes/media-list.blade.php diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index cd8588c..be4d190 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -55,20 +55,15 @@ return $config ] ], 'no_multiline_whitespace_around_double_arrow' => true, - 'no_spaces_around_offset' => true, - 'no_unused_imports' => true, 'no_whitespace_before_comma_in_array' => true, 'no_whitespace_in_blank_line' => true, 'object_operator_without_whitespace' => true, - 'single_blank_line_before_namespace' => true, 'ternary_operator_spaces' => true, 'trim_array_spaces' => true, 'unary_operator_spaces' => true, 'whitespace_after_comma_in_array' => true, 'single_line_after_imports' => true, - 'ordered_imports' => [ - 'sort_algorithm' => 'none', - ], + //'single_blank_line_before_namespace' => true, php fixer doesn't like this rule? //Other rules here... ]) ->setLineEnding("\n"); diff --git a/.prettierrc b/.prettierrc index 5caa4b9..dfe4522 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,9 +1,7 @@ { + "plugins": ["@shufo/prettier-plugin-blade"], "overrides": [ - { - "files": ".prettierrc", - "options": { "parser": "json" } - }, + { "files": ".prettierrc", "options": { "parser": "json" } }, { "files": "*.css", "options": { @@ -31,6 +29,10 @@ "tabWidth": 4, "printWidth": 90 } + }, + { + "files": ["*.blade.php"], + "options": { "parser": "blade", "tabWidth": 4 } } ] } diff --git a/app/Http/Controllers/DashController.php b/app/Http/Controllers/DashController.php index e6a0925..ac8ebac 100644 --- a/app/Http/Controllers/DashController.php +++ b/app/Http/Controllers/DashController.php @@ -92,12 +92,50 @@ class DashController extends Controller $mode == 'edit' ? $title = $page['title'] : $title = 'Add New'; $mode == 'edit' ? $views = $this->themes->getCustomViews($page['layout']) : $views[] = 'page'; + //just a patch for now to get this out of the template + if ($mode == 'edit') { + $id = $page['id']; + $uuid = $page['uuid']; + $slug = $page['slug']; + $feature = $page['feature']; + $layout = $page['layout']; + $tags = $page['tags']; + $content = $page['content']; + $date = $page['created']; + $updated = $page['updated']; + $media = $page['media']; + $files = $page['docs']; + } else { + $id = ""; + $uuid = ""; + $slug = ""; + $feature = ""; + $layout = ""; + $tags = ""; + $content = ""; + $date = ""; + $updated = ""; + $media = ""; + $files = ""; + }; + return view('back.page', [ - "status" => $this->member::status(), - "mode" => $mode, - "page" => $page, - "views" => $views, - "title" => $title, + "status" => $this->member::status(), + "mode" => $mode, + "page" => $page, + "views" => $views, + "id" => $id, + "uuid" => $uuid, + "slug" => $slug, + "feature" => $feature, + "layout" => $layout, + "tags" => $tags, + "content" => $content, + "date" => $date, + "updated" => $updated, + "media" => $media, + "files" => $files, + "title" => urldecode($title), ]); } diff --git a/resources/views/back/page.blade.php b/resources/views/back/page.blade.php index db7454c..6aa0c91 100644 --- a/resources/views/back/page.blade.php +++ b/resources/views/back/page.blade.php @@ -1,191 +1,82 @@ -@extends('frame') +@extends('frame') +@section('title', 'The Dash | Editing '. $title) -@php - $title = urldecode($title); - if($mode == 'edit') - { - $id = $page['id']; - $uuid = $page['uuid']; - $slug = $page['slug']; - $feature = $page['feature']; - $layout = $page['layout']; - $tags = $page['tags']; - $content = $page['content']; - $date = $page['created']; - $updated = $page['updated']; - $media = $page['media']; - $files = $page['docs']; - }else{ - $id = ""; - $uuid = ""; - $slug = ""; - $feature = ""; - $layout = ""; - $tags = ""; - $content = ""; - $date = ""; - $updated = ""; - $media = ""; - $files = ""; - } -@endphp - @section('title', 'The Dash | Editing '. $title) - - @section('main-content') -
- @if($feature == '') -
- + @section('main-content') +
+ @if($feature == '') +
+ +
+ +
+ +
+ @else +
+ +
+ +
+ @include('includes.media-list') +
+ +
+ @include('includes.files-list') +
+ @endif +
+
+
+
+ TITLE + +
+
+ TAGS + +
+
+ LAYOUTS + +
+
+ OPTIONS + @include('includes.options') +
+
+ UPDATED + + {{$updated}} + +
+
+ CREATED + + {{$date}} + + + + +
- -
- -
- @else -
-
- -
- @if(count($media)>1) - @foreach($media as $item) - @if($item['type'] == "mp4") -
- - -
- @else -
- -
- @endif - @endforeach - @else - @if($media[0] != '') - @if($media[0]['type'] == "mp4") -
- -
- @else -
- -
- @endif - @endif - @endif +
+
+ @include('includes.editor') +
+ +
- -
- @if(count($files) > 1) - @foreach($files as $item) - @php - $fileName = explode("/", $item['file']); - @endphp - @if($item['type'] == "mp3") -
- - -
- @else -
- {{ $fileName[6] }}" - -
- @endif - @endforeach - @else - @if(isset($files[0]) && $files[0] != '') - @php - $fileName = explode("/", $item['file']); - @endphp - @if($files[0]['type'] == "mp3") -
- - -
- @else -
- {{ $fileName[6] }}" - -
- @endif - - @else - - @endif - @endif - -
- @endif -
-
-
- TITLE - -
-
- TAGS - -
-
- LAYOUTS - -
-
- OPTIONS - @include('includes.options') -
-
- UPDATED - - {{ $updated }} - -
-
- CREATED - - {{ $date }} - - - -
-
-
-
-
- @include('includes.editor') -
- -
-
-
- @endsection - @section('scripting') - - @endsection + + @endsection + @section('scripting') + + @endsection \ No newline at end of file diff --git a/resources/views/includes/files-list.blade.php b/resources/views/includes/files-list.blade.php new file mode 100644 index 0000000..a999b9f --- /dev/null +++ b/resources/views/includes/files-list.blade.php @@ -0,0 +1,50 @@ +@if(count($files) > 1) + @foreach($files as $item) + @php + $fileName = explode("/", $item['file']); + @endphp + @if($item['type'] == "mp3") +
+ + +
+ @else +
+ {{$fileName[6]}}" + +
+ @endif + @endforeach +@else + @if(isset($files[0]) && $files[0] != '') + @php + $fileName = explode("/", $item['file']); + @endphp + @if($files[0]['type'] == "mp3") +
+ + +
+ @else +
+ {{$fileName[6]}}" + +
+ @endif + + @else + + @endif +@endif \ No newline at end of file diff --git a/resources/views/includes/media-list.blade.php b/resources/views/includes/media-list.blade.php new file mode 100644 index 0000000..78f67e1 --- /dev/null +++ b/resources/views/includes/media-list.blade.php @@ -0,0 +1,32 @@ +@if(count($media)>1) + @foreach($media as $item) + @if($item['type'] == "mp4") +
+ + +
+ @else +
+ +
+ @endif + @endforeach +@else + @if($media[0] != '') + @if($media[0]['type'] == "mp4") +
+ +
+ @else +
+ +
+ @endif + @endif +@endif \ No newline at end of file diff --git a/resources/views/includes/options.blade.php b/resources/views/includes/options.blade.php index c8844a4..067ccc3 100644 --- a/resources/views/includes/options.blade.php +++ b/resources/views/includes/options.blade.php @@ -1,5 +1,4 @@ - -@php +
- -
+ \ No newline at end of file