From 75f34e63f5b771c0c0b5175cd00ca1f7e20a7038 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:28:19 -0400
Subject: [PATCH 1/8] perf(#362): Update countdown page trigger for all routes

---
 app/src/App.vue            |  3 +++
 app/tests/unit/app.spec.js | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 app/tests/unit/app.spec.js

diff --git a/app/src/App.vue b/app/src/App.vue
index 9662a401..5fc04f8b 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -12,6 +12,9 @@ export default {
     Snackbar
   },
   async created () {
+    if (this.$store.getters.countDownDate - new Date().getTime() > 0) {
+      return this.$router.push('/countdown')
+    }
     await this.$store.dispatch('auth/tryLogin')
   }
 }
diff --git a/app/tests/unit/app.spec.js b/app/tests/unit/app.spec.js
new file mode 100644
index 00000000..57b4c51b
--- /dev/null
+++ b/app/tests/unit/app.spec.js
@@ -0,0 +1,28 @@
+import createWrapper from '../jest/script/wrapper'
+import { enableAutoDestroy } from '@vue/test-utils'
+import App from '@/App.vue'
+import router from '@/router'
+import store from '@/store/index.js'
+
+// Spy on created method early
+const route = jest.spyOn(router, 'push').mockImplementation(() => {})
+const dispatch = jest.spyOn(store, 'dispatch').mockImplementation(() => {})
+
+describe('App.vue', () => {
+  let wrapper
+  beforeEach(async () => {
+    wrapper = await createWrapper(App, { }, false)
+  })
+
+  enableAutoDestroy(afterEach)
+
+  it('mounts properly', () => {
+    expect(wrapper.find('.page-container').exists()).toBe(true)
+    expect(wrapper.find('#app').exists()).toBe(true)
+    if (wrapper.vm.$store.getters.countDownDate - new Date().getTime() > 0) {
+      expect(route).toHaveBeenCalledWith('/countdown')
+    } else {
+      expect(dispatch).toHaveBeenCalledWith('auth/tryLogin')
+    }
+  })
+})

From cbe8df36a49b998863ac2172990ade0749e5d1a4 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:30:57 -0400
Subject: [PATCH 2/8] fix(#358): Fix styling bugs

---
 app/src/assets/css/modules/_pages.scss   | 23 ++++++++++++++++++++++-
 app/src/assets/css/modules/_utility.scss |  6 ++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/src/assets/css/modules/_pages.scss b/app/src/assets/css/modules/_pages.scss
index 7c0c0b8c..9e52e5e1 100644
--- a/app/src/assets/css/modules/_pages.scss
+++ b/app/src/assets/css/modules/_pages.scss
@@ -533,16 +533,37 @@
 
 .countdown-page {
     & > .section_banner {
-        width: 100vw;
         height: 100vh;
     }
 
+    .header-logo {
+        @include respond(tab-land){
+            width: 21rem;
+        }
+    }
+
+    .form__input--adjust{
+        border: 0.15rem solid rgba($primary-white, .5);;
+    }
+
+    .visualize_header-h1 {
+        @include respond(phone){
+            font-size: 3.8rem;
+            font-weight: 400;
+            margin: 1rem 0 0rem 0;
+        }
+    }
+
     .clock__box{
         background-color: rgba(0, 0, 0, 0.3);
         padding: 12px 16px;
         width: 12rem;
         max-width: 23%;
         border-bottom: .3rem solid #d7df71;
+
+        @include respond(phone){
+            padding: 4px 12px;
+        }
     }
 
         .p{
diff --git a/app/src/assets/css/modules/_utility.scss b/app/src/assets/css/modules/_utility.scss
index 7d8496f9..2ae4600a 100644
--- a/app/src/assets/css/modules/_utility.scss
+++ b/app/src/assets/css/modules/_utility.scss
@@ -146,6 +146,12 @@
         &-width {
             width: 99% !important;
         }
+        &-flex{
+            display: flex;
+            &-column{
+                flex-direction: column;
+            }
+        }
         &-flex-justify-se {
             justify-content: space-evenly;
         }

From 04920dea30cffac0a4a640b9044d43198e931a19 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:31:55 -0400
Subject: [PATCH 3/8] perf(#362): Group drawer menu into appropriate sections

---
 app/src/components/Drawer.vue | 74 +++++++++++++++++------------------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/app/src/components/Drawer.vue b/app/src/components/Drawer.vue
index 3d802e20..7a53cfbb 100644
--- a/app/src/components/Drawer.vue
+++ b/app/src/components/Drawer.vue
@@ -1,7 +1,12 @@
 <template>
-  <div>
-    <md-toolbar class="md-transparent" md-elevation="0">Welcome {{ name }}</md-toolbar>
+  <div class="md-app-internal-drawer u--layout-flex u--layout-flex-column u--layout-flex-justify-sb">
     <md-list md-expand-single=true class="utility-transparentbg">
+      <md-toolbar class="md-transparent u--font-emph-l u_toggle-display-off" md-elevation="0"><small>App Navigation</small></md-toolbar>
+      <div class="visualize-pagination-width-mod footer_content-mobile u_margin-none">
+        <md-toolbar class="md-transparent u--font-emph-l" md-elevation="0"><small>Welcome {{ name }}</small></md-toolbar>
+      </div>
+      <md-divider></md-divider>
+
       <md-list-item md-expand>
         <md-icon class="utility-navfonticon">home</md-icon>
         <span class="md-list-item-text utility-navfont">Home</span>
@@ -32,6 +37,10 @@
           </router-link>
         </md-list>
       </md-list-item>
+
+      <md-toolbar class="md-transparent u--font-emph-l u_margin-top-small" md-elevation="0"><small>Explore</small></md-toolbar>
+      <md-divider></md-divider>
+
       <md-list-item md-expand>
         <md-icon class="utility-navfonticon">view_comfy</md-icon>
         <span class="md-list-item-text utility-navfont">Visualize</span>
@@ -47,30 +56,6 @@
           </router-link>
         </md-list>
       </md-list-item>
-      <md-list-item md-expand v-if="isAuth">
-        <md-icon class="utility-navfonticon">upload</md-icon>
-        <span class="md-list-item-text utility-navfont">Curate</span>
-        <md-list slot="md-expand">
-          <!-- <md-list-item class="md-inset" href="https://materialsmine.org/nm#/XMLCONV">
-            Upload a Spreadsheet
-          </md-list-item> -->
-          <router-link :to="'/explorer/curate/spreadsheet'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Upload a Spreadsheet</md-list-item>
-          </router-link>
-          <router-link :to="''" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Fill a Form</md-list-item>
-          </router-link>
-          <router-link :to="''" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Submit SDD</md-list-item>
-          </router-link>
-          <router-link :to="''" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Create New Chart</md-list-item>
-          </router-link>
-          <router-link :to="'/explorer/curate/validlist'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Add Xlsx List Entry</md-list-item>
-          </router-link>
-        </md-list>
-      </md-list-item>
       <md-list-item md-expand>
         <md-icon class="utility-navfonticon">handyman</md-icon>
         <span class="md-list-item-text utility-navfont">Tools</span>
@@ -92,33 +77,46 @@
           </router-link>
         </md-list>
       </md-list-item>
-      <md-list-item v-if="isAuth && isAdmin" md-expand>
-        <md-icon class="utility-navfonticon">edit</md-icon>
-        <span class="md-list-item-text utility-navfont">Admin</span>
+
+      <md-toolbar class="md-transparent u--font-emph-l u_margin-top-small" md-elevation="0" v-if="isAuth" ><small>User Dashboard</small></md-toolbar>
+      <md-divider v-if="isAuth" ></md-divider>
+      <md-list-item md-expand v-if="isAuth">
+        <md-icon class="utility-navfonticon">upload</md-icon>
+        <span class="md-list-item-text utility-navfont">Curate</span>
         <md-list slot="md-expand">
-          <router-link :to="'/nm/contact-inquiry'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Contact Inquiry</md-list-item>
+          <!-- <md-list-item class="md-inset" href="https://materialsmine.org/nm#/XMLCONV">
+            Upload a Spreadsheet
+          </md-list-item> -->
+          <router-link :to="'/explorer/curate/spreadsheet'" v-slot="{navigate, href}" custom>
+            <md-list-item :href="href" @click="navigate"  class="md-inset">Upload a Spreadsheet</md-list-item>
           </router-link>
-          <router-link :to="'/deploy'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Deploy</md-list-item>
+          <router-link :to="''" v-slot="{navigate, href}" custom>
+            <md-list-item :href="href" @click="navigate"  class="md-inset">Fill a Form</md-list-item>
+          </router-link>
+          <router-link :to="''" v-slot="{navigate, href}" custom>
+            <md-list-item :href="href" @click="navigate"  class="md-inset">Submit SDD</md-list-item>
           </router-link>
-          <router-link :to="'/nm'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">User Management</md-list-item>
+          <router-link :to="''" v-slot="{navigate, href}" custom>
+            <md-list-item :href="href" @click="navigate"  class="md-inset">Create New Chart</md-list-item>
           </router-link>
-          <router-link :to="'/nm'" v-slot="{navigate, href}" custom>
-            <md-list-item :href="href" @click="navigate"  class="md-inset">Curations</md-list-item>
+          <router-link :to="'/explorer/curate/validlist'" v-slot="{navigate, href}" custom>
+            <md-list-item :href="href" @click="navigate"  class="md-inset">Add Xlsx List Entry</md-list-item>
           </router-link>
         </md-list>
       </md-list-item>
+    </md-list>
+
+    <md-list class="utility-transparentbg">
       <md-list-item v-if="isAuth" @click="$store.dispatch('auth/logout')">
         <md-icon class="utility-navfonticon">logout</md-icon>
         <span class="md-list-item-text utility-navfont">Log out</span>
       </md-list-item>
-      <md-list-item v-if="!isAuth" @click="login">
+      <md-list-item class="" v-if="!isAuth" @click="login">
         <md-icon class="utility-navfonticon">login</md-icon>
         <span class="md-list-item-text utility-navfont">Login</span>
       </md-list-item>
     </md-list>
+
   </div>
 </template>
 <script>

From f9f81b14f9def1508b97ca87903b911ada408974 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:32:54 -0400
Subject: [PATCH 4/8] perf(#362): Refactor pagination util to only display when
 total page is greater than 1

---
 app/src/components/explorer/Pagination.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/components/explorer/Pagination.vue b/app/src/components/explorer/Pagination.vue
index afb79f12..dbd18400 100644
--- a/app/src/components/explorer/Pagination.vue
+++ b/app/src/components/explorer/Pagination.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="explorer_page-nav u_margin-top-med viz-pagination-width-mod u_margin-bottom-small">
+  <div>
+    <div v-if="tpages > 1" class="explorer_page-nav u_margin-top-med viz-pagination-width-mod u_margin-bottom-small">
       <button
         @click.prevent="goToBeginning"
         v-if="rowNumber > 1" :disabled="rowNumber < 1"
@@ -18,8 +19,9 @@
         <md-icon class="u--default-size">more_horiz</md-icon>
       </button>
       <button @click.prevent="goToEnd" v-if="rowNumber < factor" class="md-button md-icon-button md-dense md-primary u--color-primary"> {{ tpages }} </button>
-
     </div>
+  </div>
+
 </template>
 <script>
 export default {

From 23b40688364fb8db6a43fe5d9519e59efefb2eac Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:34:19 -0400
Subject: [PATCH 5/8] fix(#362): Fix mobile and tablet design bugs

---
 app/src/pages/CountDown.vue            |  12 +--
 app/tests/unit/pages/countdown.spec.js | 109 +++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 app/tests/unit/pages/countdown.spec.js

diff --git a/app/src/pages/CountDown.vue b/app/src/pages/CountDown.vue
index c9975bfa..6e456d0a 100644
--- a/app/src/pages/CountDown.vue
+++ b/app/src/pages/CountDown.vue
@@ -3,7 +3,7 @@
     <div class="section_banner">
       <div class="editImage_modal">
         <div class="metamine_intro-content">
-          <p class="search_box_header u_centralize_text u_color_white u_margin-top-med">We Are Coming Very Soon!</p>
+          <p class="search_box_header u_centralize_text u_color_white u_margin-top-small">We Are Coming Very Soon!</p>
           <br>
           <div class="header-logo u--margin-none u_margin-top-med">
             <span class="md-title"><img id="logo" src="@/assets/img/materialsmine_logo_sm.png"></span>
@@ -11,26 +11,26 @@
 
           <div class="md-layout md-alignment-center-center visualize_accordion u_margin-top-med">
             <div class="clock__box u_margin-right-small">
-              <h1 class="visualize_header-h1 article_title u_centralize_text u_margin-bottom-small">{{days}}</h1>
+              <h1 class="visualize_header-h1 article_title u_centralize_text">{{days}}</h1>
               <p class="u_centralize_text p_mobile_small">DAYS</p>
             </div>
 
             <div class="clock__box u_margin-right-small">
-              <h1 class="visualize_header-h1 article_title u_centralize_text u_margin-bottom-small">{{hours}}</h1>
+              <h1 class="visualize_header-h1 article_title u_centralize_text">{{hours}}</h1>
               <p class="u_centralize_text p_mobile_small">HOURS</p>
             </div>
 
             <div class="clock__box u_margin-right-small">
-              <h1 class="visualize_header-h1 article_title u_centralize_text u_margin-bottom-small">{{minutes}}</h1>
+              <h1 class="visualize_header-h1 article_title u_centralize_text ">{{minutes}}</h1>
               <p class="u_centralize_text p_mobile_small">MINUTES</p>
             </div>
 
             <div class="clock__box u_margin-right-small">
-              <h1 class="visualize_header-h1 article_title u_centralize_text u_margin-bottom-small">{{seconds}}</h1>
+              <h1 class="visualize_header-h1 article_title u_centralize_text ">{{seconds}}</h1>
               <p class="u_centralize_text p_mobile_small">SECONDS</p>
             </div>
           </div>
-          <p class="u_color_white u_margin-top-med u--margin-toplg">Notify me when it's ready</p>
+          <p class="u_color_white u--margin-toplg">Notify me when it's ready</p>
 
           <form class="form" @submit.prevent="onSubmit">
             <div class="search_box_form">
diff --git a/app/tests/unit/pages/countdown.spec.js b/app/tests/unit/pages/countdown.spec.js
new file mode 100644
index 00000000..9a36b16b
--- /dev/null
+++ b/app/tests/unit/pages/countdown.spec.js
@@ -0,0 +1,109 @@
+import createWrapper from '../../jest/script/wrapper'
+import { enableAutoDestroy } from '@vue/test-utils'
+import CountDown from '@/pages/CountDown.vue'
+
+const mounted = jest.spyOn(CountDown.methods, 'getDate').mockImplementation(() => {})
+describe('CountDown.vue', () => {
+  let wrapper
+  beforeEach(async () => {
+    wrapper = await createWrapper(CountDown, { }, false)
+  })
+
+  enableAutoDestroy(afterEach)
+
+  it('mounts properly', () => {
+    expect(wrapper.find('.countdown-page').exists()).toBe(true)
+    expect(mounted).toHaveBeenCalledTimes(1)
+  })
+
+  it('render page layout properly', () => {
+    expect.assertions(2)
+    expect(wrapper.find('.countdown-page > .section_banner > .editImage_modal').exists()).toBe(true)
+    expect(wrapper.find('.editImage_modal > .metamine_intro-content').exists()).toBe(true)
+  })
+
+  it('render header text properly', () => {
+    expect.assertions(2)
+    const header = wrapper.find('.search_box_header.u_centralize_text.u_color_white.u_margin-top-small')
+    expect(header.exists()).toBe(true)
+    expect(header.text()).toBe('We Are Coming Very Soon!')
+  })
+
+  it('render image properly', () => {
+    expect.assertions(3)
+    const imageContainer = wrapper.find('.header-logo.u--margin-none.u_margin-top-med')
+    const image = imageContainer.find('img')
+    const span = imageContainer.find('span.md-title')
+    expect(image.attributes().src).toBe('@/assets/img/materialsmine_logo_sm.png')
+    expect(image.attributes().id).toBe('logo')
+    expect(span.exists()).toBe(true)
+  })
+
+  it('render clock box elements properly', () => {
+    expect.assertions(3)
+    const clockBox = wrapper.find('.clock__box.u_margin-right-small')
+    const clockHeader = clockBox.find('h1')
+    const clockText = clockBox.find('p')
+    expect(clockBox.exists()).toBe(true)
+    expect(clockHeader.attributes().class).toBe('visualize_header-h1 article_title u_centralize_text')
+    expect(clockText.attributes().class).toBe('u_centralize_text p_mobile_small')
+  })
+
+  it('render correct no of clock box ', () => {
+    expect.assertions(9)
+    const clockBox = wrapper.findAll('.clock__box.u_margin-right-small')
+    expect(clockBox.length).toBe(4)
+    for (let i = 0; i < clockBox.length; i++) {
+      expect(clockBox.at(i).find('h1').exists()).toBe(true)
+      expect(clockBox.at(i).find('p').exists()).toBe(true)
+    }
+  })
+
+  it('render correct clock box in the right order', () => {
+    expect.assertions(4)
+    const arr = ['DAYS', 'HOURS', 'MINUTES', 'SECONDS']
+    const clockText = wrapper.findAll('.u_centralize_text.p_mobile_small')
+    for (let i = 0; i < clockText.length; i++) {
+      expect(clockText.at(i).text()).toBe(arr[i])
+    }
+  })
+
+  it('render notify text', () => {
+    expect.assertions(1)
+    expect(wrapper.find('.u_color_white.u--margin-toplg').text()).toBe("Notify me when it's ready")
+  })
+
+  it('render form layout', () => {
+    expect.assertions(3)
+    const form = wrapper.find('form')
+    const inputContainer = form.find('.search_box_form > .search_box_form-item-1')
+    const buttonContainer = form.find('.search_box_form > .search_box_form-item-2')
+    expect(inputContainer.exists()).toBe(true)
+    expect(buttonContainer.exists()).toBe(true)
+    expect(form.findAll('.form__group').length).toBe(2)
+  })
+
+  it('render button properly', () => {
+    expect.assertions(2)
+    const button = wrapper.find('button')
+    expect(button.attributes().class).toBe('btn btn--primary btn--tertiary btn--noradius search_box_form_btn')
+    expect(button.text()).toBe('Submit')
+  })
+
+  it('render form correctly', async () => {
+    expect.assertions(7)
+    const onSubmit = jest.spyOn(wrapper.vm, 'onSubmit').mockImplementation(() => {})
+    const form = wrapper.find('form')
+    const input = form.find('#search')
+    expect(input.attributes().type).toBe('email')
+    expect(input.attributes().class).toBe('form__input form__input--adjust')
+    expect(input.attributes().placeholder).toBe('Get notified by email.')
+    expect(input.attributes().required).toBe('required')
+    expect(form.find('label').attributes().class).toBe('form__label search_box_form_label')
+
+    await input.setValue('my@mail.com')
+    expect(wrapper.vm.email).toBe('my@mail.com')
+    form.trigger('submit')
+    expect(onSubmit).toHaveBeenCalledTimes(1)
+  })
+})

From 54d7f4d84d131e63b3ea604e29076d6b1ba92a8a Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:35:46 -0400
Subject: [PATCH 6/8] fix(#362): Fix UI styling and chips spacing bug

---
 app/src/pages/explorer/curate/validlist/UpdateXlsList.vue | 6 +++---
 app/src/pages/explorer/curate/validlist/XlsList.vue       | 8 ++++----
 app/src/pages/explorer/curate/validlist/XlsListAll.vue    | 4 ++--
 app/src/pages/nanomine/Home/Home.vue                      | 5 -----
 app/tests/unit/pages/nanomine/home.spec.js                | 5 +----
 5 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue b/app/src/pages/explorer/curate/validlist/UpdateXlsList.vue
index 22814412..935f6f52 100644
--- 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
index 652058b6..c1871e06 100644
--- 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
index 2602ab13..83f75ed0 100644
--- 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
index 6f4ce246..5aa2b2b0 100644
--- 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
index 004d0229..7ce9f3fe 100644
--- 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()

From 7edad35fb9adbd159ecde22f08eca4b47374ebc5 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 13:57:14 -0400
Subject: [PATCH 7/8] fix(#362): Fix submit button styling for countdown page

---
 app/src/assets/css/modules/_pages.scss | 17 +++++++++++++++++
 app/src/pages/CountDown.vue            |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/assets/css/modules/_pages.scss b/app/src/assets/css/modules/_pages.scss
index 9e52e5e1..5f631309 100644
--- a/app/src/assets/css/modules/_pages.scss
+++ b/app/src/assets/css/modules/_pages.scss
@@ -554,6 +554,23 @@
         }
     }
 
+    button.submit_button {
+        @include respond(laptop){
+            padding: 1.6rem 3.5rem !important;
+            margin-left: -1rem !important;
+        }
+        @include respond(tab-land){
+            padding: 1.85rem 3.5rem !important;
+            margin-left: -1rem !important;
+        }
+        @include respond(tab-port){
+            padding: 1.86rem 3.5rem !important;
+        }
+        @include respond(phone){
+            padding: 1.65rem 3.5rem !important;
+        }
+    }
+
     .clock__box{
         background-color: rgba(0, 0, 0, 0.3);
         padding: 12px 16px;
diff --git a/app/src/pages/CountDown.vue b/app/src/pages/CountDown.vue
index 6e456d0a..199dea06 100644
--- a/app/src/pages/CountDown.vue
+++ b/app/src/pages/CountDown.vue
@@ -39,7 +39,7 @@
                     <label htmlFor="email" class="form__label search_box_form_label">Search</label>
                 </div>
                 <div class="form__group search_box_form-item-2">
-                    <button type="submit" class="btn btn--primary btn--tertiary btn--noradius search_box_form_btn">Submit</button>
+                    <button type="submit" class="btn btn--primary btn--tertiary btn--noradius search_box_form_btn submit_button">Submit</button>
                 </div>
             </div>
           </form>

From da139ea8107603898b27694485e58d71dd314920 Mon Sep 17 00:00:00 2001
From: tholulomo <fatexjames@yahoo.com>
Date: Wed, 22 Mar 2023 14:12:51 -0400
Subject: [PATCH 8/8] fix(#362): Fix failing unit test for countdown page

---
 app/src/components/Drawer.vue          | 2 +-
 app/tests/unit/pages/countdown.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/components/Drawer.vue b/app/src/components/Drawer.vue
index 7a53cfbb..0a5931d1 100644
--- a/app/src/components/Drawer.vue
+++ b/app/src/components/Drawer.vue
@@ -111,7 +111,7 @@
         <md-icon class="utility-navfonticon">logout</md-icon>
         <span class="md-list-item-text utility-navfont">Log out</span>
       </md-list-item>
-      <md-list-item class="" v-if="!isAuth" @click="login">
+      <md-list-item v-if="!isAuth" @click="login">
         <md-icon class="utility-navfonticon">login</md-icon>
         <span class="md-list-item-text utility-navfont">Login</span>
       </md-list-item>
diff --git a/app/tests/unit/pages/countdown.spec.js b/app/tests/unit/pages/countdown.spec.js
index 9a36b16b..d2efdeba 100644
--- a/app/tests/unit/pages/countdown.spec.js
+++ b/app/tests/unit/pages/countdown.spec.js
@@ -86,7 +86,7 @@ describe('CountDown.vue', () => {
   it('render button properly', () => {
     expect.assertions(2)
     const button = wrapper.find('button')
-    expect(button.attributes().class).toBe('btn btn--primary btn--tertiary btn--noradius search_box_form_btn')
+    expect(button.attributes().class).toBe('btn btn--primary btn--tertiary btn--noradius search_box_form_btn submit_button')
     expect(button.text()).toBe('Submit')
   })