Merge branch 'master' into master

CHANGELOG

@@ -1,6 +1,6 @@
 UNRELEASED CHANGES:
 
-*
+* fix settings' sidebar links and change security icon
 
 RELEASED VERSIONS:
 

app/Http/Controllers/Contacts/TasksController.php

@@ -83,7 +83,5 @@ public function toggle(TaskToggleRequest $request, Contact $contact, Task $task)
     public function destroy(Contact $contact, Task $task)
     {
         $task->delete();
-
-        $contact->events()->forObject($task)->get()->each->delete();
     }
 }

database/migrations/2018_08_31_020908_create_life_events_table.php

@@ -354,7 +354,7 @@ public function up()
             'updated_at' => now(),
         ]);
         DB::table('default_life_event_types')->insert([
-            'translation_key' => 'tatoo_or_piercing',
+            'translation_key' => 'tattoo_or_piercing',
             'default_life_event_category_id' => $defaultCategoryId,
             'created_at' => now(),
             'updated_at' => now(),

database/migrations/2018_10_19_081816_life_event_tattoo.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Migrations\Migration;
+
+class LifeEventTattoo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('default_life_event_types')
+            ->where('translation_key', 'tatoo_or_piercing')
+            ->update([
+                'translation_key' => 'tattoo_or_piercing',
+            ]);
+
+        DB::table('life_event_types')
+            ->where('default_life_event_type_key', 'tatoo_or_piercing')
+            ->update([
+                'default_life_event_type_key' => 'tattoo_or_piercing',
+                'name' => trans('settings.personalization_life_event_type_tattoo_or_piercinge', [], 'en'),
+            ]);
+    }
+}

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=464ed60abd73a777832e",
+    "/js/app.js": "/js/app.js?id=06cf7d3943c971315cac",
     "/css/app-ltr.css": "/css/app-ltr.css?id=aeed1bc1277811d4283c",
     "/css/app-rtl.css": "/css/app-rtl.css?id=ebbe907f4e5cf0c8bd1a",
     "/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",

resources/lang/en/people.php

@@ -421,7 +421,7 @@
     'life_event_sentence_new_hobby' => 'Started a hobby',
     'life_event_sentence_new_instrument' => 'Learned a new instrument',
     'life_event_sentence_new_language' => 'Learned a new language',
-    'life_event_sentence_tatoo_or_piercing' => 'Got a tatoo or piercing',
+    'life_event_sentence_tattoo_or_piercing' => 'Got a tattoo or piercing',
     'life_event_sentence_new_license' => 'Got a license',
     'life_event_sentence_travel' => 'Traveled',
     'life_event_sentence_achievement_or_award' => 'Got an achievement or award',

resources/lang/en/settings.php

@@ -382,7 +382,7 @@
     'personalization_life_event_type_new_hobby' => 'New hobby',
     'personalization_life_event_type_new_instrument' => 'New instrument',
     'personalization_life_event_type_new_language' => 'New language',
-    'personalization_life_event_type_tatoo_or_piercing' => 'Tatoo or piercing',
+    'personalization_life_event_type_tattoo_or_piercing' => 'Tattoo or piercing',
     'personalization_life_event_type_new_license' => 'New license',
     'personalization_life_event_type_travel' => 'Travel',
     'personalization_life_event_type_achievement_or_award' => 'Achievement or award',

resources/views/components/sidebar.blade.php

@@ -0,0 +1,11 @@
+@if (Route::currentRouteName() == $route)
+  <li class="selected">
+    <i class="{{ $icon }}" aria-hidden="true"></i>
+    <strong>{{ trans($title) }}</strong>
+  </li>
+@else
+  <li class="bg-white">
+    <i class="{{ $icon }}" aria-hidden="true"></i>
+    <a href="{{ route($route) }}">{{ trans($title) }}</a>
+  </li>
+@endif

resources/views/settings/_sidebar.blade.php

@@ -1,114 +1,61 @@
 <div class="col-xs-12 col-sm-3 sidebar-menu">
   <ul class="mb4">
 
-    @if (Route::currentRouteName() == 'settings.index')
-    <li class="selected">
-      <i class="fa fa-cog" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_settings') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-cog" aria-hidden="true"></i>
-      <a href="{{ route('settings.index') }}">{{ trans('settings.sidebar_settings') }}</a>
-    </li>
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.personalization')
-    <li class="selected">
-      <i class="fa fa-handshake-o" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_personalization') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-handshake-o" aria-hidden="true"></i>
-      <a href="{{ route('settings.personalization.index') }}">{{ trans('settings.sidebar_personalization') }}</a>
-    </li>
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.export')
-    <li class="selected">
-      <i class="fa fa-cloud-download" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_settings_export') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-cloud-download" aria-hidden="true"></i>
-      <a href="{{ route('settings.export') }}">{{ trans('settings.sidebar_settings_export') }}</a>
-    </li>
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.import')
-    <li class="selected">
-      <i class="fa fa-cloud-upload" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_settings_import') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-cloud-upload" aria-hidden="true"></i>
-      <a href="{{ route('settings.import') }}">{{ trans('settings.sidebar_settings_import') }}</a>
-    </li>
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.users.index')
-    <li class="selected">
-      <i class="fa fa-user-circle-o" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_settings_users') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-user-circle-o" aria-hidden="true"></i>
-      <a href="{{ route('settings.users.index') }}">{{ trans('settings.sidebar_settings_users') }}</a>
-    </li>
-    @endif
+    @component('components.sidebar', [
+      'route' => 'settings.index',
+      'icon' => 'fa fa-cog',
+      'title' => 'settings.sidebar_settings'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.personalization.index',
+      'icon' => 'fa fa-handshake-o',
+      'title' => 'settings.sidebar_personalization'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.export',
+      'icon' => 'fa fa-cloud-download',
+      'title' => 'settings.sidebar_settings_export'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.import',
+      'icon' => 'fa fa-cloud-upload',
+      'title' => 'settings.sidebar_settings_import'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.users.index',
+      'icon' => 'fa fa-user-circle-o',
+      'title' => 'settings.sidebar_settings_users'])
+    @endcomponent
 
     @if (config('monica.requires_subscription') && ! auth()->user()->account->has_access_to_paid_version_for_free)
-      @if (Route::currentRouteName() == 'settings.subscriptions.index')
-      <li class="selected">
-        <i class="fa fa-money" aria-hidden="true"></i>
-        <strong>{{ trans('settings.sidebar_settings_subscriptions') }}</strong>
-      </li>
-      @else
-      <li class="bg-white">
-        <i class="fa fa-money" aria-hidden="true"></i>
-        <a href="{{ route('settings.subscriptions.index') }}">{{ trans('settings.sidebar_settings_subscriptions') }}</a>
-      </li>
-      @endif
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.tags')
-    <li class="selected">
-      <i class="fa fa-tags" aria-hidden="true"></i>
-      <strong>{{ trans('settings.sidebar_settings_tags') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-tags" aria-hidden="true"></i>
-      <a href="{{ route('settings.tags.index') }}">{{ trans('settings.sidebar_settings_tags') }}</a>
-    </li>
-    @endif
+      @component('components.sidebar', [
+        'route' => 'settings.subscriptions.index',
+        'icon' => 'fa fa-money',
+        'title' => 'settings.sidebar_settings_subscriptions'])
+      @endcomponent
+    @endif
+
+    @component('components.sidebar', [
+      'route' => 'settings.tags.index',
+      'icon' => 'fa fa-tags',
+      'title' => 'settings.sidebar_settings_tags'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.api',
+      'icon' => 'fa fa-random',
+      'title' => 'settings.sidebar_settings_api'])
+    @endcomponent
+
+    @component('components.sidebar', [
+      'route' => 'settings.security.index',
+      'icon' => 'fa fa-shield',
+      'title' => 'settings.sidebar_settings_security'])
+    @endcomponent
 
-    @if (Route::currentRouteName() == 'settings.api')
-    <li class="selected">
-      <i class="fa fa-random"></i>
-      <strong>{{ trans('settings.sidebar_settings_api') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-random"></i>
-      <a href="{{ route('settings.api') }}">{{ trans('settings.sidebar_settings_api') }}</a>
-    </li>
-    @endif
-
-    @if (Route::currentRouteName() == 'settings.security')
-    <li class="selected">
-      <i class="fa fa-cog"></i>
-      <strong>{{ trans('settings.sidebar_settings_security') }}</strong>
-    </li>
-    @else
-    <li class="bg-white">
-      <i class="fa fa-cog"></i>
-      <a href="{{ route('settings.security.index') }}">{{ trans('settings.sidebar_settings_security') }}</a>
-    </li>
-    @endif
   </ul>
 </div>