Skip to content

Commit bc9a9b4

Browse files
committed
admin panel restoration
1 parent 40372c4 commit bc9a9b4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+333
-415
lines changed

.env.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
APP_NAME=Genealogy
1+
APP_NAME="Liberu Genealogy"
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
@@ -11,7 +11,7 @@ LOG_LEVEL=debug
1111
DB_CONNECTION=mysql
1212
DB_HOST=127.0.0.1
1313
DB_PORT=3306
14-
DB_DATABASE=liberu
14+
DB_DATABASE=liberu_genealogy
1515
DB_USERNAME=root
1616
DB_PASSWORD=
1717

.env.testing

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
APP_NAME=Liberu
1+
APP_NAME="Liberu Genealogy"
22
APP_ENV=testing
33
APP_KEY=base64:GS0VwCqzgSVBnM0Wz/Ig610q86M+GIvyVmzQQvrL7Xw=
44
APP_DEBUG=true
@@ -12,7 +12,7 @@ LOG_CHANNEL=stack
1212
DB_CONNECTION=mysql
1313
DB_HOST=127.0.0.1
1414
DB_PORT=3306
15-
DB_DATABASE=liberu
15+
DB_DATABASE=liberu_genealogy_testing
1616
DB_USERNAME=root
1717
DB_PASSWORD=root
1818

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
image: mysql:8.0
1717
env:
1818
MYSQL_ROOT_PASSWORD: root
19-
MYSQL_DATABASE: liberu
19+
MYSQL_DATABASE: liberu_genealogy_testing
2020
ports:
2121
- 3306:3306
2222
options: >-

app/Filament/Admin/Pages/ManageGeneralSettings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace App\Filament\Admin\Pages;
44

55
use Filament\Schemas\Schema;
6-
use Filament\Forms\Components\Section;
6+
use Filament\Schemas\Components\Section;
77
use Filament\Forms\Components\TextInput;
88
use Filament\Forms\Components\Textarea;
99
use App\Settings\GeneralSettings;
@@ -25,6 +25,7 @@ class ManageGeneralSettings extends SettingsPage
2525
public function form(Schema $schema): Schema
2626
{
2727
return $schema
28+
->columns(1)
2829
->components([
2930
Section::make('Site Information')
3031
->schema([

app/Filament/Admin/Resources/SiteSettingsResource.php

Lines changed: 0 additions & 120 deletions
This file was deleted.

app/Filament/Admin/Resources/SiteSettingsResource/Pages/CreateSiteSettings.php

Lines changed: 0 additions & 11 deletions
This file was deleted.

app/Filament/Admin/Resources/SiteSettingsResource/Pages/EditSiteSettings.php

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/Filament/Admin/Resources/SiteSettingsResource/Pages/ListSiteSettings.php

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/Models/User.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ public function canAccessPanel(Panel $panel): bool
172172
}
173173

174174
return match ($panel->getId()) {
175-
'admin' => $this->hasRole('super_admin'),
176-
default => false,
175+
'admin' => $this->hasRole('admin'),
176+
default => true,
177177
};
178178
}
179179

app/Providers/Filament/AdminPanelProvider.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use App\Filament\Admin\Pages\EditTeam;
88
use App\Http\Middleware\TeamsPermission;
99
use App\Models\Team;
10+
use BezhanSalleh\FilamentShield\FilamentShieldPlugin;
11+
use Filament\Actions\Action;
1012
use Filament\Facades\Filament;
1113
use Filament\Http\Middleware\Authenticate;
1214
use Filament\Http\Middleware\DisableBladeIconComponents;
@@ -45,7 +47,7 @@ public function panel(Panel $panel): Panel
4547
'primary' => Color::Gray,
4648
])
4749
->userMenuItems([
48-
MenuItem::make()
50+
Action::make('profile')
4951
->label('Profile')
5052
->icon('heroicon-o-user-circle')
5153
->url(fn () => $this->shouldRegisterMenuItem()
@@ -76,7 +78,11 @@ public function panel(Panel $panel): Panel
7678
->authMiddleware([
7779
Authenticate::class,
7880
TeamsPermission::class,
79-
\App\Http\Middleware\EnsureUserHasAdminRole::class,
81+
// \App\Http\Middleware\EnsureUserHasAdminRole::class,
82+
])
83+
->plugins([
84+
FilamentShieldPlugin::make()
85+
->navigationGroup('Administration')
8086
]);
8187

8288
// if (Features::hasApiFeatures()) {
@@ -96,7 +102,7 @@ public function panel(Panel $panel): Panel
96102
->tenantRegistration(CreateTeam::class)
97103
->tenantProfile(EditTeam::class)
98104
->userMenuItems([
99-
MenuItem::make()
105+
Action::make('team-settings')
100106
->label('Team Settings')
101107
->icon('heroicon-o-cog-6-tooth')
102108
->url(fn () => $this->shouldRegisterMenuItem()

0 commit comments

Comments
 (0)