DESIGN 🎨 some functional layout tweaks

ndeblauw · Jan 2, 2025 · 4c7364f · 4c7364f
1 parent 8f7916d
commit 4c7364f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/resources/views/generic/flux/show.blade.php b/resources/views/generic/flux/show.blade.php
@@ -4,22 +4,23 @@
         <div>Details for {{$model->title ?? $model->name}}</div>
 
         <div class="flex gap-x-4">
+            @if(auth()->user()->isAdmin() && get_class($model) === \App\Models\User::class)
+                <flux:button href="{{route('loginas', ['user' => $model])}}" icon="shield-exclamation" variant="filled" size="sm" class="!text-pink-500 hover:!bg-pink-50">Impersonate</flux:button>
+            @endif
+
             @if( View::exists('admin.'.$config->modelsname().'._form'))
                 <flux:button href="{{$config->getEditUrl($model->getKey())}}" icon="pencil" variant="filled" size="sm">Edit</flux:button>
             @endif
             <x-ba-delete-button action="{{$config->getDestroyUrl($model->getKey()) }}" />
         </div>
 
-
     </flux:heading>
 
     <flux:separator />
 
-
     <div class="mt-8 overflow-hidden border border-zinc-200 rounded-lg">
 
-
-            <div class="border-t border-gray-200 px-4 py-5 sm:p-0">
+            <div class="px-4 py-5 sm:p-0">
                 <dl class="sm:divide-y sm:divide-gray-200">
                     @foreach($attributesToShow as $attribute)
                         <div class="py-4 sm:py-5 sm:grid sm:grid-cols-5 sm:gap-4 sm:px-6">
@@ -36,11 +37,12 @@
 
                 </dl>
             </div>
-            <div class="text-sm text-gray-400 px-6 float-right">
-                Last updated <span class="font-bold">{{$model->updated_at->diffForHumans()}}</span> ({{$model->updated_at}})
-                <span class="text-blue-300">|</span>
-                Created <span class="font-bold">{{$model->created_at->diffForHumans()}}</span> ({{$model->created_at}})
-            </div>
+
+        </div>
+        <div class="text-xs mt-1 text-zinc-400 pr-2 float-right">
+            Last updated <span class="font-bold">{{$model->updated_at->diffForHumans()}}</span> ({{$model->updated_at}})
+            <span class="text-zinc-500">|</span>
+            Created <span class="font-bold">{{$model->created_at->diffForHumans()}}</span> ({{$model->created_at}})
         </div>
 
 

diff --git a/resources/views/layouts/flux/header.blade.php b/resources/views/layouts/flux/header.blade.php
@@ -35,17 +35,23 @@
     </flux:navbar>
     --}}
 
-    <flux:dropdown position="top" align="start">
-        <flux:navbar.item icon-trailing="chevron-down">{{auth()->user()->name}}</flux:navbar.item>
+    <flux:dropdown position="top" align="start" >
+
+            <flux:navbar.item icon-trailing="chevron-down" @class(["!bg-pink-50 !border-pink-500 border" => session()->has('loginas')]) >
+                <span class="flex items-center gap-x-2">
+                    @if(session()->has('loginas')) <flux:icon name="shield-exclamation" variant="mini" class="text-pink-500 dark:text-pink-300"/> @endif
+                    @if(session()->get('no_antenna_scope', false)) <flux:icon name="globe-alt" variant="mini" /> @endif
+                    {{auth()->user()->name}}
+                </span>
+            </flux:navbar.item>
 
         <flux:menu>
-            {{-- todo: remove this from blueadmin --}}
-            <flux:menu.radio.group>
-                <flux:menu.radio checked>Focus op mijn antenne</flux:menu.radio>
-                <flux:menu.radio>Overkoepelend</flux:menu.radio>
-            </flux:menu.radio.group>
+            @includeIf('admin._parts.usermenu')
 
-            <flux:menu.separator />
+            @if(session()->has('loginas'))
+                <flux:menu.item href="{{route('stoploginas')}}" icon="shield-exclamation" class="!text-pink-500">Stop login as</flux:menu.item>
+                <flux:menu.separator />
+            @endif
 
             <flux:menu.item href="{{route('admin.logout')}}" icon="arrow-right-start-on-rectangle">Logout</flux:menu.item>
         </flux:menu>