Add timeline events you're going to

Mix format

Fix chocobozzz feedback

Only show upcoming events on feed

Remove console log calls

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/src/views/Account/Profile.vue

@@ -1,68 +1,107 @@
 <template>
-  <section>
-    <div class="columns">
-      <div class="column">
-        <div class="card" v-if="person">
-          <div class="card-image" v-if="person.bannerUrl">
-            <figure class="image">
-              <img :src="person.bannerUrl">
-            </figure>
-          </div>
-          <div class="card-content">
-            <div class="media">
-              <div class="media-left">
-                <figure class="image is-48x48">
-                  <img :src="person.avatarUrl">
-                </figure>
-              </div>
-              <div class="media-content">
-                <p class="title">{{ person.name }}</p>
-                <p class="subtitle">@{{ person.preferredUsername }}</p>
-              </div>
-            </div>
+    <section>
+        <div class="columns">
+            <div class="column">
+                <div class="card" v-if="person">
+                    <div class="card-image" v-if="person.bannerUrl">
+                        <figure class="image">
+                            <img :src="person.bannerUrl">
+                        </figure>
+                    </div>
+                    <div class="card-content">
+                        <div class="media">
+                            <div class="media-left">
+                                <figure class="image is-48x48">
+                                    <img :src="person.avatarUrl">
+                                </figure>
+                            </div>
+                            <div class="media-content">
+                                <p class="title">{{ person.name }}</p>
+                                <p class="subtitle">@{{ person.preferredUsername }}</p>
+                            </div>
+                        </div>
 
-            <div class="content">
-              <p v-html="person.summary"></p>
+                        <div class="content">
+                            <p v-html="person.summary"></p>
+                        </div>
+
+                        <b-dropdown hoverable has-link aria-role="list">
+                            <button class="button is-info" slot="trigger">
+                                <translate>Public feeds</translate>
+                                <b-icon icon="menu-down"></b-icon>
+                            </button>
+
+                            <b-dropdown-item aria-role="listitem">
+                                <a :href="feedUrls('atom', true)">
+                                    <translate>Public RSS/Atom Feed</translate>
+                                </a>
+                            </b-dropdown-item>
+                            <b-dropdown-item aria-role="listitem">
+                                <a :href="feedUrls('ics', true)">
+                                    <translate>Public iCal Feed</translate>
+                                </a>
+                            </b-dropdown-item>
+                        </b-dropdown>
+
+                        <b-dropdown hoverable has-link aria-role="list" v-if="person.feedTokens.length > 0">
+                            <button class="button is-info" slot="trigger">
+                                <translate>Private feeds</translate>
+                                <b-icon icon="menu-down"></b-icon>
+                            </button>
+
+                            <b-dropdown-item aria-role="listitem">
+                                <a :href="feedUrls('atom', false)">
+                                    <translate>RSS/Atom Feed</translate>
+                                </a>
+                            </b-dropdown-item>
+                            <b-dropdown-item aria-role="listitem">
+                                <a :href="feedUrls('ics', false)">
+                                    <translate>iCal Feed</translate>
+                                </a>
+                            </b-dropdown-item>
+                        </b-dropdown>
+                        <a class="button" v-else @click="createToken">
+                            <translate>Create token</translate>
+                        </a>
+                    </div>
+                    <section v-if="person.organizedEvents.length > 0">
+                        <h2 class="subtitle">
+                            <translate>Organized</translate>
+                        </h2>
+                        <div class="columns">
+                            <EventCard
+                                    v-for="event in person.organizedEvents"
+                                    :event="event"
+                                    :options="{ hideDetails: true }"
+                                    :key="event.uuid"
+                                    class="column is-one-third"
+                            />
+                        </div>
+                        <div class="field is-grouped">
+                            <p class="control">
+                                <a
+                                        class="button"
+                                        @click="logoutUser()"
+                                        v-if="loggedPerson && loggedPerson.id === person.id"
+                                >
+                                    <translate>User logout</translate>
+                                </a>
+                            </p>
+                            <p class="control">
+                                <a
+                                        class="button"
+                                        @click="deleteProfile()"
+                                        v-if="loggedPerson && loggedPerson.id === person.id"
+                                >
+                                    <translate>Delete</translate>
+                                </a>
+                            </p>
+                        </div>
+                    </section>
+                </div>
             </div>
-          </div>
-          <section v-if="person.organizedEvents.length > 0">
-            <h2 class="subtitle">
-              <translate>Organized</translate>
-            </h2>
-            <div class="columns">
-              <EventCard
-                v-for="event in person.organizedEvents"
-                :event="event"
-                :hideDetails="true"
-                :key="event.uuid"
-                class="column is-one-third"
-              />
-            </div>
-            <div class="field is-grouped">
-              <p class="control">
-                <a
-                  class="button"
-                  @click="logoutUser()"
-                  v-if="loggedPerson && loggedPerson.id === person.id"
-                >
-                  <translate>User logout</translate>
-                </a>
-              </p>
-              <p class="control">
-                <a
-                  class="button"
-                  @click="deleteProfile()"
-                  v-if="loggedPerson && loggedPerson.id === person.id"
-                >
-                  <translate>Delete</translate>
-                </a>
-              </p>
-            </div>
-          </section>
         </div>
-      </div>
-    </div>
-  </section>
+    </section>
 </template>
 
 <script lang="ts">
@@ -70,6 +109,9 @@ import { FETCH_PERSON, LOGGED_PERSON } from '@/graphql/actor';
 import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
 import EventCard from '@/components/Event/EventCard.vue';
 import { RouteName } from '@/router';
+import { MOBILIZON_INSTANCE_HOST } from '@/api/_entrypoint';
+import { IPerson } from '@/types/actor.model';
+import { CREATE_FEED_TOKEN_ACTOR } from '@/graphql/feed_tokens';
 
 @Component({
   apollo: {
@@ -92,21 +134,41 @@ import { RouteName } from '@/router';
 export default class Profile extends Vue {
   @Prop({ type: String, required: true }) name!: string;
 
-  person = null;
+  person!: IPerson;
 
-  // call again the method if the route changes
+    // call again the method if the route changes
   @Watch('$route')
-  onRouteChange() {
-    // this.fetchData()
+    onRouteChange() {
+        // this.fetchData()
   }
 
   logoutUser() {
-    // TODO : implement logout
+        // TODO : implement logout
     this.$router.push({ name: RouteName.HOME });
   }
 
   nl2br(text) {
     return text.replace(/(?:\r\n|\r|\n)/g, '<br>');
   }
+
+  feedUrls(format, isPublic = true): string {
+    let url = format === 'ics' ? 'webcal:' : '';
+    url += `//${MOBILIZON_INSTANCE_HOST}/`;
+    if (isPublic === true) {
+      url += `@${this.person.preferredUsername}/feed/`;
+    } else {
+      url += `events/going/${this.person.feedTokens[0].token}/`;
+    }
+    return url + (format === 'ics' ? 'ics' : 'atom');
+  }
+
+  async createToken() {
+    const { data } = await this.$apollo.mutate({
+      mutation: CREATE_FEED_TOKEN_ACTOR,
+      variables: { actor_id: this.person.id },
+    });
+
+    this.person.feedTokens.push(data);
+  }
 }
 </script>

js/src/views/Account/Register.vue

@@ -93,6 +93,8 @@ export default class Register extends Vue {
     avatarUrl: '',
     bannerUrl: '',
     domain: null,
+    feedTokens: [],
+    goingToEvents: [],
   };
   errors: object = {};
   validationSent: boolean = false;

js/src/views/Event/Event.vue

@@ -107,6 +107,7 @@ import { IEvent, IParticipant } from '@/types/event.model';
 import { IPerson } from '@/types/actor.model';
 import { RouteName } from '@/router';
 import 'vue-simple-markdown/dist/vue-simple-markdown.css';
+import { GRAPHQL_API_ENDPOINT } from '@/api/_entrypoint';
 
 @Component({
   apollo: {
@@ -199,19 +200,15 @@ export default class Event extends Vue {
     }
   }
 
-  downloadIcsEvent() {
-    // FIXME: remove eventFetch
-    // eventFetch(`/events/${this.uuid}/ics`, this.$store, { responseType: 'arraybuffer' })
-    //   .then(response => response.text())
-    //   .then((response) => {
-    //     const blob = new Blob([ response ], { type: 'text/calendar' });
-    //     const link = document.createElement('a');
-    //     link.href = window.URL.createObjectURL(blob);
-    //     link.download = `${this.event.title}.ics`;
-    //     document.body.appendChild(link);
-    //     link.click();
-    //     document.body.removeChild(link);
-    //   });
+  async downloadIcsEvent() {
+    const data = await (await fetch(`${GRAPHQL_API_ENDPOINT}/events/${this.uuid}/export/ics`)).text();
+    const blob = new Blob([data], { type: 'text/calendar' });
+    const link = document.createElement('a');
+    link.href = window.URL.createObjectURL(blob);
+    link.download = `${this.event.title}.ics`;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
   }
 
   actorIsParticipant() {

js/src/views/Group/Group.vue

@@ -33,7 +33,7 @@
               <EventCard
                 v-for="event in group.organizedEvents"
                 :event="event"
-                :hideDetails="true"
+                :options="{ hideDetails: true }"
                 :key="event.uuid"
                 class="column is-one-third"
               />

js/src/views/Home.vue

@@ -18,6 +18,50 @@
         >Welcome back %{username}</translate>
       </h1>
     </section>
+    <section v-if="loggedPerson">
+      <span class="events-nearby title">Events you're going at</span>
+      <b-loading :active.sync="$apollo.loading"></b-loading>
+      <div v-if="goingToEvents.size > 0" v-for="row in Array.from(goingToEvents.entries())">
+        <!--   Iterators will be supported in v-for with VueJS 3     -->
+        <date-component :date="row[0]"></date-component>
+          <h3 class="subtitle"
+            v-if="isToday(row[0])"
+            v-translate="{count: row[1].length}"
+            :translate-n="row[1].length"
+            translate-plural="You have %{ count } events today"
+          >
+                  You have one event today.
+          </h3>
+          <h3 class="subtitle"
+              v-else-if="isTomorrow(row[0])"
+              v-translate="{count: row[1].length}"
+              :translate-n="row[1].length"
+              translate-plural="You have %{ count } events tomorrow"
+          >
+              You have one event tomorrow.
+          </h3>
+          <h3 class="subtitle"
+              v-else
+              v-translate="{count: row[1].length, days: calculateDiffDays(row[0])}"
+              :translate-n="row[1].length"
+              translate-plural="You have %{ count } events in %{ days } days"
+          >
+              You have one event in %{ days } days.
+          </h3>
+        <div class="columns">
+          <EventCard
+                  v-for="event in row[1]"
+                  :key="event.uuid"
+                  :event="event"
+                  :options="{loggedPerson: loggedPerson}"
+                  class="column is-one-quarter-desktop is-half-mobile"
+          />
+        </div>
+      </div>
+      <b-message v-else type="is-danger">
+        <translate>You're not going to any event yet</translate>
+      </b-message>
+    </section>
     <section>
       <span class="events-nearby title">Events nearby you</span>
       <b-loading :active.sync="$apollo.loading"></b-loading>
@@ -41,11 +85,13 @@ import ngeohash from 'ngeohash';
 import { FETCH_EVENTS } from '@/graphql/event';
 import { Component, Vue } from 'vue-property-decorator';
 import EventCard from '@/components/Event/EventCard.vue';
-import { LOGGED_PERSON } from '@/graphql/actor';
-import { IPerson } from '@/types/actor.model';
+import { LOGGED_PERSON_WITH_GOING_TO_EVENTS } from '@/graphql/actor';
+import { IPerson, Person } from '@/types/actor.model';
 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 DateComponent from '@/components/Event/Date.vue';
 
 @Component({
   apollo: {
@@ -54,13 +100,14 @@ import { RouteName } from '@/router';
       fetchPolicy: 'no-cache', // Debug me: https://github.com/apollographql/apollo-client/issues/3030
     },
     loggedPerson: {
-      query: LOGGED_PERSON,
+      query: LOGGED_PERSON_WITH_GOING_TO_EVENTS,
     },
     currentUser: {
       query: CURRENT_USER_CLIENT,
     },
   },
   components: {
+    DateComponent,
     EventCard,
   },
 })
@@ -69,8 +116,7 @@ export default class Home extends Vue {
   locations = [];
   city = { name: null };
   country = { name: null };
-  // FIXME: correctly parse local storage
-  loggedPerson!: IPerson;
+  loggedPerson: IPerson = new Person();
   currentUser!: ICurrentUser;
 
   get displayed_name() {
@@ -79,13 +125,47 @@ export default class Home extends Vue {
       : this.loggedPerson.name;
   }
 
-  fetchLocations() {
-    // FIXME: remove eventFetch
-    // eventFetch('/locations', this.$store)
-    //   .then(response => (response.json()))
-    //   .then((response) => {
-    //     this.locations = response;
-    //   });
+  isToday(date: string) {
+    return (new Date(date)).toDateString() === (new Date()).toDateString();
+  }
+
+  isTomorrow(date: string) :boolean {
+    return this.isInDays(date, 1);
+  }
+
+  isInDays(date: string, nbDays: number) :boolean {
+    return this.calculateDiffDays(date) === nbDays;
+  }
+
+  isBefore(date: string, nbDays: number) :boolean {
+    return this.calculateDiffDays(date) > nbDays;
+  }
+
+  // FIXME: Use me
+  isInLessThanSevenDays(date: string): boolean {
+    return this.isInDays(date, 7);
+  }
+
+  calculateDiffDays(date: string): number {
+    const dateObj = new Date(date);
+    return Math.ceil((dateObj.getTime() - (new Date()).getTime()) / 1000 / 60 / 60 / 24);
+  }
+
+  get goingToEvents(): Map<string, IEvent[]> {
+    const res = this.$data.loggedPerson.goingToEvents.filter((event) => {
+      return event.beginsOn != null && this.isBefore(event.beginsOn, 0)
+    });
+    res.sort(
+            (a: IEvent, b: IEvent) => new Date(a.beginsOn) > new Date(b.beginsOn),
+    );
+    const groups = res.reduce((acc: Map<string, IEvent[]>, event: IEvent) => {
+      const day = (new Date(event.beginsOn)).toDateString();
+      const events: IEvent[] = acc.get(day) || [];
+      events.push(event);
+      acc.set(day, events);
+      return acc;
+    }, new Map());
+    return groups;
   }
 
   geoLocalize() {
@@ -144,6 +224,6 @@ export default class Home extends Vue {
 }
 
 .events-nearby {
-  margin-bottom: 25px;
+  margin: 25px auto;
 }
 </style>