diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue
index ee29a9584..4abac1302 100644
--- a/js/src/components/Event/EventListCard.vue
+++ b/js/src/components/Event/EventListCard.vue
@@ -44,7 +44,7 @@
-
-
+
{{ $t('Edit') }}
@@ -52,12 +52,12 @@
{{ $t('Delete') }}
-
-
+
{{ $t('Manage participations') }}
-
- {{ $t('View event page') }}
+ {{ $t('View event page') }}
@@ -70,7 +70,6 @@ import { IParticipant, ParticipantRole, EventVisibility } from '@/types/event.mo
import { Component, Prop } from 'vue-property-decorator';
import DateCalendarIcon from '@/components/Event/DateCalendarIcon.vue';
import { IActor, IPerson, Person } from '@/types/actor';
-import { EventRouteName } from '@/router/event';
import { mixins } from 'vue-class-component';
import ActorMixin from '@/mixins/actor';
import { CURRENT_ACTOR_CLIENT, LOGGED_USER_PARTICIPATIONS } from '@/graphql/actor';
@@ -100,8 +99,8 @@ export default class EventListCard extends mixins(ActorMixin, EventMixin) {
currentActor!: IPerson;
ParticipantRole = ParticipantRole;
- EventRouteName = EventRouteName;
EventVisibility = EventVisibility;
+ RouteName = RouteName;
defaultOptions: IEventCardOptions = {
hideDate: true,
diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index fb1a14791..27425aa2d 100644
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@@ -4,8 +4,8 @@
- {{ $t('Explore') }}
- {{ $t('Events') }}
+ {{ $t('Explore') }}
+ {{ $t('Events') }}
{{ $t('Create') }}
@@ -40,16 +40,16 @@
-
- {{ $t('My account') }}
+
+ {{ $t('My account') }}
-
- {{ $t('Create group') }}
-
+
+
+
-
- {{ $t('Administration') }}
+
+ {{ $t('Administration') }}
@@ -74,17 +74,14 @@
import { Component, Vue, Watch } from 'vue-property-decorator';
import { CURRENT_USER_CLIENT } from '@/graphql/user';
import { changeIdentity, logout } from '@/utils/auth';
-import { CURRENT_ACTOR_CLIENT, IDENTITIES, UPDATE_CURRENT_ACTOR_CLIENT } from '@/graphql/actor';
+import { CURRENT_ACTOR_CLIENT, IDENTITIES } from '@/graphql/actor';
import { IPerson, Person } from '@/types/actor';
import { CONFIG } from '@/graphql/config';
import { IConfig } from '@/types/config.model';
import { ICurrentUser, ICurrentUserRole } from '@/types/current-user.model';
import Logo from '@/components/Logo.vue';
import SearchField from '@/components/SearchField.vue';
-import { ActorRouteName } from '@/router/actor';
-import { AdminRouteName } from '@/router/admin';
import { RouteName } from '@/router';
-import { EventRouteName } from '@/router/event';
@Component({
apollo: {
@@ -108,10 +105,6 @@ import { EventRouteName } from '@/router/event';
},
})
export default class NavBar extends Vue {
- notifications = [
- { header: 'Coucou' },
- { title: 'T\'as une notification', subtitle: 'Et elle est cool' },
- ];
currentActor!: IPerson;
config!: IConfig;
currentUser!: ICurrentUser;
@@ -119,10 +112,6 @@ export default class NavBar extends Vue {
identities: IPerson[] = [];
RouteName = RouteName;
- ActorRouteName = ActorRouteName;
- AdminRouteName = AdminRouteName;
- EventRouteName = EventRouteName;
-
@Watch('currentActor')
async initializeListOfIdentities() {
const { data } = await this.$apollo.query<{ identities: IPerson[] }>({
@@ -133,21 +122,6 @@ export default class NavBar extends Vue {
}
}
- // @Watch('currentUser')
- // async onCurrentUserChanged() {
- // // Refresh logged person object
- // if (this.currentUser.isLoggedIn) {
- // const result = await this.$apollo.query({
- // query: CURRENT_ACTOR_CLIENT,
- // });
- // console.log(result);
- //
- // this.loggedPerson = result.data.currentActor;
- // } else {
- // this.loggedPerson = null;
- // }
- // }
-
async logout() {
await logout(this.$apollo.provider.defaultClient);
this.$buefy.notification.open({
diff --git a/js/src/components/Report/ReportCard.vue b/js/src/components/Report/ReportCard.vue
index e0bc9d46d..0a10af3e0 100644
--- a/js/src/components/Report/ReportCard.vue
+++ b/js/src/components/Report/ReportCard.vue
@@ -27,13 +27,10 @@