Should fix the issue

netarchivesuite · Aug 10, 2023 · 203cc90 · 203cc90
1 parent b47fdc7
commit 203cc90
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/js/src/assets/styles/global.scss b/src/js/src/assets/styles/global.scss
@@ -227,8 +227,8 @@ color:white;
  .facetContainer .spinner, 
  .domainContentContainer .spinner,
  .linkGraphContainer .spinner {
-  width: 40px;
-  height: 40px;
+  width: 100px;
+  height: 100px;
   padding:15px;
   margin:100px 0 0 200px;
   background-color: var(--main-highlight-color);

diff --git a/src/js/src/components/ToolboxComponents/NgramNetarchive.vue b/src/js/src/components/ToolboxComponents/NgramNetarchive.vue
@@ -4,9 +4,6 @@
       Ngram Netarchive
     </h2>
     <div class="contentContainer">
-      <transition name="loading-overlay">
-        <loading-overlay />
-      </transition>
       <search-box />
       <netarchive-chart />
     </div>
@@ -17,15 +14,12 @@
 
 import NetarchiveChart from '@/components/ngrams/netarchive/NetarchiveChart.vue'
 import SearchBox from '@/components/ngrams/netarchive/SearchBox.vue'
-import LoadingOverlay from '@/components/LoadingOverlay'
-
 
 
 export default {
   name: 'NgramNetarchive',
   components: {
    NetarchiveChart,
-  LoadingOverlay, 
    SearchBox,
   }
 

diff --git a/src/js/src/components/ngrams/netarchive/SearchBox.vue b/src/js/src/components/ngrams/netarchive/SearchBox.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="searchBoxContainer">
+    <transition name="loading-overlay">
+      <div v-if="loading" class="spinner" />
+    </transition>
     <div v-if="searcBoxClass() === 'urlNotTrue' && searchType === 'tags'" class="badTagQueryNotice">
       You don't need <span v-if="searchQuery.includes('<')" class="queryErrorColor">&lt;</span><span v-if="searchQuery.includes('>')" class="queryErrorColor">&gt;</span> when searching for tags
     </div>

diff --git a/src/js/src/store/modules/ngram.store.js b/src/js/src/store/modules/ngram.store.js
@@ -32,7 +32,7 @@ const actions = {
     commit('setTimeScale', param)
   },
   doSearch ({ commit }, params) {
-    this.dispatch('Search/setLoadingStatus', true)
+    this.dispatch('Ngram/setLoadingStatus', true)
 
     requestService.getNgramNetarchive(params)
    .then(results => {this.dispatch('Ngram/updateQuery', params.query), this.dispatch('Ngram/setTimeScale', params.timeScale), commit('doSearchSuccess', results)}, error =>
@@ -77,8 +77,7 @@ const mutations = {
         total: state.countsTotal.map(countTotal => countTotal.total),
         percent: state.countPercent
       })
-    this.dispatch('Search/setLoadingStatus', false)
-
+    this.dispatch('Ngram/setLoadingStatus', false) 
   },
 
   doSearchError(state, message) {