Dark mode updates, and ui polishing

Removed dbupdate from Dockerfile. It didn't work in the container
danastasio · Nov 17, 2021 · 8fb5809 · 8fb5809
1 parent 450a204
commit 8fb5809
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -41,8 +41,6 @@ RUN php artisan storage:link
 RUN php artisan view:cache
 RUN php artisan config:cache
 RUN php artisan route:cache
-RUN chmod +x dbupdate.sh
-RUN sh dbupdate.sh
 
 VOLUME /app/database
 EXPOSE 8000

diff --git a/app/Http/Livewire/ClaimItem.php b/app/Http/Livewire/ClaimItem.php
@@ -37,8 +37,11 @@ public function claim()
     public function unclaim()
     {
         $user_item = Item::where('id', $this->item_id)->get();
+        // TODO: Change this to a boolean field
+        // TODO: Do we really need to find items this way? There must be a better way.
         $user_item[0]['claimed'] = 0;
         $user_item[0]['claimant_id'] = null;
+        $user_item[0]['purchased'] = false;
         $user_item[0]->save();
         $this->claimed = false;
         $this->claimant_id = null;

diff --git a/resources/views/deleted-items.blade.php b/resources/views/deleted-items.blade.php
@@ -1,14 +1,17 @@
 <x-app-layout>
-	<div class="mt-5 p-2 text-center w-full mx-auto">
-		<p class="mx-auto bg-gray-600 max-w-prose rounded-lg p-2 font-bold text-lg text-center">
-			Here you can view the items that you have previously deleted
-		</p>
-		<p>
+	<x-slot name="header">
+		<span class="mx-auto max-w-prose rounded-lg p-2 font-bold text-2xl">
+			Your Deleted Items
+		</span>
+	</x-slot>
+		<!-- <p>
 			TODO: Force permanent delete
-		</p>
+		</p> -->
 		<div>
 			@if ($deleted_items->isEmpty())
-				You do not have any deleted items. If you delete something, it can be restored here.
+				<div class="max-w-7xl text-center text-xl mx-auto mt-6 p-6 dark:text-gray-200">
+					You do not have any deleted items. If you delete something, it can be restored here.
+				</div>
 			@else
 				Deleted Items:
 				<div class="grid grid-cols-3 gap-2 max-w-7xl mx-auto">

diff --git a/resources/views/navigation-dropdown.blade.php b/resources/views/navigation-dropdown.blade.php
@@ -204,22 +204,22 @@
     <!-- Responsive Navigation Menu -->
     <div :class="{'block': open, 'hidden': ! open}" class="hidden sm:hidden">
         <div class="pt-2 pb-3 space-y-1">
-            <x-jet-responsive-nav-link href="{{ route('dashboard') }}" :active="request()->routeIs('dashboard')" class="dark:text-black">
+            <x-jet-responsive-nav-link href="{{ route('dashboard') }}" :active="request()->routeIs('dashboard')" class="dark:text-gray-200">
                 {{ __('Dashboard') }}
             </x-jet-responsive-nav-link>
         </div>
         <div class="pt-2 pb-3 space-y-1">
-            <x-jet-responsive-nav-link href="{{ route('claim.index') }}" :active="request()->routeIs('claim.index')" class="dark:text-black">
+            <x-jet-responsive-nav-link href="{{ route('claim.index') }}" :active="request()->routeIs('claim.index')" class="dark:text-gray-200">
                 {{ __('My Claims') }}
             </x-jet-responsive-nav-link>
         </div>
         <div class="pt-2 pb-3 space-y-1">
-            <x-jet-responsive-nav-link href="{{ route('list') }}" :active="request()->routeIs('list')" class="dark:text-black">
+            <x-jet-responsive-nav-link href="{{ route('list') }}" :active="request()->routeIs('list')" class="dark:text-gray-200">
                 {{ __('My List') }}
             </x-jet-responsive-nav-link>
         </div>
         <div class="pt-2 pb-3 space-y-1">
-            <x-jet-responsive-nav-link href="{{ route('share.index') }}" :active="request()->routeIs('share.index')" class="dark:text-black">
+            <x-jet-responsive-nav-link href="{{ route('share.index') }}" :active="request()->routeIs('share.index')" class="dark:text-gray-200">
                 {{ __('Sharing Center') }}
             </x-jet-responsive-nav-link>
         </div>
@@ -239,12 +239,12 @@
 
             <div class="mt-3 space-y-1">
                 <!-- Account Management -->
-                <x-jet-responsive-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')" class="dark:text-black">
+                <x-jet-responsive-nav-link href="{{ route('profile.show') }}" :active="request()->routeIs('profile.show')" class="dark:text-gray-200">
                     {{ __('Profile') }}
                 </x-jet-responsive-nav-link>
 
                 @if (Laravel\Jetstream\Jetstream::hasApiFeatures())
-                    <x-jet-responsive-nav-link href="{{ route('api-tokens.index') }}" :active="request()->routeIs('api-tokens.index')" class="dark:text-black">
+                    <x-jet-responsive-nav-link href="{{ route('api-tokens.index') }}" :active="request()->routeIs('api-tokens.index')" class="dark:text-gray-200">
                         {{ __('API Tokens') }}
                     </x-jet-responsive-nav-link>
                 @endif
@@ -253,7 +253,7 @@
                 <form method="POST" action="{{ route('logout') }}">
                     @csrf
 
-                    <x-jet-responsive-nav-link href="{{ route('logout') }}" class="dark:text-black"
+                    <x-jet-responsive-nav-link href="{{ route('logout') }}" class="dark:text-gray-200"
                                     onclick="event.preventDefault();
                                                 this.closest('form').submit();">
                         {{ __('Logout') }}