v1.0.1

- Adaptation for v0.2.0-alpha
Flute-CMS · Jun 1, 2024 · eb0413e · eb0413e
1 parent be8b43e
commit eb0413e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 52 deletions.
diff --git a/Http/Controllers/AdminApiController.php b/Http/Controllers/AdminApiController.php
@@ -13,7 +13,7 @@ class AdminApiController extends AbstractController
 {
     protected $carouselService;
 
-    public function __construct( CarouselService $carouselService )
+    public function __construct(CarouselService $carouselService)
     {
         $this->carouselService = $carouselService;
 
@@ -22,7 +22,7 @@ public function __construct( CarouselService $carouselService )
         $this->middleware(CSRFMiddleware::class);
     }
 
-    public function store(FluteRequest $request) : Response
+    public function store(FluteRequest $request): Response
     {
         try {
             $this->carouselService->store($request->title, $request->description, $request->files->get('image'), $request->input('link', null));
@@ -33,7 +33,7 @@ public function store(FluteRequest $request) : Response
         }
     }
 
-    public function delete(FluteRequest $request, $id) : Response
+    public function delete(FluteRequest $request, $id): Response
     {
         try {
             $this->carouselService->delete((int) $id);
@@ -44,7 +44,7 @@ public function delete(FluteRequest $request, $id) : Response
         }
     }
 
-    public function update(FluteRequest $request, $id) : Response
+    public function update(FluteRequest $request, $id): Response
     {
         try {
             $this->carouselService->update((int) $id, $request->title, $request->description, $request->files->get('image'), $request->input('link', null));

diff --git a/Http/Views/admin/add.blade.php b/Http/Views/admin/add.blade.php
@@ -3,11 +3,12 @@
 ])
 
 @push('content')
-    <div class="admin-header d-flex align-items-center">
-        <a href="{{ url('admin/carousel/list') }}" class="back_btn">
-            <i class="ph ph-caret-left"></i>
-        </a>
+    <div class="admin-header d-flex justify-content-between align-items-center">
         <div>
+            <a class="back-btn" href="{{ url('admin/carousel/list') }}">
+                <i class="ph ph-arrow-left ignore"></i>
+                @t('def.back')
+            </a>
             <h2>@t('carousel.add_title')</h2>
             <p>@t('carousel.add_description')</p>
         </div>

diff --git a/Http/Views/admin/edit.blade.php b/Http/Views/admin/edit.blade.php
@@ -1,20 +1,28 @@
 @extends('Core.Admin.Http.Views.layout', [
-    'title' => __('admin.title', ['name' => __('carousel.edit_title', [
-        ':name' => $slide->title
-    ])]),
+    'title' => __('admin.title', [
+        'name' => __('carousel.edit_title', [
+            ':name' => $slide->title,
+        ]),
+    ]),
 ])
 
 @push('content')
-    <div class="admin-header d-flex align-items-center">
-        <a href="{{ url('admin/carousel/list') }}" class="back_btn">
-            <i class="ph ph-caret-left"></i>
-        </a>
+    <div class="admin-header d-flex justify-content-between align-items-center">
         <div>
+            <a class="back-btn" href="{{ url('admin/carousel/list') }}">
+                <i class="ph ph-arrow-left ignore"></i>
+                @t('def.back')
+            </a>
             <h2>@t('carousel.edit_title', [
-                ':name' => $slide->title
+                ':name' => $slide->title,
             ])</h2>
             <p>@t('carousel.edit_description')</p>
         </div>
+        <div>
+            <button data-deleteaction="{{ $slide->id }}" data-deletepath="carousel" class="btn size-s error outline">
+                @t('def.delete')
+            </button>
+        </div>
     </div>
 
     <form data-id="{{ $slide->id }}" data-carouselform="edit" data-page="carousel" enctype="multipart/form-data">

diff --git a/Http/assets/js/admin_form.js b/Http/assets/js/admin_form.js
@@ -13,40 +13,6 @@ function serializeFormCarousel($form) {
     return formData;
 }
 
-function sendCarouselRequest(data, path = null, method = 'POST') {
-    let result = null;
-
-    $.ajax({
-        url: u(path),
-        type: method,
-        data: data,
-        processData: false,
-        async: false,
-        success: function (response) {
-            toast({
-                message: response?.success || translate('def.success'),
-                type: 'success',
-            });
-
-            result = response;
-
-            Modals.clear();
-        },
-        error: function (jqXHR, textStatus, errorThrown) {
-            console.error('error request', jqXHR, textStatus, errorThrown);
-            toast({
-                message:
-                    jqXHR.responseJSON?.error ?? translate('def.unknown_error'),
-                type: 'error',
-            });
-
-            result = jqXHR.responseJSON;
-        },
-    });
-
-    return result;
-}
-
 $(document).on('submit', '[data-carouselform]', (ev) => {
     let $form = $(ev.currentTarget);
 
@@ -65,6 +31,6 @@ $(document).on('submit', '[data-carouselform]', (ev) => {
     }
 
     if (ev.target.checkValidity()) {
-        sendCarouselRequest(form, url, method);
+        sendRequestFormData(form, url, method);
     }
 });
diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
     "key": "Carousel",
     "name": "Carousel",
     "description": "Создает карусель на сайте",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "authors": [
         "Flames"
     ],