From 7331c0488af1479cf99ea2e5acd42198e07e1fe7 Mon Sep 17 00:00:00 2001
From: Arthur Monney <monneylobe@gmail.com>
Date: Sat, 30 Mar 2024 22:26:15 +0100
Subject: [PATCH] Fix logout issue

---
 .../views/components/dropdown-link.blade.php  |  4 +-
 .../components/account/dropdown.blade.php     | 17 +++++----
 .../livewire/modals/delete-customer.blade.php | 33 ----------------
 .../views/livewire/pages/auth/login.blade.php |  2 +-
 packages/admin/routes/web.php                 |  3 +-
 .../src/Livewire/Modals/DeleteCustomer.php    | 38 -------------------
 6 files changed, 13 insertions(+), 84 deletions(-)
 delete mode 100755 packages/admin/resources/views/livewire/modals/delete-customer.blade.php
 delete mode 100755 packages/admin/src/Livewire/Modals/DeleteCustomer.php

diff --git a/packages/admin/resources/views/components/dropdown-link.blade.php b/packages/admin/resources/views/components/dropdown-link.blade.php
index 46a62b553..770efc537 100755
--- a/packages/admin/resources/views/components/dropdown-link.blade.php
+++ b/packages/admin/resources/views/components/dropdown-link.blade.php
@@ -1,3 +1,3 @@
-<a {{ $attributes->twMerge(['class' => 'group flex items-center px-4 py-2 text-sm leading-5 text-gray-700 dark:text-gray-400 hover:bg-gray-50 dark:hover:bg-gray-800 hover:text-gray-900 dark:hover:text-white transition duration-150 ease-in-out']) }} wire:navigate>
+<x-shopper::link {{ $attributes->twMerge(['class' => 'group flex items-center px-4 py-2 text-sm leading-5 text-gray-700 hover:text-gray-900 hover:bg-gray-50 dark:text-gray-400 dark:hover:bg-white/5 dark:hover:text-white transition duration-150 ease-in-out']) }}>
     {{ $slot }}
-</a>
+</x-shopper::link>
diff --git a/packages/admin/resources/views/livewire/components/account/dropdown.blade.php b/packages/admin/resources/views/livewire/components/account/dropdown.blade.php
index fc87b9963..fea53ad6b 100755
--- a/packages/admin/resources/views/livewire/components/account/dropdown.blade.php
+++ b/packages/admin/resources/views/livewire/components/account/dropdown.blade.php
@@ -49,15 +49,16 @@ class="absolute z-50 top-10 right-2.5 w-56 origin-top-right rounded-lg bg-white
                 <div class="py-1.5 px-1">
                     <x-shopper::theme-switcher />
                 </div>
-                <div class="py-1.5" role="none">
-                    <x-shopper::dropdown-link
-                        :href="route('shopper.logout')"
-                        onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
-                    >
-                        {{ __('shopper::layout.account_dropdown.sign_out') }}
-                    </x-shopper::dropdown-link>
-                    <form id="logout-form" action="{{ route('shopper.logout') }}" method="POST" style="display: none;">
+                <div class="py-1.5 px-1" role="none">
+                    <form id="logout-form" action="{{ route('shopper.logout') }}" method="POST">
                         @csrf
+                        <button
+                            type="submit"
+                            class="group w-full flex items-center px-4 py-2 text-sm leading-5 rounded-lg text-gray-700 hover:bg-gray-50 dark:text-gray-400 dark:hover:bg-white/5"
+                        >
+                            <x-untitledui-log-out class="mr-2 h-5 w-5 text-gray-400 dark:group-hover:text-gray-500" />
+                            {{ __('shopper::layout.account_dropdown.sign_out') }}
+                        </button>
                     </form>
                 </div>
             </div>
diff --git a/packages/admin/resources/views/livewire/modals/delete-customer.blade.php b/packages/admin/resources/views/livewire/modals/delete-customer.blade.php
deleted file mode 100755
index 1feea36d3..000000000
--- a/packages/admin/resources/views/livewire/modals/delete-customer.blade.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<x-shopper::modal footerClasses="px-4 pb-5 sm:px-6 sm:flex sm:flex-row-reverse">
-    <x-slot name="content">
-        <div class="sm:flex sm:items-start">
-            <div class="mx-auto shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-red-100 sm:mx-0 sm:h-10 sm:w-10">
-                <x-untitledui-alert-triangle class="h-6 w-6 text-danger-600" />
-            </div>
-            <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-                <h3 class="text-lg leading-6 font-medium text-gray-900 dark:text-white" id="modal-headline">
-                    {{ __('shopper::pages/customers.modal.title') }}
-                </h3>
-                <div class="mt-2">
-                    <p class="text-sm leading-5 text-gray-500 dark:text-gray-400">
-                        {{ __('shopper::pages/customers.modal.description') }}
-                    </p>
-                </div>
-            </div>
-        </div>
-    </x-slot>
-
-    <x-slot name="buttons">
-        <span class="flex w-full rounded-md shadow-sm sm:ml-3 sm:w-auto">
-            <x-shopper::buttons.danger wire:click="delete" type="button">
-                <x-shopper::loader wire:loading wire:target="delete" class="text-white" />
-                {{ __('shopper::layout.forms.actions.confirm') }}
-            </x-shopper::buttons.danger>
-        </span>
-        <span class="mt-3 flex w-full rounded-md shadow-sm sm:mt-0 sm:w-auto">
-            <x-shopper::buttons.default wire:click="$emit('closeModal')" type="button">
-                {{ __('shopper::layout.forms.actions.cancel') }}
-            </x-shopper::buttons.default>
-        </span>
-    </x-slot>
-</x-shopper::modal>
diff --git a/packages/admin/resources/views/livewire/pages/auth/login.blade.php b/packages/admin/resources/views/livewire/pages/auth/login.blade.php
index f12560864..5d1219fdc 100755
--- a/packages/admin/resources/views/livewire/pages/auth/login.blade.php
+++ b/packages/admin/resources/views/livewire/pages/auth/login.blade.php
@@ -17,7 +17,7 @@
         </div>
     </div>
 
-    <form class="mt-6" wire:submit.prevent="authenticate">
+    <form class="mt-6" wire:submit="authenticate">
         <div class="rounded-md shadow-sm">
             <div>
                 <input
diff --git a/packages/admin/routes/web.php b/packages/admin/routes/web.php
index 216b4c4aa..dbe0ef4d3 100755
--- a/packages/admin/routes/web.php
+++ b/packages/admin/routes/web.php
@@ -68,8 +68,7 @@
                 });
 
                 if (config('shopper.routes.custom_file')) {
-                    Route::namespace(config('shopper.admin.controllers.namespace'))
-                        ->group(config('shopper.routes.custom_file'));
+                    Route::as('shopper.')->group(config('shopper.routes.custom_file'));
                 }
             });
         });
diff --git a/packages/admin/src/Livewire/Modals/DeleteCustomer.php b/packages/admin/src/Livewire/Modals/DeleteCustomer.php
deleted file mode 100755
index f33ef2d5d..000000000
--- a/packages/admin/src/Livewire/Modals/DeleteCustomer.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shopper\Livewire\Modals;
-
-use Illuminate\Contracts\View\View;
-use LivewireUI\Modal\ModalComponent;
-use Shopper\Core\Repositories\UserRepository;
-
-class DeleteCustomer extends ModalComponent
-{
-    public int $customerId;
-
-    public function mount(int $customerId): void
-    {
-        $this->customerId = $customerId;
-    }
-
-    public function delete(): void
-    {
-        (new UserRepository())->getById($this->customerId)->delete();
-
-        session()->flash('success', __('shopper::pages/customers.modal.success_message'));
-
-        $this->redirectRoute('shopper.customers.index');
-    }
-
-    public static function modalMaxWidth(): string
-    {
-        return 'xl';
-    }
-
-    public function render(): View
-    {
-        return view('shopper::livewire.modals.delete-customer');
-    }
-}