Merge branch 'master' of https://github.com/brown-dash/Dash-Web into DocCreatorMenu-work

1 files changed, 17 insertions, 14 deletions

diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts
index 59a121de7..03626107f 100644
--- a/src/client/documents/DocumentTypes.ts
+++ b/src/client/documents/DocumentTypes.ts
@@ -26,12 +26,12 @@ export enum DocumentType {
     SCRIPTING = 'script', // script editor
     CHAT = 'chat', // chat with GPT about files
     EQUATION = 'equation', // equation editor
-    FUNCPLOT = 'funcplot', // function plotter
+    FUNCPLOT = 'function plot', // function plotter
     MAP = 'map',
     DATAVIZ = 'dataviz',
     ANNOPALETTE = 'annopalette',
     LOADING = 'loading',
-    SIMULATION = 'simulation', // physics simulation
+    MESSAGE = 'message', // chat message
 
     // special purpose wrappers that either take no data or are compositions of lower level types
     LINK = 'link',
@@ -43,26 +43,29 @@ export enum DocumentType {
 
     SCRIPTDB = 'scriptdb', // database of scripts
     GROUPDB = 'groupdb', // database of groups
+
+    JOURNAL = 'journal', // AARAV ADD
 }
 export enum CollectionViewType {
     Invalid = 'invalid',
     Freeform = 'freeform',
-    Schema = 'schema',
-    Docking = 'docking',
-    Tree = 'tree',
-    Stacking = 'stacking',
-    Masonry = 'masonry',
-    Multicolumn = 'multicolumn',
-    Multirow = 'multirow',
-    Time = 'time',
+    Calendar = 'calendar',
+    Card = 'card',
     Carousel = 'carousel',
     Carousel3D = '3D Carousel',
+    Docking = 'docking',
+    Grid = 'grid',
     Linear = 'linear',
     Map = 'map',
-    Grid = 'grid',
+    Masonry = 'masonry',
+    Multicolumn = 'multicolumn',
+    Multirow = 'multirow',
+    NoteTaking = 'notetaking',
     Pile = 'pileup',
+    Pivot = 'pivot',
+    Schema = 'schema',
+    Stacking = 'stacking',
     StackedTimeline = 'stacked timeline',
-    NoteTaking = 'notetaking',
-    Calendar = 'calendar',
-    Card = 'card',
+    Time = 'time',
+    Tree = 'tree',
 }