Browse Source

refactor mutation

tripeur 4 years ago
parent
commit
54b70d5cfe

+ 3 - 3
src/Inscription.vue

@@ -31,7 +31,7 @@ import cFooter from "@/components/Utils/Footer.vue";
 import Questionnaire from "@/components/Questionaire.vue";
 import dots from "@/components/Utils/Dots.vue";
 
-import { StateJSON } from "@/store/State";
+import { EvenementStateJSON } from "@/store/State";
 import Benevole, { BenevoleJSON } from "@/models/Benevole";
 import Competence from "@/models/Competence";
 import getQuestionnaire from "@/mixins/getQuestionnaire";
@@ -46,7 +46,7 @@ export default defineComponent({
     return {
       uuid: location.pathname.split("/").pop(),
       status: "Loading",
-      data: null as StateJSON | null,
+      data: null as EvenementStateJSON | null,
       registration: [] as Array<Benevole>,
       competences: [] as Array<Competence>,
     };
@@ -83,7 +83,7 @@ export default defineComponent({
             throw new Error(res.statusText);
           }
         })
-        .then((data: StateJSON) => {
+        .then((data: EvenementStateJSON) => {
           this.data = data;
           this.competences = data.competences.map((o) => Competence.fromJSON(o));
           this.addBenevoles(data.benevoles);

+ 1 - 1
src/components/EditeurBenevole.vue

@@ -92,7 +92,7 @@ import styledInput from "@/components/Form/Input.vue";
 import chipsInput from "@/components/Form/SelectChipInput.vue";
 import checkbox from "@/components/Form/checkBox.vue";
 import { defineComponent, PropType } from "vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import AutocompleteOptions from "@/models/AutocompleteOptions";
 
 export default defineComponent({

+ 1 - 1
src/components/EditeurCompetence.vue

@@ -64,7 +64,7 @@ import Competence from "@/models/Competence";
 import styledInput from "./Form/Input.vue";
 import checkbox from "./Form/checkBox.vue";
 import { defineComponent, PropType } from "vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import "@/assets/css/editor-panel.css";
 
 export default defineComponent({

+ 1 - 1
src/components/EditeurCreneau.vue

@@ -155,7 +155,7 @@ import checkbox from "./Form/checkBox.vue";
 import dayjs from "dayjs";
 
 import "@/assets/css/editor-panel.css";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import Benevole from "@/models/Benevole";
 import Competence from "@/models/Competence";
 

+ 1 - 1
src/components/Utils/ManageRegistration.vue

@@ -62,7 +62,7 @@ import Benevole, { BenevoleJSON } from "@/models/Benevole";
 import { defineComponent } from "vue";
 
 import dots from "@/components/Utils/Dots.vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 
 const API_URL = process.env.VUE_APP_API_URL;
 

+ 3 - 3
src/mixins/ImportJsonState.ts

@@ -2,8 +2,8 @@ import Benevole from "@/models/Benevole";
 import Competence from "@/models/Competence";
 import Creneau from "@/models/Creneau";
 import Evenement from "@/models/Evenement";
-import { MutationTypes } from "@/store/Mutations";
-import { StateJSON } from "@/store/State";
+import { MutationTypes } from "@/views/Mutations";
+import { EvenementStateJSON } from "@/store/State";
 import { Ressource } from "jc-timeline";
 import { defineComponent } from "vue";
 
@@ -11,7 +11,7 @@ const keyofEvent: Array<keyof Evenement> = ["name", "uuid", "start", "end"];
 
 export default defineComponent({
   methods: {
-    importJsonState(obj: StateJSON, preserve = false) {
+    importJsonState(obj: EvenementStateJSON, preserve = false) {
       // Remove previous content and load the main event title
       if (preserve == false) {
         this.$store.commit(MutationTypes.resetState, undefined);

+ 1 - 1
src/mixins/updatePlanningVersions.ts

@@ -1,4 +1,4 @@
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import { defineComponent } from "vue";
 
 const API_URL = process.env.VUE_APP_API_URL;

+ 1 - 1
src/store/Actions.ts

@@ -1,6 +1,6 @@
 import { ActionTree, ActionContext } from "vuex";
 import { State } from "./State";
-import { Mutations, MutationTypes } from "./Mutations";
+import { Mutations, MutationTypes } from "../views/Mutations";
 import Creneau, { ICreneau } from "@/models/Creneau";
 
 export enum ActionTypes {

+ 3 - 3
src/store/Getters.ts

@@ -3,14 +3,14 @@ import Competence from "@/models/Competence";
 import Creneau from "@/models/Creneau";
 import { Ressource } from "jc-timeline";
 import { GetterTree } from "vuex";
-import { State, StateJSON } from "./State";
+import { State, EvenementStateJSON } from "./State";
 
 export type Getters = {
   getCreneauById(state: State): (id: string) => Creneau | undefined;
   getCreneauGroupById(state: State): (id: string) => Ressource | undefined;
   getCompetenceById(state: State): (id: number) => Competence | undefined;
   getBenevoleById(state: State): (id: number) => Benevole | undefined;
-  getJSONState(state: State): StateJSON;
+  getJSONEvenementState(state: State): EvenementStateJSON;
 };
 
 export const getters: GetterTree<State, State> & Getters = {
@@ -26,7 +26,7 @@ export const getters: GetterTree<State, State> & Getters = {
   getBenevoleById: (state) => (id: number) => {
     return state.benevoleList.find((o) => o.id == id);
   },
-  getJSONState: (s) => {
+  getJSONEvenementState: (s) => {
     return {
       evenement: s.evenement.toJSON(),
       competences: s.competenceList.map((o) => o.toJSON()),

+ 1 - 1
src/store/State.ts

@@ -5,7 +5,7 @@ import Benevole, { BenevoleJSON } from "../models/Benevole";
 import Competence, { ICompetence } from "../models/Competence";
 import Creneau, { CreneauJSON } from "../models/Creneau";
 
-export type StateJSON = {
+export type EvenementStateJSON = {
   evenement: IEvenement;
   competences: Array<ICompetence>;
   benevoles: Array<BenevoleJSON>;

+ 1 - 1
src/store/Store.ts

@@ -1,7 +1,7 @@
 import { createStore, Store as VuexStore, CommitOptions, DispatchOptions } from "vuex";
 import { State, state } from "./State";
 import { Getters, getters } from "./Getters";
-import { Mutations, mutations } from "./Mutations";
+import { Mutations, mutations } from "../views/Mutations";
 import { Actions, actions } from "./Actions";
 
 export const store = createStore({

+ 1 - 1
src/views/BenevoleManager.vue

@@ -48,7 +48,7 @@ import DataTable, {
   DataTableData,
 } from "@/components/Utils/DataTable.vue";
 import { defineComponent } from "vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import Benevole from "@/models/Benevole";
 import csv from "@/utils/csv";
 import dayjs from "dayjs";

+ 1 - 1
src/views/CompetenceManager.vue

@@ -22,7 +22,7 @@ import Competence from "@/models/Competence";
 import EditeurContrainte from "@/components/EditeurCompetence.vue";
 import DataTable, { DataTableData, DataTableColumn } from "@/components/Utils/DataTable.vue";
 import { defineComponent } from "vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 
 type CompetenceTableObject = {
   id: number;

+ 1 - 1
src/views/Evenement.vue

@@ -110,7 +110,7 @@
 import { Dayjs } from "dayjs";
 import { v4 as uuidv4 } from "uuid";
 import { defineComponent } from "vue";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import Evenement from "@/models/Evenement";
 import EvenementVersion from "@/models/EvenementVersion";
 import styledInput from "@/components/Form/Input.vue";

+ 1 - 1
src/store/Mutations.ts → src/views/Mutations.ts

@@ -5,7 +5,7 @@ import Evenement from "@/models/Evenement";
 import EvenementVersion from "@/models/EvenementVersion";
 import { Ressource } from "jc-timeline";
 import { MutationTree } from "vuex";
-import { State } from "./State";
+import { State } from "../store/State";
 
 export enum MutationTypes {
   resetState = "resetState",

+ 1 - 1
src/views/Planning.vue

@@ -68,7 +68,7 @@ import EditeurCreneau from "@/components/EditeurCreneau.vue";
 import EditeurLigne from "@/components/EditeurCreneauGroup.vue";
 
 import Creneau from "@/models/Creneau";
-import { MutationTypes } from "@/store/Mutations";
+import { MutationTypes } from "@/views/Mutations";
 import toast from "@/utils/Toast";
 
 import dayjs from "dayjs";