From adbff03274b5267c7acbca6b8e80991df07ccdc9 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sun, 3 Sep 2017 09:54:51 +0100
Subject: [PATCH] Add tabs on settings. Close #220

Former-commit-id: ceb274e0e526378d5ab449470c122f11789200dd [formerly 63e043d75c173243116fb35ba389141e323e7606] [formerly da9fc0747c65a3fbdeb032a5e7e3b9e146f409e4 [formerly 9a9b41dca84f367a0e980f14160e945266463364]]
Former-commit-id: 2a287ab5251869f0e2e2fb836268fb2b1682b81d [formerly d7201a4b07230d32422940250bf0e01b430dde9c]
Former-commit-id: f8f4013fe9eb03ce233738e51ec2c967753b29d7
---
 assets/src/css/dashboard.css         | 11 +++++++----
 assets/src/views/GlobalSettings.vue  | 13 +++----------
 assets/src/views/ProfileSettings.vue |  8 +++-----
 assets/src/views/User.vue            |  9 +++------
 assets/src/views/Users.vue           | 11 ++++-------
 rice-box.go.REMOVED.git-id           |  1 -
 6 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 rice-box.go.REMOVED.git-id

diff --git a/assets/src/css/dashboard.css b/assets/src/css/dashboard.css
index 003ced21..f7e9b23f 100644
--- a/assets/src/css/dashboard.css
+++ b/assets/src/css/dashboard.css
@@ -131,18 +131,21 @@ p code {
   display: flex;
   color: rgb(84, 110, 122);
   font-weight: 500;
-  padding: 0 0 1em;
   margin: 0 0 1em;
   font-size: .8em;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  text-align: center;
+  justify-content: space-between;
+  padding: 0;
 }
 
 .dashboard #nav li {
   width: 100%;
+  padding: 0 0 1em;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
-.dashboard #nav li:last-child {
-  text-align: right
+.dashboard #nav li.active {
+  border-color: #2196f3
 }
 
 .dashboard #nav i {
diff --git a/assets/src/views/GlobalSettings.vue b/assets/src/views/GlobalSettings.vue
index 75963c27..4b4a5085 100644
--- a/assets/src/views/GlobalSettings.vue
+++ b/assets/src/views/GlobalSettings.vue
@@ -1,16 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav">
-      <li>
-        <router-link to="/settings/profile">
-          <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.profileSettings') }}
-        </router-link>
-      </li>
-      <li>
-        <router-link to="/users">
-          {{ $t('settings.userManagement') }} <i class="material-icons">keyboard_arrow_right</i>
-        </router-link>
-      </li>
+      <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
+      <li class="active"><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
+      <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
     </ul>
 
     <h1>{{ $t('settings.globalSettings') }}</h1>
diff --git a/assets/src/views/ProfileSettings.vue b/assets/src/views/ProfileSettings.vue
index 22ebe48b..8d10ba92 100644
--- a/assets/src/views/ProfileSettings.vue
+++ b/assets/src/views/ProfileSettings.vue
@@ -1,11 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav" v-if="user.admin">
-      <li>
-        <router-link to="/settings/global">
-          {{ $t('settings.globalSettings') }} <i class="material-icons">keyboard_arrow_right</i>
-        </router-link>
-      </li>
+      <li class="active"><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
+      <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
+      <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
     </ul>
 
     <h1>{{ $t('settings.profileSettings') }}</h1>
diff --git a/assets/src/views/User.vue b/assets/src/views/User.vue
index 3afd8338..3168ed0e 100644
--- a/assets/src/views/User.vue
+++ b/assets/src/views/User.vue
@@ -2,12 +2,9 @@
   <div>
     <form @submit="save" class="dashboard">
       <ul id="nav">
-        <li>
-          <router-link to="/users">
-            <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.userManagement') }}
-          </router-link>
-        </li>
-        <li></li>
+        <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
+        <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
+        <li><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
       </ul>
 
       <h1 v-if="id === 0">{{ $t('settings.newUser') }}</h1>
diff --git a/assets/src/views/Users.vue b/assets/src/views/Users.vue
index 840c450e..43f70442 100644
--- a/assets/src/views/Users.vue
+++ b/assets/src/views/Users.vue
@@ -1,12 +1,9 @@
 <template>
   <div class="dashboard">
     <ul id="nav">
-      <li>
-        <router-link to="/settings/global">
-          <i class="material-icons">keyboard_arrow_left</i> {{ $t('settings.globalSettings') }}
-        </router-link>
-      </li>
-      <li></li>
+      <li><router-link to="/settings/profile">{{ $t('settings.profileSettings') }}</router-link></li>
+      <li><router-link to="/settings/global">{{ $t('settings.globalSettings') }}</router-link></li>
+      <li class="active"><router-link to="/users">{{ $t('settings.userManagement') }}</router-link></li>
     </ul>
 
     <h1>{{ $t('settings.users') }} <router-link to="/users/new"><button>{{ $t('buttons.new') }}</button></router-link></h1>
@@ -19,7 +16,7 @@
         <th></th>
       </tr>
 
-      <tr v-for="user in users">
+      <tr v-for="user in users" :key="user.id">
         <td>{{ user.username }}</td>
         <td><i v-if="user.admin" class="material-icons">done</i><i v-else class="material-icons">close</i></td>
         <td>{{ user.filesystem }}</td>
diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id
deleted file mode 100644
index 06ae129c..00000000
--- a/rice-box.go.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3b621522d90af10b96208b839db22160799540b3
\ No newline at end of file