fix(#362): Fix UI styling and chips spacing bug

Duke-MatSci · Mar 22, 2023 · 54d7f4d · 54d7f4d
1 parent 23b4068
commit 54d7f4d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue b/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue
@@ -19,7 +19,7 @@
                         <md-table-row slot="md-table-row" slot-scope="{ item}" md-selectable="single">
                           <md-table-cell md-label="Field Name">{{ item.field }}</md-table-cell>
                           <md-table-cell md-label="Value">
-                            <md-chip v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
+                            <md-chip class="u_margin-bottom-small" v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
                           </md-table-cell>
                           <md-table-cell md-label="User">{{ item.user ?? ''}}</md-table-cell>
                         </md-table-row>
@@ -35,7 +35,7 @@
                         <md-table-row>
                           <md-table-cell>{{ fieldName }}</md-table-cell>
                           <md-table-cell>
-                            <md-chip v-for="(element, i) in value" @md-delete="deleteValue(value, i)" md-deletable :key="`${i}`">{{ element }}</md-chip>
+                            <md-chip class="u_margin-bottom-small" v-for="(element, i) in value" @md-delete="deleteValue(value, i)" md-deletable :key="`${i}`">{{ element }}</md-chip>
                           </md-table-cell>
                         </md-table-row>
 
@@ -53,7 +53,7 @@
                         <md-table-row>
                           <md-table-cell>{{ uploadedData.field }}</md-table-cell>
                           <md-table-cell>
-                            <md-chip v-for="(element, i) in uploadedData['values']" :key="`${i}`">{{ element }}</md-chip>
+                            <md-chip class="u_margin-bottom-small" v-for="(element, i) in uploadedData['values']" :key="`${i}`">{{ element }}</md-chip>
                           </md-table-cell>
                           <md-table-cell>{{ uploadedData.user ?? '' }}</md-table-cell>
                         </md-table-row>

diff --git a/app/src/pages/explorer/curate/validlist/XlsList.vue b/app/src/pages/explorer/curate/validlist/XlsList.vue
@@ -23,14 +23,14 @@
                       <md-table-row v-for="item in tableData" :key="item.field">
                         <md-table-cell>{{ item.field }}</md-table-cell>
                         <md-table-cell>
-                          <md-chip v-for="(element, i) in item['values']" @md-delete="deleteValue(item['values'], i)" md-deletable :key="`B${i}`">{{ element }}</md-chip>
+                          <md-chip class="u_margin-bottom-small" v-for="(element, i) in item['values']" @md-delete="deleteValue(item['values'], i)" md-deletable :key="`B${i}`">{{ element }}</md-chip>
                         </md-table-cell>
                       </md-table-row>
 
                       <md-table-row>
                         <md-table-cell>{{ fieldName.split(" ").join("_")}}</md-table-cell>
                         <md-table-cell>
-                          <md-chip v-for="(item, i) in value" @md-delete="deleteValue(value, i)" md-deletable :key="`C${i}`" class="u--color-primary">{{ item }}</md-chip>
+                          <md-chip v-for="(item, i) in value" @md-delete="deleteValue(value, i)" md-deletable :key="`C${i}`" class="u--color-primary u_margin-bottom-small">{{ item }}</md-chip>
                         </md-table-cell>
                       </md-table-row>
                     </md-table>
@@ -42,7 +42,7 @@
                         <md-table-cell md-label=""><md-icon class="u--color-success">check</md-icon></md-table-cell>
                         <md-table-cell md-label="FieldName">{{ item.field }}</md-table-cell>
                         <md-table-cell md-label="Value">
-                          <md-chip v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
+                          <md-chip class="u_margin-bottom-small" v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
                         </md-table-cell>
                       </md-table-row>
                     </md-table>
@@ -57,7 +57,7 @@
                         <md-table-cell md-label=""><md-icon class="u--color-error">close</md-icon></md-table-cell>
                         <md-table-cell md-label="FieldName">{{ item.field }}</md-table-cell>
                         <md-table-cell md-label="Value">
-                          <md-chip v-for="(element, i) in item['values']" :key="`D${i}`">{{ element }}</md-chip>
+                          <md-chip class="u_margin-bottom-small" v-for="(element, i) in item['values']" :key="`D${i}`">{{ element }}</md-chip>
                         </md-table-cell>
                       </md-table-row>
                     </md-table>

diff --git a/app/src/pages/explorer/curate/validlist/XlsListAll.vue b/app/src/pages/explorer/curate/validlist/XlsListAll.vue
@@ -34,7 +34,7 @@
                 <md-table-row slot="md-table-row" slot-scope="{ item }">
                   <md-table-cell md-label="Field Name" md-sort-by="field">{{ item.field }}</md-table-cell>
                   <md-table-cell md-label="Value">
-                    <md-chip v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
+                    <md-chip class="u_margin-bottom-small" v-for="(element, i) in item['values']" :key="`C${i}`">{{ element }}</md-chip>
                   </md-table-cell>
                   <md-table-cell md-label="User" md-sort-by="user">{{ item.user ?? ''}}</md-table-cell>
                   <md-table-cell md-label="Actions">
@@ -67,7 +67,7 @@
             with values:
         </span>
         <div class="md-layout md-gutter md-alignment-bottom-center" style="margin-top:1rem">
-            <md-chip v-for="(value, index) in dialog['values']" :key="`value_${index}`">{{ value }}</md-chip>
+            <md-chip class="u_margin-bottom-small" v-for="(value, index) in dialog['values']" :key="`value_${index}`">{{ value }}</md-chip>
         </div>
       </template>
       <template v-slot:actions>

diff --git a/app/src/pages/nanomine/Home/Home.vue b/app/src/pages/nanomine/Home/Home.vue
@@ -101,11 +101,6 @@ export default {
     }
   },
   created () {
-    // Trigger count down page if date is still in the future
-    if (this.$store.getters.countDownDate - new Date().getTime() > 0) {
-      return this.$router.push('/countdown')
-    }
-
     this.$store.commit('setAppHeaderInfo', {
       icon: '',
       pagetype: 'home',

diff --git a/app/tests/unit/pages/nanomine/home.spec.js b/app/tests/unit/pages/nanomine/home.spec.js
@@ -16,10 +16,7 @@ const factory = async (info = {}) => {
           return {
             setAppHeaderInfo: info
           }
-        },
-        getters: () => ({
-          countDownDate: new Date('Mar 11, 2023 13:30:00').getTime() // Using past time to ensure test run without triggering countdown
-        })
+        }
       },
       $router: {
         push: jest.fn()