@@ -87,16 +105,18 @@
import ngeohash from 'ngeohash';
import { FETCH_EVENTS } from '@/graphql/event';
import { Component, Vue } from 'vue-property-decorator';
+import EventListCard from '@/components/Event/EventListCard.vue';
import EventCard from '@/components/Event/EventCard.vue';
-import { LOGGED_PERSON_WITH_GOING_TO_EVENTS } from '@/graphql/actor';
+import { CURRENT_ACTOR_CLIENT, LOGGED_USER_PARTICIPATIONS } from '@/graphql/actor';
import { IPerson, Person } from '@/types/actor';
import { ICurrentUser } from '@/types/current-user.model';
import { CURRENT_USER_CLIENT } from '@/graphql/user';
import { RouteName } from '@/router';
-import { IEvent } from '@/types/event.model';
+import { EventModel, IEvent, IParticipant, Participant } from '@/types/event.model';
import DateComponent from '@/components/Event/DateCalendarIcon.vue';
import { CONFIG } from '@/graphql/config';
import { IConfig } from '@/types/config.model';
+import { EventRouteName } from '@/router/event';
@Component({
apollo: {
@@ -104,8 +124,8 @@ import { IConfig } from '@/types/config.model';
query: FETCH_EVENTS,
fetchPolicy: 'no-cache', // Debug me: https://github.com/apollographql/apollo-client/issues/3030
},
- loggedPerson: {
- query: LOGGED_PERSON_WITH_GOING_TO_EVENTS,
+ currentActor: {
+ query: CURRENT_ACTOR_CLIENT,
},
currentUser: {
query: CURRENT_USER_CLIENT,
@@ -116,6 +136,7 @@ import { IConfig } from '@/types/config.model';
},
components: {
DateComponent,
+ EventListCard,
EventCard,
},
})
@@ -124,10 +145,12 @@ export default class Home extends Vue {
locations = [];
city = { name: null };
country = { name: null };
- loggedPerson: IPerson = new Person();
+ currentUserParticipations: IParticipant[] = [];
currentUser!: ICurrentUser;
+ currentActor!: IPerson;
config: IConfig = { description: '', name: '', registrationsOpen: false };
RouteName = RouteName;
+ EventRouteName = EventRouteName;
// get displayed_name() {
// return this.loggedPerson && this.loggedPerson.name === null
@@ -135,7 +158,23 @@ export default class Home extends Vue {
// : this.loggedPerson.name;
// }
- isToday(date: string) {
+ async mounted() {
+ const lastWeek = new Date();
+ lastWeek.setDate(new Date().getDate() - 7);
+
+ const { data } = await this.$apollo.query({
+ query: LOGGED_USER_PARTICIPATIONS,
+ variables: {
+ afterDateTime: lastWeek.toISOString(),
+ },
+ });
+
+ if (data) {
+ this.currentUserParticipations = data.loggedUser.participations.map(participation => new Participant(participation));
+ }
+ }
+
+ isToday(date: Date) {
return (new Date(date)).toDateString() === (new Date()).toDateString();
}
@@ -148,35 +187,43 @@ export default class Home extends Vue {
}
isBefore(date: string, nbDays: number) :boolean {
- return this.calculateDiffDays(date) > nbDays;
+ return this.calculateDiffDays(date) < nbDays;
}
- // FIXME: Use me
isInLessThanSevenDays(date: string): boolean {
- return this.isInDays(date, 7);
+ return this.isBefore(date, 7);
}
calculateDiffDays(date: string): number {
- const dateObj = new Date(date);
- return Math.ceil((dateObj.getTime() - (new Date()).getTime()) / 1000 / 60 / 60 / 24);
+ return Math.ceil(((new Date(date)).getTime() - (new Date()).getTime()) / 1000 / 60 / 60 / 24);
}
- get goingToEvents(): Map
{
- const res = this.$data.loggedPerson.goingToEvents.filter((event) => {
- return event.beginsOn != null && this.isBefore(event.beginsOn, 0);
+ get goingToEvents(): Map> {
+ const res = this.currentUserParticipations.filter(({ event }) => {
+ return event.beginsOn != null && !this.isBefore(event.beginsOn.toDateString(), 0);
});
res.sort(
- (a: IEvent, b: IEvent) => new Date(a.beginsOn) > new Date(b.beginsOn),
+ (a: IParticipant, b: IParticipant) => a.event.beginsOn.getTime() - b.event.beginsOn.getTime(),
);
- return res.reduce((acc: Map, event: IEvent) => {
- const day = (new Date(event.beginsOn)).toDateString();
- const events: IEvent[] = acc.get(day) || [];
- events.push(event);
- acc.set(day, events);
+ return res.reduce((acc: Map>, participation: IParticipant) => {
+ const day = (new Date(participation.event.beginsOn)).toDateString();
+ const participations: Map = acc.get(day) || new Map();
+ participations.set(participation.event.uuid, participation);
+ acc.set(day, participations);
return acc;
}, new Map());
}
+ get lastWeekEvents() {
+ const res = this.currentUserParticipations.filter(({ event }) => {
+ return event.beginsOn != null && this.isBefore(event.beginsOn.toDateString(), 0);
+ });
+ res.sort(
+ (a: IParticipant, b: IParticipant) => a.event.beginsOn.getTime() - b.event.beginsOn.getTime(),
+ );
+ return res;
+ }
+
geoLocalize() {
const router = this.$router;
const sessionCity = sessionStorage.getItem('City');
@@ -226,7 +273,7 @@ export default class Home extends Vue {
-
diff --git a/js/src/views/User/Login.vue b/js/src/views/User/Login.vue
index a062c6d72..3b1cbadee 100644
--- a/js/src/views/User/Login.vue
+++ b/js/src/views/User/Login.vue
@@ -65,7 +65,7 @@
import { Component, Prop, Vue } from 'vue-property-decorator';
import { LOGIN } from '@/graphql/auth';
import { validateEmailField, validateRequiredField } from '@/utils/validators';
-import { saveUserData } from '@/utils/auth';
+import { initializeCurrentActor, saveUserData } from '@/utils/auth';
import { ILogin } from '@/types/login.model';
import { CURRENT_USER_CLIENT, UPDATE_CURRENT_USER_CLIENT } from '@/graphql/user';
import { onLogin } from '@/vue-apollo';
@@ -146,6 +146,7 @@ export default class Login extends Vue {
role: data.login.user.role,
},
});
+ await initializeCurrentActor(this.$apollo.provider.defaultClient);
onLogin(this.$apollo);
diff --git a/js/src/views/User/PasswordReset.vue b/js/src/views/User/PasswordReset.vue
index f3f61d1e2..6ab6a4c78 100644
--- a/js/src/views/User/PasswordReset.vue
+++ b/js/src/views/User/PasswordReset.vue
@@ -6,7 +6,7 @@
{{ error }}