Skip to content

Commit 5669c74

Browse files
VilkrinVilkrin
committed
Integrate Flux Pro, update UI and background assets
Added livewire/flux-pro to composer dependencies and configured its repository. Replaced static calendar and user icon variants with Flux components in admin views. Updated user navigation links to use route helpers, removed hardcoded user row from user list, and improved layout structure in edit-user view. Changed home page background to a new spacescape image and removed animated background elements. Adjusted admin layout background color for consistency.
1 parent bed2dfd commit 5669c74

File tree

10 files changed

+97
-128
lines changed

10 files changed

+97
-128
lines changed

‎composer.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"laravel/nightwatch": "^1.13",
1515
"laravel/tinker": "^2.10.1",
1616
"livewire/flux": "^2.1.1",
17+
"livewire/flux-pro": "^2.6",
1718
"livewire/volt": "^1.7.0",
1819
"spatie/laravel-medialibrary": "^11.14",
1920
"spatie/laravel-permission": "^6.21"
@@ -81,5 +82,11 @@
8182
}
8283
},
8384
"minimum-stability": "stable",
84-
"prefer-stable": true
85+
"prefer-stable": true,
86+
"repositories": {
87+
"flux-pro": {
88+
"type": "composer",
89+
"url": "https://composer.fluxui.dev"
90+
}
91+
}
8592
}

‎composer.lock‎

Lines changed: 58 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎database/migrations/2025_10_16_132234_create_dossiers_table.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ public function up(): void
1616
$table->foreignId('user_id')->constrained()->onDelete('cascade');
1717

1818
// Core org details
19-
$table->string('rank')->nullable(); // e.g. Captain, Ensign, etc.
20-
$table->string('division')->nullable(); // e.g. Command, Engineering, Medical
21-
$table->string('status')->default('Active'); // e.g. Active, Reserve, Retired
19+
$table->string('rank')->nullable(); // e.g. Captain, Ensign, etc.
20+
$table->string('division')->nullable(); // e.g. Command, Engineering, Medical
21+
$table->string('status')->default('Active'); // e.g. Active, Reserve, Retired
2222

2323
// Leadership-only fields
24-
$table->text('leadership_notes')->nullable(); // Private notes from org leadership
24+
$table->text('leadership_notes')->nullable(); // Private notes from org leadership
2525

2626
// Record keeping
27-
$table->json('service_record')->nullable(); // Promotion / mission history
28-
$table->json('commendations')->nullable(); // Awards / achievements
29-
$table->json('disciplinary_actions')->nullable(); // Warnings / infractions
27+
$table->json('service_record')->nullable(); // Promotion / mission history
28+
$table->json('commendations')->nullable(); // Awards / achievements
29+
$table->json('disciplinary_actions')->nullable(); // Warnings / infractions
3030

3131
// Optional metadata
3232
$table->date('enlistment_date')->nullable();

‎public/backgrounds/spacescape_vast_field.png‎

9.07 MB
Loading

‎resources/views/admin/dashboard.blade.php‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -214,50 +214,7 @@
214214
</div>
215215
<div class="p-6 pt-0">
216216
<div class="border border-slate-700 rounded-lg overflow-hidden">
217-
<div class="flex items-center justify-between px-4 py-3 border-b border-slate-700 text-sm text-slate-300">
218-
<button class="p-1 rounded hover:bg-slate-800/50">&#8592;</button>
219-
<div class="font-medium">October 2025</div>
220-
<button class="p-1 rounded hover:bg-slate-800/50">&#8594;</button>
221-
</div>
222-
<div class="grid grid-cols-7 text-center text-xs text-slate-400 py-2">
223-
<div>Su</div><div>Mo</div><div>Tu</div><div>We</div><div>Th</div><div>Fr</div><div>Sa</div>
224-
</div>
225-
<div class="grid grid-cols-7 gap-px bg-slate-800/40 p-px">
226-
<div class="bg-slate-900/60 h-12"></div>
227-
<div class="bg-slate-900/60 h-12"></div>
228-
<div class="bg-slate-900/60 h-12"></div>
229-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">1</div>
230-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">2</div>
231-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">3</div>
232-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">4</div>
233-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">5</div>
234-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">6</div>
235-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">7</div>
236-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">8</div>
237-
<div class="bg-amber-400/20 ring-1 ring-amber-400 h-12 flex items-center justify-center text-xs text-amber-400 font-semibold">9</div>
238-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">10</div>
239-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">11</div>
240-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">12</div>
241-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">13</div>
242-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">14</div>
243-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">15</div>
244-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">16</div>
245-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">17</div>
246-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">18</div>
247-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">19</div>
248-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">20</div>
249-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">21</div>
250-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">22</div>
251-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">23</div>
252-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">24</div>
253-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">25</div>
254-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">26</div>
255-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">27</div>
256-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">28</div>
257-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">29</div>
258-
<div class="bg-slate-900/60 h-12 flex items-center justify-center text-xs text-slate-400">30</div>
259-
<div class="bg-slate-900/60 h-12"></div>
260-
</div>
217+
<flux:calendar size="2xl"/>
261218
</div>
262219
</div>
263220
</div>

‎resources/views/admin/users/show.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<x-layouts.admin :title="__('Show User')">
22

33
<div class="flex items-center gap-4 space-y-6">
4-
<a href="users.html" class="inline-flex items-center gap-2 px-3 py-2 text-sm text-slate-300 hover:bg-slate-800/50 rounded transition-colors">
4+
<a href="{{ route('admin.users.index') }}" class="inline-flex items-center gap-2 px-3 py-2 text-sm text-slate-300 hover:bg-slate-800/50 rounded transition-colors">
55
<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
66
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
77
</svg>
@@ -34,7 +34,7 @@
3434
{{ $user->getRoleNames()->implode(', ') }}
3535
</span>
3636
<div class="flex items-center gap-1">
37-
<flux:icon.user-check variant="solid" class="text-green-500 dark:text-green-300" />
37+
<flux:icon.user-check class="text-green-500 dark:text-green-300" />
3838
<span class="text-green-600 text-sm">{{ $user->status }}</span>
3939
</div>
4040
</div>
@@ -105,7 +105,7 @@
105105
<div>
106106
<label class="text-sm font-medium text-slate-400">Status</label>
107107
<div class="flex items-center gap-2 mt-1">
108-
<flux:icon.user-check variant="solid" class="text-green-500 dark:text-green-300" />
108+
<flux:icon.user-check class="text-green-500 dark:text-green-300" />
109109
<span class="text-green-600 text-sm">Active</span>
110110
</div>
111111
</div>

‎resources/views/components/layouts/admin.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
</head>
3636

37-
<body class="bg-gradient-to-b from-slate-900 via-slate-950 to-slate-950 text-slate-100 font-exo overflow-x-hidden min-h-screen">
37+
<body class="bg-slate-950 text-slate-100 font-exo overflow-x-hidden min-h-screen">
3838
<div class="flex w-full min-h-screen">
3939
<!-- Sidebar -->
4040
<aside id="sidebar" class="w-64 min-h-screen bg-slate-900/50 border-r border-slate-700">

‎resources/views/home.blade.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@
33
<!-- Hero Section -->
44
<section id="home" class="relative min-h-screen flex items-center justify-center overflow-hidden pt-16 pb-32">
55
<!-- Background Image -->
6-
<div class="absolute inset-0 bg-cover bg-center bg-no-repeat" style="background-image: url('assets/ironclad-real.webp'); height: calc(100% + 200px); bottom: -200px;">
6+
<div class="absolute inset-0 bg-cover bg-center bg-no-repeat" style="background-image: url('{{ asset('backgrounds/spacescape_vast_field.png') }}'); height: calc(100% + 200px); bottom: -200px;">
77
<div class="absolute inset-0 bg-gradient-to-b from-black/60 via-black/60 to-black/80"></div>
88
</div>
99

10-
<!-- Animated Background Elements -->
11-
<div class="absolute inset-0 opacity-30">
12-
<div class="absolute top-1/4 left-1/4 w-2 h-2 bg-amber-400 rounded-full animate-pulse"></div>
13-
<div class="absolute top-1/3 right-1/3 w-1 h-1 bg-amber-400 rounded-full animate-pulse" style="animation-delay: 1s;"></div>
14-
<div class="absolute bottom-1/4 left-1/3 w-1.5 h-1.5 bg-amber-400 rounded-full animate-pulse" style="animation-delay: 2s;"></div>
15-
</div>
16-
1710
<!-- Content -->
1811
<div class="relative z-10 text-center max-w-4xl mx-auto px-4">
1912
<div>

‎resources/views/livewire/admin/edit-user.blade.php‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
2-
<a href="users.html" class="inline-flex items-center gap-2 px-3 py-2 text-sm text-slate-300 hover:bg-slate-800/50 rounded transition-colors">
3-
<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
4-
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
5-
</svg>
6-
Back to Users
7-
</a>
8-
<div class="h-6 w-px bg-slate-700"></div>
9-
<div>
10-
<h1 class="font-semibold text-lg text-slate-100">Edit User</h1>
11-
<p class="text-sm text-slate-400">Modify user information and permissions</p>
1+
<div>
2+
3+
<div class="p-6 flex items-center">
4+
<a href="{{ route('admin.users.index') }}" class="inline-flex items-center gap-2 px-3 py-2 text-sm text-slate-300 hover:bg-slate-800/50 rounded transition-colors">
5+
<svg class="h-4 w-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
6+
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
7+
</svg>
8+
Back to Users
9+
</a>
10+
<div class="h-6 w-px bg-slate-700"></div>
11+
<div>
12+
<h1 class="font-semibold text-lg text-slate-100">Edit User</h1>
13+
<p class="text-sm text-slate-400">Modify user information and permissions</p>
14+
</div>
1215
</div>
1316

14-
<div class="space-y-6">
17+
<div class="space-y-6">
1518
<!-- Basic Information -->
1619
<div class="bg-slate-900/50 border border-amber-400/20 backdrop-blur-sm rounded-lg shadow-sm">
1720
<div class="p-6 border-b border-slate-700">
@@ -265,6 +268,5 @@
265268
</div>
266269
</div>
267270
</div>
268-
</main>
269-
</div>
270-
</div>
271+
272+
</div>

0 commit comments

Comments
 (0)