From fd94627fdbf7f37c37ee2610af47421272228d90 Mon Sep 17 00:00:00 2001
From: voje <kristjan.voje@gmail.com>
Date: Thu, 25 Apr 2019 18:31:56 +0200
Subject: [PATCH] loader timing and color

---
 src/frontend_vue/config/config.json           |  2 +-
 src/frontend_vue/config/config_dev.json       |  2 +-
 src/frontend_vue/src/components/Home.vue      |  9 +++------
 src/frontend_vue/src/components/MainDispl.vue | 13 ++++++------
 src/frontend_vue/src/components/Register.vue  | 20 +++++++++----------
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/frontend_vue/config/config.json b/src/frontend_vue/config/config.json
index 9f2635c..5b77999 100644
--- a/src/frontend_vue/config/config.json
+++ b/src/frontend_vue/config/config.json
@@ -1,3 +1,3 @@
 {
-    "api_addr": "http://193.2.76.103:8084"
+    "api_addr": "http://0.0.0.0:8084"
 }
diff --git a/src/frontend_vue/config/config_dev.json b/src/frontend_vue/config/config_dev.json
index 9f2635c..5b77999 100644
--- a/src/frontend_vue/config/config_dev.json
+++ b/src/frontend_vue/config/config_dev.json
@@ -1,3 +1,3 @@
 {
-    "api_addr": "http://193.2.76.103:8084"
+    "api_addr": "http://0.0.0.0:8084"
 }
diff --git a/src/frontend_vue/src/components/Home.vue b/src/frontend_vue/src/components/Home.vue
index 94014fb..e27c717 100644
--- a/src/frontend_vue/src/components/Home.vue
+++ b/src/frontend_vue/src/components/Home.vue
@@ -1,11 +1,5 @@
 <template>
 <div>
-  <p
-    v-if="this.$root.store.api_error !== null" 
-    class="text-warning"
-  >
-    api_error: {{ this.$root.store.api_error }}
-  </p>
   <Nav></Nav>
     <div class="my-home container-fluid">
       <div class="row">
@@ -15,6 +9,9 @@
           <LFunctors v-else></LFunctors>
         </div>
         <div class="col-sm-10">
+          <p v-if="this.$root.store.api_error != null">
+              {{ this.$root.store.api_error }}
+          </p>
           <router-view></router-view>
         </div>
       </div>
diff --git a/src/frontend_vue/src/components/MainDispl.vue b/src/frontend_vue/src/components/MainDispl.vue
index d007925..359ba04 100644
--- a/src/frontend_vue/src/components/MainDispl.vue
+++ b/src/frontend_vue/src/components/MainDispl.vue
@@ -1,6 +1,6 @@
 <template>
 <!--load mode-->
-<div v-if="show_loader">
+<div v-if="state === 'loading'">
     <pulse-loader :color="loader_color"></pulse-loader>
 </div>
 
@@ -76,16 +76,11 @@ export default {
         },
         state: "loading",  // editing, normal
         request_reload: false,
-        loader_color: "#007bff",
+        loader_color: "#b71511",
     }},
     created: function () {
         this.reload()
     },
-    computed: {
-        show_loader: function () {
-            return this.state === "loading" && this.$root.store.api_error !== null
-        }
-    },
     watch: {
         hw: function () {
             this.reload()
@@ -118,6 +113,7 @@ export default {
                 }
             }
             var component = this
+            component.state = "loading"
             this.$http.get(
                 this.$root.store.api_addr + 
                 "/api/functor-frames" + 
@@ -131,6 +127,7 @@ export default {
                 })
                 .catch(function(error) {
                     component.$root.store.api_error = error
+                    component.state = "error"
                 })
         },
         getFrames: function (hw, reduce_fun=null) {
@@ -149,6 +146,7 @@ export default {
                 }
             }
             var component = this
+            component.state = "loading"
             this.$http.get(
                 this.$root.store.api_addr + "/api/frames" + 
                     "?hw=" + hw + "&rf=" + reduce_fun +
@@ -161,6 +159,7 @@ export default {
                 })
                 .catch(function(error) {
                     component.$root.store.api_error = error
+                    component.state = "error"
                 })
         },
         buildSentences: function () {
diff --git a/src/frontend_vue/src/components/Register.vue b/src/frontend_vue/src/components/Register.vue
index 7d95195..1ac7f2b 100644
--- a/src/frontend_vue/src/components/Register.vue
+++ b/src/frontend_vue/src/components/Register.vue
@@ -7,15 +7,6 @@
     <div class="alert alert-danger" v-if="error">
       <p>{{ error }}</p>
     </div>
-    <div class="form-group">
-      <input 
-        type="text"
-        class="form-control js-login__username"
-        placeholder="Uporabnik"
-        v-model="credentials.username" 
-        autocomplete="off"
-      >
-    </div>
     <div class="form-group">
       <input
         type="email"
@@ -25,6 +16,15 @@
         autocomplete="off"
       >
     </div>
+    <div class="form-group">
+      <input 
+        type="text"
+        class="form-control js-login__username"
+        placeholder="Uporabnik"
+        v-model="credentials.username" 
+        autocomplete="off"
+      >
+    </div>
     <div class="form-group">
       <input
         type="password"
@@ -38,7 +38,7 @@
       <input
         type="password"
         class="form-control js-login__password "
-        placeholder="Ponovite geslo."
+        placeholder="Ponovite geslo"
         v-model="credentials.snd_password" 
         autocomplete="off"
       >