mgtypes 1.0.50 → 1.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mgtypes",
-  "version": "1.0.50",
+  "version": "1.0.52",
   "description": "types for mg development",
   "main": "index.js",
   "scripts": {

package/types/Configuration.ts

@@ -228,7 +228,6 @@ export interface mgColorsConfig {
   darkNeutral: string;
   dark: string;
 
-
   success: string;
   warning: string;
 
@@ -241,7 +240,6 @@ export interface mgColorsConfig {
   secondaryContainerGradient: string;
   tertiaryContainerGradient: string;
 
-
   // ORIGINALS
 
   primary: string;
@@ -472,39 +470,22 @@ export interface mgPermissionsProfile {
  * @param pins one of this property's internal properties can be 'all', which will filter all pins
  * @param plans same as above
  */
+
+// TODO: create a data structure that encapsulates
+// how filters might effectively work
 export interface mgMapFiltersProfile {
-  pins?: { [key: string]: mgMapFilter };
-  plans?: { [key: string]: mgMapFilter };
-  people?: {
-    friends?: mgMapFilter;
-    fire?: mgMapFilter;
-    security?: mgMapFilter;
-    medical?: mgMapFilter;
-    'mental health'?: mgMapFilter;
-    allResponders?: mgMapFilter;
-    all?: mgMapFilter;
-  };
-  emergencies?: {
-    fire?: mgMapFilter;
-    security?: mgMapFilter;
-    medical?: mgMapFilter;
-    'mental health'?: mgMapFilter;
-    all?: mgMapFilter;
-  };
-  routes?: {
-    runs?: mgMapFilter;
-    parades?: mgMapFilter;
-    all?: mgMapFilter;
-  };
+  [filterName: string]: mgMapFilter;
 }
 
 /**
  * Configs to display a map filter
  */
 export interface mgMapFilter {
-  category: 'route' | 'pin' | 'person' | 'plan' | 'emergency';
-  value: string;
-  labelText: string;
+  contentToFilter?: {
+    contentType: 'pin' | 'plan' | 'route'; // 'pin'
+    contentableCategory: string; // 'food'
+    contentableType: string; // 'burgers'
+  }[];
+  contentItemsToFilter?: number[]
   icon: string;
-  color: string;
 }

package/types/Content.ts

@@ -4,54 +4,6 @@ import { Vote } from './Vote';
 import { Emergency } from './Emergency';
 import { Position } from 'geojson';
 
-/**
- * shared posts will have sharedContentDetails, normal
- * posts won't have sCD. Posts with threads attached have
- * children; thread tracks who added and where a threaded
- * post goes. A plan may have UserPlan details that indicate
- * if user is attending the plan
- * */
-export interface AppContent {
-  feedData: {
-    mainContent: { order: number[]; content: { [contentId: string]: Post } };
-    sharedContent: { order: number[]; content: { [contentId: string]: Post } };
-    friendsContent: { order: number[]; content: { [contentId: string]: Post } };
-    userContent: { order: number[]; content: { [contentId: string]: Post } };
-  };
-  mapData: {
-    pins: { [contentId: string]: Post };
-    publicPlans: { [contentId: string]: Post };
-    userPlans: { [contentId: string]: Post };
-    pinAds: { [contentId: string]: Post };
-    planAds: { [contentId: string]: Post };
-    routes: { [contentId: string]: Post };
-  };
-  userData: {
-    user: User;
-    votes: Vote[];
-    friends: { [userId: string]: User };
-    plans: UserPlan[];
-    friendRequests: { [friendRequestId: string]: FriendRequest };
-    roles: UserRole[];
-    activeRole: string;
-    emergencies: Emergency[];
-  };
-  listsData: {
-    [listId: string]: {
-      content: { [contentId: string]: Post };
-      order: number[];
-      title: string;
-      description: string;
-      icon: string;
-    };
-  };
-  calendarData: {
-    publicPlans: { [contentId: string]: Post };
-  };
-}
-export interface PostWithIndex {
-  [contentId: string]: Post;
-}
 
 export interface Post {
   content: Content;
@@ -65,6 +17,14 @@ export interface Post {
   userVote?: Vote;
   indent?: number;
   parent?: Post;
+  pages?: {
+    feed:
+      | { main?: number; shared?: number; user?: number; friends?: number }
+      | false;
+    map: boolean;
+    calendar: boolean;
+    lists: { [listNumber: number]: number };
+  };
 }
 
 /**
@@ -106,7 +66,7 @@ export interface Content {
 
 /**
  * Covers all different content types
- *  (pin, plan, comment, photo) coming in from server
+ *  (pin, plan, comment, photo, route) coming in from server
  *  */
 export interface Contentable {
   id: number;
@@ -144,6 +104,7 @@ export interface Contentable {
 
   // Routes
   routeCategory?: string;
+  routeType?:string;
   distance?: string;
   color?: string;
   coordinates?: Position[];
@@ -164,14 +125,6 @@ export interface PinHour {
 
 export interface SharedContentDetails {
   senders: Sender[];
-  sharedContentStatus: {
-    id: number;
-    isArchived: boolean;
-    createdAt: string;
-    updatedAt: string;
-    contentId: number;
-    userId: number;
-  };
 }
 
 /**