mgtypes 1.0.14 → 1.0.16

package/package.json

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

package/types/Configuration.ts

@@ -1,9 +1,10 @@
 import { Position } from 'geojson';
 import { MapSign } from './App';
 
-interface Configuration {
+export interface Configuration {
   eventSpecs: EventSpecs;
   eventColors: EventColors;
+  eventFonts: EventFonts;
 }
 
 export interface EventSpecs {
@@ -40,7 +41,7 @@ export interface EventColors {
   onPrimary: string;
   primaryContainer: string;
   onPrimaryContainer: string;
-  onPrimaryContainerUnselected:string;
+  onPrimaryContainerUnselected: string;
   secondary: string;
   onSecondary: string;
   secondaryContainer: string;
@@ -79,4 +80,27 @@ export interface EventColors {
   backdrop: string;
 }
 
-export default Configuration;
+interface MGFontTextStyle {
+  fontFamily?: string;
+  fontWeight?: '200' | '300' | '400' | '500' | '700';
+  letterSpacing?: number;
+  fontSize?: number;
+}
+
+export interface EventFonts {
+  labelLarge: MGFontTextStyle;
+  labelMedium: MGFontTextStyle;
+  labelSmall: MGFontTextStyle;
+  bodyLarge: MGFontTextStyle;
+  bodyMedium: MGFontTextStyle;
+  displayMedium: MGFontTextStyle;
+  displaySmall: MGFontTextStyle;
+  headlineSmall: MGFontTextStyle;
+  default: MGFontTextStyle;
+}
+
+export interface EventStyles {
+  borderRadius: 'none' | 'small' | 'large',
+  borderWidth: 'none' | 'thin' | 'normal' | 'thick',
+  shadow: 'none' | 'small' | 'large'
+}

package/types/Content.ts

@@ -6,7 +6,7 @@ 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
 
-interface AllAppContent {
+export interface AllAppContent {
   feedData: {
     mainContent: { order: number[]; content: { [contentId: string]: Post } };
     sharedContent: { order: number[]; content: { [contentId: string]: Post } };
@@ -32,11 +32,11 @@ interface AllAppContent {
     emergencies: Emergency[];
   };
 }
-interface PostWithIndex {
+export interface PostWithIndex {
   [contentId: string]: Post;
 }
 
-interface Post {
+export interface Post {
   content: Content;
   contentable: Contentable;
   user: User;
@@ -51,7 +51,7 @@ interface Post {
 }
 
 // indicates who embedded a piece of content: used for ThreadModal
-interface Thread {
+export interface Thread {
   id: number;
   parentId: number;
   childId: number;
@@ -61,7 +61,7 @@ interface Thread {
   threader: User;
 }
 
-interface Content {
+export interface Content {
   id: number;
   latitude: number | string; // should be a number but is coming back from db as a string for some reason
   longitude: number | string; // same as above
@@ -86,7 +86,7 @@ interface Content {
 }
 
 // Covers all different content types (pin, plan, comment, photo) coming in from server
-interface Contentable {
+export interface Contentable {
   id: number;
   primaryText: string;
   secondaryText?: string;
@@ -130,7 +130,7 @@ interface Contentable {
   embeddedContentId: number;
 }
 
-interface PinHour {
+export interface PinHour {
   id: number;
   openDateTime: string;
   closeDateTime: string;
@@ -139,7 +139,7 @@ interface PinHour {
   pinId: number;
 }
 
-interface SharedContentDetails {
+export interface SharedContentDetails {
   senders: Sender[];
   sharedContentStatus: {
     id: number;
@@ -158,7 +158,7 @@ interface SharedContentDetails {
  * has last updated it. TODO: create events that document
  * how a friendship has changed over time
  */
-interface FriendRequest {
+export interface FriendRequest {
   id: number;
   status:
     | 'pending'
@@ -177,7 +177,7 @@ interface FriendRequest {
 }
 
 // Specific content types - type Contentable above covers all content types coming in from server, but content types below are used for creating/editing content in Create[ContentType].tsx component
-interface Pin {
+export interface Pin {
   id: number | null; // will not have id when creating
   pinCategory?: string;
   pinType?: string;
@@ -196,7 +196,7 @@ interface Pin {
   link?: string | null;
 }
 
-interface Plan {
+export interface Plan {
   id: number | null; // will not have id when creating
   planCategory: string;
   planType: string;
@@ -215,14 +215,14 @@ interface Plan {
   updatedAt: string;
 }
 
-interface Comment {
+export interface Comment {
   id: number | null; // will not have id when creating
   primaryText: string;
   createdAt: string;
   updatedAt: string;
 }
 
-interface Photo {
+export interface Photo {
   id: number | null; // will not have id when creating
   primaryText: string;
   photoURL?: string; // may not have one (gets returned from Cloudinary after posting)
@@ -230,7 +230,7 @@ interface Photo {
   updatedAt: string;
 }
 
-interface Route {
+export interface Route {
   routeCategory: string;
   primaryText: string;
   secondaryText: string;
@@ -243,18 +243,3 @@ interface Route {
   phoneNumber: string;
 }
 
-
-
-export {
-  Post,
-  FriendRequest,
-  Comment,
-  Photo,
-  Pin,
-  Plan,
-  PostWithIndex,
-  AllAppContent,
-  PinHour,
-  Route,
-  Contentable,
-};

package/types/Emergency.ts

@@ -1,6 +1,6 @@
 import { User } from "./User";
 
-interface Emergency {
+export interface Emergency {
   id?: number;
   createdAt?: string;
   updatedAt?: string;
@@ -14,4 +14,3 @@ interface Emergency {
   reporter?: User;
 }
 
-export { Emergency };

package/types/Tag.ts

@@ -1,4 +1,4 @@
-interface Tag {
+export interface Tag {
   id: number;
   tag: string;
   createdAt: string;
@@ -6,14 +6,10 @@ interface Tag {
   content_tag: ContentTag;
 }
 
-interface ContentTag {
+export interface ContentTag {
   id: number;
   createdAt: string;
   updatedAt: string;
   contentId: number;
   tagId: number;
 }
-
-export {
-  Tag
-}

package/types/User.ts

@@ -1,6 +1,6 @@
 import { FriendRequest } from "./Content";
 
-interface User {
+export interface User {
   id: number | null;
   givenName: string | null;
   familyName: string | null;
@@ -18,7 +18,7 @@ interface User {
   activeRole?:string; // indicates whether user is a friend ('user') or responder ('medical', 'security', etc.)
 }
 
-interface UserRole {
+export interface UserRole {
   id: number | null;
   createdAt: string | null;
   updatedAt: string | null;
@@ -27,7 +27,7 @@ interface UserRole {
   isActiveRole: boolean;
 }
 
-interface UserPlan {
+export interface UserPlan {
   status: 'accepted' | 'denied' | 'pending';
   userId: number;
   contentId: number;
@@ -36,11 +36,11 @@ interface UserPlan {
   id: number;
 }
 
-interface Sender extends User {
+export interface Sender extends User {
   shareTimeStamp: ShareTimeStamp;
 }
 
-interface ShareTimeStamp {
+export interface ShareTimeStamp {
   id: number | null;
   contentId: number;
   senderId: number;
@@ -49,4 +49,3 @@ interface ShareTimeStamp {
   updatedAt: string;
 }
 
-export { User, UserPlan, Sender, UserRole };

package/types/Vote.ts

@@ -1,9 +1,7 @@
-interface Vote {
+export interface Vote {
   userId: number;
   contentId: number;
   vote: 'up'|'down'|null;
   updatedAt: string;
   createdAt: string;
-}
-
-export { Vote }
+}