From 203c88118ba91feddacf9231df68e32b25db0ca3 Mon Sep 17 00:00:00 2001
From: Julien Calixte <julienc@bam.tech>
Date: Sat, 28 Dec 2019 15:18:02 +0100
Subject: [PATCH] :art: (update margin, import modal)

---
 src/App.vue                        | 17 --------
 src/components/AccountList.vue     |  3 ++
 src/services/CouchService.ts       | 14 +++----
 src/store.ts                       |  2 +-
 src/styles/framework.scss          |  1 +
 src/views/About.vue                |  7 +++-
 src/views/Home.vue                 |  2 +-
 src/views/User.vue                 | 54 ++++++++++++++++++------
 src/views/accounts/AccountItem.vue | 67 +++++++++++++-----------------
 9 files changed, 85 insertions(+), 82 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 310ce6f..1032755 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,15 +10,6 @@
       <div class="navbar-brand">
         <router-link class="navbar-item" to="/">
           <img src="./assets/vaquant-root-white.png" title="vaquant" />
-          <online-view class="online-view">
-            <div slot="offline">
-              <img
-                class="icon"
-                src="./assets/icons/baseline_cloud_off_white_48dp.png"
-                alt="offline"
-              />
-            </div>
-          </online-view>
         </router-link>
         <app-installed class="navbar-item">
           <template v-slot:app-installed>
@@ -83,7 +74,6 @@ import ClickOutside from 'vue-click-outside'
 import { Action, Getter } from 'vuex-class'
 import IUser from '@/models/IUser'
 import { COFFEE_LINK } from '@/utils/constants'
-import OnlineView from '@/components/OnlineView.vue'
 import AppInstalled from '@/components/AppInstalled.vue'
 
 @Component({
@@ -91,7 +81,6 @@ import AppInstalled from '@/components/AppInstalled.vue'
     ClickOutside
   },
   components: {
-    'online-view': OnlineView,
     'app-installed': AppInstalled
   }
 })
@@ -136,7 +125,6 @@ export default class App extends Vue {
 
 <style lang="scss">
 $icon_size: 18px;
-$margin: 0.75rem;
 
 .navbar {
   color: red;
@@ -173,9 +161,4 @@ $margin: 0.75rem;
     opacity: 1;
   }
 }
-
-main {
-  margin-left: $margin;
-  margin-right: $margin;
-}
 </style>
diff --git a/src/components/AccountList.vue b/src/components/AccountList.vue
index 7e843fb..ad92aca 100644
--- a/src/components/AccountList.vue
+++ b/src/components/AccountList.vue
@@ -53,6 +53,9 @@ export default class AccountList extends Vue {
 </script>
 
 <style lang="scss" scoped>
+.account-list {
+  margin: 0 0.75rem;
+}
 li {
   margin-bottom: 10px;
   &:last-child {
diff --git a/src/services/CouchService.ts b/src/services/CouchService.ts
index 8558b5e..0c95634 100644
--- a/src/services/CouchService.ts
+++ b/src/services/CouchService.ts
@@ -5,7 +5,7 @@ import bus, { SYNC } from '@/utils/bus-event'
 import IUser from '@/models/IUser'
 import notif from '@/utils/notif'
 import { debounce } from 'lodash-es'
-import { confirmation, toHex } from '@/utils'
+import { confirmation } from '@/utils'
 import store from '@/store'
 
 PouchDb.plugin(PouchDbAuthentication)
@@ -19,7 +19,7 @@ const remoteConfig = {
     withCredentials: true
   }
 }
-const LOCALE_DB: string = 'LOCALE_DB'
+const LOCALE_DB: string = 'VAQUANT_LOCALE_DB'
 const REMOTE: string = 'https://juliencalixte.ddns.net/database'
 
 class CouchService {
@@ -98,11 +98,7 @@ class CouchService {
     return !!docs.total_rows
   }
 
-  public setUser(
-    user: IUser | null,
-    hexUser: string | null,
-    replicateLocale: boolean
-  ): void {
+  public setUser(user: IUser | null, replicateLocale: boolean): void {
     const newUser: boolean =
       !this.user || (!!user && this.user.userId !== user.userId)
     this.user = user
@@ -219,8 +215,8 @@ class CouchService {
         await this.db.destroy()
         this.db = null
       }
-      const hexUser: string = toHex(this.user.userId)
-      this.setUser(this.user, hexUser, false)
+
+      this.setUser(this.user, false)
     }
   }
 
diff --git a/src/store.ts b/src/store.ts
index 611d672..6f461bf 100644
--- a/src/store.ts
+++ b/src/store.ts
@@ -64,7 +64,7 @@ export default new Vuex.Store<IState>({
     ) {
       store.user = user
       store.hexUser = user ? toHex(user.userId) : null
-      couchService.setUser(user, store.hexUser, replicate || false)
+      couchService.setUser(user, replicate || false)
     },
     [ADD_PUBLIC_ACCOUNT](store, { accountId }: { accountId: string }) {
       if (!accountId) {
diff --git a/src/styles/framework.scss b/src/styles/framework.scss
index 09b4779..3f09a9a 100644
--- a/src/styles/framework.scss
+++ b/src/styles/framework.scss
@@ -5,6 +5,7 @@
 @import '~bulma/sass/components/card.sass';
 @import '~bulma/sass/components/message.sass';
 @import '~bulma/sass/components/tabs.sass';
+@import '~bulma/sass/components/modal.sass';
 @import '~bulma/sass/elements/button.sass';
 @import '~bulma/sass/elements/box.sass';
 @import '~bulma/sass/elements/container.sass';
diff --git a/src/views/About.vue b/src/views/About.vue
index bf5eb54..73423b7 100644
--- a/src/views/About.vue
+++ b/src/views/About.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="about">
-    <img class="logo" src="../assets/logo.svg" title="logo Vaquant" >
+    <img class="logo" src="../assets/logo.svg" title="logo Vaquant" />
     <p class="simple-description" v-t="'about.description'"></p>
-    <hr>
+    <hr />
     <app-resume />
   </div>
 </template>
@@ -19,6 +19,9 @@ export default class About extends Vue {}
 </script>
 
 <style>
+.about {
+  margin: 0 0.75rem;
+}
 .simple-description {
   max-width: 450pt;
   margin: auto;
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 53b27d3..ee56716 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -18,7 +18,7 @@
         :to="{ name: 'user' }"
         v-t="'user.loginsignup'"
       ></router-link>
-      <div class="account-list-container box" v-if="showAccounts">
+      <div class="account-list-container" v-if="showAccounts">
         <account-list />
       </div>
       <fab-button v-else :to="{ name: 'account-new' }" :margin="true">
diff --git a/src/views/User.vue b/src/views/User.vue
index 9622226..3030fb6 100644
--- a/src/views/User.vue
+++ b/src/views/User.vue
@@ -8,9 +8,21 @@
         </div>
         <div class="column">
           <div class="buttons is-centered">
-            <button class="button is-warning" type="button" @click="logout" v-t="'user.logout'"></button>
-            <button class="button is-warning" type="button" @click="purge" v-t="'user.purge'"></button>
-            <confirm-button class="is-danger" @confirm="remove">{{ $t('user.delete') }}</confirm-button>
+            <button
+              class="button is-warning"
+              type="button"
+              @click="logout"
+              v-t="'user.logout'"
+            ></button>
+            <button
+              class="button is-warning"
+              type="button"
+              @click="purge"
+              v-t="'user.purge'"
+            ></button>
+            <confirm-button class="is-danger" @confirm="remove">{{
+              $t('user.delete')
+            }}</confirm-button>
           </div>
         </div>
       </div>
@@ -24,11 +36,19 @@
     <div v-else>
       <div class="tabs is-centered is-fullwidth">
         <ul>
-          <li :class="{ 'is-active': activeTab === 'login'}">
-            <a href="#" @click.prevent="activeTab = 'login'" v-t="'user.login'"></a>
+          <li :class="{ 'is-active': activeTab === 'login' }">
+            <a
+              href="#"
+              @click.prevent="activeTab = 'login'"
+              v-t="'user.login'"
+            ></a>
           </li>
-          <li :class="{ 'is-active': activeTab === 'signup'}">
-            <a href="#" @click.prevent="activeTab = 'signup'" v-t="'user.signup'"></a>
+          <li :class="{ 'is-active': activeTab === 'signup' }">
+            <a
+              href="#"
+              @click.prevent="activeTab = 'signup'"
+              v-t="'user.signup'"
+            ></a>
           </li>
         </ul>
       </div>
@@ -186,12 +206,20 @@
     <div class="modal" :class="{ 'is-active': show }">
       <div class="modal-background"></div>
       <div class="modal-card">
-        <section
-          class="modal-card-body"
-        >Voulez-vous récupérer les comptes utilisés avant d'être inscrit ?</section>
-        <footer class="modal-card-foot">
-          <button type="button" class="button is-success" @click="toReplicate(true)">Oui</button>
-          <button type="button" class="button" @click="toReplicate(false)">Non</button>
+        <section class="modal-card-body">
+          Voulez-vous récupérer les comptes utilisés avant d'être inscrit ?
+        </section>
+        <footer class="modal-card-foot buttons has-addons is-centered">
+          <button
+            type="button"
+            class="button is-success"
+            @click="toReplicate(true)"
+          >
+            Oui
+          </button>
+          <button type="button" class="button" @click="toReplicate(false)">
+            Non
+          </button>
         </footer>
       </div>
       <button class="modal-close is-large" aria-label="close"></button>
diff --git a/src/views/accounts/AccountItem.vue b/src/views/accounts/AccountItem.vue
index 230233c..61b116c 100644
--- a/src/views/accounts/AccountItem.vue
+++ b/src/views/accounts/AccountItem.vue
@@ -95,64 +95,53 @@
       >
         <div
           key="transaction"
-          class="transaction-panel tab-content columns is-centered"
+          class="transaction-panel tab-content is-centered"
           v-if="activeTab === 'transaction'"
         >
-          <div class="column">
-            <account-transaction-list
-              :account="account"
-              :transactions="transactions"
-            />
-          </div>
+          <account-transaction-list
+            :account="account"
+            :transactions="transactions"
+          />
         </div>
         <div
           key="tag"
-          class="tag-panel tab-content columns is-centered"
+          class="tag-panel tab-content is-centered"
           v-if="activeTab === 'tag'"
         >
-          <div class="column">
-            <tag-list
-              :transactions="transactionWithoutRefund"
-              :account="account"
-            />
-          </div>
+          <tag-list
+            :transactions="transactionWithoutRefund"
+            :account="account"
+          />
         </div>
         <div
           key="balance"
-          class="balance-panel tab-content columns is-centered"
+          class="balance-panel tab-content is-centered"
           v-if="activeTab === 'balance'"
         >
-          <div class="column">
-            <chart-balance
-              :account="account"
-              :stats="userStats"
-              :currency="account.mainCurrency"
-            />
-          </div>
+          <chart-balance
+            :account="account"
+            :stats="userStats"
+            :currency="account.mainCurrency"
+          />
         </div>
         <div
           key="refund"
-          class="refund-panel tab-content columns is-centered"
+          class="refund-panel tab-content is-centered"
           v-if="activeTab === 'refund'"
         >
-          <div class="column">
+          <div
+            v-if="userRefunds.length"
+            class="columns is-centered is-multiline"
+          >
             <div
-              v-if="userRefunds.length"
-              class="columns is-centered is-multiline"
+              class="column is-one-fifth"
+              v-for="(refund, k) in userRefunds"
+              :key="`${refund.from.alias}-${refund.to.alias}`"
             >
-              <div
-                class="column is-one-fifth"
-                v-for="(refund, k) in userRefunds"
-                :key="`${refund.from.alias}-${refund.to.alias}`"
-              >
-                <refund-transaction
-                  :refund="userRefunds[k]"
-                  :account="account"
-                />
-              </div>
+              <refund-transaction :refund="userRefunds[k]" :account="account" />
             </div>
-            <div v-else class="equilibrium">Le compte est à l'équilibre !</div>
           </div>
+          <div v-else class="equilibrium">Le compte est à l'équilibre !</div>
         </div>
       </transition-group>
     </div>
@@ -535,8 +524,8 @@ export default class AccountItem extends BaseAccount {
 }
 .tab-content {
   position: absolute;
-  width: calc(100% - 30px);
-  margin: auto;
+  width: 100%;
+  margin: 10px auto;
   transition: opacity 0.5s cubic-bezier(0.55, 0, 0.1, 1),
     transform 0.5s cubic-bezier(0.55, 0, 0.1, 1);
   &.columns {