Skip to content

Commit

Permalink
OSS => Premium
Browse files Browse the repository at this point in the history 
commit d1a6209
Author: Donovan <donovan@pulsanova.com>
Date:   Sat Mar 20 12:33:14 2021 +0100

    Amélioration de l'authentification + Dev env (#116)

commit abe7cd3
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Fri Mar 19 17:33:42 2021 +0100

    Diverses améliorations

commit 2283d84
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Fri Mar 19 00:10:57 2021 +0100

    Améliore la disposition des filtres dans les listings de matériel

commit a5e9c25
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Mar 18 22:23:10 2021 +0100

    Affiche le logo et un spinner pendant le chargement de l'application

commit 2ba643d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Mar 17 10:00:43 2021 +0100

    Affiche les quantités pour une date précise dans la page du matériel (#93)

commit 166e57a
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Mar 10 09:14:28 2021 +0100

    Corrige le style du calendrier (différences entre dev et build)

commit 10a4d40
Merge: ba5bb4b 8b76921
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Mar 9 11:33:55 2021 +0100

    Merge branch 'feature/101-remove-attributes' into develop

commit 8b76921
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Mar 9 10:06:37 2021 +0100

    Permet la suppression des caractéristiques spéciales (#101)

commit ba5bb4b
Merge: b8f00c0 c9d6b1b
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 17:00:39 2021 +0100

    Merge branch 'feature/107-rename-attributes' into develop

commit c9d6b1b
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 13:35:00 2021 +0100

    Ajoute la possibilité de renommer les caractéristiques spéciales (#107)

commit b8f00c0
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 13:03:49 2021 +0100

    Ajoute un lien vers les caractéristiques spéciales dans listing du matériel

commit 190c155
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 12:31:44 2021 +0100

    Améliore le comportement des dates dans l'édition d'événement (#99)

commit 9b1da5c
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 11:33:32 2021 +0100

    Déplace "sous-catégorie" en dessous de "catégorie" dans l'edit matériel (#105)

commit ae14498
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 11:31:14 2021 +0100

    Pré-rempli le champ "qté" du formulaire de nouveau matériel à 1 (#106)

commit 390e92d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 11:22:13 2021 +0100

    Améliore l'onglet "Facturation" des events pour les visiteurs (#104)

commit d5c4071
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 8 10:58:25 2021 +0100

    Autorise les chiffres dans le nom des caractéristiques spéciales (#103)

commit 76974da
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Mar 2 18:58:48 2021 +0100

    Corrige les settings de l'application destinés au CI

commit 03ae04d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Mar 2 18:57:55 2021 +0100

    Corrige la configuration du dependabot

commit 56624b7
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Mar 1 12:53:40 2021 +0100

    Améliore la gestion du style des événements (et refactoring + tests)

    Permettant d'utiliser la timeline et la modale d'événement n'importe où

commit 1829f8d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Feb 24 12:29:55 2021 +0100

    Corrige l'édition du profil utilisateur dans le cas où il n'existe pas

commit 0e8ac43
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Feb 24 09:20:21 2021 +0100

    Enlève la restriction de modification des utilisateurs admin par les admin

commit f91ffc6
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Feb 24 09:18:24 2021 +0100

    N'affiche le filtre par parc que si nécessaire (+ petites améliorations)

commit ed2a3c1
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Feb 23 10:32:58 2021 +0100

    Corrige le pré-remplissage du parc dans l'édition du matériel

commit b65f92a
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 19:02:37 2021 +0100

    Supprime un debug oublié

commit 88452e2
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 16:25:43 2021 +0100

    Améliore le script de release

commit e4b5b45
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 10:43:42 2021 +0100

    Met à jour le build

commit 7b14019
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 10:05:49 2021 +0100

    Met à jour les dépendances back-end

commit 68670f1
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 09:50:17 2021 +0100

    Corrige et refactore quelques problèmes dans le code

commit d22e37c
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 09:32:28 2021 +0100

    Met à jour les dépendances front-end

commit 482b6cb
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 22 09:12:12 2021 +0100

    Corrige quelques messages d'aide

commit eec0cae
Merge: 4f8eb9c f8cace0
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Feb 21 11:51:41 2021 +0100

    Merge pull request #98 from Robert-2/feature/improve-page-help

    Amélioration de la présentation des aides de page

commit f8cace0
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Feb 21 11:05:00 2021 +0100

    Améliore la présentation de l'aide de page

commit 4f8eb9c
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Feb 16 08:06:51 2021 +0100

    Corrige le lien vers le repo dans la modale des détails d'erreur (#97)

commit 7620c4b
Merge: c0a0cf2 6e766bf
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 15 18:09:17 2021 +0100

    Merge branch 'feature/92-upload-material-files' into develop

commit 6e766bf
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Feb 11 14:03:54 2021 +0100

    Ajoute les documents (model + table + controllers + tests) à l'API (#92)

commit 06ed7af
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 1 18:35:53 2021 +0100

    Ajoute l'upload de fichiers associés à du matériel (partie client) (#92)

commit c0a0cf2
Merge: 03b739b 37d5734
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Feb 1 17:59:52 2021 +0100

    Merge branch 'feature/90-attribute-type-date' into develop

commit 37d5734
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 28 18:28:52 2021 +0100

    Ajoute le type "date" aux caractéristiques spéciales (#90)

commit 03b739b
Merge: ba9ea34 8191e3f
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 28 17:50:41 2021 +0100

    Merge branch 'feature/91-attributes-categories' into develop

commit 8191e3f
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 27 18:00:19 2021 +0100

    Prend en charge les catégories des caractéristiques spéciales (Front)

commit ae29df6
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 26 18:33:00 2021 +0100

    Prend en charge les catégories pour les caractéristiques spéciales (API)

commit ba9ea34
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 26 18:04:07 2021 +0100

    Corrige l'utilisation des <router-link> avec leur nouvelle API

commit 6b8c804
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 26 10:18:12 2021 +0100

    Met à jour les dépendances Front

commit 5bcbc57
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Jan 24 13:56:48 2021 +0100

    Améliore le calcul du matériel restant

commit 5c661be
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Jan 24 14:04:37 2021 +0100

    Ajoute l'id aux donnnées récupérées pour le pivot `EventMaterial`

commit 839c24e
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Jan 24 14:05:21 2021 +0100

    Refactoring

commit 7f857a0
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Jan 24 12:41:24 2021 +0100

    Extraction de la méthode `_getSplittedPeriods ` vers une fonction utilitaire `splitPeriods`

commit cb3e168
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sun Jan 24 12:53:28 2021 +0100

    Renomme la table de pivot `EventMaterialsPivot` en `EventMaterial`

commit 4c7a69b
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Sat Jan 16 13:12:55 2021 +0100

    Supprime le endpoint `/parks/[id]/materials`, non utilisé

commit 5f5f346
Merge: f7bcb89 12b1990
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 14 15:47:26 2021 +0100

    Merge branch 'release/0.11.0' into develop

commit 12b1990
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 14 15:47:20 2021 +0100

    Release version 0.11.0

commit f7bcb89
Merge: 32fa00f 6827a9d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 14 12:49:05 2021 +0100

    Merge pull request #95 from Robert-2/feature/94-filter-events-by-park

    Ajoute un filtre par parc dans le calendrier (#94)

commit 6827a9d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Jan 14 10:12:07 2021 +0100

    Limite l'utilisation du filtre au cas où il y a plusieurs parcs

    Et corrige selon self-review

commit ac1436b
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 23:08:59 2021 +0100

    Ajoute un filtre par parc dans le calendrier (#94)

commit 32fa00f
Merge: 0b4cb86 873ae02
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 18:19:53 2021 +0100

    Merge branch 'feature/87-auto-trim' into develop

commit 873ae02
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 18:19:46 2021 +0100

    Ajoute un trim() auto sur les champs de type string (#87)

commit 0b4cb86
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 15:18:59 2021 +0100

    Ajoute la configuration de l'extension Vetur

    On peut se permettre de ne pas l'ignorer, car c'est cross-IDE apparemment, et c'est un outil vraiment utile pour le développement d'une app en Vue.js (complétion auto, snippets, etc).

commit 2274ef9
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 15:16:58 2021 +0100

    Utilise une configuration ESlint spéciale pour les tests (temporaire)

commit 650fbd9
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 13 15:16:13 2021 +0100

    Met à jour les dépendances Front

commit cf99b89
Merge: 4b011a2 352bb1b
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 12 19:51:49 2021 +0100

    Merge pull request #89 from Robert-2/feature/51-category-link-to-materials

    Ajoute des liens vers le matériel depuis les catégories (#51)

commit 352bb1b
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 10 23:10:52 2021 +0100

    Corrige les filtres par catégories dans la liste du matériel

commit 5a141a4
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 10 22:35:16 2021 +0100

    Ajoute des liens vers le matériel depuis les catégories (#51)

commit 4b011a2
Merge: 4098963 a8b68be
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 12 19:44:31 2021 +0100

    Merge pull request #88 from Robert-2/feature/36-select-search

    Ajoute un système de recherche dans le choix des bénéficiaires et techniciens (#36)

commit a8b68be
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 12 19:38:11 2021 +0100

    Corrige selon auto-review

commit 4098963
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 10 21:27:26 2021 +0100

    Ajoute un fichier de config pour le dependabot (#86)

commit f62f310
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 10 13:24:35 2021 +0100

    Ajoute la prise en charge de l'overwrite du nombre de résultat par page

commit 753dc3e
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 10 13:13:06 2021 +0100

    Permet la recherche à la volée dans les multipleItems (#36)

commit 9352baa
Merge: c1162ca 9021cbc
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Jan 6 13:07:20 2021 +0100

    Merge pull request #85 from Robert-2/dependabot/npm_and_yarn/client/axios-0.21.1

    Bump axios from 0.20.0 to 0.21.1 in /client

commit 9021cbc
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 6 05:03:45 2021 +0000

    Bump axios from 0.20.0 to 0.21.1 in /client

    Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1.
    - [Release notes](https://github.com/axios/axios/releases)
    - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
    - [Commits](axios/axios@v0.20.0...v0.21.1)

    Signed-off-by: dependabot[bot] <support@github.com>

commit c1162ca
Merge: 8640b5e 8573af6
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 5 18:38:04 2021 +0100

    Merge pull request #84 from Robert-2/feature/improves-models

    Améliorations au niveau des modèles

commit 8573af6
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 18:36:17 2021 +0100

    Supprime un commentaire inutile

commit 4aafe8f
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 18:35:01 2021 +0100

    Ajoute un auto-discover du modèle dans les contrôleurs

commit 44ea71b
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 17:06:35 2021 +0100

    Retourne le modèle avec les attributs actualisés lors de la creation / edition

commit a2c9f63
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 17:15:34 2021 +0100

    Conserve le casting dans les accessors du modèle Material

commit 3ba2646
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 16:43:58 2021 +0100

    Ajoute les valeurs par défaut pour le matériel

commit 17f6f02
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 16:42:23 2021 +0100

    Utilise des classes abstraites pour les classes de base

commit a7ab5d9
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Jan 5 16:35:15 2021 +0100

    Remplace `Material::format()` par des accesseurs

commit 8640b5e
Author: Donovan <donovan@pulsanova.com>
Date:   Tue Jan 5 15:26:34 2021 +0100

    Ajoute le champ `park_id` aux unités de matériel (#83)

commit 2dc074a
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Tue Jan 5 11:47:59 2021 +0100

    Ajoute des onglets dans la vue du matériel en détail (#82)

    * Ajoute des onglets dans la vue du matériel en détail

    * Renomme le Dotfile de développement

    * Supprime l'affichage des unités dans la vue d'un matériel

    Co-authored-by: Donovan Lambert <donovan@pulsanova.com>

commit 27e467d
Merge: d318c40 0b8c817
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Mon Jan 4 21:37:03 2021 +0100

    Merge pull request #80 from Robert-2/feature/material-view

    Ajoute la vue d'un matériel

commit 0b8c817
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sun Jan 3 22:27:42 2021 +0100

    Corrige selon review

commit 33cdf3d
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Thu Dec 31 02:42:06 2020 +0100

    Ajoute la vue d'un matériel

commit d318c40
Merge: 985126a 3053393
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Sat Jan 2 23:18:58 2021 +0100

    Merge pull request #81 from Robert-2/feature/improves-validation-2

    Améliore (encore) la validation

commit 3053393
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Fri Jan 1 16:35:37 2021 +0100

    Corrige les tests unitaires vu la nouvelle année (2021)

commit 37149e4
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Fri Jan 1 16:14:05 2021 +0100

    Améliore (encore) la validation

commit 985126a
Merge: acbb5cf de0bcb8
Author: Paul Maillardet <paul@pulsanova.com>
Date:   Wed Dec 30 14:04:04 2020 +0100

    Merge pull request #79 from Robert-2/feature/remove-partial-validation

    Améliore la validation des modèles

commit de0bcb8
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Wed Dec 30 12:25:45 2020 +0100

    Corrige la validation des modèles

commit 57993a9
Author: Donovan Lambert <donovan@pulsanova.com>
Date:   Tue Dec 29 18:56:47 2020 +0100

    Amélioration des booléens dans les fixtures

commit acbb5cf
Author: Donovan <donovan@pulsanova.com>
Date:   Tue Dec 29 17:27:42 2020 +0100

    Améliore la validation (+ Refactoring modèles) (#76)

commit f0bbab2
Author: Donovan <donovan@pulsanova.com>
Date:   Tue Dec 29 11:25:22 2020 +0100

    Ajuste la contrainte des unités de matériel dans les événements (#77)

    (Sera rollback lorsque l'on prendra en charge les guards lors du switch-back Gestion unitaire => Gestion non unitaire)
  • Loading branch information
@Donov4n
Donov4n committed Mar 20, 2021
1 parent d5ca14e commit 3450177
Show file tree
Hide file tree
Showing 68 changed files with 1,328 additions and 754 deletions.
2 changes: 1 addition & 1 deletion client/dist/css/app.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/dist/js/app.js
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions client/dist/js/chunk-vendors.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"core-js": "~3.9.0",
"debounce": "~1.2.0",
"deep-freeze-strict": "~1.1.1",
"js-cookie": "~2.2.1",
"lodash.times": "~4.3.2",
"moment": "~2.29.1",
"sweetalert2": "~10.15.5",
Expand All @@ -26,8 +27,7 @@
"vue-visjs": "~0.4.1",
"vuejs-datepicker": "~1.6.2",
"vuex": "~3.6.2",
"vuex-i18n": "~1.13.1",
"vuex-persistedstate": "~3.2.0"
"vuex-i18n": "~1.13.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.11",
Expand Down
29 changes: 22 additions & 7 deletions client/src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div id="app">
<div class="main">
<MainHeader v-if="user.groupId" @toggleMenu="toggleSideNav" />
<MainHeader v-if="isLogged" @toggleMenu="toggleSideNav" />
<div class="main__body">
<SideNav v-if="user.groupId" :isOpen="isOpenedSideNav" />
<SideNav v-if="isLogged" :isOpen="isOpenedSideNav" />
<router-view />
</div>
</div>
Expand All @@ -17,22 +17,37 @@

<script>
import Vue from 'vue';
import store from '@/store';
import MainHeader from '@/components/MainHeader/MainHeader.vue';
import SideNav from '@/components/SideNav/SideNav.vue';
export default {
name: 'App',
components: { MainHeader, SideNav },
data: () => ({
user: store.state.user,
isOpenedSideNav: false,
}),
data() {
return { isOpenedSideNav: false };
},
created() {
this.$http.interceptors.response.use((response) => response, (error) => {
const { status } = error.response || { status: 0 };
if (status === 401) {
this.$store.dispatch('auth/logout').then(() => {
this.$router.replace({ path: '/login', hash: 'expired' })
.catch(() => {});
});
}
return Promise.reject(error);
});
},
watch: {
$route() {
Vue.prototype.$modal.hide('defaultModal');
},
},
computed: {
isLogged() {
return this.$store.getters['auth/isLogged'];
},
},
methods: {
toggleSideNav(isOpen) {
if (isOpen === 'toggle') {
Expand Down
60 changes: 0 additions & 60 deletions client/src/auth.js
View file

This file was deleted.

16 changes: 2 additions & 14 deletions client/src/axios.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable import/no-cycle */
import Axios from 'axios';
import Config from '@/config/globalConfig';
import Auth from '@/auth';
import Cookies from '@/utils/cookies';

const axios = Axios.create({
baseURL: Config.api.url,
Expand All @@ -11,7 +10,7 @@ const axios = Axios.create({
axios.interceptors.request.use(
(_request) => {
const request = { ..._request };
const token = window.sessionStorage.getItem('token');
const token = Cookies.get(Config.auth.cookie);
if (token) {
request.headers.Authorization = `Bearer ${token}`;
}
Expand All @@ -20,15 +19,4 @@ axios.interceptors.request.use(
(error) => Promise.reject(error),
);

axios.interceptors.response.use(
(response) => response,
(error) => {
const { status } = error.response || { status: 0 };
if (status === 401) {
Auth.logout({ mode: 'expired' });
}
return Promise.reject(error);
},
);

export default axios;
4 changes: 1 addition & 3 deletions client/src/components/EventBilling/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Config from '@/config/globalConfig';
import store from '@/store';
import formatAmount from '@/utils/formatAmount';
import getMaterialItemsCount from '@/utils/getMaterialItemsCount';
import getEventOneDayTotal from '@/utils/getEventOneDayTotal';
Expand Down Expand Up @@ -36,8 +35,7 @@ export default {
},
computed: {
userCanEdit() {
const { groupId } = store.state.user;
return ['admin', 'member'].includes(groupId);
return this.$store.getters['auth/is'](['admin', 'member']);
},

billPdfUrl() {
Expand Down
6 changes: 3 additions & 3 deletions client/src/components/EventDetails/Header/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Config from '@/config/globalConfig';
import store from '@/store';

export default {
name: 'CalendarEventDetailsHeader',
Expand All @@ -8,7 +7,6 @@ export default {
return {
isConfirming: false,
fromToDates: {},
isVisitor: store.state.user.groupId === 'visitor',
};
},
computed: {
Expand All @@ -20,7 +18,9 @@ export default {
&& this.event.beneficiaries.length > 0
);
},

isVisitor() {
return this.$store.getters['auth/is']('visitor');
},
eventSummaryPdfUrl() {
const { baseUrl } = Config;
const { id } = this.event || { id: null };
Expand Down
5 changes: 1 addition & 4 deletions client/src/components/EventDetails/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import moment from 'moment';
import { Tabs, Tab } from 'vue-slim-tabs';
import Config from '@/config/globalConfig';
import store from '@/store';
import Help from '@/components/Help/Help.vue';
import EventMaterials from '@/components/EventMaterials/EventMaterials.vue';
import EventMissingMaterials from '@/components/EventMissingMaterials/EventMissingMaterials.vue';
Expand Down Expand Up @@ -46,10 +45,8 @@ export default {
hasMaterials() {
return this.event?.materials?.length > 0;
},

userCanEditBill() {
const { groupId } = store.state.user;
return ['admin', 'member'].includes(groupId);
return this.$store.getters['auth/is'](['admin', 'member']);
},
},
methods: {
Expand Down
12 changes: 6 additions & 6 deletions client/src/components/MainHeader/TopMenu/TopMenu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@

<script>
import ClickOutside from 'vue-click-outside';
import Auth from '@/auth';
import store from '@/store';
export default {
name: 'TopMenu',
Expand All @@ -57,9 +55,9 @@ export default {
return { isDropdownMenuOpen: false };
},
computed: {
nickname() { return store.state.user.pseudo; },
isAdmin() { return store.state.user.groupId === 'admin'; },
isMember() { return store.state.user.groupId === 'member'; },
nickname() {
return this.$store.state.auth.user.pseudo;
},
},
watch: {
$route() {
Expand All @@ -76,7 +74,9 @@ export default {
},
logout() {
Auth.logout({ mode: 'bye' });
this.$store.dispatch('auth/logout').then(() => {
this.$router.replace({ path: '/login', hash: 'bye' });
});
},
},
};
Expand Down
10 changes: 6 additions & 4 deletions client/src/components/SideNav/SideMenu/SideMenu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,15 @@
</style>

<script>
import store from '@/store';
export default {
name: 'SideMenu',
computed: {
isAdmin() { return store.state.user.groupId === 'admin'; },
isMember() { return store.state.user.groupId === 'member'; },
isAdmin() {
return this.$store.getters['auth/is']('admin');
},
isMember() {
return this.$store.getters['auth/is']('member');
},
},
};
</script>
7 changes: 6 additions & 1 deletion client/src/config/globalConfig.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable no-underscore-dangle */

import deepFreeze from 'deep-freeze-strict';

let baseUrl = process.env.VUE_APP_API_URL ?? '';
Expand All @@ -22,12 +23,16 @@ const defaultConfig = {
decimal_digits: 2,
rounding: 0,
},
auth: {
cookie: 'Authorization',
timeout: 12, // - En heures (ou `null` pour un cookie de session).
},
defaultPaginationLimit: 100,
beneficiaryTagName: 'Bénéficiaire',
technicianTagName: 'Technicien',
billingMode: 'partial',

// - This function should return a number
// - Cette fonction doit retourner un nombre.
degressiveRate: (daysCount) => (
((daysCount - 1) * 0.75) + 1
),
Expand Down
1 change: 1 addition & 0 deletions client/src/locale/en/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ export default {
'open-in-openstreetmap': "Search in OpenStreetMap",
'on-date': "On {date}",
'from-date-to-date': "from\u00a0{from} to\u00a0{to}",
'or': "or",
'for': "For",
'with': "With",
'into': "into",
Expand Down
4 changes: 2 additions & 2 deletions client/src/locale/en/pages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
},

'page-profile': {
'title': "Profile of user «\u00a0{pageSubTitle}\u00a0»",
'title': "Your profile",
'help': "If you change your email, pseudo or password, do not forget them before logging-out!",
'you-are-group': "You are: {group}.",
'edit-password': "Change your password",
Expand All @@ -29,7 +29,7 @@ export default {
},

'page-settings': {
'title': "Settings of {pageSubTitle}",
'title': "Your settings",
'help': "The « duration of a session » is the time allowed before you're automatically logged out.",
'auth-token-validity-duration': "Max. duration of a session",
'interface': "Interface",
Expand Down
1 change: 1 addition & 0 deletions client/src/locale/fr/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ export default {
'open-in-openstreetmap': "Rechercher dans OpenStreetMap",
'on-date': "Le {date}",
'from-date-to-date': "du\u00a0{from} au\u00a0{to}",
'or': "ou",
'for': "Pour",
'with': "Avec",
'into': "dans",
Expand Down
4 changes: 2 additions & 2 deletions client/src/locale/fr/pages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
},

'page-profile': {
'title': "Profil de l'utilisateur «\u00a0{pageSubTitle}\u00a0»",
'title': "Votre profil",
'help': "Si vous modifiez votre email, votre pseudo ou votre mot de passe, ne les oubliez pas avant de vous déconnecter\u00a0!",
'you-are-group': "Vous êtes\u00a0: {group}.",
'edit-password': "Modifier votre mot de passe",
Expand All @@ -29,7 +29,7 @@ export default {
},

'page-settings': {
'title': "Paramètres de {pageSubTitle}",
'title': "Vos paramètres",
'help': "La « durée d'une session » est le temps imparti avant votre déconnexion automatique de l'application.",
'auth-token-validity-duration': "Durée max. d'une session",
'interface': "Interface",
Expand Down
20 changes: 9 additions & 11 deletions client/src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import axios from '@/axios';
import store from '@/store';
import translations from '@/locale';
import vueTableTranslations from '@/locale/vendors/vue-tables';
import Auth from '@/auth';
import router from '@/router';
import App from '@/App.vue';

Expand Down Expand Up @@ -81,14 +80,13 @@ const tablesConfig = {
Vue.use(ClientTable, tablesConfig);
Vue.use(ServerTable, tablesConfig, true);

// Authorization
Auth.checkAuth();

/* eslint-disable no-new */
new Vue({
el: '#app',
store,
router,
components: { App },
template: '<App/>',
store.dispatch('auth/fetch').then(() => {
/* eslint-disable no-new */
new Vue({
el: '#app',
store,
router,
components: { App },
template: '<App/>',
});
});
Loading

0 comments on commit 3450177

Please sign in to comment.