From 7d8008138bb730c71c5d5800e10b8225f1a60bc5 Mon Sep 17 00:00:00 2001
From: Thomas <tp456@hotmail.fr>
Date: Thu, 6 Sep 2018 17:27:10 +0200
Subject: [PATCH] First Diplay

first diplay of data
---
 .idea/vcs.xml                           |   6 ++
 .idea/workspace.xml                     | 128 ++++++++++++------------
 src/renderer/App.vue                    |   9 +-
 src/renderer/components/InspireView.vue |  23 -----
 src/renderer/components/WelcomeView.vue |  83 ++++++++-------
 src/renderer/components/about.vue       |  44 ++++++++
 src/renderer/components/rm.vue          |  15 ---
 src/renderer/router/index.js            |  11 +-
 8 files changed, 169 insertions(+), 150 deletions(-)
 create mode 100644 .idea/vcs.xml
 delete mode 100644 src/renderer/components/InspireView.vue
 create mode 100644 src/renderer/components/about.vue
 delete mode 100644 src/renderer/components/rm.vue

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 94abcc9..f4b4e06 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <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$/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/" />
     <ignored path="$PROJECT_DIR$/tmp/" />
@@ -15,9 +22,10 @@
     <session id="-1439566542">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
+          <entry key="project.closed" value="3" />
           <entry key="project.open.time.0" value="2" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
@@ -25,72 +33,60 @@
           <entry key="icns" value="1" />
           <entry key="ico" value="1" />
           <entry key="js" value="1" />
-          <entry key="json" value="1" />
+          <entry key="json" value="2" />
           <entry key="png" value="1" />
           <entry key="ts" value="1" />
-          <entry key="vue" value="4" />
+          <entry key="vue" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="Image" value="3" />
-          <entry key="JSON" value="1" />
+          <entry key="JSON" value="2" />
           <entry key="JavaScript" value="1" />
           <entry key="TypeScript" value="1" />
-          <entry key="Vue.js" value="4" />
+          <entry key="Vue.js" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts">
         <counts>
-          <entry key="ESLintLanguageService" value="1" />
+          <entry key="ESLintLanguageService" value="2" />
           <entry key="TypeScriptServerServiceImpl" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="js" value="10" />
-          <entry key="vue" value="390" />
+          <entry key="js" value="25" />
+          <entry key="vue" value="1517" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JavaScript" value="10" />
-          <entry key="Vue.js" value="390" />
+          <entry key="JavaScript" value="25" />
+          <entry key="Vue.js" value="1517" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file pinned="false" current-in-tab="true">
+      <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="339">
-              <caret line="69" column="7" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
-              <folding>
-                <element signature="e#1321#1327#0" expanded="true" />
-              </folding>
+            <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>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="650">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-              <folding>
-                <element signature="e#0#21#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/renderer/components/rm.vue">
+      <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="15" selection-start-line="15" selection-end-line="15" />
+              <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>
           </provider>
         </entry>
@@ -109,12 +105,17 @@
       <find>content</find>
     </findStrings>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/renderer/components/rm.vue" />
         <option value="$PROJECT_DIR$/src/renderer/router/index.js" />
         <option value="$PROJECT_DIR$/src/renderer/App.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/components/about.vue" />
+        <option value="$PROJECT_DIR$/src/renderer/components/WelcomeView.vue" />
       </list>
     </option>
   </component>
@@ -147,7 +148,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -184,6 +184,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -222,11 +223,12 @@
       <updated>1536134871730</updated>
       <workItem from="1536134873014" duration="52000" />
       <workItem from="1536135279029" duration="4952000" />
+      <workItem from="1536244951084" duration="2621000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="5004000" />
+    <option name="totallyTimeSpent" value="7625000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1920" y="32" width="1920" height="1048" extended-state="6" />
@@ -236,7 +238,6 @@
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="npm" order="2" side_tool="true" />
       <window_info id="Favorites" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="TypeScript" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -245,9 +246,10 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Version Control" order="8" />
       <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
       <window_info anchor="bottom" id="Terminal" order="10" />
+      <window_info anchor="bottom" id="TypeScript" order="11" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -263,13 +265,6 @@
     <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView/SystemInformation.vue">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/WelcomeView.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="364">
-          <caret line="14" column="37" lean-forward="true" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/build/icons/icon.ico">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -282,24 +277,10 @@
     <entry file="file://$PROJECT_DIR$/node_modules/@fortawesome/free-solid-svg-icons/faAdjust.d.ts">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/renderer/components/rm.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1950">
-          <caret line="75" column="38" lean-forward="true" selection-start-line="75" selection-start-column="38" selection-end-line="75" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/router/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="650">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
+        <state relative-caret-position="286">
+          <caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
           </folding>
@@ -308,10 +289,31 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/renderer/App.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="339">
-          <caret line="69" column="7" selection-start-line="69" selection-start-column="7" selection-end-line="69" selection-end-column="7" />
+        <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">
+          <caret line="7" column="79" selection-start-line="7" selection-start-column="79" selection-end-line="7" selection-end-column="79" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/package.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="731">
+          <caret line="75" column="38" lean-forward="true" selection-start-line="75" selection-start-column="38" selection-end-line="75" selection-end-column="38" />
+        </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#1321#1327#0" expanded="true" />
+            <element signature="e#705#768#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index db6da80..95f2d18 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -37,7 +37,7 @@
         <v-spacer></v-spacer>
       </v-toolbar>
       <v-content>
-        <v-container fluid fill-height>
+        <v-container fluid >
           <v-slide-y-transition mode="out-in">
             <router-view></router-view>
           </v-slide-y-transition>
@@ -53,20 +53,19 @@
 
 <script>
   export default {
-    name: 'my-project',
+    name: 'Météo app',
     data: () => ({
       clipped: false,
       drawer: false,
       fixed: false,
       items: [
         { icon: 'fas fa-home', title: 'Welcome', to: '/' },
-        { icon: 'fas fa-lightbulb', title: 'Inspire', to: '/inspire' },
-        { icon: 'fas fa-leaf', title: 'RM', to: '/rm' }
+        { icon: 'fas fa-info-circle', title: 'About', to: '/about' }
       ],
       miniVariant: false,
       right: true,
       rightDrawer: false,
-      title: 'My awesome APP'
+      title: 'Météo App'
     }),
     methods: {
       back () {
diff --git a/src/renderer/components/InspireView.vue b/src/renderer/components/InspireView.vue
deleted file mode 100644
index 267c418..0000000
--- a/src/renderer/components/InspireView.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<template>
-  <v-layout column justify-center>
-    <v-flex>
-      <img src="/static/v.png" alt="Vuetify.js" class="mb-5" />
-      <blockquote class="text-xs-center">
-        &#8220;First, solve the problem. Then, write the code.&#8221;
-        <footer>
-          <small>
-            <em>&mdash;John Johnson</em>
-          </small>
-        </footer>
-      </blockquote>
-    </v-flex>
-  </v-layout>
-</template>
-
-<style scoped>
-  img {
-    margin-left: auto;
-    margin-right: auto;
-    display: block;
-  }
-</style>
\ No newline at end of file
diff --git a/src/renderer/components/WelcomeView.vue b/src/renderer/components/WelcomeView.vue
index 9dadd2f..0543b58 100644
--- a/src/renderer/components/WelcomeView.vue
+++ b/src/renderer/components/WelcomeView.vue
@@ -3,41 +3,27 @@
     <v-flex xs12 md4 offset-md1 class="text-xs-center centered">
       <img id="logo" class="logo" src="~@/assets/logo.png" alt="electron-vue">
     </v-flex>
-    <v-flex xs12 md6 class="text-xs-center centered">
-      <img id="logo" class="logo" src="/static/v.png" alt="Vuetifyjs">
+    <v-flex xs10 class="mt-3">
+      <v-card>
+        <v-card-text>
+          <p>Welcome to my météo app.</p>
+          <p>Search for a city to display the weather</p>
+          <v-text-field label="City" box v-model="city"></v-text-field>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn primary flat router @click="getWeather">Search</v-btn>
+        </v-card-actions>
+      </v-card>
     </v-flex>
     <v-flex xs10 class="mt-3">
       <v-card>
         <v-card-text>
-          <p>Welcome to the Electron-vue + Vuetify template.</p>
-          <p>Vuetify is a progressive Material Design component framework for Vue.js. It was designed to empower developers to create amazing applications. For more information on Vuetify, check out the <a href="https://vuetifyjs.com" target="_blank">documentation</a>. If you have questions, please join the official <a href="https://chat.vuetifyjs.com/" target="_blank" title="chat">discord</a>. Find a bug? Report it on the github <a href="https://github.com/vuetifyjs/vuetify/issues" target="_blank" title="contribute">issue board</a>.</p>
-          <p>Thank you for developing with Vuetify and I look forward to bringing more exciting features in the future.</p>
-          <div class="text-xs-right">
-            <em><small>&mdash; John Leider</small></em>
-          </div>
+          <h1>{{temp}}°F</h1>
+          <p>Min Temperature : {{ tempMin }}</p>
+          <p>Max Temperature : {{ tempMax }}</p>
+          <p>Humidity : {{ humidity }}</p>
         </v-card-text>
-        <v-card-actions>
-          <v-spacer></v-spacer>
-          <v-btn primary flat router to="/inspire">Continue</v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-flex>
-    <v-flex xs10 class="mt-4">
-      <system-information></system-information>
-    </v-flex>
-    <v-flex xs10 class="mt-4">
-      <v-card>
-        <v-card-title class="headline">Docs</v-card-title>
-        <v-divider></v-divider>
-        <v-card-actions class="pt-3 pb-3">
-          <v-spacer></v-spacer>
-          <v-btn class="link-btn" @click="open('https://vuejs.org/v2/guide/')">Vue</v-btn>
-          <v-spacer></v-spacer>
-          <v-btn class="link-btn" @click="open('https://electron.atom.io/docs/')">Electron</v-btn>
-          <v-spacer></v-spacer>
-          <v-btn class="link-btn" @click="open('https://vuetifyjs.com')">Vuetify</v-btn>
-          <v-spacer></v-spacer>
-        </v-card-actions>
       </v-card>
     </v-flex>
   </v-layout>
@@ -45,13 +31,43 @@
 
 <script>
   import SystemInformation from './WelcomeView/SystemInformation'
-
+  import axios from 'axios'
+  axios.defaults.baseURL = 'http://api.openweathermap.org/data/2.5'
   export default {
     name: 'welcome',
     components: { SystemInformation },
+    data () {
+      return {
+        city: '',
+        country: '',
+        weatherDescription: '',
+        temp: null,
+        tempMin: null,
+        tempMax: null,
+        humidity: null,
+        key: '863668499362fb4884ebd97229f3b26b',
+        url: 'http://api.openweathermap.org/data/2.5/weather'
+      }
+    },
     methods: {
       open (link) {
         this.$electron.shell.openExternal(link)
+      },
+      getWeather () {
+        axios.get(this.url, {
+          params: {
+            q: this.city,
+            appid: this.key
+          }
+        }).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.humidity = response.data.main.humidity
+        }).catch(errors => {
+          console.log(errors)
+        })
       }
     }
   }
@@ -69,9 +85,4 @@
   {
     max-width: 100%;
   }
-
-  .link-btn
-  {
-    width: 150px;
-  }
 </style>
diff --git a/src/renderer/components/about.vue b/src/renderer/components/about.vue
new file mode 100644
index 0000000..61f5b47
--- /dev/null
+++ b/src/renderer/components/about.vue
@@ -0,0 +1,44 @@
+<template>
+    <v-layout row justify-center id="wrapper">
+        <v-card>
+            <v-card-title class="headline">About me</v-card-title>
+            <v-card-text>
+                <p>French 21 years old student/developer.</p>
+                <p>Working on VueJs with Electron, Native-script this is a simple app for me to learn more about the real power of vuejs.</p>
+                <p>Feel free to check out my social activity, this app is also available on my GitHub for Android and IOS</p>
+                <v-btn icon href="https://github.com/Thomas-Philippot/" target="_blank">
+                    <v-icon class="mx-3">fab fa-github</v-icon>
+                </v-btn>
+                <v-btn icon href="https://gitlab.com/Thomas_philippot" target="_blank">
+                    <v-icon class="mx-3">fab fa-gitlab</v-icon>
+                </v-btn>
+                <v-btn icon href="https://twitter.com/Thomas_ph35" target="_blank">
+                    <v-icon class="mx-3">fab fa-twitter</v-icon>
+                </v-btn>
+                <v-btn icon href="https://stackoverflow.com/users/7667135/thomas?tab=profile" target="_blank">
+                    <v-icon class="mx-3">fab fa-stack-overflow</v-icon>
+                </v-btn>
+
+                <div class="text-xs-right">
+                    <em class="mr-1"><small>Thomas Philippot</small></em>
+                    <v-avatar
+                            :size="50"
+                    >
+                        <img src="https://scontent-cdg2-1.xx.fbcdn.net/v/t1.0-9/20915442_1995801463988796_2991472233340304141_n.jpg?_nc_cat=0&oh=5bcf157a380176c6ce648f4b5499ee25&oe=5C0A496C" alt="avatar">
+                    </v-avatar>
+                </div>
+                <hr class="my-3">
+            </v-card-text>
+        </v-card>
+    </v-layout>
+</template>
+
+<script>
+    export default {
+      name: 'rm'
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/renderer/components/rm.vue b/src/renderer/components/rm.vue
deleted file mode 100644
index 1bf64c4..0000000
--- a/src/renderer/components/rm.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-    <v-layout row wrap justify-center id="wrapper">
-        <p>Coucou RM</p>
-    </v-layout>
-</template>
-
-<script>
-    export default {
-      name: 'rm'
-    }
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 02d3091..55ccb53 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -11,14 +11,9 @@ export default new Router({
       component: require('@/components/WelcomeView').default
     },
     {
-      path: '/inspire',
-      name: 'inspire',
-      component: require('@/components/InspireView').default
-    },
-    {
-      path: '/rm',
-      name: 'rm',
-      component: require('@/components/rm').default
+      path: '/about',
+      name: 'about',
+      component: require('@/components/about').default
     },
     {
       path: '*',