From 0cca45d8585009d9f1b1b428bfb279508cbabaec Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Mon, 17 Apr 2023 11:57:35 -0700
Subject: [PATCH] footer now uses flex

---
 app/Models/User.php                       | 37 +++++++++++++----------
 resources/views/layouts/default.blade.php |  8 ++---
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index c716da074b..f75a2be8ba 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,13 +73,18 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'  => 'integer',
         'company_id'   => 'integer',
         'vip'      => 'boolean',
-        'created_at'   => 'datetime',
-        'updated_at'   => 'datetime',
-        'deleted_at'   => 'datetime',
-        'start_date'   => 'datetime:Y-m-d',
-        'end_date'     => 'datetime:Y-m-d',
     ];
 
+
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at',
+        'start_date' => 'date_format:Y-m-d',
+        'end_date' => 'date_format:Y-m-d',
+    ];
+
+
     /**
      * Model validation rules
      *
@@ -117,7 +122,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * The relations and their attributes that should be included when searching the model.
-     * 
+     *
      * @var array
      */
     protected $searchableRelations = [
@@ -267,7 +272,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        $this->endpoint = \App\Models\Setting::getSettings()->webhook_endpoint;
+        $this->endpoint = \App\Models\Setting::getSettings()->slack_endpoint;
 
         return $this->endpoint;
     }
@@ -349,11 +354,11 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         $licensesCount = $this->licenses()->count();
         $accessoriesCount = $this->accessories()->count();
         $consumablesCount = $this->consumables()->count();
-        
+
         $totalCount = $assetsCount + $licensesCount + $accessoriesCount + $consumablesCount;
-    
+
         return (int) $totalCount;
-        }
+    }
 
     /**
      * Establishes the user -> actionlogs relationship
@@ -507,7 +512,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
 
     /**
      * Generate email from full name
-     * 
+     *
      * @author A. Gianotto <snipe@snipe.net>
      * @since [v2.0]
      *
@@ -555,7 +560,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                 $username = str_slug($first_name).str_slug($last_name);
             } elseif ($format == 'firstnamelastinitial') {
                 $username = str_slug(($first_name.substr($last_name, 0, 1)));
-              }
+            }
         }
 
         $user['first_name'] = $first_name;
@@ -652,9 +657,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      */
     public function scopeSimpleNameSearch($query, $search)
     {
-           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
-               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
+        $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
+            ->orWhere('last_name', 'LIKE', '%'.$search.'%')
+            ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
 
         return $query;
     }
@@ -765,4 +770,4 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     {
         return $this->locale;
     }
-}
+}
\ No newline at end of file
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 4cefedd720..7a7b82f449 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -850,13 +850,11 @@
                 </section>
 
             </div><!-- /.content-wrapper -->
-
-            @if($snipeSettings->footer_text!='')
-                <footer class="main-footer hidden-print" style="height:100px;">
+            @if ($snipeSettings->footer_text!='')
+                <footer class="main-footer hidden-print" style="display:flex;flex-direction:row;" >
             @else
                 <footer class="main-footer hidden-print">
             @endif
-
                 <div class="pull-right hidden-xs">
                     @if ($snipeSettings->version_footer!='off')
                         @if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
@@ -884,7 +882,7 @@
 
                 </div>
                 @if ($snipeSettings->footer_text!='')
-                    <div class="pull-right">
+                    <div class="pull-right" style="display: flex;flex-direction: row;">
                         {!!  Helper::parseEscapedMarkedown($snipeSettings->footer_text)  !!}
                     </div>
                 @endif