adding location to ranges and more control on MyCalendarRanges

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts

@@ -3,22 +3,8 @@ import {datetimeToISO} from '../../../../../ChillMainBundle/Resources/public/chi
 import {User} from '../../../../../ChillMainBundle/Resources/public/types';
 import {CalendarRange, CalendarRemote} from '../../types';
 
-export const whoami = (): Promise<User> => {
-  const url = `/api/1.0/main/whoami.json`;
-  return fetch(url)
-    .then(response => {
-      if (response.ok) {
-        return response.json();
-      }
-      throw {
-        msg: 'Error while getting whoami.',
-        sta: response.status,
-        txt: response.statusText,
-        err: new Error(),
-        body: response.body
-      };
-    });
-};
+// re-export whoami
+export {whoami} from "../../../../../ChillMainBundle/Resources/public/lib/api/user";
 
 /**
  *

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts

@@ -73,6 +73,8 @@ export const calendarRangeToFullCalendarEvent = (entity: CalendarRange): EventIn
     allDay: false,
     userId: entity.user.id,
     calendarRangeId: entity.id,
+    locationId: entity.location.id,
+    locationName: entity.location.name,
     is: 'range',
   };
 }