Merge pull request #189 from Sellist-lk/site-settings-refectoring

Site settings refectoring

Author: curtisdelicata

.env.example

@@ -1,5 +1,5 @@
 APP_NAME=Liberu
-APP_ENV=testing
+APP_ENV=local
 APP_KEY=base64:GS0VwCqzgSVBnM0Wz/Ig610q86M+GIvyVmzQQvrL7Xw=
 APP_DEBUG=true
 APP_URL=http://localhost
@@ -21,6 +21,9 @@ CACHE_DRIVER=file
 FILESYSTEM_DISK=local
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
+SESSION_DRIVER=cookie
+SESSION_DOMAIN=null
+SESSION_SECURE_COOKIE=false
 
 CACHE_LIFETIME=60
 

app/Helpers/SiteSettingsHelper.php

@@ -12,6 +12,7 @@
         "bezhansalleh/filament-shield": "^3.2",
         "filament/filament": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
+        "intelrx/sitesettings": "^1.0",
         "joelbutcher/socialstream": "^6.0",
         "laravel/framework": "^11.0",
         "laravel/jetstream": "^5.1",

app/Models/SiteSettings.php

@@ -175,6 +175,8 @@
         App\Providers\TeamServiceProvider::class,
         App\Providers\JetstreamServiceProvider::class,
         App\Providers\FortifyServiceProvider::class,
+
+        Intelrx\Sitesettings\SitesettingsProvider::class,
     ])->toArray(),
 
     /*
@@ -190,6 +192,7 @@
 
     'aliases' => Facade::defaultAliases()->merge([
         // 'Example' => App\Facades\Example::class,
+        'SiteConfig' => Intelrx\Sitesettings\SiteConfig::class,
     ])->toArray(),
 
 ];

composer.json

@@ -3,19 +3,31 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
-use App\Models\SiteSettings;
+use Intelrx\Sitesettings\SiteConfig;
 
 class SiteSettingsSeeder extends Seeder
 {
     public function run()
     {
-        SiteSettings::create([
-            'name' => config('app.name', 'Liberu Real Estate'),
+        $data = [
+            'name' => config('app.name', 'Liberu '),
             'currency' => '£',
             'default_language' => 'en',
-            'address' => '123 Real Estate St, London, UK',
+            'address' => '123  St, London, UK',
             'country' => 'United Kingdom',
             'email' => 'info@liberurealestate.com',
-        ]);
+            'phone_01' => '+44 123 456 7890',
+            'phone_02' => '+44 123 456 7890',
+            'phone_03' => '+44 123 456 7890',
+            'phone_04' => '+44 123 456 7890',
+            'facebook' => 'https://facebook.com/liberusoftware',
+            'twitter' => 'https://twitter.com/liberusoftware',
+            'github' => 'https://Github.com/liberusoftware',
+            'youtube' => 'https://YouTube.com/@liberusoftware',
+        ];
+
+        foreach ($data as $key => $value) {
+            SiteConfig::store($key, $value);
+        }
     }
 }

composer.lock

@@ -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">
-                        {{ \App\Helpers\SiteSettingsHelper::get()->name }}
+                        {{ SiteConfig::get('name') }}
                     </span>
                 </a>
 
@@ -15,21 +15,21 @@
                 <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 : {{ \App\Helpers\SiteSettingsHelper::get()->address }}</span> <br>
-                    <span class="text-xs text-gray-600">UK Non-geographic: {{ \App\Helpers\SiteSettingsHelper::get()->phone_01 }}</span>  <br>
-                    <span class="text-xs text-gray-600">UK London: {{ \App\Helpers\SiteSettingsHelper::get()->phone_02 }}</span>  <br>
-                    <span class="text-xs text-gray-600">UK Mobile: {{ \App\Helpers\SiteSettingsHelper::get()->phone_03 }}</span>  <br>
+                    <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>
                 </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">{{ \App\Helpers\SiteSettingsHelper::get()->name }}</a>. All Rights
+                    class="hover:underline">{{ SiteConfig::get('name') }}</a>. All Rights
                 Reserved.
             </span>
             <div class="flex mt-4 space-x-6 sm:justify-center sm:mt-0">
-                <a href="{{ \App\Helpers\SiteSettingsHelper::get('facebook') }}"
+                <a href="{{ SiteConfig::get('facebook') }}"
                     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 +38,22 @@ class="text-gray-500 hover:text-gray-900 dark:hover:text-white">
                     </svg>
                 </a>
 
-                <a href="{{ \App\Helpers\SiteSettingsHelper::get('twitter') }}"
+                <a href="{{ SiteConfig::get('twitter') }}"
                     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="{{ \App\Helpers\SiteSettingsHelper::get('github') }}"
+                <a href="{{ SiteConfig::get('github') }}"
                     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="{{ \App\Helpers\SiteSettingsHelper::get('youtube') }}"
+                <a href="{{ SiteConfig::get('youtube') }}"
                     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">

config/app.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">
-                {{ \App\Helpers\SiteSettingsHelper::get()->name }}
+                {{ SiteConfig::get('name') }}
             </span>
         </a>