From 0bd122e78e513fd083a1b82856ec0757a6666289 Mon Sep 17 00:00:00 2001 From: Nikola Chuchukovski <nikolachu@digitalnode.com> Date: Sun, 18 Feb 2024 13:30:34 +0100 Subject: [PATCH] fix --- .../resources/views/faq/index.blade.php | 8 +- .../views/gallery/full-gallery.blade.php | 69 +++++----- .../maintenances/all-maintenances.blade.php | 128 ++++++++--------- .../views/materials/all-materials.blade.php | 129 +++++++++--------- .../views/products/all-products.blade.php | 35 +++-- .../resources/views/types/all-types.blade.php | 123 +++++++++-------- 6 files changed, 259 insertions(+), 233 deletions(-) diff --git a/AdminPanel-Marinov/resources/views/faq/index.blade.php b/AdminPanel-Marinov/resources/views/faq/index.blade.php index 1674e77..9bfdf99 100644 --- a/AdminPanel-Marinov/resources/views/faq/index.blade.php +++ b/AdminPanel-Marinov/resources/views/faq/index.blade.php @@ -17,9 +17,11 @@ @endif <div class="flex justify-between items-center pt-3 px-3"> <h2 class="font-bold pt-2 pl-2">All FAQs</h2> - <x-nav-link :href="route('faq.create')" class="p-1 bg-blue-400 rounded text-white hover:bg-blue-600"> - {{ __('Add new FAQ') }} - </x-nav-link> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add new FAQ') }} + </x-primary-button> + </a> </div> <div class="p-3"> <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> diff --git a/AdminPanel-Marinov/resources/views/gallery/full-gallery.blade.php b/AdminPanel-Marinov/resources/views/gallery/full-gallery.blade.php index 078f2f6..9f32854 100644 --- a/AdminPanel-Marinov/resources/views/gallery/full-gallery.blade.php +++ b/AdminPanel-Marinov/resources/views/gallery/full-gallery.blade.php @@ -1,38 +1,41 @@ @extends('layouts.app') @section('content') -@if (session('successAdd')) -<div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" - role="alert"> - <span class="block sm:inline">{{ session('successAdd') }}</span> -</div> -@elseif(session('successDelete')) -<div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successDelete') }}</span> -</div> -@endif -<div class="flex justify-between items-center p-3 px-3"> - <x-nav-link :href="route('gallery.add')" - class="bg-blue-400 rounded p-2 text-white hover:bg-blue-600 text-center"> - {{ __('Add an Image to the gallery') }} - </x-nav-link> -</div> -<div class="grid md:grid-cols-2 md:gap-2 lg:grid-cols-3 lg:gap-5 grid-cols-1"> - @foreach ($galleries as $gallery) - <div class="max-w-sm rounded overflow-hidden shadow-lg mt-5"> - <img class="w-full" style="height: 200px;" src="{{ $gallery->images }}" alt="Gallery Image"> - <div class="px-6 pt-4 pb-2"> - <div class=""> - <form action="{{ route('gallery.delete', $gallery->id) }}" method="post"> - @csrf - @method('delete') - <button type="submit" class="bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black"> - Delete - </button> - </form> - </div> + @if (session('successAdd')) + <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successAdd') }}</span> + </div> + @elseif(session('successDelete')) + <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successDelete') }}</span> </div> + @endif + <div class="flex justify-between items-center p-3 px-3"> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add an Image to the gallery') }} + </x-primary-button> + </a> + </div> + <div class="grid md:grid-cols-2 md:gap-2 lg:grid-cols-3 lg:gap-5 grid-cols-1"> + @foreach ($galleries as $gallery) + <div class="max-w-sm rounded overflow-hidden shadow-lg mt-5"> + <img class="w-full" style="height: 200px;" src="{{ $gallery->images }}" alt="Gallery Image"> + <div class="px-6 pt-4 pb-2"> + <div class=""> + <form action="{{ route('gallery.delete', $gallery->id) }}" method="post"> + @csrf + @method('delete') + <button type="submit" + class="bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black"> + Delete + </button> + </form> + </div> + </div> + </div> + @endforeach </div> - @endforeach -</div> -@endsection \ No newline at end of file +@endsection diff --git a/AdminPanel-Marinov/resources/views/maintenances/all-maintenances.blade.php b/AdminPanel-Marinov/resources/views/maintenances/all-maintenances.blade.php index 5202b7b..f78f7f9 100644 --- a/AdminPanel-Marinov/resources/views/maintenances/all-maintenances.blade.php +++ b/AdminPanel-Marinov/resources/views/maintenances/all-maintenances.blade.php @@ -1,72 +1,78 @@ @extends('layouts.app') @section('content') -<div class="sm:w-3/4 w-full mt-6"> -@if (session('successAdd')) - <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successAdd') }}</span> - </div> + <div class="sm:w-3/4 w-full mt-6"> + @if (session('successAdd')) + <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successAdd') }}</span> + </div> @elseif(session('successEdit')) - <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successEdit') }}</span> - </div> + <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successEdit') }}</span> + </div> @elseif(session('successDelete')) - <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successDelete') }}</span> - </div> + <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successDelete') }}</span> + </div> @endif - <div class="flex justify-between items-center pt-3 px-3"> - <h2 class="font-bold pt-2 pl-2">All Maintenances</h2> - <x-nav-link :href="route('maintenances.add')" class="p-1 bg-blue-400 rounded text-white hover:bg-blue-600"> - {{ __('Add new Maintenance') }} - </x-nav-link> - </div> - <div class="p-3"> - <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> - <table class="w-full text-sm text-left rtl:text-right text-gray-500"> - <thead class="text-xs text-gray-700 uppercase bg-gray-50"> - <tr> - <th scope="col" class="px-6 py-3">Title</th> - <th scope="col" class="px-6 py-3">Description</th> - <th scope="col" class="px-6 py-3">Action</th> - </tr> - </thead> - <tbody> - @foreach ($maintenances as $maintenance) - <tr class="{{ $loop->odd ? 'bg-white' : 'bg-gray-50' }} order-b"> - <td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> - {{ $maintenance->title }} - </td> - <td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> - {{ $maintenance->description }} - </td> - <td class="px-6 py-4"> - <div class=""> - <div class=""> + <div class="flex justify-between items-center pt-3 px-3"> + <h2 class="font-bold pt-2 pl-2">All Maintenances</h2> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add new Maintenance') }} + </x-primary-button> + </a> + </div> + <div class="p-3"> + <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> + <table class="w-full text-sm text-left rtl:text-right text-gray-500"> + <thead class="text-xs text-gray-700 uppercase bg-gray-50"> + <tr> + <th scope="col" class="px-6 py-3">Title</th> + <th scope="col" class="px-6 py-3">Description</th> + <th scope="col" class="px-6 py-3">Action</th> + </tr> + </thead> + <tbody> + @foreach ($maintenances as $maintenance) + <tr class="{{ $loop->odd ? 'bg-white' : 'bg-gray-50' }} order-b"> + <td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> + {{ $maintenance->title }} + </td> + <td class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> + {{ $maintenance->description }} + </td> + <td class="px-6 py-4"> + <div class=""> + <div class=""> + + <x-nav-link :href="route('maintenances.edit', $maintenance->id)" + class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> + {{ __('Edit') }} + </x-nav-link> - <x-nav-link :href="route('maintenances.edit' , $maintenance->id)" - class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> - {{ __('Edit') }} - </x-nav-link> - - <form action="{{route('maintenances.delete',$maintenance->id)}}" method="POST"> - @csrf - @method('DELETE') - <button - class="py-1 bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black"> - Delete - </button> - </form> - </div> - </div> - </td> - </tr> - @endforeach - </tbody> - </table> + <form action="{{ route('maintenances.delete', $maintenance->id) }}" + method="POST"> + @csrf + @method('DELETE') + <button + class="py-1 bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black"> + Delete + </button> + </form> + </div> + </div> + </td> + </tr> + @endforeach + </tbody> + </table> + </div> </div> </div> -</div> -@endsection \ No newline at end of file +@endsection diff --git a/AdminPanel-Marinov/resources/views/materials/all-materials.blade.php b/AdminPanel-Marinov/resources/views/materials/all-materials.blade.php index 11a1d21..e2ce243 100644 --- a/AdminPanel-Marinov/resources/views/materials/all-materials.blade.php +++ b/AdminPanel-Marinov/resources/views/materials/all-materials.blade.php @@ -1,72 +1,79 @@ @extends('layouts.app') @section('content') -<div class=" sm:w-3/5 w-full mx-auto mt-6"> + <div class=" sm:w-3/5 w-full mx-auto mt-6"> - @if (session('successAdd')) - <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successAdd') }}</span> - </div> - @elseif(session('successEdit')) - <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successEdit') }}</span> - </div> - @elseif(session('successDelete')) - <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successDelete') }}</span> - </div> - @endif - <div class=" flex justify-between items-center pt-3 px-3"> - <h2 class="font-bold pt-2 pl-2"> - All Materials - </h2> - <x-nav-link :href="route('materials.create')" class="bg-blue-400 rounded text-white hover:bg-blue-600 p-2 px-3"> - {{ __('Add new Material') }} - </x-nav-link> - </div> - <div class=" p-3"> - <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> - <table class="w-full text-sm text-left rtl:text-right text-gray-500 "> - <thead class="text-xs text-gray-700 uppercase bg-gray-50 "> - <tr> - <th scope="col" class="px-6 py-3"> - Name - </th> + @if (session('successAdd')) + <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successAdd') }}</span> + </div> + @elseif(session('successEdit')) + <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successEdit') }}</span> + </div> + @elseif(session('successDelete')) + <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successDelete') }}</span> + </div> + @endif + <div class=" flex justify-between items-center pt-3 px-3"> + <h2 class="font-bold pt-2 pl-2"> + All Materials + </h2> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add new Material') }} + </x-primary-button> + </a> + </div> + <div class=" p-3"> + <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> + <table class="w-full text-sm text-left rtl:text-right text-gray-500 "> + <thead class="text-xs text-gray-700 uppercase bg-gray-50 "> + <tr> + <th scope="col" class="px-6 py-3"> + Name + </th> - <th scope="col" class="px-6 py-3"> - Action - </th> - </tr> - </thead> - <tbody> - @foreach ($materials as $material) - <tr class="odd:bg-white even:bg-gray-50 border-b"> - <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> - {{ $material->name }} - </th> + <th scope="col" class="px-6 py-3"> + Action + </th> + </tr> + </thead> + <tbody> + @foreach ($materials as $material) + <tr class="odd:bg-white even:bg-gray-50 border-b"> + <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> + {{ $material->name }} + </th> - <td class="px-6 py-4"> - <div class=""> - <x-nav-link :href="route('materials.edit', ['id' => $material->id])" :active="request()->routeIs('')" class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> - {{ __('Edit') }} - </x-nav-link> + <td class="px-6 py-4"> + <div class=""> + <x-nav-link :href="route('materials.edit', ['id' => $material->id])" :active="request()->routeIs('')" + class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> + {{ __('Edit') }} + </x-nav-link> - <form action="{{ route('materials.destroy', ['id' => $material->id]) }}" class="mt-2" method="post"> - @csrf - @method('delete') - <button type="submit" class="bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black py-1">Delete</button> - </form> - </div> - </td> - </tr> - @endforeach + <form action="{{ route('materials.destroy', ['id' => $material->id]) }}" + class="mt-2" method="post"> + @csrf + @method('delete') + <button type="submit" + class="bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black py-1">Delete</button> + </form> + </div> + </td> + </tr> + @endforeach - </tbody> - </table> - </div> + </tbody> + </table> + </div> + </div> </div> -</div> - -@endsection \ No newline at end of file +@endsection diff --git a/AdminPanel-Marinov/resources/views/products/all-products.blade.php b/AdminPanel-Marinov/resources/views/products/all-products.blade.php index 1c7c793..9157775 100644 --- a/AdminPanel-Marinov/resources/views/products/all-products.blade.php +++ b/AdminPanel-Marinov/resources/views/products/all-products.blade.php @@ -31,25 +31,30 @@ All Products </h2> - <x-nav-link :href="route('product.create')" class="bg-blue-400 rounded py-2 px-3 text-white hover:bg-blue-600"> - {{ __('Add a Product') }} - </x-nav-link> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add a Product') }} + </x-primary-button> + </a> </div> @if (session('successAdd')) - <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successAdd') }}</span> - </div> + <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successAdd') }}</span> + </div> @elseif(session('successEdit')) - <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successEdit') }}</span> - </div> + <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successEdit') }}</span> + </div> @elseif(session('successDelete')) - <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successDelete') }}</span> - </div> + <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successDelete') }}</span> + </div> @endif - + <div class="grid md:grid-cols-2 md:gap-2 lg:grid-cols-3 lg:gap-5 grid-cols-1"> @foreach ($products as $product) <div class="max-w-sm rounded overflow-hidden shadow-lg mt-5"> @@ -106,11 +111,11 @@ <div class="px-6 pt-4 pb-2"> <div class=" w-1/2 mx-auto flex"> - <x-nav-link :href="route('product.edit' , $product->id)" + <x-nav-link :href="route('product.edit', $product->id)" class="bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> {{ __('Edit') }} </x-nav-link> - <form action="{{route('product.destroy',$product->id)}}" method="post"> + <form action="{{ route('product.destroy', $product->id) }}" method="post"> @csrf @method('delete') <Button diff --git a/AdminPanel-Marinov/resources/views/types/all-types.blade.php b/AdminPanel-Marinov/resources/views/types/all-types.blade.php index e7d74ea..8a619f5 100644 --- a/AdminPanel-Marinov/resources/views/types/all-types.blade.php +++ b/AdminPanel-Marinov/resources/views/types/all-types.blade.php @@ -1,75 +1,78 @@ @extends('layouts.app') @section('content') -<div class=" sm:w-3/5 mx-auto mt-6"> + <div class=" sm:w-3/5 mx-auto mt-6"> -@if (session('successAdd')) - <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successAdd') }}</span> - </div> + @if (session('successAdd')) + <div class="alert bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successAdd') }}</span> + </div> @elseif(session('successEdit')) - <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successEdit') }}</span> - </div> + <div class="alert bg-yellow-100 border border-yellow-400 text-yellow-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successEdit') }}</span> + </div> @elseif(session('successDelete')) - <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" role="alert"> - <span class="block sm:inline">{{ session('successDelete') }}</span> - </div> + <div class="alert bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative w-8/12 mx-auto" + role="alert"> + <span class="block sm:inline">{{ session('successDelete') }}</span> + </div> @endif - <div class=" flex justify-between items-center pt-3 px-3"> - <h2 class="font-bold pt-2 pl-2"> - All types - </h2> - <x-nav-link :href="route('types.create')" class="py-1 bg-blue-400 rounded text-white hover:bg-blue-600"> - {{ __('Add new type') }} - </x-nav-link> - </div> - <div class=" p-3"> - - - + <div class=" flex justify-between items-center pt-3 px-3"> + <h2 class="font-bold pt-2 pl-2"> + All types + </h2> + <a href="{{ route('gift-card.add') }}"> + <x-primary-button class="my-5"> + {{ __('Add new type') }} + </x-primary-button> + </a> + </div> + <div class=" p-3"> + <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> + <table class="w-full text-sm text-left rtl:text-right text-gray-500 "> + <thead class="text-xs text-gray-700 uppercase bg-gray-50 "> + <tr> + <th scope="col" class="px-6 py-3"> + Name + </th> - <div class="relative overflow-x-auto shadow-md sm:rounded-lg"> - <table class="w-full text-sm text-left rtl:text-right text-gray-500 "> - <thead class="text-xs text-gray-700 uppercase bg-gray-50 "> - <tr> - <th scope="col" class="px-6 py-3"> - Name - </th> + <th scope="col" class="px-6 py-3"> + Action + </th> + </tr> + </thead> + <tbody> + @foreach ($types as $type) + <tr class="odd:bg-white even:bg-gray-50 border-b"> + <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> + {{ $type->name }} + </th> - <th scope="col" class="px-6 py-3"> - Action - </th> - </tr> - </thead> - <tbody> - @foreach ($types as $type) - <tr class="odd:bg-white even:bg-gray-50 border-b"> - <th scope="row" class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap"> - {{ $type->name }} - </th> + <td class="px-6 py-4"> + <div class=""> + <x-nav-link :href="route('types.edit', ['id' => $type->id])" + class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> + {{ __('Edit') }} + </x-nav-link> - <td class="px-6 py-4"> - <div class=""> - <x-nav-link :href="route('types.edit', ['id' => $type->id])" class="py-1 bg-yellow-400 px-3 mr-4 rounded text-white hover:bg-yellow-600"> - {{ __('Edit') }} - </x-nav-link> + <form action="{{ route('types.destroy', ['type' => $type->id]) }}" class="mt-2" + method="post"> + @csrf + @method('delete') + <button type="submit" + class="py-1 bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black">Delete</button> + </form> + </div> + </td> + </tr> + @endforeach - <form action="{{ route('types.destroy', ['type' => $type->id]) }}" class="mt-2" method="post"> - @csrf - @method('delete') - <button type="submit" class="py-1 bg-red-600 rounded text-white px-3 hover:bg-red-400 hover:text-black">Delete</button> - </form> - </div> - </td> - </tr> - @endforeach + </tbody> + </table> + </div> - </tbody> - </table> </div> - </div> -</div> - @endsection -- GitLab