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

1 files changed, 8 insertions, 6 deletions

diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 17eea585a..fc2d7f572 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -29,7 +29,6 @@ import { CollectionSchemaView } from './collections/collectionSchema/CollectionS
 import { SchemaRowBox } from './collections/collectionSchema/SchemaRowBox';
 import './global/globalScripts';
 import { AudioBox } from './nodes/AudioBox';
-import { ChatBox } from './nodes/ChatBox/ChatBox';
 import { ComparisonBox } from './nodes/ComparisonBox';
 import { DataVizBox } from './nodes/DataVizBox/DataVizBox';
 import { DiagramBox } from './nodes/DiagramBox';
@@ -46,13 +45,14 @@ import { LoadingBox } from './nodes/LoadingBox';
 import { MapBox } from './nodes/MapBox/MapBox';
 import { MapPushpinBox } from './nodes/MapBox/MapPushpinBox';
 import { PDFBox } from './nodes/PDFBox';
-import { PhysicsSimulationBox } from './nodes/PhysicsBox/PhysicsSimulationBox';
 import { RecordingBox } from './nodes/RecordingBox';
 import { ScreenshotBox } from './nodes/ScreenshotBox';
 import { ScriptingBox } from './nodes/ScriptingBox';
 import { VideoBox } from './nodes/VideoBox';
 import { WebBox } from './nodes/WebBox';
 import { CalendarBox } from './nodes/calendarBox/CalendarBox';
+import { ChatBox } from './nodes/chatbot/chatboxcomponents/ChatBox';
+import { DailyJournal } from './nodes/formattedText/DailyJournal';
 import { DashDocCommentView } from './nodes/formattedText/DashDocCommentView';
 import { DashDocView } from './nodes/formattedText/DashDocView';
 import { DashFieldView } from './nodes/formattedText/DashFieldView';
@@ -64,7 +64,9 @@ import { ImportElementBox } from './nodes/importBox/ImportElementBox';
 import { PresBox, PresElementBox } from './nodes/trails';
 import { FaceRecognitionHandler } from './search/FaceRecognitionHandler';
 import { SearchBox } from './search/SearchBox';
-import { AnnotationPalette } from './smartdraw/AnnotationPalette';
+import { StickerPalette } from './smartdraw/StickerPalette';
+import { Field } from './nodes/DataVizBox/DocCreatorMenu/FieldTypes/Field';
+import { FieldUtils } from './nodes/DataVizBox/DocCreatorMenu/FieldTypes/FieldUtils';
 
 dotenv.config();
 
@@ -90,7 +92,6 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
         document.getElementById('root')!.addEventListener('wheel', event => event.ctrlKey && event.preventDefault(), true);
         const startload = (document as unknown as { startLoad: number }).startLoad; // see index.html in deploy/
         const loading = Date.now() - (startload ? Number(startload) : Date.now() - 3000);
-        console.log('Loading Time = ' + loading);
         const d = new Date();
         d.setTime(d.getTime() + 100 * 24 * 60 * 60 * 1000);
         const expires = 'expires=' + d.toUTCString();
@@ -101,6 +102,7 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
         new PingManager();
         new KeyManager();
         new FaceRecognitionHandler();
+        Field.initField = FieldUtils.initField; // set the init function for fields
 
         // initialize plugins and classes that require plugins
         CollectionDockingView.Init(TabDocView);
@@ -117,8 +119,9 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
         KeyValueBox.Init();
         PresBox.Init(TabDocView.AllTabDocs);
         DocumentContentsView.Init(KeyValueBox.LayoutString(), {
-            AnnotationPalette,
+            StickerPalette: StickerPalette,
             FormattedTextBox,
+            DailyJournal, // AARAV
             ImageBox,
             FontIconBox,
             LabelBox,
@@ -153,7 +156,6 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
             CalendarBox,
             ComparisonBox,
             LoadingBox,
-            PhysicsSimulationBox,
             SchemaRowBox,
             ImportElementBox,
             MapPushpinBox,