Skip to content
Snippets Groups Projects
Commit a7a135eb authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Loading animation improvements

parent 82684d6c
No related branches found
No related tags found
No related merge requests found
Pipeline #977 passed
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
**/dist/* **/dist/*
.env.local .env.local
nbactions.xml nbactions.xml
nb-configuration.xml
.env.development.local .env.development.local
...@@ -3,6 +3,6 @@ client_secret=@client_secret@ ...@@ -3,6 +3,6 @@ client_secret=@client_secret@
rap_uri=@rap_uri@ rap_uri=@rap_uri@
gms_uri=@gms_uri@ gms_uri=@gms_uri@
groups_autoload=false groups_autoload=true
store_state_on_login_endpoint=true store_state_on_login_endpoint=true
scope=openid email profile read:rap scope=openid email profile read:rap
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
&nbsp;Powered by <img alt="IA2 logo" src="./assets/ia2-logo-footer.png"> &nbsp;Powered by <img alt="IA2 logo" src="./assets/ia2-logo-footer.png">
<strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="blank_">IA2</a></strong>&nbsp; <strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="blank_">IA2</a></strong>&nbsp;
</footer> </footer>
<div id="loading" v-if="loading"> <div id="loading" v-if="loading" class="loading">
<div class="spinner-wrapper"> <div class="spinner-wrapper">
<b-spinner variant="primary" style="width: 3rem; height: 3rem;" label="Loading"></b-spinner> <b-spinner variant="primary" style="width: 3rem; height: 3rem;" label="Loading"></b-spinner>
</div> </div>
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
left: 0; left: 0;
} }
#loading { .loading {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
......
...@@ -16,7 +16,9 @@ function apiRequest(options, showLoading = true, handleValidationErrors = false) ...@@ -16,7 +16,9 @@ function apiRequest(options, showLoading = true, handleValidationErrors = false)
} else { } else {
resolve(response.data); resolve(response.data);
} }
if (showLoading) {
store.commit('setLoading', false); store.commit('setLoading', false);
}
}) })
.catch(error => { .catch(error => {
store.commit('setLoading', false); store.commit('setLoading', false);
......
...@@ -17,13 +17,28 @@ ...@@ -17,13 +17,28 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="jobs-loading" v-if="jobsLoading" class="loading">
<div class="spinner-wrapper">
<b-spinner variant="primary" style="width: 3rem; height: 3rem;" label="Loading"></b-spinner>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
computed: { computed: {
jobs() { return this.$store.state.jobs } jobs() { return this.$store.state.jobs },
jobsLoading() { return this.$store.state.jobsLoading }
},
mounted() {
this.loadJobs();
this.$store.commit('setLoading', false);
},
methods: {
loadJobs() {
this.$store.dispatch('loadJobs');
}
} }
} }
</script> </script>
...@@ -13,6 +13,7 @@ export default new Vuex.Store({ ...@@ -13,6 +13,7 @@ export default new Vuex.Store({
loading: true, loading: true,
asyncButtonEnabled: false, asyncButtonEnabled: false,
jobs: [], jobs: [],
jobsLoading: true,
user: 'anonymous', user: 'anonymous',
nodeToDelete: null, nodeToDelete: null,
writable: false writable: false
...@@ -41,6 +42,9 @@ export default new Vuex.Store({ ...@@ -41,6 +42,9 @@ export default new Vuex.Store({
addJob(state, job) { addJob(state, job) {
state.jobs.push(job); state.jobs.push(job);
}, },
setJobsLoading(state, loading) {
state.jobsLoading = loading;
},
setUsername(state, username) { setUsername(state, username) {
state.user = username; state.user = username;
}, },
...@@ -83,8 +87,10 @@ export default new Vuex.Store({ ...@@ -83,8 +87,10 @@ export default new Vuex.Store({
}); });
}, },
loadJobs({ commit }) { loadJobs({ commit }) {
commit('setJobsLoading', true);
client.loadJobs() client.loadJobs()
.then(jobs => commit('setJobs', jobs)); .then(jobs => commit('setJobs', jobs))
.finally(() => commit('setJobsLoading', false));
}, },
loadUserInfo({ commit }) { loadUserInfo({ commit }) {
client.getUserInfo() client.getUserInfo()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment