2025-10-27 07:17:14 +01:00
26 changed files with 204 additions and 426 deletions
--- a/app/Filament/Pages/Reserve.php
+++ b/app/Filament/Pages/Reserve.php
@ -1,124 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use Filament\Pages\BasePage;
-use App\Filament\Widgets\StatsOverviewWidget;
-use App\Filament\Resources\ItemResource\Pages;
-use App\Filament\Resources\ItemResource\RelationManagers;
-use App\Models\Item;
-use App\Models\User;
-use App\Models\Category;
-use Filament\Forms;
-use Filament\Forms\Form;
-use Filament\Resources\Resource;
-use Filament\Tables;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Radio;
-use Filament\Tables\Enums\FiltersLayout;
-use Filament\Tables\Filters\Filter;
-use Filament\Tables\Filters\SelectFilter;
-use Filament\Actions\CreateAction;
-use App\Models\Reserveditem;
-use Filament\Forms\Components\TextInput;
-use Carbon\Carbon;
-use Filament\Support\Enums\IconPosition;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Infolists\Components\Section;
-use Filament\Tables\Contracts\HasTable;
-use Filament\Tables\Concerns\InteractsWithTable;
-
-class Reserve extends BasePage implements HasTable
-{
-    use InteractsWithTable;
-
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.reserve';
-
-    
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->query( Item::where('can_be_loaned', true)->where('type', "game"))
-            ->columns([
-                Tables\Columns\TextColumn::make('desc')
-                    ->label('Description')
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\ImageColumn::make('image')
-                    ->label('Image'),
-                Tables\Columns\TextColumn::make('players')
-                    ->label('Players')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('play_time')
-                    ->label('Play Time')
-                    ->sortable(),
-                Tables\Columns\TextColumn::make('age')
-                    ->label('Age')
-                    ->sortable(),
-                Tables\Columns\IconColumn::make('reserved')
-                    ->label('Available')
-                    ->falseIcon('heroicon-o-check-badge')
-                    ->trueIcon('heroicon-o-x-mark')
-                    ->falseColor('success')
-                    ->trueColor('danger')
-                    ->default(false),
-                    
-            ])
-            ->filters([
-                SelectFilter::make('category_id')
-                ->label('Category')
-                ->multiple()
-                ->options(Category::all()->where('type', 'game')->pluck('name', 'id')),
-                Filter::make('reserved')
-                ->label('Available')
-                ->query(fn (Builder $query): Builder => $query->where('reserved', false))
-                ->columnSpanFull()
-                ->toggle()
-            ],layout: FiltersLayout::AboveContent)
-            ->actions([
-                Tables\Actions\Action::make('More info')
-                ->modalSubmitAction(false)   
-                ->infolist([
-                    Section::make('Game')
-                    ->schema([
-                        TextEntry::make('desc'),
-                        TextEntry::make('acquisition_date'),
-                        TextEntry::make('category.name'),
-                        TextEntry::make('players'),
-                        TextEntry::make('play_time'),
-                        TextEntry::make('age'),
-                    ])
-                    ->columns(),
-                    ]),
-                Tables\Actions\Action::make('reserve')
-                ->label('Reserve')
-                ->button()
-                ->color('success')
-                ->form([
-                    Forms\Components\TextInput::make('username')
-                        ->label('Name')
-                        ->required(),
-                    Forms\Components\TextInput::make('email')
-                        ->label('Email')
-                        ->required(),
-                ])
-                ->action(function (array $data, Item $record): void {
-                    Reserveditem::create([
-                        'item_id' => $record->id,
-                        'reserved_date' => Carbon::now(),
-                        'username' => $data['username'],
-                        'email' => $data['email']
-                    ]);
-                    Item::where('id', $record->id)->update(['reserved' => true]);
-                })
-                ->hidden(fn ($record) => $record->reserved)
-            ])
-            ->bulkActions([
-            ]);
-    }
-}
--- a/app/Filament/Resources/ItemResource.php
+++ b/app/Filament/Resources/ItemResource.php
@ -6,7 +6,7 @@ use App\Filament\Resources\ItemResource\Pages;
 use App\Filament\Resources\ItemResource\RelationManagers;
 use App\Models\Item;
 use App\Models\User;
-use App\Models\Category;
+use App\Models\Type;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
@ -15,17 +15,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Radio;
-use Filament\Tables\Enums\FiltersLayout;
-use Filament\Tables\Filters\Filter;
-use Filament\Tables\Filters\SelectFilter;
-use Filament\Actions\CreateAction;
-use App\Models\Reserveditem;
-use Filament\Forms\Components\TextInput;
-use Carbon\Carbon;
-use Filament\Support\Enums\IconPosition;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Infolists\Components\Section;


 class ItemResource extends Resource
@ -34,21 +23,13 @@ class ItemResource extends Resource

    protected static ?string $navigationIcon = 'heroicon-o-archive-box';

-    protected static ?string $modelLabel = 'Inventory';
-
+    protected static ?string $modelLabel = 'Items';


    public static function form(Form $form): Form
    {
        return $form
            ->schema([
-                Radio::make('type')
-                ->options([
-                    'game' => 'Game',
-                    'item' => 'Item',
-                ])
-                ->default('game')
-                ->live(),
                Forms\Components\FileUpload::make('image')
                ->label('Image')
                ->minSize(25)
@ -67,32 +48,16 @@ class ItemResource extends Resource
                    ->numeric()
                    ->minValue(0)
                    ->maxValue(1000)
-                    ->default(0)
-                    ->hidden(fn ($get): string => $get('type') == 'game'),
-                Forms\Components\Select::make('category_id')
-                    ->label('Category')
-                    ->options(Category::all()->pluck('name', 'id')),
+                    ->default(0),
+                Forms\Components\Select::make('type_id')
+                    ->label('Type')
+                    ->options(Type::all()->pluck('name', 'id'))
+                    ->required(),
                Forms\Components\TextInput::make('cost')
                    ->label('Price')
                    ->default(null),
-                Forms\Components\TextInput::make('age')
-                    ->label('Age')
-                    ->maxLength(255)
-                    ->default(null)
-                    ->hidden(fn ($get): string => $get('type') == 'item'),
-                Forms\Components\TextInput::make('players')
-                    ->label('Players')
-                    ->maxLength(255)
-                    ->default(null)
-                    ->hidden(fn ($get): string => $get('type') == 'item'),
-                Forms\Components\TextInput::make('play_time')
-                    ->label('Play time')
-                    ->maxLength(255)
-                    ->default(null)
-                    ->hidden(fn ($get): string => $get('type') == 'item'),
                Forms\Components\Toggle::make('can_be_loaned')
-                    ->label('Can be loaned')
-                    ->hidden(fn ($get): string => $get('type') == 'game'),
+                    ->label('Can be loaned'),
            ]);
    }

@ -102,111 +67,42 @@ class ItemResource extends Resource
            ->columns([
                Tables\Columns\TextColumn::make('desc')
                    ->label('Description')
-                    ->sortable()
                    ->searchable(),
-                Tables\Columns\TextColumn::make('type')
-                    ->label('Type')
-                    ->searchable()
+                Tables\Columns\TextColumn::make('acquisition_date')
+                    ->label('Acquisition date')
+                    ->date()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('quantity')
+                    ->label('Quantity')
+                    ->numeric()
                    ->sortable(),
+                Tables\Columns\TextColumn::make('type.name')
+                    ->label('Type')
+                    ->numeric()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('cost')
+                    ->label('Price')
+                    ->toggleable(isToggledHiddenByDefault: true),
                Tables\Columns\ImageColumn::make('image')
                    ->label('Image'),
                Tables\Columns\IconColumn::make('can_be_loaned')
                    ->label('Can be loaned')
-                    ->sortable()
                    ->trueIcon('heroicon-o-check-badge')
                    ->falseIcon('heroicon-o-x-mark')
                    ->trueColor('success')
                    ->falseColor('danger'),
-                Tables\Columns\IconColumn::make('reserved')
-                    ->label('Available')
-                    ->falseIcon('heroicon-o-check-badge')
-                    ->trueIcon('heroicon-o-x-mark')
-                    ->falseColor('success')
-                    ->trueColor('danger')
-                    ->default(false),
+                //Tables\Columns\TextColumn::make('reserveditems.reserved')
+                //    ->label('Ska returneras'),
+                //Tables\Columns\TextColumn::make('reserveditems.name')
+                //    ->label('Utlånad till')
+                    
            ])
            ->filters([
-                SelectFilter::make('type')
-                ->multiple()
-                ->options([
-                    'game' => 'Game',
-                    'item' => 'Item',
-                ]),
-                SelectFilter::make('category_id')
-                ->label('Item Category')
-                ->multiple()
-                ->options(Category::all()->where('type', 'item')->pluck('name', 'id')),
-                SelectFilter::make('category_id')
-                ->label('Category')
-                ->multiple()
-                ->options(
-                    Category::all()->pluck('name', 'id'),
-                ),
-                Filter::make('reserved')
-                ->label('Available')
-                ->query(fn (Builder $query): Builder => $query->where('reserved', false))
-                ->columnSpanFull()
-                ->toggle(),
-                Filter::make('can_be_loaned')
-                ->label('Can be loaned')
-                ->query(fn (Builder $query): Builder => $query->where('can_be_loaned', true))
-                ->columnSpanFull()
-                ->toggle()
-            ],layout: FiltersLayout::AboveContent)
+                //
+            ])
            ->actions([
-                Tables\Actions\Action::make('More info')
-                ->modalSubmitAction(false)   
-                ->infolist([
-                    Section::make('Game')
-                    ->schema([
-                        TextEntry::make('desc'),
-                        TextEntry::make('acquisition_date'),
-                        TextEntry::make('category.name'),
-                        TextEntry::make('players'),
-                        TextEntry::make('play_time'),
-                        TextEntry::make('age'),
-                        TextEntry::make('cost'),
-                    ])
-                    ->columns()
-                    ->hidden(fn ($record) => $record->type === "item"),
-                    Section::make('Item')
-                    ->schema([
-                        TextEntry::make('desc'),
-                        TextEntry::make('acquisition_date'),
-                        TextEntry::make('category.name'),
-                        TextEntry::make('quantity'),
-                        TextEntry::make('cost'),
-                    ])
-                    ->columns()
-                    ->hidden(fn ($record) => $record->type === "game"),
-                    ]),
-               
                Tables\Actions\EditAction::make()
-                ->button()
-                ->icon('heroicon-m-pencil-square')
-                ->iconPosition(IconPosition::After),
-                Tables\Actions\Action::make('reserve')
-                ->label('Reserve')
-                ->button()
-                ->color('success')
-                ->form([
-                    Forms\Components\TextInput::make('username')
-                        ->label('Name')
-                        ->required(),
-                    Forms\Components\TextInput::make('email')
-                        ->label('Email')
-                        ->required(),
-                ])
-                ->action(function (array $data, Item $record): void {
-                    Reserveditem::create([
-                        'item_id' => $record->id,
-                        'reserved_date' => Carbon::now(),
-                        'username' => $data['username'],
-                        'email' => $data['email']
-                    ]);
-                    Item::where('id', $record->id)->update(['reserved' => true]);
-                })
-                ->hidden(fn ($record) => $record->reserved)
            ])
            ->bulkActions([
                Tables\Actions\BulkActionGroup::make([
--- a/app/Filament/Resources/ItemResource/Pages/CreateItem.php
+++ b/app/Filament/Resources/ItemResource/Pages/CreateItem.php
@ -5,7 +5,6 @@ namespace App\Filament\Resources\ItemResource\Pages;
 use App\Filament\Resources\ItemResource;
 use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Database\Eloquent\Model;

 class CreateItem extends CreateRecord
 {
@ -15,16 +14,4 @@ class CreateItem extends CreateRecord
    {
        return $this->getResource()::getUrl('index');
    }
-
-    protected function handleRecordCreation(array $data): Model
-    {
-         
-        if ($data['type'] == "game")
-         {
-             $data['can_be_loaned'] = true;
-         }
- 
-         
-        return static::getModel()::create($data);
-    }
 }
--- a/app/Filament/Resources/ItemResource/Pages/EditItem.php
+++ b/app/Filament/Resources/ItemResource/Pages/EditItem.php
@ -17,13 +17,10 @@ class EditItem extends EditRecord
        ];
    }

+
+
    protected function getRedirectUrl(): string
    {
        return $this->getResource()::getUrl('index');
    }
-
-    public function getHeading(): string
-    {
-        return 'Edit: ' . $this->getRecord()->desc;
-    }
 }
--- a/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php
+++ b/app/Filament/Resources/ItemResource/Widgets/ItemsOverview.php
@ -0,0 +1,41 @@
+<?php
+
+namespace App\Filament\Resources\ItemResource\Widgets;
+
+use Filament\Tables;
+use Filament\Tables\Table;
+use App\Models\Item;
+use Filament\Widgets\TableWidget as BaseWidget;
+use App\Models\Post;
+use Filament\Tables\Actions\Action;
+
+class ItemsOverview extends BaseWidget
+{
+
+    protected int | string | array $columnSpan = 'full';
+    public function table(Table $table): Table
+    {
+        return $table
+            ->query(
+                Item::where('can_be_loaned', true)
+            )
+            ->heading('Items for lending')
+            ->columns([
+                Tables\Columns\TextColumn::make('desc')
+                    ->label('Description')
+                    ->searchable(),
+                Tables\Columns\ImageColumn::make('image')
+                    ->label('Image'),
+                Tables\Columns\IconColumn::make('reserved')
+                    ->label('Available')
+                    ->falseIcon('heroicon-o-check-badge')
+                    ->trueIcon('heroicon-o-x-mark')
+                    ->falseColor('success')
+                    ->trueColor('danger')
+                    ->default(false),
+                Tables\Columns\TextColumn::make('reserveditem.return_date')
+                    ->label('Available again')
+                    ->searchable(),
+            ]);
+    }
+}
--- a/app/Filament/Resources/ReserveditemResource.php
+++ b/app/Filament/Resources/ReserveditemResource.php
@ -9,14 +9,11 @@ use App\Models\Item;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Resources\Get;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Radio;
-use Filament\Support\Enums\IconPosition;


 class ReserveditemResource extends Resource
@ -25,7 +22,7 @@ class ReserveditemResource extends Resource

    protected static ?string $navigationIcon = 'heroicon-o-archive-box-x-mark';

-    protected static ?string $modelLabel = 'Reservations';
+    protected static ?string $modelLabel = 'Reserved items';

    protected static ?string $title = 'Reserve an item';

@ -33,12 +30,21 @@ class ReserveditemResource extends Resource
    {
        return $form
            ->schema([
-                Forms\Components\TextInput::make('username')
-                   ->label('Name')
-                   ->default(null),
-                Forms\Components\TextInput::make('email')
-                   ->label('Email')
-                   ->default(null),
+                Forms\Components\Select::make('item_id')
+                ->label('Choose item to reserve')
+                   ->relationship(
+                       name: 'item', 
+                       titleAttribute: 'desc',
+                        modifyQueryUsing: fn ($query) =>  $query->where('can_be_loaned', true)->where('reserved', false)
+                   )
+                   ->required()
+                   ->disabledOn('edit') 
+                   ->hiddenOn('edit'),
+                //Forms\Components\TextInput::make('user_id')
+                //    ->label('Användare')
+                //    ->default(auth()->id())
+                //    ->disabledOn(['edit', 'create']) 
+                //    ->hiddenOn('edit'),
                Section::make('')
                ->schema([
                    Forms\Components\Toggle::make('delivered'),
@ -59,9 +65,6 @@ class ReserveditemResource extends Resource
                Tables\Columns\TextColumn::make('username')
                    ->label('User')
                    ->sortable(),
-                Tables\Columns\TextColumn::make('email')
-                    ->label('Email')
-                    ->sortable(),
                Tables\Columns\TextColumn::make('reserved_date')
                    ->label('Reservation date')
                    ->sortable(),
@ -79,15 +82,12 @@ class ReserveditemResource extends Resource
                //
            ])
            ->actions([
-                Tables\Actions\EditAction::make()
-                ->button()
-                ->icon('heroicon-m-pencil-square')
-                ->iconPosition(IconPosition::After),
+                Tables\Actions\EditAction::make(),
            ])
            ->bulkActions([
-            //    Tables\Actions\BulkActionGroup::make([
-            //        Tables\Actions\DeleteBulkAction::make(),
-            //    ]),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
            ]);
    }

@ -107,14 +107,13 @@ class ReserveditemResource extends Resource
        ];
    }

-
-
-public static function canCreate(): bool
+    public static function getWidgets(): array
 {
-        return false;
+    return [
+        ItemResource\Widgets\ItemsOverview::class,
+    ];
 }

-
 public static function canViewAny(): bool
    {
        return auth()->user()->is_admin==true;
--- a/app/Filament/Resources/ReserveditemResource/Pages/CreateReserveditem.php
+++ b/app/Filament/Resources/ReserveditemResource/Pages/CreateReserveditem.php
@ -18,11 +18,8 @@ class CreateReserveditem extends CreateRecord

   protected function handleRecordCreation(array $data): Model
   {
-        if(!$data['username']) {
        $data['user_id'] = auth()->id();
       $data['username'] = auth()->user()->name;
-            $data['email'] = auth()->user()->email;
-        }
       $data['reserved_date'] = Carbon::now();

       if ($data['delivered'])
@ -52,5 +49,10 @@ class CreateReserveditem extends CreateRecord
       return $this->getResource()::getUrl('index');
   }

-   
+   protected function getFooterWidgets(): array
+    {
+        return [
+            ItemResource\Widgets\ItemsOverview::class,
+        ];
+    }
 }
--- a/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php
+++ b/app/Filament/Resources/ReserveditemResource/Pages/EditReserveditem.php
@ -16,7 +16,7 @@ class EditReserveditem extends EditRecord
    protected function getHeaderActions(): array
    {
        return [
-            //Actions\DeleteAction::make(),
+            Actions\DeleteAction::make(),
        ];
    }

@ -51,9 +51,4 @@ class EditReserveditem extends EditRecord
   {
       return $this->getResource()::getUrl('index');
   }
-
-   public function getHeading(): string
-    {
-        return 'Edit: ' . Item::where('id', $this->getRecord()->item_id)->pluck('desc')->first();
-    }
 }
--- a/app/Filament/Resources/ReserveditemResourceUser.php
+++ b/app/Filament/Resources/ReserveditemResourceUser.php
@ -94,7 +94,12 @@ class ReserveditemResourceUser extends Resource
        ];
    }

-
+    public static function getWidgets(): array
+{
+    return [
+        ItemResource\Widgets\ItemsOverview::class,
+    ];
+}

 public static function canViewAny(): bool
 {
--- a/app/Filament/Resources/ReserveditemResourceUser/Pages/CreateReserveditemUser.php
+++ b/app/Filament/Resources/ReserveditemResourceUser/Pages/CreateReserveditemUser.php
@ -42,5 +42,10 @@ class CreateReserveditemUser extends CreateRecord
       Item::where('id', $record->item_id)->update(['reserved' => true]);
   }

-  
+   protected function getFooterWidgets(): array
+    {
+        return [
+            ItemResource\Widgets\ItemsOverview::class,
+        ];
+    }
 }
--- a/app/Filament/Resources/CategoryResource.php
+++ b/app/Filament/Resources/CategoryResource.php
@ -2,9 +2,9 @@

 namespace App\Filament\Resources;

-use App\Filament\Resources\CategoryResource\Pages;
-use App\Filament\Resources\CategoryResource\RelationManagers;
-use App\Models\Category;
+use App\Filament\Resources\TypeResource\Pages;
+use App\Filament\Resources\TypeResource\RelationManagers;
+use App\Models\Type;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
@ -13,15 +13,15 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;

-class CategoryResource extends Resource
+class TypeResource extends Resource
 {
-    protected static ?string $model = Category::class;
+    protected static ?string $model = Type::class;

    protected static ?string $navigationIcon = 'heroicon-o-bookmark';

-    protected static ?string $modelLabel = 'Categories';
+    protected static ?string $modelLabel = 'Item types';

-    protected static ?string $title = 'Categories';
+    protected static ?string $title = 'Item Types';

    public static function form(Form $form): Form
    {
@ -30,12 +30,6 @@ class CategoryResource extends Resource
                Forms\Components\TextInput::make('name')
                    ->required()
                    ->maxLength(255),
-                Forms\Components\Select::make('type')
-                ->required()
-                ->options([
-                    'game' => 'Game',
-                    'item' => 'Item',
-                ]),
            ]);
    }

@ -46,9 +40,6 @@ class CategoryResource extends Resource
                Tables\Columns\TextColumn::make('name')
                    ->label('Name')
                    ->searchable(),
-                    Tables\Columns\TextColumn::make('type')
-                    ->label('Type')
-                    ->searchable(),
            ])
            ->filters([
                //
@ -73,9 +64,9 @@ class CategoryResource extends Resource
    public static function getPages(): array
    {
        return [
-            'index' => Pages\ListCategories::route('/'),
-            'create' => Pages\CreateCategory::route('/create'),
-            'edit' => Pages\EditCategory::route('/{record}/edit'),
+            'index' => Pages\ListTypes::route('/'),
+            'create' => Pages\CreateType::route('/create'),
+            'edit' => Pages\EditType::route('/{record}/edit'),
        ];
    }

--- a/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
+++ b/app/Filament/Resources/CategoryResource/Pages/CreateCategory.php
@ -1,14 +1,14 @@
 <?php

-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace App\Filament\Resources\TypeResource\Pages;

-use App\Filament\Resources\CategoryResource;
+use App\Filament\Resources\TypeResource;
 use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;

-class CreateCategory extends CreateRecord
+class CreateType extends CreateRecord
 {
-    protected static string $resource = CategoryResource::class;
+    protected static string $resource = TypeResource::class;

    protected function getRedirectUrl(): string
    {
--- a/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
+++ b/app/Filament/Resources/CategoryResource/Pages/EditCategory.php
@ -1,14 +1,14 @@
 <?php

-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace App\Filament\Resources\TypeResource\Pages;

-use App\Filament\Resources\CategoryResource;
+use App\Filament\Resources\TypeResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;

-class EditCategory extends EditRecord
+class EditType extends EditRecord
 {
-    protected static string $resource = CategoryResource::class;
+    protected static string $resource = TypeResource::class;

    protected function getHeaderActions(): array
    {
--- a/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
+++ b/app/Filament/Resources/CategoryResource/Pages/ListCategories.php
@ -1,14 +1,14 @@
 <?php

-namespace App\Filament\Resources\CategoryResource\Pages;
+namespace App\Filament\Resources\TypeResource\Pages;

-use App\Filament\Resources\CategoryResource;
+use App\Filament\Resources\TypeResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;

-class ListCategories extends ListRecords
+class ListTypes extends ListRecords
 {
-    protected static string $resource = CategoryResource::class;
+    protected static string $resource = TypeResource::class;

    protected function getHeaderActions(): array
    {
--- a/app/Filament/Widgets/ReservedItemsOverview.php
+++ b/app/Filament/Widgets/ReservedItemsOverview.php
@ -0,0 +1,49 @@
+<?php
+
+namespace App\Filament\Widgets;
+
+use Filament\Tables;
+use Filament\Tables\Table;
+use Filament\Widgets\TableWidget as BaseWidget;
+use App\Models\Reserveditem;
+use App\Filament\Widgets\Filament;
+use Filament\Forms\Components\TextColumn;
+
+class ReserveditemsOverview extends BaseWidget
+{
+    protected int | string | array $columnSpan = 'full';
+    
+    public function table(Table $table): Table
+    {
+        return $table
+            ->query(
+                Reserveditem::where('user_id', auth()->id())->where('returned', false)
+            )
+            ->heading('Your reserved items')
+            ->columns([
+                Tables\Columns\TextColumn::make('item.desc')
+                    ->label('Description')
+                    ->searchable(),
+                Tables\Columns\ImageColumn::make('item.image')
+                    ->label('Image'),
+                Tables\Columns\TextColumn::make('reserved_date')
+                    ->label('Reserved date')
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('return_date')
+                    ->label('Return date')
+                    ->sortable(),
+                Tables\Columns\IconColumn::make('delivered')
+                    ->label('Delivered')
+                    ->trueIcon('heroicon-o-check-badge')
+                    ->falseIcon('heroicon-o-x-mark')
+                    ->trueColor('success')
+                    ->falseColor('danger'),
+                Tables\Columns\IconColumn::make('returned')
+                    ->label('Returned')
+                    ->trueIcon('heroicon-o-check-badge')
+                    ->falseIcon('heroicon-o-x-mark')
+                    ->trueColor('success')
+                    ->falseColor('danger'),
+            ]);
+    }
+}
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@ -2,7 +2,7 @@

 namespace App\Models;
 use App\Models\User;
-use App\Models\Category;
+use App\Models\Type;
 use App\Models\Reserveditem;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
@ -19,20 +19,16 @@ class Item extends Model
        'quantity',
        'cost',
        'can_be_loaned',
-        'category_id',
-        'players',
-        'play_time',
-        'age',
-        'type'
+        'type_id'
    ];


    /**
     * Get the type of the item
     */
-    public function category(): BelongsTo
+    public function type(): BelongsTo
    {
-        return $this->belongsTo(Category::class);
+        return $this->belongsTo(Type::class);
    }

    public function reserveditem()
--- a/app/Models/Reserveditem.php
+++ b/app/Models/Reserveditem.php
@ -21,8 +21,7 @@ class Reserveditem extends Model
        'delivered',
        'returned',
        'user_id',
-        'item_id',
-        'email'
+        'item_id'
    ];


--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@ -1,16 +1,15 @@
 <?php

 namespace App\Models;
-use App\Models\Category;
+use App\Models\Item;
 use Illuminate\Database\Eloquent\Relations\HasMany;

 use Illuminate\Database\Eloquent\Model;

-class Category extends Model
+class Type extends Model
 {
    protected $fillable = [
-        'name',
-        'type'
+        'name'
    ];

   /**
--- a/database/migrations/2025_01_15_160621_create_items_table.php
+++ b/database/migrations/2025_01_15_160621_create_items_table.php
@ -16,7 +16,7 @@ return new class extends Migration
            $table->string('desc')->nullable();
            $table->date('acquisition_date')->nullable();
            $table->string('image')->nullable();
-            $table->integer('category_id')->nullable();
+            $table->integer('type_id')->nullable();
            $table->integer('quantity')->nullable();
            $table->string('cost')->nullable();
            $table->boolean('can_be_loaned')->default(false);
--- a/database/migrations/2025_01_15_182450_create_categories_table.php
+++ b/database/migrations/2025_01_15_182450_create_categories_table.php
@ -11,10 +11,9 @@ return new class extends Migration
     */
    public function up(): void
    {
-        Schema::create('categories', function (Blueprint $table) {
+        Schema::create('types', function (Blueprint $table) {
            $table->bigIncrements('id');
            $table->string('name')->required();
-            $table->string('type')->required();
            $table->timestamps();
        });
    }
@ -24,6 +23,6 @@ return new class extends Migration
     */
    public function down(): void
    {
-        Schema::dropIfExists('categories');
+        Schema::dropIfExists('types');
    }
 };
--- a/database/migrations/2025_01_16_061731_reserveditems_table.php
+++ b/database/migrations/2025_01_16_061731_reserveditems_table.php
@ -18,7 +18,6 @@ return new class extends Migration
            $table->foreignId('item_id')->constrained('items')->cascadeOnDelete();
            $table->integer('user_id')->nullable();
            $table->string('username')->nullable();
-            $table->string('email')->nullable();
            $table->timestamp('reserved_date')->nullable();
            $table->timestamp('delivered_date')->nullable();
            $table->timestamp('return_date')->nullable();
--- a/database/migrations/2025_02_24_120234_add_to_items_table.php
+++ b/database/migrations/2025_02_24_120234_add_to_items_table.php
@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('items', function (Blueprint $table) {
-            $table->string('players')->nullable();
-            $table->string('age')->nullable();
-            $table->string('play_time')->nullable();
-            $table->string('type')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('items', function (Blueprint $table) {
-            $table->dropColumn('players');
-            $table->dropColumn('age');
-            $table->dropColumn('play_time');
-            $table->dropColumn('type');
-        });
-    }
-};
--- a/public/img/logo.png
+++ b/public/img/logo.png
--- a/resources/css/app.css
+++ b/resources/css/app.css
@ -1,8 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
-
-
-#reserve-form-container {
-    max-width: 1400px !important;
-}
--- a/resources/views/filament/pages/reserve.blade.php
+++ b/resources/views/filament/pages/reserve.blade.php
@ -1,15 +0,0 @@
-
-
-<div id="reserve-form-container">
- <nav class="py-2 flex h-16 items-center align-items gap-x-4 bg-white px-4 shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 md:px-6 lg:px-8">
-    <img class=" w-auto h-full" src="/img/logo.png" alt="logo">
-    <h1 class="fi-logo flex text-xl font-bold leading-5 tracking-tight text-gray-950 dark:text-white">vBytes</h1>
- </nav>
- <div class="py-12 mx-auto h-full w-full px-4 md:px-6 lg:px-8 max-w-7xl">
-    <h1 class="fi-header-heading text-2xl font-bold tracking-tight text-gray-950 dark:text-white sm:text-3xl">Game booking</h1>
-    <p class="py-4">Welcome! Here you can make a reservation for a game.</p>
- </div>
-    <div class="mx-auto h-full w-full px-4 md:px-6 lg:px-8 max-w-7xl">
-        {{ $this->table }}
-    </div>
-</div>
--- a/routes/web.php
+++ b/routes/web.php
@ -4,7 +4,6 @@ use App\Http\Controllers\ProfileController;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
-use App\Filament\Pages\Reserve;

 //Route::get('/', function () {
 //    return Inertia::render('Welcome', [
@ -25,6 +24,4 @@ use App\Filament\Pages\Reserve;
 //    Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
 //});

-Route::get('reserve', Reserve::class);
-
 require __DIR__.'/auth.php';