settings and roles

JoshKisb · JoshKisb · commit 1f2d49e4eb65 · 2025-12-04T14:58:09.000+03:00
diff --git a/app/Filament/Admin/Pages/ManageGeneralSettings.php b/app/Filament/Admin/Pages/ManageGeneralSettings.php
@@ -25,6 +25,7 @@ class ManageGeneralSettings extends SettingsPage
     public function form(Schema $schema): Schema
     {
         return $schema
+            ->columns(1)
             ->components([
                 Section::make('Site Information')
                     ->schema([
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
@@ -70,6 +70,9 @@ public function panel(Panel $panel): Panel
             ->authMiddleware([
                 Authenticate::class,
                 TeamsPermission::class,
+            ])
+            ->plugins([
+                \BezhanSalleh\FilamentShield\FilamentShieldPlugin::make()
             ]);
 
         // if (Features::hasApiFeatures()) {
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
@@ -82,9 +82,6 @@ public function panel(Panel $panel): Panel
             ->authMiddleware([
                 Authenticate::class,
                 TeamsPermission::class,
-            ])
-            ->plugins([
-                // \BezhanSalleh\FilamentShield\FilamentShieldPlugin::make()
             ]);
 
         // if (Features::hasApiFeatures()) {
diff --git a/app/Settings/GeneralSettings.php b/app/Settings/GeneralSettings.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Settings;
+
+use Spatie\LaravelSettings\Settings;
+
+class GeneralSettings extends Settings
+{
+
+    public string $site_name;
+    public string $site_email;
+    public ?string $site_phone;
+    public ?string $site_address;
+    public ?string $site_country;
+    public string $site_currency;
+    public string $site_default_language;
+    public ?string $facebook_url;
+    public ?string $twitter_url;
+    public ?string $github_url;
+    public ?string $youtube_url;
+    public string $footer_copyright;
+
+    public static function group(): string
+    {
+        return 'general';
+    }
+}
diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php
@@ -5,7 +5,7 @@
                 <a href="#" class="flex items-center">
                     <x-logo/>
                     <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">
-                        {{ SiteConfig::get('name') }}
+                        {{ app(\App\Settings\GeneralSettings::class)->site_name }}
                     </span>
                 </a>
                
@@ -15,21 +15,20 @@
                 <div></div>
                 <div>
                     <h2 class="mb-6 text-sm font-semibold text-gray-900 uppercase dark:text-white">Contact Details</h2>
-                    <span class="text-xs text-gray-600">Address : {{ SiteConfig::get('address') }}</span> <br>
-                    <span class="text-xs text-gray-600">UK Non-geographic: {{ SiteConfig::get('phone_01') }}</span>  <br>
-                    <span class="text-xs text-gray-600">UK London: {{ SiteConfig::get('phone_02') }}</span>  <br>
-                    <span class="text-xs text-gray-600">UK Mobile: {{ SiteConfig::get('phone_03') }}</span>  <br>
+                    <span class="text-xs text-gray-600">Address : {{ app(\App\Settings\GeneralSettings::class)->site_address }}</span> <br>
+                    <span class="text-xs text-gray-600">UK Non-geographic: {{ app(\App\Settings\GeneralSettings::class)->site_phone }}</span>  <br>
+                    <span class="text-xs text-gray-600">UK London: </span>  <br>
+                    <span class="text-xs text-gray-600">UK Mobile: </span>  <br>
                 </div>
             </div>
         </div>
         <hr class="my-6 border-gray-200 sm:mx-auto dark:border-gray-700 lg:my-8" />
         <div class="sm:flex sm:items-center sm:justify-between">
-            <span class="text-sm text-gray-500 sm:text-center dark:text-gray-400" title="{{config('app.version')}}">© {{now()->year}} <a href="#"
-                    class="hover:underline">{{ SiteConfig::get('name') }}</a>. All Rights
-                Reserved.
+            <span class="text-sm text-gray-500 sm:text-center dark:text-gray-400" title="{{config('app.version')}}">
+                {{ app(\App\Settings\GeneralSettings::class)->footer_copyright }}
             </span>
             <div class="flex mt-4 space-x-6 sm:justify-center sm:mt-0">
-                <a href="{{ SiteConfig::get('facebook') }}"
+                <a href="{{ app(\App\Settings\GeneralSettings::class)->facebook_url }}"
                     class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
                         <path fill-rule="evenodd"
@@ -38,22 +37,22 @@ class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     </svg>
                 </a>
 
-                <a href="{{ SiteConfig::get('twitter') }}"
+                <a href="{{ app(\App\Settings\GeneralSettings::class)->twitter_url }}"
                     class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
                         <path
                             d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
                     </svg>
                 </a>
-                <a href="{{ SiteConfig::get('github') }}"
+                <a href="{{ app(\App\Settings\GeneralSettings::class)->github_url }}"
                     class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
                         <path fill-rule="evenodd"
                             d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
                             clip-rule="evenodd" />
                     </svg>
                 </a>
-                <a href="{{ SiteConfig::get('youtube') }}"
+                <a href="{{ app(\App\Settings\GeneralSettings::class)->youtube_url }}"
                     class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24"
                         height="24" fill="currentColor" viewBox="0 0 24 24">
diff --git a/resources/views/components/home-navbar.blade.php b/resources/views/components/home-navbar.blade.php
@@ -15,7 +15,7 @@
         <a href="/" class="flex items-center space-x-3 rtl:space-x-reverse">
             <x-logo/>
             <span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">
-                {{ SiteConfig::get('name') }}
+                {{ app(\App\Settings\GeneralSettings::class)->site_name }}
             </span>
         </a>
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ SiteConfig::get('name') }}</title>
+    <title>{{ app(\App\Settings\GeneralSettings::class)->site_name }}</title>
 
     @if(config('googletagmanager.id'))
         @include('googletagmanager::head')
diff --git a/setup.sh b/setup.sh
@@ -72,13 +72,7 @@ echo "🎬 DEV ---> php artisan db:seed"
 if ! php artisan db:seed; then
     echo "Database seeding failed."
     exit 1
-fi
-php artisan db:seed
-if ! php artisan db:seed; then
-    echo "Database seeding failed."
-    exit 1
-fi
-php artisan db:seed
+fi 
 echo ""
 
   echo "🎬 DEV ---> Running PHPUnit tests"

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ class ManageGeneralSettings extends SettingsPage`
`25`	`25`	`public function form(Schema $schema): Schema`
`26`	`26`	`{`
`27`	`27`	`return $schema`
	`28`	`+ ->columns(1)`
`28`	`29`	`->components([`
`29`	`30`	`Section::make('Site Information')`
`30`	`31`	`->schema([`