feat: add contact archiving

CHANGELOG

@@ -1,6 +1,6 @@
 UNRELEASED CHANGES:
 
-*
+* Add ability to archive a contact
 
 RELEASED VERSIONS:
 
@@ -22,9 +22,7 @@ v2.7.0 - 2018-09-04
 * Fix gift recipient relation
 * Fix subscription cancel on account deletion
 * Fix email maximum size on settings
-* Add contact archiving
-
-RELEASED VERSIONS:
+* Fix reminder link in email sent
 
 v2.6.0 - 2018-08-17
 -------------------

Makefile

@@ -81,7 +81,11 @@ docker_push_bintray: .deploy.json
 
 .PHONY: docker docker_build docker_tag docker_push docker_push_bintray
 
-build: build-dev
+build:
+	composer install --no-interaction --no-suggest --ignore-platform-reqs
+	php artisan lang:generate
+	yarn install
+	yarn run production
 
 build-prod:
 	composer install --no-interaction --no-suggest --ignore-platform-reqs --no-dev

public/mix-manifest.json

@@ -1,7 +1,7 @@
 {
-    "/js/app.js": "/js/app.js?id=4451742bfd445a6ddbd4",
-    "/css/app-ltr.css": "/css/app-ltr.css?id=d44d00bbf39ff8c5d2aa",
-    "/css/app-rtl.css": "/css/app-rtl.css?id=30f2452c42d24e922374",
+    "/js/app.js": "/js/app.js?id=fabb54e3bcd43e3893ca",
+    "/css/app-ltr.css": "/css/app-ltr.css?id=e7fb9bf63d762412fc0d",
+    "/css/app-rtl.css": "/css/app-rtl.css?id=6235c7b59e82da7cd6b8",
     "/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",
     "/js/vendor.js": "/js/vendor.js?id=490bf428af4c7224b600",
     "/js/stripe.js": "/js/stripe.js?id=e2284957ba723a52a4b7",

resources/assets/js/components/people/Archive.vue

@@ -5,7 +5,7 @@
     <div>
         <notifications group="archive" position="top middle" duration=5000 width="400" />
 
-        <a href="#" class="btn edit-information" @click="toggle">{{ active ? $t('people.contact_archive') : $t('people.contact_unarchive') }}</a>
+        <a class="btn btn-special" @click="toggle" :title="$t('people.contact_archive_help')">{{ active ? $t('people.contact_archive') : $t('people.contact_unarchive') }}</a>
     </div>
 </template>
 

resources/assets/sass/buttons.scss

@@ -88,3 +88,24 @@
   width: 15px;
   margin-right: 3px;
 }
+
+$btn-special-light: #A9BCF5;
+$btn-special: #819FF7;
+$btn-special-hover-light: #5882FA;
+$btn-special-hover: #2E64FE;
+
+.btn-special {
+  color: #fff;
+  background-color: $btn-special;
+  background-image: -webkit-linear-gradient(270deg, $btn-special-light 0%, $btn-special 90%);
+  background-image: linear-gradient(-180deg, $btn-special-light 0%, $btn-special 90%);
+
+  &:hover {
+    color: #fff;
+    background-color: $btn-special-hover;
+    background-image: -webkit-linear-gradient(270deg, $btn-special-hover-light 0%, $btn-special-hover 90%);
+    background-image: linear-gradient(-180deg, $btn-special-hover-light 0%, $btn-special-hover 90%);
+    background-position: 0 -0.5em;
+    border-color: rgba(27,31,35,0.5);
+  }
+}

resources/lang/en/people.php

@@ -63,6 +63,7 @@
     'edit_contact_information' => 'Edit contact information',
     'contact_archive' => 'Archive contact',
     'contact_unarchive' => 'Unarchive contact',
+    'contact_archive_help' => 'Archived contact will not appear on contact lists',
     'call_button' => 'Log a call',
     'set_favorite' => 'Favorite contacts are placed at the top of the contact list',
 

resources/views/people/_header.blade.php

@@ -93,9 +93,6 @@
             <li>
               <a href="{{ route('people.edit', $contact) }}" class="btn edit-information" id="button-edit-contact">{{ trans('people.edit_contact_information') }}</a>
             </li>
-            <li>
-              <contact-archive hash="{{ $contact->hashID() }}" active="{{ json_encode($contact->is_active) }}"></contact-archive>
-            </li>
           </ul>
         </div>
       </div>

resources/views/people/profile.blade.php

@@ -43,9 +43,12 @@
             @include('people.sidebar')
 
             <p><a href="{{ route('people.vcard', $contact) }}">{{ trans('people.people_export') }}</a></p>
+            <p>
+              <contact-archive hash="{{ $contact->hashID() }}" active="{{ json_encode($contact->is_active) }}"></contact-archive>
+            </p>
             <p>
               {{ trans('people.people_delete_message') }}
-              <a href="#" id="link-delete-contact" onclick="if (confirm('{{ trans('people.people_delete_confirmation') }}')) { $('#contact-delete-form').submit(); } return false;">{{ trans('people.people_delete_click_here') }}</a>.
+              <a id="link-delete-contact" onclick="if (confirm('{{ trans('people.people_delete_confirmation') }}')) { $('#contact-delete-form').submit(); } return false;">{{ trans('people.people_delete_click_here') }}</a>.
               <form method="POST" action="{{ route('people.delete', $contact) }}" id="contact-delete-form" class="hidden">
                 {{ method_field('DELETE') }}
                 {{ csrf_field() }}