re-factor / cleanup

ayanova/src/views/login.vue

@@ -12,8 +12,8 @@
               :label="authEnterPin"
               required
               :error-messages="pinError"
-              @keyup.enter="tfaVerify"
               autofocus
+              @keyup.enter="tfaVerify"
             ></v-text-field>
           </v-card-text>
           <v-card-actions>
@@ -56,7 +56,7 @@
             </v-col>
 
             <!-- Small AyaNova logo -->
-            <v-col cols="12" v-if="showSmallBrandLogo()">
+            <v-col v-if="showSmallBrandLogo()" cols="12">
               <v-img
                 :src="require('../assets/logo.svg')"
                 contain
@@ -64,20 +64,20 @@
               ></v-img>
             </v-col>
             <!-- Large AyaNova logo. -->
-            <v-col cols="7" class="ml-16" v-if="showLargeBrandLogo()">
+            <v-col v-if="showLargeBrandLogo()" cols="7" class="ml-16">
               <v-img
                 :src="require('../assets/logo.svg')"
                 contain
                 height="128"
               ></v-img>
             </v-col>
-            <v-col cols="12" md="7" v-if="formState.errorBoxMessage">
+            <v-col v-if="formState.errorBoxMessage" cols="12" md="7">
               <gz-error
                 :error-box-message="formState.errorBoxMessage"
               ></gz-error>
             </v-col>
 
-            <v-col cols="12" md="7" v-if="showEvalUsers == true">
+            <v-col v-if="showEvalUsers == true" cols="12" md="7">
               <v-select
                 v-model="selectedTrialUserId"
                 :items="selectLists.trialUsers"
@@ -85,18 +85,19 @@
                 item-value="l"
                 label="Trial mode example users"
                 prepend-icon="$ayiQuestionCircle"
-                @click:prepend="trialHelpClick"
-                @input="trialUserSelected"
                 return-object
                 data-cy="selecttrialuser"
+                @click:prepend="trialHelpClick"
+                @input="trialUserSelected"
               >
               </v-select>
             </v-col>
             <v-col cols="12" md="7">
               <v-text-field
-                name="username"
                 id="username"
                 v-model="input.username"
+                v-focus
+                name="username"
                 prepend-icon="$ayiUser"
                 autofocus
                 autocomplete="off"
@@ -104,15 +105,14 @@
                 autocapitalize="off"
                 spellcheck="false"
                 :error="errorBadCreds"
-                v-focus
                 @keyup.enter="onEnterUserName"
               ></v-text-field>
             </v-col>
             <v-col cols="12" md="7">
               <v-text-field
-                name="password"
                 id="password"
                 v-model="input.password"
+                name="password"
                 :append-outer-icon="reveal ? '$ayiEye' : '$ayiEyeSlash'"
                 prepend-icon="$ayiKey"
                 :type="reveal ? 'text' : 'password'"
@@ -124,9 +124,9 @@
             <v-col cols="12" md="7" mt-1 mb-5>
               <v-btn
                 color="primary"
-                @click="login()"
                 value="LOGIN"
                 :data-cy="`loginbutton${errorBadCreds ? '_failedcreds' : ''}`"
+                @click="login()"
               >
                 <v-icon>$ayiSignIn</v-icon>
               </v-btn>
@@ -153,7 +153,7 @@
           style="text-decoration:none"
           class="primary white--text text-caption"
         >
-          <div style="width: 100%;" class="mx-auto" v-if="showFooterLogo()">
+          <div v-if="showFooterLogo()" style="width: 100%;" class="mx-auto">
             <v-img
               style="margin: 0 auto;"
               :src="require('../assets/logo.svg')"
@@ -337,6 +337,14 @@ export default {
       }
     };
   },
+  computed: {
+    copyright() {
+      return ayaNovaVersion.copyright;
+    },
+    version() {
+      return ayaNovaVersion.version;
+    }
+  },
   async created() {
     const vm = this;
     window.$gz.eventBus.$emit("menu-change", {
@@ -365,14 +373,6 @@ export default {
       //squash it, this isn't critical
     }
   },
-  computed: {
-    copyright() {
-      return ayaNovaVersion.copyright;
-    },
-    version() {
-      return ayaNovaVersion.version;
-    }
-  },
   methods: {
     async tfaVerify() {
       //