From 03b4eff75827b2999f56259abeb3dd00e4c44938 Mon Sep 17 00:00:00 2001
From: Douglas Barone <douglasvbarone@gmail.com>
Date: Tue, 8 Dec 2020 09:54:54 -0400
Subject: [PATCH] Layout refresh

---
 .gitignore                                    |  3 +-
 web/src/components/MainDrawer.vue             | 23 +++++---------
 web/src/components/UserPresenceStatusList.vue |  4 ++-
 web/src/components/widgets/Widget.vue         |  8 +++--
 web/src/layouts/Default.vue                   | 26 ++++------------
 web/src/scss/style.scss                       | 12 ++++----
 web/src/views/Home.vue                        |  6 ++--
 web/src/views/UserPresence.vue                | 30 ++++++++++++-------
 web/src/views/WifiDevices.vue                 |  2 +-
 web/src/views/WifiUsers.vue                   |  5 ++--
 10 files changed, 55 insertions(+), 64 deletions(-)

diff --git a/.gitignore b/.gitignore
index eb976e0..e9acd53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,5 @@
 *.sln
 *.sw?
 pti.code-workspace
-temporary-captain-to-deploy.tar
\ No newline at end of file
+temporary-captain-to-deploy.tar
+deploy.sh
diff --git a/web/src/components/MainDrawer.vue b/web/src/components/MainDrawer.vue
index c5c27f9..9617fd3 100755
--- a/web/src/components/MainDrawer.vue
+++ b/web/src/components/MainDrawer.vue
@@ -2,30 +2,21 @@
   <v-navigation-drawer
     v-if="me"
     v-model="drawer"
-    :clipped="$vuetify.breakpoint.mdAndDown"
+    clipped
     :mini-variant="mini"
     :mini-variant-width="64"
-    :fixed="$vuetify.breakpoint.mdAndDown"
-    :app="$vuetify.breakpoint.mdAndDown"
-    right
+    :right="$vuetify.breakpoint.mdAndDown"
+    app
     @input="$emit('input', drawer)"
   >
     <template slot="prepend">
-      <v-img class="ma-4" src="../assets/logoTI.svg" height="48px" contain />
+      <div class="d-lg-none">
+        <v-img class="ma-4" src="../assets/logoTI.svg" height="48px" contain />
+        <div class="text-center title font-weight-light">Portal de TI</div>
+      </div>
     </template>
 
     <NavList :mini="mini" />
-
-    <template slot="append">
-      <v-list nav>
-        <v-list-item @click="mini = !mini">
-          <v-list-item-icon>
-            <v-icon v-if="mini">mdi-chevron-left</v-icon>
-            <v-icon v-else>mdi-chevron-right</v-icon>
-          </v-list-item-icon>
-        </v-list-item>
-      </v-list>
-    </template>
   </v-navigation-drawer>
 </template>
 
diff --git a/web/src/components/UserPresenceStatusList.vue b/web/src/components/UserPresenceStatusList.vue
index 97511c1..399234f 100644
--- a/web/src/components/UserPresenceStatusList.vue
+++ b/web/src/components/UserPresenceStatusList.vue
@@ -10,6 +10,7 @@
         :key="userPresence.user.id"
         cols="12"
         md="6"
+        lg="3"
       >
         <v-card outlined class="border-highlight">
           <v-list three-line>
@@ -63,7 +64,7 @@
   </div>
   <div v-else>
     <div class="d-flex flex-wrap">
-      <v-col v-for="i in 10" :key="i" cols="12" md="6">
+      <v-col v-for="i in 12" :key="i" cols="12" md="6" lg="3">
         <v-card outlined class="border-highlight">
           <v-list three-line>
             <v-list-item>
@@ -103,4 +104,5 @@ export default {
 <style scoped lang="sass">
 .border-highlight
   box-shadow: 1.5px 1.5px 12px rgba(0, 0, 0, 0.05)
+  border-left: 3px solid grey
 </style>
diff --git a/web/src/components/widgets/Widget.vue b/web/src/components/widgets/Widget.vue
index f12a32f..2695dcc 100755
--- a/web/src/components/widgets/Widget.vue
+++ b/web/src/components/widgets/Widget.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card v-bind="$attrs" outlined class="fill-height">
+  <v-card v-bind="$attrs" outlined class="fill-height widged">
     <v-toolbar flat class="font-weight-light headline">
       <v-icon v-if="widgetIcon" left>{{ widgetIcon }}</v-icon>
       {{ title }}
@@ -26,4 +26,8 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.fill-height.v-card.v-sheet.v-sheet--outlined.theme--light {
+  box-shadow: 1.5px 1.5px 12px rgba(0, 0, 0, 0.05);
+}
+</style>
diff --git a/web/src/layouts/Default.vue b/web/src/layouts/Default.vue
index 7ae7aab..cd07f8f 100755
--- a/web/src/layouts/Default.vue
+++ b/web/src/layouts/Default.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <v-app-bar app fixed elevate-on-scroll>
-      <v-container style="max-width: 1280px">
+    <v-app-bar app elevate-on-scroll clipped-left>
+      <v-container fluid>
         <v-row>
           <v-col v-if="$vuetify.breakpoint.lgAndUp">
             <v-toolbar-title>
@@ -25,23 +25,10 @@
       />
     </v-app-bar>
 
-    <MainDrawer v-if="$vuetify.breakpoint.mdAndDown" v-model="mainDrawer" />
     <v-main>
-      <v-container style="max-width: 1280px">
-        <v-row>
-          <v-col v-if="$vuetify.breakpoint.lgAndUp" cols="3">
-            <v-sheet>
-              <NavList />
-            </v-sheet>
-          </v-col>
-          <v-col cols="12" lg="9">
-            <v-sheet>
-              <v-slide-x-transition hide-on-leave>
-                <router-view />
-              </v-slide-x-transition>
-            </v-sheet>
-          </v-col>
-        </v-row>
+      <MainDrawer v-model="mainDrawer" />
+      <v-container>
+        <router-view />
       </v-container>
     </v-main>
   </div>
@@ -51,11 +38,10 @@
 import MainDrawer from '../components/MainDrawer'
 
 import UserMenu from '@/components/UserMenu'
-import NavList from '@/components/NavList'
 
 export default {
   name: 'Default',
-  components: { NavList, UserMenu, MainDrawer },
+  components: { UserMenu, MainDrawer },
   data: () => ({
     mainDrawer: true
   })
diff --git a/web/src/scss/style.scss b/web/src/scss/style.scss
index 7d0ab29..82703eb 100755
--- a/web/src/scss/style.scss
+++ b/web/src/scss/style.scss
@@ -20,10 +20,10 @@
 //  );
 //}
 
-//.theme--light.v-application {
-//  background: #f5f5f5;
-//}
+// .theme--light.v-application {
+//   background: #f5f5f5;
+// }
 
-//.theme--dark.v-application {
-//  background: #313233;
-//}
+// .theme--dark.v-application {
+//   background: #313233;
+// }
diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue
index 0cb29ab..5eeb8b4 100755
--- a/web/src/views/Home.vue
+++ b/web/src/views/Home.vue
@@ -1,13 +1,13 @@
 <template>
   <v-container class="home" fluid>
     <v-row>
-      <v-col>
+      <v-col cols="12" md="6">
         <UserInfoWidget />
       </v-col>
-      <v-col v-if="me && me.isTokenCreator">
+      <v-col v-if="me && me.isTokenCreator" cols="12" md="6">
         <TokenStatsWidget />
       </v-col>
-      <v-col>
+      <v-col cols="12" md="6" class="flex-grow-1">
         <DevicesWidget />
       </v-col>
     </v-row>
diff --git a/web/src/views/UserPresence.vue b/web/src/views/UserPresence.vue
index 1bdb09d..e580da1 100644
--- a/web/src/views/UserPresence.vue
+++ b/web/src/views/UserPresence.vue
@@ -9,6 +9,7 @@
       prepend-icon="mdi-account-search"
       clearable
       filled
+      style="max-width: 400px"
     />
 
     <div v-if="stats" class="text-center mb-6 mt-0">
@@ -34,21 +35,28 @@
       text
       large
       block
-      @click="resultSize += 10"
+      @click="resultSize += 12"
     >
       Mostrar mais
     </v-btn>
 
-    <v-alert class="mt-12" color="info" outlined dismissible icon="mdi-alert">
-      A lista de pessoas mostrada aqui é obtida através do uso da rede Wireless.
-      Este método não é preciso (podendo não indicar alguém presente ou
-      indicando alguém que deixou um dispositivo no campus). Use esta lista com
-      a devida cautela.
-    </v-alert>
+    <v-row class="mt-6">
+      <v-col>
+        <v-alert class="fill-height" color="info" outlined icon="mdi-alert">
+          A lista de pessoas mostrada aqui é obtida através do uso da rede
+          Wireless. Este método não é preciso (podendo não indicar alguém
+          presente ou indicando alguém que deixou um dispositivo no campus). Use
+          esta lista com a devida cautela.
+        </v-alert>
+      </v-col>
 
-    <v-alert color="accent" outlined dismissible icon="mdi-update">
-      A lista é atualizada automaticamente. Não é necessário atualizar a página.
-    </v-alert>
+      <v-col>
+        <v-alert class="fill-height" color="accent" outlined icon="mdi-update">
+          A lista é atualizada automaticamente. Não é necessário atualizar a
+          página.
+        </v-alert>
+      </v-col>
+    </v-row>
   </v-container>
 </template>
 
@@ -61,7 +69,7 @@ export default {
   components: { UserPresenceStatusList },
   data: () => ({
     search: '',
-    resultSize: 10
+    resultSize: 12
   }),
   apollo: {
     userPresence: {
diff --git a/web/src/views/WifiDevices.vue b/web/src/views/WifiDevices.vue
index 1a98d15..f964cd5 100644
--- a/web/src/views/WifiDevices.vue
+++ b/web/src/views/WifiDevices.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container fluid>
-    <v-toolbar flat class="mb-2">
+    <v-toolbar flat class="mb-2 pt-3">
       <v-text-field
         v-model="search"
         prepend-inner-icon="mdi-cellphone"
diff --git a/web/src/views/WifiUsers.vue b/web/src/views/WifiUsers.vue
index 587c89c..75a1a31 100644
--- a/web/src/views/WifiUsers.vue
+++ b/web/src/views/WifiUsers.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container fluid>
-    <v-toolbar flat class="mb-2">
+    <v-toolbar flat class="mb-2 pt-3">
       <v-text-field
         v-model="search"
         prepend-inner-icon="mdi-account"
@@ -77,8 +77,7 @@
               </template>
             </v-expansion-panel-header>
             <v-expansion-panel-content>
-              Dispositivos associados à este usuário:
-              <v-expansion-panels flat>
+              <v-expansion-panels accordion>
                 <v-expansion-panel
                   v-for="device in user.wifiDevices"
                   :key="device.mac"