Merge branch 'master' into enhancement/finish-events

Author: lieselwd

app/Http/Controllers/AtcTraining/ApplicationsController.php

@@ -75,17 +75,17 @@ public function submitApplication(Request $request)
     {
         $messages = [
             'applicant_statement.required' => 'You need to write why you wish to control at Gander.',
-            'refereeName.required' => 'Please provide a name for your referee.',
+           /*  'refereeName.required' => 'Please provide a name for your referee.',
             'refereeEmail.required' => 'Please provide an email for your referee.',
-            'refereePosition.required' => 'Please provide your referee\'s email.'
+            'refereePosition.required' => 'Please provide your referee\'s email.' */
         ];
 
         //Validate form
         $validator = Validator::make($request->all(), [
             'applicant_statement' => 'required',
-            'refereeName' => 'required',
+         /*    'refereeName' => 'required',
             'refereeEmail' => 'required|email',
-            'refereePosition' => 'required'
+            'refereePosition' => 'required' */
         ], $messages);
 
         if ($validator->fails()) {

app/Http/Controllers/Auth/LoginController.php

@@ -191,6 +191,7 @@ public function validateConnectLogin(Request $request)
         if (!UserPreferences::where('user_id', $user->id)->first()) {
             $prefs = new UserPreferences();
             $prefs->user_id = $user->id;
+            $prefs->ui_mode = "light";
             $prefs->save();
         }
         return redirect('/dashboard')->with('success', 'Logged in!');

app/Http/Controllers/Users/UserController.php

@@ -26,6 +26,7 @@
 use mofodojodino\ProfanityFilter\Check;
 use RestCord\Interfaces\AuditLog;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Laravel\Socialite\Facades\Socialite;
 use NotificationChannels\Discord\Discord;
 
@@ -495,8 +496,36 @@ public function unlinkDiscord()
     }
 
     public function preferences()
-{
+    {
         $preferences = Auth::user()->preferences;
         return view('dashboard.me.preferences', compact('preferences'));
     }
+
+    public function preferencesPost(Request $request)
+    {
+        //Define validator messages
+        $messages = [
+            'ui_mode.required' => 'Please select a UI mode.'
+        ];
+
+        //Validate
+        $validator = Validator::make($request->all(), [
+            'ui_mode' => 'required',
+        ], $messages);
+
+        //Redirect if fails
+        if ($validator->fails()) {
+            return redirect()->back()->withInput()->withErrors($validator, 'savePreferencesErrors');
+        }
+
+        //Save preferences
+        $preferences = Auth::user()->preferences;
+
+        //UI mode
+        $preferences->ui_mode = $request->get('ui_mode');
+
+        //Save and redirect
+        $preferences->save();
+        return redirect()->back()->withInput()->with('success', 'Preferences saved!');
+    }
 }

app/Models/Users/UserPreferences.php

@@ -6,5 +6,14 @@
 
 class UserPreferences extends Model
 {
-    //
+    protected $hidden = ['id'];
+
+    protected $fillable = [
+        'enable_beta_components', 'ui_mode', 'enable_discord_notifications'
+    ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
 }

public/css/czqomd.css

@@ -19,14 +19,14 @@ body[data-theme="dark"] {
 }
 
 body[data-theme="dark"] .card,
-body[data-theme="dark"].list-group-item {
+body[data-theme="dark"] .list-group-item {
     background-color: rgb(59, 61, 68) !important;
 }
 
 body[data-theme="dark"] .list-group-item,
-body[data-theme="dark"]span.black-text,
-body[data-theme="dark"].text-dark,
-body[data-theme="dark"].text-muted {
+body[data-theme="dark"] span.black-text,
+body[data-theme="dark"] .text-dark,
+body[data-theme="dark"] .text-muted {
     color: #eee !important;
 }
 
@@ -52,6 +52,15 @@ body[data-theme="dark"] #czqoHeaderLight {
     background: rgb(47, 49, 54) !important;
 }
 
+
+body[data-theme="dark"] .modal-content {
+    background:  rgb(59, 61, 68) !important;
+}
+
+body[data-theme="dark"] .modal-content .close {
+    color: #eee !important;
+}
+
 #czqoHeaderImg {
     width: 225px;
     margin-bottom: 4px;
@@ -200,6 +209,19 @@ div.d-flex.flex-row > i {
     border-radius: .45em !important;
 }
 
+body[data-theme="dark"] .custom-file-label, body[data-theme="dark"] .custom-file-label::after {
+    color: #eee !important;
+}
+
+body[data-theme="dark"] .form-control {
+    color: #eee !important;
+}
+
+body[data-theme="dark"]  ::placeholder {
+    color: rgb(184, 184, 184) !important;
+    opacity: 1;
+  }
+
 .custom-file-input:lang(en) ~ .custom-file-label::after {
     border-left: 1px solid #E0E0DC;
 }
@@ -255,3 +277,19 @@ div.d-flex.flex-row > i {
     font-weight: 600;
 }
 
+
+.jarallax {
+    position: relative;
+    z-index: 0;
+}
+.jarallax > .jarallax-img {
+    position: absolute;
+    object-fit: cover;
+    /* support for plugin https://github.com/bfred-it/object-fit-images */
+    font-family: 'object-fit: cover;';
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+}