From 780240515a06d9d71a4b58a2559d8661478a560f Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Tue, 26 Nov 2019 20:34:33 -0500
Subject: cleanup after looking at changed files

---
 src/client/DocServer.ts                       | 2 --
 src/client/util/ClientDiagnostics.ts          | 4 ++--
 src/client/util/Import & Export/ImageUtils.ts | 2 +-
 src/client/views/MainView.tsx                 | 1 -
 src/client/views/search/SearchBox.tsx         | 2 +-
 src/server/ApiManagers/UserManager.ts         | 1 -
 src/server/Initialization.ts                  | 1 -
 src/server/RouteManager.ts                    | 2 ++
 8 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 14479694c..2cec1046b 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -64,8 +64,6 @@ export namespace DocServer {
         }
     }
 
-    let connection_error = false;
-
     export function init(protocol: string, hostname: string, port: number, identifier: string) {
         _cache = {};
         GUID = identifier;
diff --git a/src/client/util/ClientDiagnostics.ts b/src/client/util/ClientDiagnostics.ts
index 6f82a47db..24f196252 100644
--- a/src/client/util/ClientDiagnostics.ts
+++ b/src/client/util/ClientDiagnostics.ts
@@ -13,7 +13,7 @@ export namespace ClientDiagnostics {
             }
             await fetch("/serverHeartbeat");
             serverPolls--;
-        }, 100);
+        }, 1000 * 15);
 
 
         let executed = false;
@@ -24,7 +24,7 @@ export namespace ClientDiagnostics {
                 executed = true;
                 clearInterval(solrHandle);
             }
-        }, 100);
+        }, 1000 * 15);
 
     }
 
diff --git a/src/client/util/Import & Export/ImageUtils.ts b/src/client/util/Import & Export/ImageUtils.ts
index ca80f3bca..6a9486f83 100644
--- a/src/client/util/Import & Export/ImageUtils.ts	
+++ b/src/client/util/Import & Export/ImageUtils.ts	
@@ -22,7 +22,7 @@ export namespace ImageUtils {
 
     export const ExportHierarchyToFileSystem = async (collection: Doc): Promise<void> => {
         const a = document.createElement("a");
-        a.href = Utils.prepend(`imageHierarchyExport/${collection[Id]}`);
+        a.href = Utils.prepend(`/imageHierarchyExport/${collection[Id]}`);
         a.download = `Dash Export [${StrCast(collection.title)}].zip`;
         a.click();
     };
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index f59da3cde..5231075a1 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -423,7 +423,6 @@ export class MainView extends React.Component {
         return !this.userDoc || !(sidebar instanceof Doc) ? (null) : (
             <div className="mainView-mainContent" >
                 <div className="mainView-flyoutContainer" onPointerLeave={this.pointerLeaveDragger}>
-                    <div>HEY!</div>
                     <div className="mainView-libraryHandle"
                         style={{ cursor: "ew-resize", left: `${(this.flyoutWidth * (this._flyoutTranslate ? 1 : 0)) - 10}px`, backgroundColor: `${StrCast(sidebar.backgroundColor, "lightGray")}` }}
                         onPointerDown={this.onPointerDown} onPointerOver={this.pointerOverDragger}>
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 1337d3f95..ff35542ed 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -89,7 +89,7 @@ export class SearchBox extends React.Component {
 
     public static async convertDataUri(imageUri: string, returnedFilename: string) {
         try {
-            let posting = Utils.prepend("uploadURI");
+            let posting = Utils.prepend("/uploadURI");
             const returnedUri = await rp.post(posting, {
                 body: {
                     uri: imageUri,
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 8edeab16d..0f7d14320 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -9,7 +9,6 @@ interface ActivityUnit {
     duration: number;
 }
 
-
 export default class UserManager extends ApiManager {
 
     protected initialize(register: Registration): void {
diff --git a/src/server/Initialization.ts b/src/server/Initialization.ts
index 76acb4363..8b633a7cd 100644
--- a/src/server/Initialization.ts
+++ b/src/server/Initialization.ts
@@ -40,7 +40,6 @@ export default async function InitializeServer(options: InitializationOptions) {
     server.use("*", ({ user, originalUrl }, _res, next) => {
         if (!originalUrl.includes("Heartbeat")) {
             const userEmail = user?.email;
-            console.log(ConsoleColors.Cyan, originalUrl, userEmail ?? "<user logged out>");
             if (userEmail) {
                 timeMap[userEmail] = Date.now();
             }
diff --git a/src/server/RouteManager.ts b/src/server/RouteManager.ts
index 3aae5734a..3a20d5af5 100644
--- a/src/server/RouteManager.ts
+++ b/src/server/RouteManager.ts
@@ -1,6 +1,7 @@
 import RouteSubscriber from "./RouteSubscriber";
 import { DashUserModel } from "./authentication/models/user_model";
 import * as express from 'express';
+import { ConsoleColors } from "./ActionUtilities";
 
 export enum Method {
     GET,
@@ -52,6 +53,7 @@ export default class RouteManager {
                 try {
                     await toExecute(args);
                 } catch (e) {
+                    console.log(ConsoleColors.Red, target, user?.email ?? "<user logged out>");
                     if (onError) {
                         onError({ ...core, error: e });
                     } else {
-- 
cgit v1.2.3-70-g09d2