Merge branch 'master' into alyssa-starter

1 files changed, 18 insertions, 7 deletions

diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 43b9a6b39..f7cd0e925 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -50,6 +50,7 @@ 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 { DashDocCommentView } from './nodes/formattedText/DashDocCommentView';
 import { DashDocView } from './nodes/formattedText/DashDocView';
 import { DashFieldView } from './nodes/formattedText/DashFieldView';
@@ -60,6 +61,11 @@ import { SummaryView } from './nodes/formattedText/SummaryView';
 import { ImportElementBox } from './nodes/importBox/ImportElementBox';
 import { PresBox, PresElementBox } from './nodes/trails';
 import { SearchBox } from './search/SearchBox';
+import { ImageLabelBox } from './collections/collectionFreeForm/ImageLabelBox';
+import { FaceRecognitionHandler } from './search/FaceRecognitionHandler';
+import { FaceCollectionBox, UniqueFaceBox } from './collections/collectionFreeForm/FaceCollectionBox';
+import { Node } from 'prosemirror-model';
+import { EditorView } from 'prosemirror-view';
 
 dotenv.config();
 
@@ -83,7 +89,7 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
     setTimeout(() => {
         // prevent zooming browser
         document.getElementById('root')!.addEventListener('wheel', event => event.ctrlKey && event.preventDefault(), true);
-        const startload = (document as any).startLoad;
+        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();
@@ -95,16 +101,17 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
         new BranchingTrailManager({});
         new PingManager();
         new KeyManager();
+        new FaceRecognitionHandler();
 
         // initialize plugins and classes that require plugins
         CollectionDockingView.Init(TabDocView);
         FormattedTextBox.Init((tbox: FormattedTextBox) => ({
-            dashComment(node: any, view: any, getPos: any) { return new DashDocCommentView(node, view, getPos); }, // prettier-ignore
-            dashDoc(node: any, view: any, getPos: any)     { return new DashDocView(node, view, getPos, tbox); }, // prettier-ignore
-            dashField(node: any, view: any, getPos: any)   { return new DashFieldView(node, view, getPos, tbox); }, // prettier-ignore
-            equation(node: any, view: any, getPos: any)    { return new EquationView(node, view, getPos, tbox); }, // prettier-ignore
-            summary(node: any, view: any, getPos: any)     { return new SummaryView(node, view, getPos); }, // prettier-ignore
-            footnote(node: any, view: any, getPos: any)    { return new FootnoteView(node, view, getPos); }, // prettier-ignore
+            dashComment(node: Node, view: EditorView, getPos: () => number | undefined) { return new DashDocCommentView(node, view, getPos); }, // prettier-ignore
+            dashDoc(node: Node, view: EditorView, getPos: () => number | undefined)     { return new DashDocView(node, view, getPos, tbox); }, // prettier-ignore
+            dashField(node: Node, view: EditorView, getPos: () => number | undefined)   { return new DashFieldView(node, view, getPos, tbox); }, // prettier-ignore
+            equation(node: Node, view: EditorView, getPos: () => number | undefined)    { return new EquationView(node, view, getPos, tbox); }, // prettier-ignore
+            summary(node: Node, view: EditorView, getPos: () => number | undefined)     { return new SummaryView(node, view, getPos); }, // prettier-ignore
+            footnote(node: Node, view: EditorView, getPos: () => number | undefined)    { return new FootnoteView(node, view, getPos); }, // prettier-ignore
         }));
         CollectionFreeFormInfoUI.Init();
         LinkFollower.Init();
@@ -131,6 +138,9 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
             PresBox,
             PresElementBox,
             SearchBox,
+            ImageLabelBox,
+            FaceCollectionBox,
+            UniqueFaceBox,
             FunctionPlotBox,
             InkingStroke,
             LinkBox,
@@ -141,6 +151,7 @@ FieldLoader.ServerLoadStatus = { requested: 0, retrieved: 0, message: 'cache' };
             ChatBox,
             DiagramBox,
             HTMLtag,
+            CalendarBox,
             ComparisonBox,
             LoadingBox,
             PhysicsSimulationBox,