From 663e856e1f19a7086460b6caf97a5a75c12ed132 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.philippot@labo-mylab.fr>
Date: Thu, 6 Sep 2018 20:32:25 +0200
Subject: [PATCH] improved display

---
 .idea/workspace.xml                     | 58 ++++++++++---------------
 src/renderer/components/WelcomeView.vue | 31 +++++++++----
 2 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4b4e06..c4a2dbb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="55e9631d-9eec-4a61-b221-10a0c409abfa" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/InspireView.vue" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/renderer/components/WelcomeView.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/WelcomeView.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/components/rm.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/components/about.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/renderer/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/renderer/router/index.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -22,10 +18,10 @@
     <session id="-1439566542">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="3" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.0" value="2" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.open.time.1" value="2" />
+          <entry key="project.opened" value="4" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -50,20 +46,20 @@
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts">
         <counts>
-          <entry key="ESLintLanguageService" value="2" />
+          <entry key="ESLintLanguageService" value="3" />
           <entry key="TypeScriptServerServiceImpl" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="js" value="25" />
-          <entry key="vue" value="1517" />
+          <entry key="vue" value="2170" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="JavaScript" value="25" />
-          <entry key="Vue.js" value="1517" />
+          <entry key="Vue.js" value="2170" />
         </counts>
       </usages-collector>
     </session>
@@ -73,7 +69,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="208">
+            <state relative-caret-position="1612">
               <caret line="62" column="35" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
             </state>
           </provider>
@@ -82,11 +78,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
-              <folding>
-                <element signature="e#705#768#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="286">
+              <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -139,9 +132,9 @@
     <dismissed value="$PROJECT_DIR$/package.json" />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1756" />
-    <option name="width" value="1717" />
-    <option name="height" value="949" />
+    <option name="y" value="32" />
+    <option name="width" value="1920" />
+    <option name="height" value="1048" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
@@ -224,15 +217,15 @@
       <workItem from="1536134873014" duration="52000" />
       <workItem from="1536135279029" duration="4952000" />
       <workItem from="1536244951084" duration="2621000" />
+      <workItem from="1536255993769" duration="2712000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="7625000" />
+    <option name="totallyTimeSpent" value="10337000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1920" y="32" width="1920" height="1048" extended-state="6" />
-    <editor active="true" />
+    <frame x="0" y="32" width="1920" height="1048" extended-state="6" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2498671" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -287,13 +280,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="62" column="35" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/about.vue">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="182">
@@ -308,13 +294,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1612">
+          <caret line="62" column="35" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
-          <folding>
-            <element signature="e#705#768#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="286">
+          <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
         </state>
       </provider>
     </entry>
diff --git a/src/renderer/components/WelcomeView.vue b/src/renderer/components/WelcomeView.vue
index 0543b58..220584d 100644
--- a/src/renderer/components/WelcomeView.vue
+++ b/src/renderer/components/WelcomeView.vue
@@ -17,12 +17,24 @@
       </v-card>
     </v-flex>
     <v-flex xs10 class="mt-3">
-      <v-card>
+      <v-card v-if="show">
         <v-card-text>
-          <h1>{{temp}}°F</h1>
-          <p>Min Temperature : {{ tempMin }}</p>
-          <p>Max Temperature : {{ tempMax }}</p>
-          <p>Humidity : {{ humidity }}</p>
+            <v-layout row>
+                <v-layout xs6>
+                    <v-card-text>
+                        <v-spacer></v-spacer>
+                        <h1>{{temp.toFixed(2)}}°C</h1>
+                        <h1>{{weatherDescription}}</h1>
+                    </v-card-text>
+                </v-layout>
+                <v-layout xs6>
+                    <v-card-text>
+                        <p><v-icon>fas fa-snowflake</v-icon>Min : {{ tempMin.toFixed(2) }}°C</p>
+                        <p><v-icon>fas fa-sun</v-icon>Max : {{ tempMax.toFixed(2) }}°C</p>
+                        <p><v-icon>fas fa-tint</v-icon>Humidity : {{ humidity }} %</p>
+                    </v-card-text>
+                </v-layout>
+            </v-layout>
         </v-card-text>
       </v-card>
     </v-flex>
@@ -45,6 +57,7 @@
         tempMin: null,
         tempMax: null,
         humidity: null,
+        show: false,
         key: '863668499362fb4884ebd97229f3b26b',
         url: 'http://api.openweathermap.org/data/2.5/weather'
       }
@@ -61,10 +74,12 @@
           }
         }).then(response => {
           console.log(response.data)
-          this.temp = response.data.main.temp
-          this.tempMax = response.data.main.temp_max
-          this.tempMin = response.data.main.temp_min
+          this.temp = response.data.main.temp - 274
+          this.tempMax = response.data.main.temp_max - 274
+          this.tempMin = response.data.main.temp_min - 274
           this.humidity = response.data.main.humidity
+          this.weatherDescription = response.data.weather[0].description
+          this.show = true
         }).catch(errors => {
           console.log(errors)
         })