tphilippot/Desktop-meteo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved display

Browse Source
This commit is contained in:
Thomas
2018-09-06 20:32:25 +02:00
parent 7d8008138b
commit 663e856e1f
2 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+24 -34
View File
@@ -3,11 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="55e9631d-9eec-4a61-b221-10a0c409abfa" name="Default Changelist" comment=""> <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$/.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/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> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
@@ -22,10 +18,10 @@
<session id="-1439566542"> <session id="-1439566542">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <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.0" value="2" />
<entry key="project.open.time.1" value="1" /> <entry key="project.open.time.1" value="2" />
<entry key="project.opened" value="3" /> <entry key="project.opened" value="4" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
@@ -50,20 +46,20 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.js.language.service.starts"> <usages-collector id="statistics.js.language.service.starts">
<counts> <counts>
<entry key="ESLintLanguageService" value="2" /> <entry key="ESLintLanguageService" value="3" />
<entry key="TypeScriptServerServiceImpl" value="1" /> <entry key="TypeScriptServerServiceImpl" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="js" value="25" /> <entry key="js" value="25" />
<entry key="vue" value="1517" /> <entry key="vue" value="2170" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JavaScript" value="25" /> <entry key="JavaScript" value="25" />
<entry key="Vue.js" value="1517" /> <entry key="Vue.js" value="2170" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
@@ -73,7 +69,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/renderer/App.vue"> <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
<provider selected="true" editor-type-id="text-editor"> <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" /> <caret line="62" column="35" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" />
</state> </state>
</provider> </provider>
@@ -82,11 +78,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue"> <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="286">
<caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" /> <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
<folding>
<element signature="e#705#768#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -139,9 +132,9 @@
<dismissed value="$PROJECT_DIR$/package.json" /> <dismissed value="$PROJECT_DIR$/package.json" />
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1756" /> <option name="y" value="32" />
<option name="width" value="1717" /> <option name="width" value="1920" />
<option name="height" value="949" /> <option name="height" value="1048" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
@@ -224,15 +217,15 @@
<workItem from="1536134873014" duration="52000" /> <workItem from="1536134873014" duration="52000" />
<workItem from="1536135279029" duration="4952000" /> <workItem from="1536135279029" duration="4952000" />
<workItem from="1536244951084" duration="2621000" /> <workItem from="1536244951084" duration="2621000" />
<workItem from="1536255993769" duration="2712000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7625000" /> <option name="totallyTimeSpent" value="10337000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1920" y="32" width="1920" height="1048" extended-state="6" /> <frame x="0" y="32" width="1920" height="1048" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2498671" /> <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" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -287,13 +280,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/renderer/components/about.vue">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182"> <state relative-caret-position="182">
@@ -308,13 +294,17 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="286">
<caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" /> <caret line="26" column="39" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
<folding>
<element signature="e#705#768#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
src/renderer/components/WelcomeView.vue
+23 -8
View File
@@ -17,12 +17,24 @@
</v-card> </v-card>
</v-flex> </v-flex>
<v-flex xs10 class="mt-3"> <v-flex xs10 class="mt-3">
<v-card> <v-card v-if="show">
<v-card-text> <v-card-text>
<h1>{{temp}}°F</h1> <v-layout row>
<p>Min Temperature : {{ tempMin }}</p> <v-layout xs6>
<p>Max Temperature : {{ tempMax }}</p> <v-card-text>
<p>Humidity : {{ humidity }}</p> <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-text>
</v-card> </v-card>
</v-flex> </v-flex>
@@ -45,6 +57,7 @@
tempMin: null, tempMin: null,
tempMax: null, tempMax: null,
humidity: null, humidity: null,
show: false,
key: '863668499362fb4884ebd97229f3b26b', key: '863668499362fb4884ebd97229f3b26b',
url: 'http://api.openweathermap.org/data/2.5/weather' url: 'http://api.openweathermap.org/data/2.5/weather'
} }
@@ -61,10 +74,12 @@
} }
}).then(response => { }).then(response => {
console.log(response.data) console.log(response.data)
this.temp = response.data.main.temp this.temp = response.data.main.temp - 274
this.tempMax = response.data.main.temp_max this.tempMax = response.data.main.temp_max - 274
this.tempMin = response.data.main.temp_min this.tempMin = response.data.main.temp_min - 274
this.humidity = response.data.main.humidity this.humidity = response.data.main.humidity
this.weatherDescription = response.data.weather[0].description
this.show = true
}).catch(errors => { }).catch(errors => {
console.log(errors) console.log(errors)
}) })