From 94415dd5aef997c0c901eaf858e097b3d4afa76a Mon Sep 17 00:00:00 2001
From: Paulo Souza <paulosouzav@gmail.com>
Date: Fri, 20 Oct 2017 18:04:09 -0200
Subject: [PATCH] =?UTF-8?q?Altera=C3=A7=C3=B5es=20tela=20ajuda=20e=20menu?=
 =?UTF-8?q?=20principal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/App.vue                                   |   6 +-
 src/components/home/Home.vue                  |   2 -
 src/components/menu/Menu.vue                  |   2 +-
 src/components/tabs/Tabs.vue                  |  40 -------
 src/components/timeline/Timeline.vue          |   2 -
 .../weatherForecast/WeatherForecast.vue       | 100 ++++++++++++++++--
 src/main.js                                   |   2 +
 src/router/index.js                           |  12 ---
 9 files changed, 98 insertions(+), 69 deletions(-)
 delete mode 100644 src/components/tabs/Tabs.vue

diff --git a/package.json b/package.json
index 62a5641..5e00f98 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "vue-bulma-components": "^1.5.0",
     "vue-notification": "^1.3.1",
     "vue-router": "^2.7.0",
+    "vuetify": "^0.16.9",
     "vulma": "0.0.11",
     "webrtc-adapter": "^4.2.2"
   },
diff --git a/src/App.vue b/src/App.vue
index 7d32d1d..48d38dd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,12 +12,10 @@
   </div>
 </template>
 <script>
-  import tabsComponent from './components/tabs/Tabs'
   import menuComponent from './components/menu/Menu'
   export default {
     name: 'app',
     components: {
-      'tabs': tabsComponent,
       'menu-component': menuComponent
     }
   }
@@ -32,6 +30,10 @@ body
   background-color: iuvo-main-blue;
   height: 100vh;
 
+.wrapper{
+  padding-top 68px
+}
+
 #app
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
diff --git a/src/components/home/Home.vue b/src/components/home/Home.vue
index b75ed56..5c93031 100644
--- a/src/components/home/Home.vue
+++ b/src/components/home/Home.vue
@@ -2,7 +2,6 @@
     <forecast></forecast>
 </template>
 <script>
-import tabsComponent from '../tabs/Tabs'
 import menuComponent from '../menu/Menu'
 import weatherForecastComponent from '../weatherForecast/WeatherForecast'
 
@@ -10,7 +9,6 @@ export default {
   name: 'timeline',
 
   components: {
-    'tabs': tabsComponent,
     'menu-component': menuComponent,
     'forecast': weatherForecastComponent
   },
diff --git a/src/components/menu/Menu.vue b/src/components/menu/Menu.vue
index 580249b..431fd6a 100644
--- a/src/components/menu/Menu.vue
+++ b/src/components/menu/Menu.vue
@@ -43,7 +43,7 @@ export default {
       accountTitle: 'Conta',
       paymentTitle: 'Pagamento',
       projectsTitle: 'Projetos',
-      title: 'Timeline'
+      title: 'Iuvo'
     }
   }
 
diff --git a/src/components/tabs/Tabs.vue b/src/components/tabs/Tabs.vue
deleted file mode 100644
index ac34236..0000000
--- a/src/components/tabs/Tabs.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div>
-    <div class="tabs is-centered is-boxed">
-      <ul>
-        <li class="is-active">
-          <a>
-            <span>{{ filters.all }}</span>
-          </a>
-        </li>
-        <li>
-          <a>
-            <span>{{ filters.animals }}</span>
-          </a>
-        </li>
-      </ul>
-    </div>
-
-  </div>
-</template>
-<script>
-
-export default {
-  name: 'tabsComponent',
-
-  data () {
-    return {
-      filters: {
-        all: 'all',
-        animals: 'animals'
-      }
-    }
-  }
-}
-</script>
-<style lang="stylus" scoped>
-.tabs
-  margin-top: 70px
-
-</style>
-
diff --git a/src/components/timeline/Timeline.vue b/src/components/timeline/Timeline.vue
index e77d2f2..1456006 100644
--- a/src/components/timeline/Timeline.vue
+++ b/src/components/timeline/Timeline.vue
@@ -2,14 +2,12 @@
   <div class="wrapper-card"></div>
 </template>
 <script>
-import tabsComponent from '../tabs/Tabs'
 import menuComponent from '../menu/Menu'
 
 export default {
   name: 'timeline',
 
   components: {
-    'tabs': tabsComponent,
     'menu-component': menuComponent
   }
   // data () {
diff --git a/src/components/weatherForecast/WeatherForecast.vue b/src/components/weatherForecast/WeatherForecast.vue
index fd4a581..7d51c62 100644
--- a/src/components/weatherForecast/WeatherForecast.vue
+++ b/src/components/weatherForecast/WeatherForecast.vue
@@ -7,11 +7,27 @@
                     <h2 class="city-name">Charqueadas</h2>
                 </div>
                 <div class="weather-image-wrapper">
-                    <img src="../../assets/images/animated/day.svg" alt="Tempo Atual" class="weather-image">
+                    <div class="weather-description">
+                        Ensolarado
+                    </div>
+                    <div class="weather-information">
+                        <img src="../../assets/images/animated/day.svg" alt="Tempo Atual" class="weather-image">
+                        <div class="main-temperature">
+                            23°
+                        </div>
+                    </div>
+                    <div class="weather-risk normal">
+                        Sem risco
+                    </div>
+                    <div class="other-temperature">
+                        <i class="fa fa-long-arrow-up maximum"></i> 23 | 15 <i class="fa fa-long-arrow-down minimum"></i>
+                    </div>
                 </div>
+                
             </div>
 
         </div>
+        <vulma-button class="danger" color='primary'>Preciso de Ajuda</vulma-button>
     </div>
 </template>
 
@@ -28,18 +44,82 @@
         position: relative;
 
     .weather-image-wrapper
-        background-color: #1c2d3e;
+        background-color #1c2d3e
+
+        .weather-description, .weather-risk
+            color #fff
+            position absolute
+            width 100%
+
+        .weather-description
+            text-align center
+            margin-top 5px
+            font-size: 20px
     
-    .weather-image
-        width: 70%;
-        max-width: 200px;
+        .weather-information
+            text-align left
+            position relative
+            padding 15px 0
+            .weather-image
+                width 70%
+                max-width 200px
+                display inline
+            .main-temperature
+                color #fff
+                position: absolute
+                top 50%
+                right 20px
+                text-align center
+                -webkit-transform translateY(-50%)
+                -ms-transform translateY(-50%)
+                transform translateY(-50%)
+                font-size 60px
+
+        .weather-risk
+            bottom 8px
+            right 8px
+            width auto
+            padding 2px 10px
+            border-radius 100px
+
+        .normal
+            background-color #00d1b2
+        .alert
+            background-color #f1c40f
+        .danger
+            background-color #e74c3c
 
+        .other-temperature
+            position absolute
+            bottom 0px
+            left 8px
+            bottom 8px
+            width auto
+            padding 2px 10px
+            border-radius 100px
+            background-color #fff
+
+        .maximum
+            color #e74c3c
+        .minimum
+            color #3498db
     .city-information
-        color: #fff;
+        color #fff
 
     .city-name
-        margin: 20px 0px 10px;
-        font-size: 28px;
-        font-weight: inherit;
-        font-style: normal;
+        margin 20px 0
+        font-size 28px
+        font-weight inherit
+        font-style normal
+
+    .danger
+        font-size 20px
+        width 100%
+        height 66px
+        position absolute
+        bottom 0
+        left 50%
+        transform translate3d(-50%,0,0)
+        background-color #e74c3c
+
 </style>
diff --git a/src/main.js b/src/main.js
index 8523b7b..ed599ca 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,7 @@ import Notifications from 'vue-notification'
 import Vulma from 'vulma'
 import Bulma from 'Bulma'
 import vueBulmaComponents from 'vue-bulma-components'
+import Vuetify from 'vuetify'
 
 Vue.config.productionTip = false
 
@@ -14,6 +15,7 @@ Vue.use(Vulma)
 Vue.use(Bulma)
 Vue.use(Notifications)
 Vue.use(vueBulmaComponents)
+Vue.use(Vuetify)
 
 /* eslint-disable no-new */
 new Vue({
diff --git a/src/router/index.js b/src/router/index.js
index 2c9d71e..0a9cd88 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,8 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 import Hello from '@/components/Hello'
-import SignUp from '@/components/signUp/SignUp'
-import SignIn from '@/components/signIn/SignIn'
 import Timeline from '@/components/timeline/Timeline'
 import Home from '@/components/home/Home'
 
@@ -20,16 +18,6 @@ export default new Router({
       name: 'Hello',
       component: Hello
     },
-    {
-      path: '/signUp',
-      name: 'SignUp',
-      component: SignUp
-    },
-    {
-      path: '/signIn',
-      name: 'SignIn',
-      component: SignIn
-    },
     {
       path: '/timeline',
       name: 'Timeline',