Merge pull request #5 from paulosouzav/correcao_app

Remodularização app.vue
paulovirote · Oct 20, 2017 · b77f1fb · b77f1fb
2 parents 18edf20 + a270b55
commit b77f1fb
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 78 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,43 +1,54 @@
 <template>
   <div id="app">
     <main>
-      <router-view></router-view>
+      <menu-component></menu-component>
+
+      <div class="wrapper">
+        <tabs></tabs>
+        <router-view></router-view>   
+      </div>
+
     </main>
   </div>
 </template>
 <script>
-export default {
-  name: 'app'
-}
+  import tabsComponent from './components/tabs/Tabs'
+  import menuComponent from './components/menu/Menu'
+  export default {
+    name: 'app',
+    components: {
+      'tabs': tabsComponent,
+      'menu-component': menuComponent
+    }
+  }
 </script>
 
-<style>
-body {
+<style lang="stylus">
+iuvo-main-blue = #2c3e50
+iuvo-dark-blue = #1c2d3e
+
+body
   margin: 0;
-  background-color: #2c3e50;
+  background-color: iuvo-main-blue;
   height: 100vh;
-}
 
-#app {
+#app
   font-family: 'Avenir', Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
-}
 
-main {
+main
   text-align: center;
-}
 
-header {
+header
   margin: 0;
   height: 56px;
   padding: 0 16px 0 24px;
   background-color: #00d1b2;
   color: #fff;
-}
 
-header span {
+header span
   display: block;
   position: relative;
   font-size: 20px;
@@ -46,5 +57,5 @@ header span {
   font-weight: 400;
   box-sizing: border-box;
   padding-top: 16px;
-}
+
 </style>
diff --git a/src/components/home/Home.vue b/src/components/home/Home.vue
@@ -1,12 +1,5 @@
 <template>
-  <div>
-    <menu-component></menu-component>
-
-    <div class="wrapper">
-      <tabs></tabs>
-      <forecast></forecast>
-    </div>
-  </div>
+    <forecast></forecast>
 </template>
 <script>
 import tabsComponent from '../tabs/Tabs'

diff --git a/src/components/signIn/SignIn.vue b/src/components/signIn/SignIn.vue
diff --git a/src/components/signUp/SignUp.vue b/src/components/signUp/SignUp.vue
diff --git a/src/components/timeline/Timeline.vue b/src/components/timeline/Timeline.vue
@@ -1,15 +1,5 @@
 <template>
-  <div>
-    <menu-component></menu-component>
-
-    <div class="wrapper">
-      <tabs></tabs>
-
-      <div class="wrapper-card">
-
-      </div>
-    </div>
-  </div>
+  <div class="wrapper-card"></div>
 </template>
 <script>
 import tabsComponent from '../tabs/Tabs'
@@ -26,7 +16,7 @@ export default {
   //   return {
   //     projects: []
   //   }
-  // },
+  // }
 }
 </script>
 

diff --git a/src/components/weatherForecast/WeatherForecast.vue b/src/components/weatherForecast/WeatherForecast.vue
@@ -21,38 +21,25 @@
     }
 </script>
 
-<style>
-    .weather-info-wrapper {
+<style lang="stylus" scoped>
+    .weather-info-wrapper
         text-align: center;
         height: 100%;
         position: relative;
-    }
-
-    .weather-centered {
-        /* position: relative;
-        top: 50%;
-        -webkit-transform: translateY(-50%);
-        -ms-transform: translateY(-50%);
-        transform: translateY(-50%); */
-    }
 
-    .weather-image-wrapper{
+    .weather-image-wrapper
         background-color: #1c2d3e;
-    }
     
-    .weather-image {
+    .weather-image
         width: 70%;
         max-width: 200px;
-    }
 
-    .city-information{
+    .city-information
         color: #fff;
-    }
 
-    .city-name{
-        margin: 20px 0px;
+    .city-name
+        margin: 20px 0px 10px;
         font-size: 28px;
         font-weight: inherit;
         font-style: normal;
-    }
 </style>