Skip to content
Snippets Groups Projects
Commit ec13bea9 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issues/v2/11785' into 'develop'

REDMINE-ISSUES-11785 V2

See merge request geocontrib/geocontrib-frontend!90
parents 125ad518 c8643585
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,13 @@ export default new Vuex.Store({ ...@@ -47,7 +47,13 @@ export default new Vuex.Store({
SSO_SETTED: false, SSO_SETTED: false,
USER_LEVEL_PROJECTS: null, USER_LEVEL_PROJECTS: null,
user_permissions: null, user_permissions: null,
messages: [] messages: [],
events: null
// events: {
// 'events': null,
// 'features': null,
// 'comments': null
// }
}, },
mutations: { mutations: {
...@@ -90,6 +96,9 @@ export default new Vuex.Store({ ...@@ -90,6 +96,9 @@ export default new Vuex.Store({
SET_USER_PERMISSIONS(state, userPermissions) { SET_USER_PERMISSIONS(state, userPermissions) {
state.user_permissions = userPermissions; state.user_permissions = userPermissions;
}, },
SET_EVENTS(state, events) {
state.events = events;
},
DISPLAY_MESSAGE(state, comment) { DISPLAY_MESSAGE(state, comment) {
state.messages = [{ comment }, ...state.messages]; state.messages = [{ comment }, ...state.messages];
document.getElementById("messages").scrollIntoView({ block: "start", inline: "nearest" }); document.getElementById("messages").scrollIntoView({ block: "start", inline: "nearest" });
...@@ -183,6 +192,23 @@ export default new Vuex.Store({ ...@@ -183,6 +192,23 @@ export default new Vuex.Store({
} }
}, },
USER_EVENTS({ commit }) {
return new Promise((resolve, reject) => {
axios
.get(`${this.state.configuration.VUE_APP_DJANGO_API_BASE}events`)
.then((response) => {
if (response && response.status === 200) {
const events = response.data;
commit("SET_EVENTS", events);
resolve(response.data);
}
})
.catch(() => {
reject("Error");
});
});
},
LOGOUT({ commit, dispatch }) { LOGOUT({ commit, dispatch }) {
// const pageNoRedirect = ["liste-signalements", "details-type-signalement", "details-signalement", "project_detail", "mentions", "aide", "index"] // const pageNoRedirect = ["liste-signalements", "details-type-signalement", "details-signalement", "project_detail", "mentions", "aide", "index"]
axios axios
......
...@@ -309,6 +309,21 @@ export default { ...@@ -309,6 +309,21 @@ export default {
refreshId() { refreshId() {
return "?ver=" + Math.random(); return "?ver=" + Math.random();
}, },
setEvents(data){
this.events = data.events;
this.features = data.features;
this.comments = data.comments;
},
getEvents(){
this.$store
.dispatch("USER_EVENTS")
.then((data)=>{
this.setEvents(data)
})
}
}, },
created(){
this.getEvents();
}
}; };
</script> </script>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment