iridium34/FilamentLaravel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored Color Livewire components, added CreateColor, EditColor, and ShowColor components. Updated views, navigation, and Tailwind color schemes. Adjusted database migrations for consistency.

Browse Source
This commit is contained in:
iridium34
2025-12-14 01:39:16 +01:00
parent 7e79d1d034
commit ac812ed142
32 changed files with 496 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Livewire/Color/Color.php
+8 -87
View File
@@ -3,10 +3,7 @@
namespace App\Livewire\Color; namespace App\Livewire\Color;
use App\Models\Color as ColorModel; use App\Models\Color as ColorModel;
use Flux\Flux;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\title; use Livewire\Attributes\title;
use Livewire\Attributes\Validate;
use Livewire\Component; use Livewire\Component;
use Livewire\WithPagination; use Livewire\WithPagination;
@@ -15,104 +12,28 @@ class Color extends Component
{ {
use WithPagination; use WithPagination;
// Validation
#[Validate('required')]
public $name = '';
#[Validate('required')]
public $hex = '';
public $search =''; public $search ='';
// Edit Modal + Query
public $editquery = '';
public $editid = '';
public $deleteid = '';
public function create(){ public function create(){
@Auth::check(); return $this->redirectRoute('color.create', navigate: true);
// Validate
$this->validate();
$color = new ColorModel();
$color->name = $this->name;
$color->hex = $this->hex;
$color->save();
session()->flash('status', 'Color successfully created.');
// Clear the form
$this->reset(['name', 'hex']);
// Close the modal
Flux::modal('createModal')->close();
} }
public function edit($colorid) { public function edit($id){
@Auth::check(); return $this->redirectRoute('color.edit', $id, navigate: true);
$editid = $colorid;
$this->editid = $editid;
$color =ColorModel::findOrFail($editid);
$this->name = $color->name;
$this->hex = $color->hex;
Flux::modal('editModal')->show();
} }
public function save($editid) { public function show($id){
@Auth::check(); return $this->redirectRoute('color.show', $id, navigate: true);
$color = ColorModel::findOrFail($editid);
$color->name = $this->name;
$color->hex = $this->hex;
$color->save();
session()->flash('status', 'Color successfully updated.');
Flux::modal('editModal')->close();
} }
public function deleteModal($colorid) { public function delete($id){
@Auth::check(); ColorModel::destroy($id);
$deleteid = $colorid;
$this->deleteid = $deleteid;
$color = ColorModel::findOrFail($colorid);
$this->name = $color->name;
$this->hex = $color->hex;
Flux::modal('deleteModal')->show();
}
public function delete($deleteid) {
@Auth::check();
$color = ColorModel::findOrFail($deleteid)->delete();
$this->deleteid = $deleteid;
Flux::modal('deleteModal')->close();
// Clear the form
$this->reset(['name', 'hex', 'deleteid']);
session()->flash('status', 'Color successfully deleted.');
} }
public function cancel() {
$this->reset(['name', 'hex', 'deleteid']);
Flux::modals()->close();
}
public function render() public function render()
{ {
return view('livewire.color.index', [ return view('livewire.color.index', [
'colors' => ColorModel::search('name', $this->search)->paginate(20) 'colors' => ColorModel::search('name', $this->search)->paginate(10)
]); ]);
} }
} }
app/Livewire/Color/CreateColor.php
+41
View File
@@ -0,0 +1,41 @@
<?php
namespace App\Livewire\Color;
use App\Models\Color as Model;
use Livewire\Attributes\title;
use Livewire\Component;
#[title('Colors')]
class CreateColor extends Component
{
public Model $color ;
public string $name = '';
public string $hex = '';
public function save(){
$this->validate([
'name' => ['required', 'string', 'max:255'],
'hex' => ['required', 'string', 'size:6', 'regex:/^[0-9A-F]{6}$/'],
]);
$color = new Model();
$color->name = $this->name;
$color->hex = $this->hex;
$color->save();
return $this->redirectRoute('color.show', $color->id, navigate: true);
}
public function cancel(){
return $this->redirectRoute('color.index', navigate: true);
}
public function render()
{
return view('livewire.color.create', [
]);
}
}
app/Livewire/Color/EditColor.php
+48
View File
@@ -0,0 +1,48 @@
<?php
namespace App\Livewire\Color;
use App\Models\Color as Model;
use Livewire\Attributes\title;
use Livewire\Attributes\Validate;
use Livewire\Component;
#[title('Colors')]
class EditColor extends Component
{
public Model $color;
public string $name = '';
public string $hex = '';
public function mount(Model $color){
$this->color = $color;
$this->name = $color->name;
$this->hex = $color->hex;
}
#[Validate('required')]
public function save(){
$this->validate([
'name' => ['required', 'string', 'max:255'],
'hex' => ['required', 'string', 'size:6', 'regex:/^[0-9A-F]{6}$/'],
]);
$this->color->update([
'name' => $this->name,
'hex' => $this->hex,
]);
return $this->redirectRoute('color.show', $this->color->id, navigate: true);
}
public function cancel(){
return $this->redirectRoute('color.index', navigate: true);
}
public function render()
{
return view('livewire.color.edit', [
]);
}
}
app/Livewire/Color/ShowColor.php
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Livewire\Color;
use App\Models\Color as Model;
use Livewire\Attributes\title;
use Livewire\Component;
#[title('Colors')]
class ShowColor extends Component
{
public Model $color;
public function mount(Model $color){
$this->color = $color;
}
public function edit($id){
return $this->redirectRoute('color.edit', $id, navigate: true);
}
public function back(){
return $this->redirectRoute('color.index', navigate: true);
}
public function render()
{
return view('livewire.color.show', [
]);
}
}
app/Livewire/Dashboard.php
+1 -1
View File
@@ -12,7 +12,7 @@ class Dashboard extends Component
public function render() public function render()
{ {
return view('livewire.dashboard', [ return view('livewire.dashboard', [
'manufacturer' => Manufacturer::all()->sortBy('filament_count')->reverse() 'manufacturers' => Manufacturer::all()->sortBy('filament_count')->reverse()
]); ]);
} }
} }
app/Livewire/Type/CreateType.php
+2 -2
View File
@@ -34,11 +34,11 @@ class CreateType extends Component
$type->description = $this->description; $type->description = $this->description;
$type->save(); $type->save();
return redirect()->route('type.index'); return $this->redirectRoute('type.show', $type->id, navigate: true);
} }
public function cancel(){ public function cancel(){
return redirect()->route('type.index'); return $this->redirectRoute('type.index', navigate: true);
} }
public function render() public function render()
{ {
app/Livewire/Type/EditType.php
+23 -12
View File
@@ -2,8 +2,7 @@
namespace App\Livewire\Type; namespace App\Livewire\Type;
use App\Models\FilamentType; use App\Models\FilamentType as Model;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\title; use Livewire\Attributes\title;
use Livewire\Attributes\Validate; use Livewire\Attributes\Validate;
use Livewire\Component; use Livewire\Component;
@@ -11,29 +10,41 @@ use Livewire\Component;
#[title('Types')] #[title('Types')]
class EditType extends Component class EditType extends Component
{ {
public FilamentType $type; public Model $type;
public string $name = '';
public string $description = '';
public function mount(Model $type)
{
$this->type = $type;
$this->name = $type->name;
$this->description = $type->description;
}
// Validation // Validation
#[Validate('required')] #[Validate('required')]
public function save()
public function save() { {
$this->validate([ $this->validate([
'type.name' => ['required', 'string', 'max:255'], 'type.name' => ['required', 'string', 'max:255'],
'type.description' => ['nullable', 'string'], 'type.description' => ['nullable', 'string'],
]); ]);
$this->type->save(); $this->type->update([
'name' => $this->name,
'description' => $this->description,
]);
return redirect()->route('type.show', $this->type->id );
return $this->redirectRoute('type.show', $this->type->id, navigate: true);
} }
public function cancel(){ public function cancel()
return redirect()->route('type.index'); {
return $this->redirectRoute('type.index', navigate: true);
} }
public function mount(FilamentType $type){
$this->type = $type;
}
public function render() public function render()
{ {
return view('livewire.type.edit', [ return view('livewire.type.edit', [
app/Livewire/Type/ShowType.php
+2 -2
View File
@@ -16,11 +16,11 @@ class ShowType extends Component
public FilamentType $type; public FilamentType $type;
public function back(){ public function back(){
return redirect()->route('type.index'); return $this->redirectRoute('type.index', navigate: true);
} }
public function edit($id){ public function edit($id){
return redirect()->route('type.edit', $id); return $this->redirectRoute('type.edit', $id, navigate: true);
} }
public function mount(FilamentType $type){ public function mount(FilamentType $type){
app/Livewire/Type/Type.php
+11 -7
View File
@@ -20,15 +20,19 @@ class Type extends Component
// Validation // Validation
#[Validate('required')] #[Validate('required')]
public function create() { public function create()
@Auth::check(); {
return redirect()->route('type.create'); return $this->redirectRoute('type.create', navigate: true);
} }
public function edit($id){
return redirect()->route('type.edit', $id); public function edit($id)
{
return $this->redirectRoute('type.edit', $id, navigate: true);
} }
public function show($id){
return redirect()->route('type.show', $id); public function show($id)
{
return $this->redirectRoute('type.show', $id, navigate: true);
} }
public function delete($id){ public function delete($id){
@Auth::check(); @Auth::check();
app/Models/Color.php
-12
View File
@@ -15,17 +15,5 @@ class Color extends Model
'hex' 'hex'
]; ];
// Color has many filaments
public function filaments()
{
return $this->hasMany(Filament::class);
}
// Color has many filament type
public function filamentTypes()
{
return $this->hasMany(FilamentType::class);
}
} }
database/migrations/2025_03_10_182844_create_colors.php
+1 -1
View File
@@ -11,7 +11,7 @@ return new class extends Migration
*/ */
public function up(): void public function up(): void
{ {
Schema::create('color', function (Blueprint $table) { Schema::create('colors', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name')->required(); $table->string('name')->required();
$table->string('hex')->required(); $table->string('hex')->required();
database/migrations/2025_03_10_182903_create_manufacturers.php
+1 -1
View File
@@ -11,7 +11,7 @@ return new class extends Migration
*/ */
public function up(): void public function up(): void
{ {
Schema::create('manufacturer', function (Blueprint $table) { Schema::create('manufacturers', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name')->required(); $table->string('name')->required();
$table->string('description')->nullable(); $table->string('description')->nullable();
database/migrations/2025_03_10_183058_create_filaments.php
+7 -6
View File
@@ -13,13 +13,14 @@ return new class extends Migration
{ {
Schema::create('filaments', function (Blueprint $table) { Schema::create('filaments', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name')->required(); $table->string('name');
$table->string('description')->nullable(); $table->string('description')->nullable();
$table->foreignId('color_id')->constrained()->onUpdate('cascade')->onDelete('cascade'); // Foreign keys pointing to existing tables with non-standard names
$table->foreignId('manufacturer_id')->constrained()->onUpdate('cascade')->onDelete('cascade');; $table->foreignId('color_id')->constrained('colors')->onUpdate('cascade')->onDelete('cascade');
$table->foreignId('filament_type_id')->constrained()->onUpdate('cascade')->onDelete('cascade');; $table->foreignId('manufacturer_id')->constrained('manufacturers')->onUpdate('cascade')->onDelete('cascade');
$table->integer('weight')->required(); $table->foreignId('filament_type_id')->constrained('filament_types')->onUpdate('cascade')->onDelete('cascade');
$table->decimal('diameter', 10, 2)->required(); $table->integer('weight');
$table->decimal('diameter', 10, 2);
$table->decimal('price', 10, 2)->nullable(); $table->decimal('price', 10, 2)->nullable();
$table->string('finish')->nullable(); $table->string('finish')->nullable();
$table->string('image')->nullable(); $table->string('image')->nullable();
database/migrations/2025_03_15_185700_create_buildplates_table.php
+2 -3
View File
@@ -11,13 +11,12 @@ return new class extends Migration
*/ */
public function up(): void public function up(): void
{ {
Schema::create('buildplate', function (Blueprint $table) { Schema::create('buildplates', function (Blueprint $table) {
$table->id(); $table->id();
$table->string('name'); $table->string('name');
$table->string('description'); $table->string('description');
$table->foreignId('manufacturer_id')->constrained(); $table->foreignId('manufacturer_id')->constrained('manufacturers');
$table->string('temp_max'); $table->string('temp_max');
$table->string('amount');
$table->timestamps(); $table->timestamps();
}); });
} }
database/seeders/ColorSeeder.php
+14 -14
View File
@@ -15,20 +15,20 @@ class ColorSeeder extends Seeder
{ {
// Seed predefined Colors // Seed predefined Colors
$colors = [ $colors = [
['name' => 'Red', 'hex' => '#FF0000'], ['name' => 'Red', 'hex' => 'FF0000'],
['name' => 'Green', 'hex' => '#00FF00'], ['name' => 'Green', 'hex' => '00FF00'],
['name' => 'Blue', 'hex' => '#0000FF'], ['name' => 'Blue', 'hex' => '0000FF'],
['name' => 'Yellow', 'hex' => '#FFFF00'], ['name' => 'Yellow', 'hex' => 'FFFF00'],
['name' => 'Orange', 'hex' => '#FFA500'], ['name' => 'Orange', 'hex' => 'FFA500'],
['name' => 'Purple', 'hex' => '#800080'], ['name' => 'Purple', 'hex' => '800080'],
['name' => 'Pink', 'hex' => '#FFC0CB'], ['name' => 'Pink', 'hex' => 'FFC0CB'],
['name' => 'Brown', 'hex' => '#A52A2A'], ['name' => 'Brown', 'hex' => 'A52A2A'],
['name' => 'Gray', 'hex' => '#808080'], ['name' => 'Gray', 'hex' => '808080'],
['name' => 'Black', 'hex' => '#000000'], ['name' => 'Black', 'hex' => '000000'],
['name' => 'White', 'hex' => '#FFFFFF'], ['name' => 'White', 'hex' => 'FFFFFF'],
['name' => 'Gold', 'hex' => '#FFD700'], ['name' => 'Gold', 'hex' => 'FFD700'],
['name' => 'Silver', 'hex' => '#C0C0C0'], ['name' => 'Silver', 'hex' => 'C0C0C0'],
['name' => 'Cyan', 'hex' => '#00FFFF'] ['name' => 'Cyan', 'hex' => '00FFFF']
]; ];
foreach ($colors as $color) { foreach ($colors as $color) {
resources/css/app.css
+64 -37
View File
@@ -8,15 +8,18 @@
@source '../../vendor/laravel/jetstream/**/*.blade.php'; @source '../../vendor/laravel/jetstream/**/*.blade.php';
@theme { @theme {
--font-sans: --font-sans: Inter, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
Inter, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'; 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
--color-jet: #33312e; --color-jet: #33312e;
--color-pumpkin: #FE7F2D; --color-pumpkin: #FE7F2D;
--color-sunglow: #FCCA46;
--color-olivine: #A1C181; --color-olivine: #A1C181;
--color-zomp: #619B8A;
--color-cornflower: #8ecae6;
--color-pacific: #219ebc;
--color-elephant: #023047;
--color-selective: #ffb703;
--color-gold-drop: #fb8500;
--color-jet-50: #f6f5f5; --color-jet-50: #f6f5f5;
--color-jet-100: #e8e6e5; --color-jet-100: #e8e6e5;
@@ -54,41 +57,65 @@
--color-olivine-900: #324027; --color-olivine-900: #324027;
--color-olivine-950: #182211; --color-olivine-950: #182211;
--color-nuke-50: oklch(0.99 0.0358 117.24); --color-cornflower-50: #f2f9fd;
--color-nuke-100: oklch(0.97 0.0779 120.18); --color-cornflower-100: #e5f1f9;
--color-nuke-200: oklch(0.95 0.1412 121.89); --color-cornflower-200: #c5e3f2;
--color-nuke-300: oklch(0.93 0.2049 125.66); --color-cornflower-300: #8ecae6;
--color-nuke-400: oklch(0.91 0.2468 130.72); --color-cornflower-400: #58b2d8;
--color-nuke-500: oklch(0.84 0.231054 131.6647); --color-cornflower-500: #3298c5;
--color-nuke-600: oklch(0.71 0.197756 132.5804); --color-cornflower-600: #237ba6;
--color-nuke-700: oklch(0.57 0.1604 132.33); --color-cornflower-700: #1d6187;
--color-nuke-800: oklch(0.48 0.1306 131.73); --color-cornflower-800: #1c5370;
--color-nuke-900: oklch(0.43 0.112 131.31); --color-cornflower-900: #1c465e;
--color-nuke-950: oklch(0.29 0.0821 132.58); --color-cornflower-950: #132d3e;
--color-etheral-50:oklch(0.98 0.019 204.85); --color-pacific-50: #eefbfd;
--color-etheral-100:oklch(0.95 0.0444 210.46); --color-pacific-100: #d5f3f8;
--color-etheral-200:oklch(0.9 0.0777 214.41); --color-pacific-200: #b0e7f1;
--color-etheral-300:oklch(0.82 0.1327 218.85); --color-pacific-300: #7ad5e6;
--color-etheral-400:oklch(0.77 0.1401 223.63); --color-pacific-400: #3cb9d4;
--color-etheral-500:oklch(0.68 0.1345 228.8); --color-pacific-500: #219ebc;
--color-etheral-600:oklch(0.58 0.1216 233.84); --color-pacific-600: #1e7e9c;
--color-etheral-700:oklch(0.5 0.1034 235.16); --color-pacific-700: #1f657f;
--color-etheral-800:oklch(0.43 0.0843 235.25); --color-pacific-800: #215569;
--color-etheral-900:oklch(0.38 0.0743 238.47); --color-pacific-900: #204659;
--color-etheral-950:oklch(0.29 0.0601 239.11); --color-pacific-950: #102e3c;
--color-blackout-50:oklch(0.97 0 0); --color-elephant-50: #effaff;
--color-blackout-100:oklch(0.93 0 0); --color-elephant-100: #ddf5ff;
--color-blackout-200:oklch(0.86 0 0); --color-elephant-200: #b4edff;
--color-blackout-300:oklch(0.76 0 0); --color-elephant-300: #72e0ff;
--color-blackout-400:oklch(0.63 0 0); --color-elephant-400: #27d2ff;
--color-blackout-500:oklch(0.53 0 0); --color-elephant-500: #00bdfc;
--color-blackout-600:oklch(0.48 0 0); --color-elephant-600: #0098d9;
--color-blackout-700:oklch(0.43 0 0); --color-elephant-700: #0079af;
--color-blackout-800:oklch(0.39 0 0); --color-elephant-800: #006690;
--color-blackout-900:oklch(0.36 0 0); --color-elephant-900: #035477;
--color-blackout-950:oklch(0.31 0 0); --color-elephant-950: #023047;
--color-selective-50: #fffeea;
--color-selective-100: #fff9c5;
--color-selective-200: #fff485;
--color-selective-300: #ffe746;
--color-selective-400: #ffd71b;
--color-selective-500: #ffb703;
--color-selective-600: #e28b00;
--color-selective-700: #bb6202;
--color-selective-800: #984b08;
--color-selective-900: #7c3e0b;
--color-selective-950: #481f00;
--color-gold-drop-50: #fffbec;
--color-gold-drop-100: #fff5d3;
--color-gold-drop-200: #ffe8a5;
--color-gold-drop-300: #ffd56d;
--color-gold-drop-400: #ffb732;
--color-gold-drop-500: #ff9f0a;
--color-gold-drop-600: #fb8500;
--color-gold-drop-700: #cc6302;
--color-gold-drop-800: #a14c0b;
--color-gold-drop-900: #82400c;
--color-gold-drop-950: #461e04;
} }
/* /*
resources/views/components/header.blade.php
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="bg-jet-900 w-full border-b border-jet-900"> <div class="bg-elephant w-full border-b border-elephant-900">
<div class="container mx-auto py-6 px-4 sm:px-6 lg:px-8 flex justify-between items-center"> <div class="container mx-auto py-6 px-4 sm:px-6 lg:px-8 flex justify-between items-center">
<x-header.header-left> <x-header.header-left>
@isset($headerleft) @isset($headerleft)
resources/views/components/layouts/app.blade.php
+1 -1
View File
@@ -22,7 +22,7 @@
<title>{{ $title . ' | ' . config('app.name') ?? config('app.name') }}</title> <title>{{ $title . ' | ' . config('app.name') ?? config('app.name') }}</title>
</head> </head>
<body class="font-sans antialiased bg-jet-950/50"> <body class="font-sans antialiased bg-neutral-900">
<x-navbar /> <x-navbar />
<div class="flex flex-row"> <div class="flex flex-row">
<!-- <!--
resources/views/components/navbar.blade.php
+25 -11
View File
@@ -1,4 +1,4 @@
<section class="bg-jet-950"> <section class="bg-elephant/50">
<flux:header class="container mx-auto flex items-center"> <flux:header class="container mx-auto flex items-center">
<flux:sidebar.toggle class="lg:hidden" icon="bars-2" inset="left"/> <flux:sidebar.toggle class="lg:hidden" icon="bars-2" inset="left"/>
@@ -7,18 +7,29 @@
<flux:navbar class="-mb-px max-lg:hidden"> <flux:navbar class="-mb-px max-lg:hidden">
<flux:navbar.item wire:navigate icon="home" href="{{ route('dashboard') }}">Dashboard</flux:navbar.item> <flux:navbar.item wire:navigate icon="home" href="{{ route('dashboard') }}">Dashboard</flux:navbar.item>
<flux:navbar.item wire:navigate icon="shopping-bag" href="{{ route('orders.index') }}">Orders</flux:navbar.item> <flux:navbar.item wire:navigate icon="shopping-bag" href="{{ route('orders.index') }}">Orders
</flux:navbar.item>
<flux:dropdown> <flux:dropdown>
<flux:navbar.item icon="circle-stack" icon-trailing="chevron-down">Filaments</flux:navbar.item>
<flux:navmenu class="bg-jet"> <flux:navbar.item icon="circle-stack" icon-trailing="chevron-down">Database</flux:navbar.item>
<flux:navmenu.item wire:navigate icon="circle-stack" href="{{ route('filaments.index') }}">All Filaments</flux:navmenu.item>
<flux:navmenu class="bg-white">
<flux:navmenu.item wire:navigate icon="circle-stack" href="{{ route('filaments.index') }}">All
Filaments
</flux:navmenu.item>
<flux:navmenu.separator/> <flux:navmenu.separator/>
<flux:navmenu.item wire:navigate icon="archive-box" href="{{ route('manufacturer.index') }}">Manufacturers</flux:navmenu.item> <flux:navmenu.item wire:navigate icon="archive-box" href="{{ route('manufacturer.index') }}">
<flux:navmenu.item wire:navigate icon="paint-brush" href="{{ route('color.index') }}">Colors</flux:navmenu.item> Manufacturers
<flux:navmenu.item wire:navigate icon="clipboard" href="{{ route('type.index') }}">Types</flux:navmenu.item> </flux:navmenu.item>
<flux:navmenu.item wire:navigate icon="clipboard" href="{{ route('buildplate.index') }}">BuildPlates</flux:navmenu.item> <flux:navmenu.item wire:navigate icon="paint-brush" href="{{ route('color.index') }}">Colors
</flux:navmenu.item>
<flux:navmenu.item wire:navigate icon="clipboard" href="{{ route('type.index') }}">Types
</flux:navmenu.item>
<flux:navmenu.item wire:navigate icon="clipboard" href="{{ route('buildplate.index') }}">
BuildPlates
</flux:navmenu.item>
</flux:navmenu> </flux:navmenu>
</flux:dropdown> </flux:dropdown>
</flux:navbar> </flux:navbar>
@@ -28,7 +39,8 @@
<flux:navbar class="mr-4"> <flux:navbar class="mr-4">
<flux:navbar.item icon="magnifying-glass" href="#" label="Search"/> <flux:navbar.item icon="magnifying-glass" href="#" label="Search"/>
<flux:navbar.item class="max-lg:hidden" icon="cog-6-tooth" href="{{ route('settings.index') }}" label="Settings" /> <flux:navbar.item class="max-lg:hidden" icon="cog-6-tooth" href="{{ route('settings.index') }}"
label="Settings"/>
<flux:separator vertical variant="subtle" class="my-2"/> <flux:separator vertical variant="subtle" class="my-2"/>
</flux:navbar> </flux:navbar>
@@ -41,7 +53,9 @@
<flux:menu.separator/> <flux:menu.separator/>
<form method="POST" action="{{ route('logout') }}" x-data> <form method="POST" action="{{ route('logout') }}" x-data>
@csrf @csrf
<flux:menu.item href="{{ route('logout') }}" icon="arrow-right-start-on-rectangle" @click.prevent="$root.submit();">Logout</flux:menu.item> <flux:menu.item href="{{ route('logout') }}" icon="arrow-right-start-on-rectangle"
@click.prevent="$root.submit();">Logout
</flux:menu.item>
</form> </form>
</flux:menu> </flux:menu>
resources/views/components/table.blade.php
+1 -1
View File
@@ -1,6 +1,6 @@
<div> <div>
<table class="w-full rounded-lg"> <table class="w-full rounded-lg">
<thead class="border-b border-jet-200 rounded-t-lg"> <thead class="border-b border-white/70 rounded-t-lg">
<tr class="text-left "> <tr class="text-left ">
{{ $tableheader }} {{ $tableheader }}
</tr> </tr>
resources/views/livewire/color/create.blade.php
+41
View File
@@ -0,0 +1,41 @@
<section>
<form wire:submit="save">
<x-header>
{{ __('Create Color') }}
<x-slot name="headerright">
<flux:button type="submit" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 hover:cursor-pointer transition-all ease-in-out" icon="check">Save</flux:button>
<flux:button wire:click="cancel" variant="primary" class=" bg-red-700 shadow hover:bg-red-800 hover:cursor-pointer transition-all ease-in-out" icon="x-mark">Cancel</flux:button>
</x-slot>
</x-header>
<div class="container m-auto my-8 bg-elephant-950 border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<div>
<div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Color Information</h3>
<p class="mt-1 max-w-2xl text-sm/6 text-gray-200">Color details.</p>
</div>
<div class="mt-6 border-t border-white/10">
<dl class="divide-y divide-white/10">
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Name</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input wire:model="name" type="text" class="mt-1 block w-full"/>
</dd>
</div>
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Hex Code</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input.group>
<flux:input.group.prefix>#</flux:input.group.prefix>
<flux:input wire:model="hex" type="text" class="block w-full"/>
</flux:input.group>
</dd>
</div>
</dl>
</div>
</div>
</div>
</form>
</section>
resources/views/livewire/color/edit.blade.php
+41
View File
@@ -0,0 +1,41 @@
<section>
<form wire:submit="save">
<x-header>
{{ __('Create Color') }}
<x-slot name="headerright">
<flux:button type="submit" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 hover:cursor-pointer transition-all ease-in-out" icon="check">Save</flux:button>
<flux:button wire:click="cancel" variant="primary" class=" bg-red-700 shadow hover:bg-red-800 hover:cursor-pointer transition-all ease-in-out" icon="x-mark">Cancel</flux:button>
</x-slot>
</x-header>
<div class="container m-auto my-8 bg-elephant-950 border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<div>
<div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Color Information</h3>
<p class="mt-1 max-w-2xl text-sm/6 text-gray-200">Color details.</p>
</div>
<div class="mt-6 border-t border-white/10">
<dl class="divide-y divide-white/10">
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Name</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input wire:model="name" type="text" class="mt-1 block w-full"/>
</dd>
</div>
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Hex Code</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input.group>
<flux:input.group.prefix>#</flux:input.group.prefix>
<flux:input wire:model="hex" type="text" class="block w-full"/>
</flux:input.group>
</dd>
</div>
</dl>
</div>
</div>
</div>
</form>
</section>
resources/views/livewire/color/index.blade.php
+10 -74
View File
@@ -3,12 +3,12 @@
{{ __('Colors') }} {{ __('Colors') }}
<x-slot name="headerleft"> <x-slot name="headerleft">
<input type="text" placeholder="Search..." wire:model.live="search" class="bg-jet-700 border-jet-500 rounded text-jet-50 placeholder:text-jet-200 focus:border-olivine focus:ring-olivine" /> <input type="text" placeholder="Search..." wire:model.live="search" class="bg-black/10 border-white/20 rounded text-gray-50 placeholder:text-gray-200 focus:border-white/50 focus:ring-white/50" />
</x-slot> </x-slot>
<x-slot name="headerright"> <x-slot name="headerright">
<flux:modal.trigger name="createModal"> <flux:modal.trigger name="createModal">
<flux:button variant="primary" class="bg-olivine hover:bg-olivine-600">Create Color</flux:button> <flux:button wire:click="create" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 transition ease-in-out hover:cursor-pointer">Create Type</flux:button>
</flux:modal.trigger> </flux:modal.trigger>
</x-slot> </x-slot>
</x-header> </x-header>
@@ -16,26 +16,25 @@
<div class="container m-auto my-8 bg-jet-800 rounded-lg shadow p-6 text-jet-50"> <div class="container m-auto my-8 bg-elephant border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<x-table> <x-table>
<x-slot name="tableheader"> <x-slot name="tableheader">
<x-table.header>Name</x-table.header> <x-table.header>Name</x-table.header>
<x-table.header>Color</x-table.header> <x-table.header>Color</x-table.header>
<x-table.header>Hex</x-table.header> <x-table.header>Hex</x-table.header>
<x-table.header>Rolls</x-table.header> <x-table.header class="w-[150px]">Actions</x-table.header>
<x-table.header class="w-1/6"></x-table.header>
</x-slot> </x-slot>
@foreach ($colors as $color) @foreach ($colors as $color)
<tr wire:key="{{ $color->id }}" class="text-jet-200 border-b border-jet-600 hover:bg-jet-700 transition duration-150 ease-in-out"> <tr wire:key="{{ $color->id }}" class="text-gray-200 border-b border-white/50 hover:bg-white/10 transition duration-150 ease-in-out">
<x-table.item><p class="p-4 px-3 pl-6 font-bold ">{{ $color->name }}</p></x-table.item> <x-table.item><p class="p-4 px-3 pl-6 font-bold "><a wire:click="edit({{ $color->id }})" class="hover:cursor-pointer">{{ $color->name }}</a></p></x-table.item>
<x-table.item><div class="p-4 px-3 mx-3 h-8 rounded" style="background-color: {{ $color->hex }}"></div></x-table.item> <x-table.item><div class="p-4 mx-3 w-[20px] h-[20px] rounded" style="background-color:#{{ $color->hex }}"></div></x-table.item>
<x-table.item><p class="p-4 px-3 text-left ">{{ $color->hex }}</p></x-table.item> <x-table.item><p class="p-4 px-3 text-left ">{{ $color->hex }}</p></x-table.item>
<x-table.item><p class="p-4 px-3"></p></x-table.item>
<x-table.item> <x-table.item>
<div class="flex flex-row gap-4 justify-end pr-8"> <div class="flex flex-row gap-4 justify-end pr-8">
<flux:button variant="ghost" wire:click="edit({{ $color->id }})" class=" rounded-lg px-4 py-2 cursor-pointer" icon="pencil">Edit</flux:button> <flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-cornflower hover:shadow hover:text-gray-950 hover:cursor-pointer" wire:click="show({{ $color->id }})" icon="magnifying-glass"></flux:button>
<flux:button variant="danger" wire:click="deleteModal({{ $color->id }})" icon="x-mark">Delete</flux:button> <flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-gold-drop hover:shadow hover:text-gray-950 hover:cursor-pointer" wire:click="edit({{ $color->id }})" icon="pencil"></flux:button>
<flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-red-700 hover:shadow hover:cursor-pointer" wire:click="delete({{ $color->id }})" icon="trash"></flux:button>
</div> </div>
</x-table.item> </x-table.item>
</tr> </tr>
@@ -47,67 +46,4 @@
</x-table> </x-table>
</div> </div>
<!-- Create Form -->
<flux:modal wire:model.self='createModal' name="createModal" class="md:w-lg">
<form wire:submit.prevent="create">
<div class="space-y-6">
<div>
<flux:heading size="lg" class="text-nuke-400">Create color</flux:heading>
<flux:text class="mt-2">Create a new color.</flux:text>
</div>
<flux:input label="Name" wire:model="name" placeholder="Color Name" required />
<flux:input label="hex" wire:model="hex" type="color" required />
<div class="flex gap-2">
<flux:spacer />
<flux:button variant="ghost" wire:click='cancel'>Cancel</flux:button>
<flux:button type="submit" variant="primary" class="bg-nuke-400 hover:bg-nuke-500">Create</flux:button>
</div>
</div>
</form>
</flux:modal>
<!-- Edit Form -->
@empty($color)
@else
<flux:modal wire:model.self='editModal' name="editModal" class="md:w-lg">
<form wire:submit.prevent="save({{ $editid }})">
<div class="space-y-6">
<div>
<flux:heading size="lg" class="text-etheral-300">Edit color</flux:heading>
<flux:text class="mt-2">Edit an existing color.</flux:text>
</div>
<flux:input label="Name" wire:model="name" placeholder="Color Name" required />
<flux:input label="hex" wire:model="hex" type="color" required />
<div class="flex gap-2">
<flux:spacer />
<flux:button variant="ghost" wire:click='cancel'>Cancel</flux:button>
<flux:button type="submit" variant="primary" class="bg-etheral-300 hover:bg-etheral-400">Save</flux:button>
</div>
</div>
</form>
</flux:modal>
@endempty
<!-- Delete Form -->
<flux:modal wire:model.self='deleteModal' name="deleteModal" class="md:w-lg">
<form wire:submit.prevent="delete({{ $deleteid }})">
<div class="space-y-6">
<div>
<flux:heading size="lg" class="text-red-500">Delete color?</flux:heading>
<flux:text class="mt-2">
<p>You're about to delete this color.</p>
<p>This action cannot be reversed.</p>
</flux:text>
</div>
<flux:input label="Name" wire:model="name" disabled placeholder="Color Name" required />
<flux:input label="hex" wire:model="hex" disabled type="color" required />
<div class="flex gap-2">
<flux:spacer />
<flux:button variant="ghost" wire:click='cancel'>Cancel</flux:button>
<flux:button type="submit" variant="danger">Delete color</flux:button>
</div>
</div>
</form>
</flux:modal>
</section> </section>
resources/views/livewire/color/show.blade.php
+40
View File
@@ -0,0 +1,40 @@
<section>
<x-header>
{{ __('Create Color') }}
<x-slot name="headerright">
<flux:button wire:click="back" variant="primary" class="bg-transparent shadow-none hover:bg-black/10 hover:cursor-pointer transition-all ease-in-out" icon="arrow-left">Back</flux:button>
<flux:button wire:click="edit({{ $color->id }})" variant="primary" class="bg-selective text-gray-950 shadow-none hover:bg-selective-600 hover:cursor-pointer transition-all ease-in-out" icon="check">Edit</flux:button>
</x-slot>
</x-header>
<div class="container m-auto my-8 bg-elephant-950 border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<div>
<div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Color Information</h3>
<p class="mt-1 max-w-2xl text-sm/6 text-gray-200">Color details.</p>
</div>
<div class="mt-6 border-t border-white/10">
<dl class="divide-y divide-white/10">
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Name</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
{{ $color->name }}
</dd>
</div>
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-gray-100">Hex Code</dt>
<dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<div class="flex items-center gap-4">
<div class="w-[20px] h-[20px] rounded" style="background-color:#{{ $color->hex }}"></div>
<span>#{{ $color->hex }}</span>
</div>
</dd>
</div>
</dl>
</div>
</div>
</div>
</form>
</section>
resources/views/livewire/dashboard.blade.php
-6
View File
@@ -1,12 +1,6 @@
<div> <div>
<x-header> <x-header>
{{ __('Dashboard') }} {{ __('Dashboard') }}
<x-slot name="headerright">
<flux:modal.trigger name="createModal">
<flux:button variant="primary" class="bg-olivine transition-all hover:bg-jet hover:text-jet-100 hover:cursor-pointer">Create Buildplate</flux:button>
</flux:modal.trigger>
</x-slot>
</x-header> </x-header>
<div class="py-12"> <div class="py-12">
resources/views/livewire/type/create.blade.php
+8 -8
View File
@@ -4,28 +4,28 @@
{{ __('Create Type') }} {{ __('Create Type') }}
<x-slot name="headerright"> <x-slot name="headerright">
<flux:button type="submit" variant="primary" icon="check">Save</flux:button> <flux:button type="submit" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 hover:cursor-pointer transition-all ease-in-out" icon="check">Save</flux:button>
<flux:button wire:click="cancel" variant="danger" icon="x-mark">Cancel</flux:button> <flux:button wire:click="cancel" variant="primary" class=" bg-red-700 shadow hover:bg-red-800 hover:cursor-pointer transition-all ease-in-out" icon="x-mark">Cancel</flux:button>
</x-slot> </x-slot>
</x-header> </x-header>
<div class="container m-auto my-8 bg-jet-800 rounded-lg shadow p-6 text-jet-50"> <div class="container m-auto my-8 bg-elephant-950 border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<div> <div>
<div class="px-4 sm:px-0"> <div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Type Information</h3> <h3 class="text-base/7 font-semibold text-white">Type Information</h3>
<p class="mt-1 max-w-2xl text-sm/6 text-jet-200">Type details.</p> <p class="mt-1 max-w-2xl text-sm/6 text-gray-200">Type details.</p>
</div> </div>
<div class="mt-6 border-t border-white/10"> <div class="mt-6 border-t border-white/10">
<dl class="divide-y divide-white/10"> <dl class="divide-y divide-white/10">
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center"> <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-jet-100">Name</dt> <dt class="text-sm/6 font-medium text-gray-100">Name</dt>
<dd class="mt-1 text-sm/6 text-jet-200 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input wire:model="name" type="text" class="mt-1 block w-full"/> <flux:input wire:model="name" type="text" class="mt-1 block w-full"/>
</dd> </dd>
</div> </div>
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center"> <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-jet-100">Description</dt> <dt class="text-sm/6 font-medium text-gray-100">Description</dt>
<dd class="mt-1 text-sm/6 text-jet-200 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:textarea wire:model="description" type="text" class="mt-1 block w-full"/> <flux:textarea wire:model="description" type="text" class="mt-1 block w-full"/>
</dd> </dd>
</div> </div>
resources/views/livewire/type/edit.blade.php
+10 -11
View File
@@ -4,30 +4,29 @@
{{ __('Create Type') }} {{ __('Create Type') }}
<x-slot name="headerright"> <x-slot name="headerright">
<flux:button type="submit" variant="primary" icon="check">Save</flux:button> <flux:button type="submit" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 hover:cursor-pointer transition-all ease-in-out" icon="check">Save</flux:button>
<flux:button wire:click="cancel" variant="danger" icon="x-mark">Cancel</flux:button> <flux:button wire:click="cancel" variant="primary" class=" bg-red-700 shadow hover:bg-red-800 hover:cursor-pointer transition-all ease-in-out" icon="x-mark">Cancel</flux:button>
</x-slot> </x-slot>
</x-header> </x-header>
<div class="container m-auto my-8 bg-jet-800 rounded-lg shadow p-6 text-jet-50"> <div class="container m-auto my-8 bg-elephant border border-elephant-900 rounded-lg shadow p-6 text-gray-50">
<div> <div>
<div>Loaded: {{ $type?->id }} - {{ $type?->name }}</div>
<div class="px-4 sm:px-0"> <div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Type Information</h3> <h3 class="text-base/7 font-semibold text-white">Type Information</h3>
<p class="mt-1 max-w-2xl text-sm/6 text-jet-200">Type details.</p> <p class="mt-1 max-w-2xl text-sm/6 text-gray-200">Type details.</p>
</div> </div>
<div class="mt-6 border-t border-white/10"> <div class="mt-6 border-t border-white/10">
<dl class="divide-y divide-white/10"> <dl class="divide-y divide-white/10">
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center"> <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-jet-100">Name</dt> <dt class="text-sm/6 font-medium text-gray-100">Name</dt>
<dd class="mt-1 text-sm/6 text-jet-200 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm/6 text-gray-200 sm:col-span-2 sm:mt-0">
<flux:input wire:model="type.name" type="text" class="mt-1 block w-full"/> <flux:input wire:model="name" type="text" class="mt-1 block w-full"/>
</dd> </dd>
</div> </div>
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center"> <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0 items-center">
<dt class="text-sm/6 font-medium text-jet-100">Description</dt> <dt class="text-sm/6 font-medium text-gray-100">Description</dt>
<dd class="mt-1 text-sm/6 text-jet-200 sm:col-span-2 sm:mt-0"> <dd class="mt-1 text-sm/6 text-jet-gray sm:col-span-2 sm:mt-0">
<flux:textarea wire:model="type.description" type="text" rows="auto" class="mt-1 block w-full" /> <flux:textarea wire:model="description" type="text" rows="auto" class="mt-1 block w-full" />
</dd> </dd>
</div> </div>
</dl> </dl>
resources/views/livewire/type/index.blade.php
+10 -9
View File
@@ -3,19 +3,20 @@
{{ __('Types') }} {{ __('Types') }}
<x-slot name="headerleft"> <x-slot name="headerleft">
<input type="text" placeholder="Search..." wire:model.live="search" class="bg-jet-700 border-jet-500 rounded text-jet-50 placeholder:text-jet-200 focus:border-olivine focus:ring-olivine" /> <input type="text" placeholder="Search..." wire:model.live="search" class="bg-black/10 border-white/20 rounded text-gray-50 placeholder:text-gray-200 focus:border-white/50 focus:ring-white/50" />
</x-slot> </x-slot>
<x-slot name="headerright"> <x-slot name="headerright">
<flux:modal.trigger name="createModal"> <flux:modal.trigger name="createModal">
<flux:button wire:click="create" variant="primary" class="bg-olivine hover:bg-olivine-600">Create Type</flux:button> <flux:button wire:click="create" variant="primary" class="bg-selective hover:bg-selective-600 text-gray-950 transition ease-in-out hover:cursor-pointer">Create Type</flux:button>
</flux:modal.trigger> </x-slot> </flux:modal.trigger>
</x-slot>
</x-header> </x-header>
<div class="container m-auto my-8 bg-jet-800 rounded-lg shadow p-6 text-jet-50"> <div class="container m-auto my-8 bg-elephant-950 rounded-lg shadow p-6 text-gray-50 border border-elephant-900">
<x-table> <x-table>
<x-slot name="tableheader"> <x-slot name="tableheader">
<x-table.header>Name</x-table.header> <x-table.header>Name</x-table.header>
@@ -25,15 +26,15 @@
</x-slot> </x-slot>
@foreach ($types as $type) @foreach ($types as $type)
<tr wire:key="{{ $type->id }}" class="text-jet-200 border-b border-jet-600 hover:bg-jet-700 transition duration-150 ease-in-out"> <tr wire:key="{{ $type->id }}" class="text-gray-200 border-b border-white/40 hover:bg-white/10 transition duration-150 ease-in-out">
<x-table.item><p class="p-4 px-3 pl-6 font-bold">{{ $type->name }}</p></x-table.item> <x-table.item><p class="p-4 px-3 pl-6 font-bold"><a class="hover:cursor-pointer" wire:click="show({{ $type->id }})" >{{ $type->name }}</a></p></x-table.item>
<x-table.item><p class="p-4 px-3">{{ $type->description }}</p></x-table.item> <x-table.item><p class="p-4 px-3">{{ $type->description }}</p></x-table.item>
<x-table.item><p class="p-4 px-3">{{ $type->amount }}</p></x-table.item> <x-table.item><p class="p-4 px-3">{{ $type->amount }}</p></x-table.item>
<x-table.item> <x-table.item>
<div class="flex flex-row gap-4 justify-end pr-8"> <div class="flex flex-row gap-4 justify-end pr-8">
<flux:button variant="primary" class="text-jet-200 bg-transparent shadow-none hover:bg-olivine hover:shadow hover:text-jet-950" wire:click="show({{ $type->id }})" icon="magnifying-glass"></flux:button> <flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-cornflower hover:shadow hover:text-gray-950 hover:cursor-pointer" wire:click="show({{ $type->id }})" icon="magnifying-glass"></flux:button>
<flux:button variant="primary" class="text-jet-200 bg-transparent shadow-none hover:bg-pumpkin-500 hover:shadow" wire:click="edit({{ $type->id }})" icon="pencil"></flux:button> <flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-gold-drop hover:shadow hover:text-gray-950 hover:cursor-pointer" wire:click="edit({{ $type->id }})" icon="pencil"></flux:button>
<flux:button variant="primary" class="text-jet-200 bg-transparent shadow-none hover:bg-red-600 hover:shadow" wire:click="delete({{ $type->id }})" icon="trash"></flux:button> <flux:button variant="primary" class="text-gray-200 bg-transparent shadow-none hover:bg-red-700 hover:shadow hover:cursor-pointer" wire:click="delete({{ $type->id }})" icon="trash"></flux:button>
</div> </div>
</x-table.item> </x-table.item>
</tr> </tr>
resources/views/livewire/type/show.blade.php
+3 -3
View File
@@ -3,12 +3,12 @@
{{ __('Show Type - ') . $type->name }} {{ __('Show Type - ') . $type->name }}
<x-slot name="headerright"> <x-slot name="headerright">
<flux:button wire:click="back" variant="ghost" icon="arrow-left">Back</flux:button> <flux:button wire:click="back" variant="primary" class="bg-transparent shadow-none hover:bg-black/10 hover:cursor-pointer transition-all ease-in-out" icon="arrow-left">Back</flux:button>
<flux:button wire:click="edit({{ $type->id }})" variant="primary" icon="check">Edit</flux:button> <flux:button wire:click="edit({{ $type->id }})" variant="primary" class="bg-selective text-gray-950 shadow-none hover:bg-selective-600 hover:cursor-pointer transition-all ease-in-out" icon="check">Edit</flux:button>
</x-slot> </x-slot>
</x-header> </x-header>
<div class="container m-auto my-8 bg-jet-800 rounded-lg shadow p-6 text-jet-50"> <div class="container m-auto my-8 bg-elephant-950 rounded-lg shadow p-6 text-gray-50 border border-elephant-900">
<div> <div>
<div class="px-4 sm:px-0"> <div class="px-4 sm:px-0">
<h3 class="text-base/7 font-semibold text-white">Type Information</h3> <h3 class="text-base/7 font-semibold text-white">Type Information</h3>
resources/views/vendor/livewire/simple-tailwind.blade.php
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
</button> </button>
@endif @endif
@else @else
<span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md"> <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md dark:text-gray-600 dark:bg-gray-800 dark:border-gray-600">
{!! __('pagination.next') !!} {!! __('pagination.next') !!}
</span> </span>
@endif @endif
resources/views/vendor/livewire/tailwind.blade.php
Vendored
+11 -11
View File
@@ -16,11 +16,11 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
<div class="flex justify-between flex-1 sm:hidden"> <div class="flex justify-between flex-1 sm:hidden">
<span> <span>
@if ($paginator->onFirstPage()) @if ($paginator->onFirstPage())
<span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md"> <span class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
{!! __('pagination.previous') !!} {!! __('pagination.previous') !!}
</span> </span>
@else @else
<button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150"> <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
{!! __('pagination.previous') !!} {!! __('pagination.previous') !!}
</button> </button>
@endif @endif
@@ -28,11 +28,11 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
<span> <span>
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150"> <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" wire:loading.attr="disabled" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.before" class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 rounded-md hover:text-gray-500 focus:outline-none focus:ring ring-blue-300 focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300 dark:focus:border-blue-700 dark:active:bg-gray-700 dark:active:text-gray-300">
{!! __('pagination.next') !!} {!! __('pagination.next') !!}
</button> </button>
@else @else
<span class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md"> <span class="relative inline-flex items-center px-4 py-2 ml-3 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 rounded-md dark:text-gray-600 dark:bg-gray-800 dark:border-gray-600">
{!! __('pagination.next') !!} {!! __('pagination.next') !!}
</span> </span>
@endif @endif
@@ -58,14 +58,14 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
{{-- Previous Page Link --}} {{-- Previous Page Link --}}
@if ($paginator->onFirstPage()) @if ($paginator->onFirstPage())
<span aria-disabled="true" aria-label="{{ __('pagination.previous') }}"> <span aria-disabled="true" aria-label="{{ __('pagination.previous') }}">
<span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5" aria-hidden="true"> <span class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-l-md leading-5 dark:bg-gray-800 dark:border-gray-600" aria-hidden="true">
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20"> <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg> </svg>
</span> </span>
</span> </span>
@else @else
<button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.previous') }}"> <button type="button" wire:click="previousPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" dusk="previousPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" class="relative inline-flex items-center px-2 py-2 text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-l-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:active:bg-gray-700 dark:focus:border-blue-800" aria-label="{{ __('pagination.previous') }}">
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20"> <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
</svg> </svg>
@@ -78,7 +78,7 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
{{-- "Three Dots" Separator --}} {{-- "Three Dots" Separator --}}
@if (is_string($element)) @if (is_string($element))
<span aria-disabled="true"> <span aria-disabled="true">
<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 cursor-default leading-5">{{ $element }}</span> <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-300">{{ $element }}</span>
</span> </span>
@endif @endif
@@ -88,10 +88,10 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
<span wire:key="paginator-{{ $paginator->getPageName() }}-page{{ $page }}"> <span wire:key="paginator-{{ $paginator->getPageName() }}-page{{ $page }}">
@if ($page == $paginator->currentPage()) @if ($page == $paginator->currentPage())
<span aria-current="page"> <span aria-current="page">
<span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5">{{ $page }}</span> <span class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default leading-5 dark:bg-gray-800 dark:border-gray-600">{{ $page }}</span>
</span> </span>
@else @else
<button type="button" wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150" aria-label="{{ __('Go to page :page', ['page' => $page]) }}"> <button type="button" wire:click="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" class="relative inline-flex items-center px-4 py-2 -ml-px text-sm font-medium text-gray-700 bg-white border border-gray-300 leading-5 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:text-gray-400 dark:hover:text-gray-300 dark:active:bg-gray-700 dark:focus:border-blue-800" aria-label="{{ __('Go to page :page', ['page' => $page]) }}">
{{ $page }} {{ $page }}
</button> </button>
@endif @endif
@@ -103,14 +103,14 @@ $scrollIntoViewJsSnippet = ($scrollTo !== false)
<span> <span>
{{-- Next Page Link --}} {{-- Next Page Link --}}
@if ($paginator->hasMorePages()) @if ($paginator->hasMorePages())
<button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150" aria-label="{{ __('pagination.next') }}"> <button type="button" wire:click="nextPage('{{ $paginator->getPageName() }}')" x-on:click="{{ $scrollIntoViewJsSnippet }}" dusk="nextPage{{ $paginator->getPageName() == 'page' ? '' : '.' . $paginator->getPageName() }}.after" class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 rounded-r-md leading-5 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:ring ring-blue-300 active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150 dark:bg-gray-800 dark:border-gray-600 dark:active:bg-gray-700 dark:focus:border-blue-800" aria-label="{{ __('pagination.next') }}">
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20"> <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
</svg> </svg>
</button> </button>
@else @else
<span aria-disabled="true" aria-label="{{ __('pagination.next') }}"> <span aria-disabled="true" aria-label="{{ __('pagination.next') }}">
<span class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5" aria-hidden="true"> <span class="relative inline-flex items-center px-2 py-2 -ml-px text-sm font-medium text-gray-500 bg-white border border-gray-300 cursor-default rounded-r-md leading-5 dark:bg-gray-800 dark:border-gray-600" aria-hidden="true">
<svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20"> <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
<path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
</svg> </svg>
routes/web.php
+6
View File
@@ -26,8 +26,13 @@ Route::middleware([
// Buildplates // Buildplates
Route::get('buildplate', Buildplate::class)->name('buildplate.index'); Route::get('buildplate', Buildplate::class)->name('buildplate.index');
// Colors // Colors
Route::get('color', Color::class)->name('color.index'); Route::get('color', Color::class)->name('color.index');
Route::get('color/create', \App\Livewire\Color\CreateColor::class)->name('color.create');
Route::get('color/{color}/edit', \App\Livewire\Color\EditColor::class)->name('color.edit');
Route::get('color/{color}', \App\Livewire\Color\ShowColor::class)->name('color.show');
// Types // Types
Route::get('type', Type::class)->name('type.index'); Route::get('type', Type::class)->name('type.index');
Route::get('type/create', \App\Livewire\Type\CreateType::class)->name('type.create'); Route::get('type/create', \App\Livewire\Type\CreateType::class)->name('type.create');
@@ -39,6 +44,7 @@ Route::middleware([
Route::get('filaments/create', Filament::class)->name('filaments.create'); Route::get('filaments/create', Filament::class)->name('filaments.create');
Route::get('filaments/{filament}/edit', \App\Livewire\Filament\EditFilament::class)->name('filaments.edit'); Route::get('filaments/{filament}/edit', \App\Livewire\Filament\EditFilament::class)->name('filaments.edit');
Route::get('filaments/{filament}', \App\Livewire\Filament\ShowFilament::class)->name('filaments.show'); Route::get('filaments/{filament}', \App\Livewire\Filament\ShowFilament::class)->name('filaments.show');
// Manufacturers // Manufacturers
Route::get('manufacturer', Manufacturer::class)->name('manufacturer.index'); Route::get('manufacturer', Manufacturer::class)->name('manufacturer.index');