Fix settings view

Strimoid · Jun 20, 2020 · 53ba31b · 53ba31b
1 parent b988413
commit 53ba31b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -29,7 +29,7 @@ public function showSettings()
     public function saveSettings(Request $request)
     {
         $this->validate($request, [
-            'css_style' => 'url|safe_url|max:250',
+            'css_style' => 'nullable|url|safe_url|max:250',
             'contents_per_page' => 'integer|min:1|max:100',
             'entries_per_page' => 'integer|min:1|max:100',
             'timezone' => 'timezone',

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -222,7 +222,7 @@ public function saveProfile(Request $request)
         $this->validate($request, [
             'sex' => 'in:male,female,unknown',
             'avatar' => 'image|max:1024',
-            'age' => 'integer|min:1900|max:2010',
+            'age' => 'integer|min:1900|max:2020',
             'location' => 'max:32',
             'description' => 'max:250',
         ]);

diff --git a/app/Models/UserSetting.php b/app/Models/UserSetting.php
@@ -10,18 +10,13 @@ class UserSetting extends BaseModel
     public $incrementing = false;
 
     protected $table = 'user_settings';
-    protected $primaryKey = ['key', 'user_id'];
+    protected array $primaryKeys = ['key', 'user_id'];
 
     protected static $unguarded = true;
 
-    /**
-     * Set the keys for a save update query.
-     *
-     *
-     */
-    protected function setKeysForSaveQuery(Builder $query): \Illuminate\Database\Eloquent\Builder
+    protected function setKeysForSaveQuery(Builder $query): Builder
     {
-        foreach ($this->getKeyName() as $key) {
+        foreach ($this->primaryKeys as $key) {
             if (!$this->$key) {
                 throw new \Exception(__METHOD__ . 'Missing part of the primary key: ' . $key);
             }

diff --git a/resources/views/global/form/input.blade.php b/resources/views/global/form/input.blade.php
@@ -10,7 +10,7 @@
 
 ?>
 
-<div class="form-group @if ($errors->has($name)) has-error @endif">
+<div class="form-group row @if ($errors->has($name)) has-error @endif">
     <label for="{!! $name !!}" class="col-lg-3 control-label">{!! $label !!}</label>
 
     <div class="col-lg-6">

diff --git a/resources/views/user/settings.blade.php b/resources/views/user/settings.blade.php
@@ -69,43 +69,43 @@
     </ul>
 
     <div class="tab-content">
-        <div class="tab-pane fade in active" id="profile">
+        <div class="tab-pane active" id="profile">
             @include('user.settings.profile')
         </div>
 
-        <div class="tab-pane fade" id="password">
+        <div class="tab-pane" id="password">
             @include('user.settings.change_password')
         </div>
 
-        <div class="tab-pane fade" id="email">
+        <div class="tab-pane" id="email">
             @include('user.settings.change_email')
         </div>
 
-        <div class="tab-pane fade" id="settings">
+        <div class="tab-pane" id="settings">
             @include('user.settings.settings')
         </div>
 
-        <div class="tab-pane fade" id="subscribed">
+        <div class="tab-pane" id="subscribed">
             @include('user.settings.subscribed_groups')
         </div>
 
-        <div class="tab-pane fade" id="moderated">
+        <div class="tab-pane" id="moderated">
             @include('user.settings.moderated_groups')
         </div>
 
-        <div class="tab-pane fade" id="blocked">
+        <div class="tab-pane" id="blocked">
             @include('user.settings.blocked_groups')
         </div>
 
-        <div class="tab-pane fade" id="bans">
+        <div class="tab-pane" id="bans">
             @include('user.settings.bans')
         </div>
 
-        <div class="tab-pane fade" id="blockedusers">
+        <div class="tab-pane" id="blockedusers">
             @include('user.settings.blocked_users')
         </div>
 
-        <div class="tab-pane fade" id="domains">
+        <div class="tab-pane" id="domains">
             @include('user.settings.blocked_domains')
         </div>
     </div>

diff --git a/resources/views/user/settings/settings.blade.php b/resources/views/user/settings/settings.blade.php
@@ -1,6 +1,6 @@
 {!! Form::open(['action' => 'SettingsController@saveSettings', 'class' => 'form-horizontal', 'style' => 'margin-top: 20px']) !!}
 
-<div class="form-group">
+<div class="form-group row">
     <label class="col-lg-3 control-label">Opcje</label>
 
     <div class="col-lg-6">
@@ -17,7 +17,7 @@
     </div>
 </div>
 
-<div class="form-group">
+<div class="form-group row">
     <label class="col-lg-3 control-label">Powiadomienia</label>
 
     <div class="col-lg-6">
@@ -39,7 +39,7 @@
     </div>
 </div>
 
-<div class="form-group">
+<div class="form-group row">
     <label class="col-lg-3 control-label">Wygląd</label>
 
     <div class="col-lg-6">

diff --git a/src/Settings/settings.php b/src/Settings/settings.php
@@ -1,11 +1,11 @@
 <?php
 
-$timezones = function () {
-    return collect(\DateTimeZone::listIdentifiers())->map(function ($timezone) {
+$timezones = static function () {
+    return collect(\DateTimeZone::listIdentifiers())->mapWithKeys(function ($timezone) {
         $key = 'timezones.' . Str::lower($timezone);
 
         return [$timezone => trans($key)];
-    })->flatten(1);
+    });
 };
 
 Setting::add('enter_send', 'checkbox', [