From 272bc257aba8bd2f1ac2e1f3248c482c4da7edcb Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Tue, 12 Nov 2019 17:22:42 -0500
Subject: fixed button issue

---
 src/client/views/MainView.scss | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'src/client/views/MainView.scss')

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index a858a73c7..a940e6889 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -4,8 +4,9 @@
 
 .mainView-tabButtons {
     position: relative;
-    width:100%;
+    width: 100%;
 }
+
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
@@ -22,21 +23,25 @@
     overflow: auto;
     z-index: 1;
 }
+
 .mainView-mainContent {
-    width:100%;
-    height:100%;
-    position:absolute;
+    width: 100%;
+    height: 100%;
+    position: absolute;
 }
-.mainView-flyoutContainer{
-    display:flex;
+
+.mainView-flyoutContainer {
+    display: flex;
     flex-direction: column;
     position: absolute;
-    width:100%;
-    height:100%;
+    width: 100%;
+    height: 100%;
+
     .documentView-node-topmost {
         background: lightgrey;
     }
 }
+
 .mainView-mainDiv {
     width: 100%;
     height: 100%;
@@ -46,6 +51,18 @@
     overflow: hidden;
 }
 
+
+.mainView-settings {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    font-size: 8px;
+}
+
+.mainView-settings:hover {
+    transform: none !important;
+}
+
 .mainView-logout {
     position: absolute;
     right: 0;
@@ -53,6 +70,10 @@
     font-size: 8px;
 }
 
+.mainView-logout:hover {
+    transform: none !important;
+}
+
 .mainView-libraryFlyout {
     height: 100%;
     position: absolute;
-- 
cgit v1.2.3-70-g09d2


From e410cde0e430553002d4e1a2f64364b57b65fdbc Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Thu, 16 Jan 2020 09:59:21 -0500
Subject: fixed context menu on mac.  fixed exceptions with contentScaling and
 contentfittingviews.  fixed sizing of mainview's contents

---
 src/client/views/MainView.scss                        | 8 ++++++++
 src/client/views/nodes/ContentFittingDocumentView.tsx | 6 +++---
 src/client/views/nodes/DocumentView.tsx               | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/client/views/MainView.scss')

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index 4c8c95529..c7fc6096a 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -5,6 +5,9 @@
 .mainView-tabButtons {
     position: relative;
     width: 100%;
+    .documentView-node-topmost {
+        height: 200% !important;
+    }
 }
 
 .mainContent-div {
@@ -13,6 +16,11 @@
     height:100%;
 }
 
+.mainView-contentArea {
+    .documentView-node-topmost {
+        height: 200% !important;
+    }
+}
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
diff --git a/src/client/views/nodes/ContentFittingDocumentView.tsx b/src/client/views/nodes/ContentFittingDocumentView.tsx
index bbec66233..e97445f27 100644
--- a/src/client/views/nodes/ContentFittingDocumentView.tsx
+++ b/src/client/views/nodes/ContentFittingDocumentView.tsx
@@ -48,11 +48,11 @@ export class ContentFittingDocumentView extends React.Component<ContentFittingDo
     private get nativeWidth() { return NumCast(this.layoutDoc?.nativeWidth, this.props.PanelWidth()); }
     private get nativeHeight() { return NumCast(this.layoutDoc?.nativeHeight, this.props.PanelHeight()); }
     private contentScaling = () => {
-        const wscale = this.props.PanelWidth() / (this.nativeWidth ? this.nativeWidth : this.props.PanelWidth());
+        const wscale = this.props.PanelWidth() / (this.nativeWidth || this.props.PanelWidth() || 1);
         if (wscale * this.nativeHeight > this.props.PanelHeight()) {
-            return this.props.PanelHeight() / (this.nativeHeight ? this.nativeHeight : this.props.PanelHeight());
+            return (this.props.PanelHeight() / (this.nativeHeight || this.props.PanelHeight() || 1)) || 1;
         }
-        return wscale;
+        return wscale || 1;
     }
 
     @undoBatch
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index b2c2ccff5..dabe5a7aa 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -583,7 +583,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
     @action
     onContextMenu = async (e: React.MouseEvent): Promise<void> => {
         // the touch onContextMenu is button 0, the pointer onContextMenu is button 2
-        if (e.button === 0) {
+        if (e.button === 0 && !e.ctrlKey) {
             e.preventDefault();
             return;
         }
-- 
cgit v1.2.3-70-g09d2


From fcd9313158f8c131cf5a124880c46ca7b20a1b25 Mon Sep 17 00:00:00 2001
From: bob <bcz@cs.brown.edu>
Date: Thu, 16 Jan 2020 11:43:38 -0500
Subject: better fix for sidebar / stacking view sizing

---
 src/client/views/MainView.scss                          | 8 --------
 src/client/views/collections/CollectionStackingView.tsx | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/client/views/MainView.scss')

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index c7fc6096a..4c8c95529 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -5,9 +5,6 @@
 .mainView-tabButtons {
     position: relative;
     width: 100%;
-    .documentView-node-topmost {
-        height: 200% !important;
-    }
 }
 
 .mainContent-div {
@@ -16,11 +13,6 @@
     height:100%;
 }
 
-.mainView-contentArea {
-    .documentView-node-topmost {
-        height: 200% !important;
-    }
-}
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
diff --git a/src/client/views/collections/CollectionStackingView.tsx b/src/client/views/collections/CollectionStackingView.tsx
index 886a9c870..ca792c134 100644
--- a/src/client/views/collections/CollectionStackingView.tsx
+++ b/src/client/views/collections/CollectionStackingView.tsx
@@ -396,7 +396,7 @@ export class CollectionStackingView extends CollectionSubView(doc => doc) {
                     ref={this.createRef}
                     style={{
                         transform: `scale(${Math.min(1, this.props.PanelHeight() / this.layoutDoc[HeightSym]())})`,
-                        height: `${100 * 1 / Math.min(this.props.PanelWidth() / this.layoutDoc[WidthSym](), this.props.PanelHeight() / this.layoutDoc[HeightSym]())}%`,
+                        height: `${Math.max(100, 100 * 1 / Math.min(this.props.PanelWidth() / this.layoutDoc[WidthSym](), this.props.PanelHeight() / this.layoutDoc[HeightSym]()))}%`,
                         transformOrigin: "top"
                     }}
                     onScroll={action((e: React.UIEvent<HTMLDivElement>) => this._scroll = e.currentTarget.scrollTop)}
-- 
cgit v1.2.3-70-g09d2


From 42b325a94f66e6da0a9fdb0ca0740c01ac7b52f1 Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Thu, 16 Jan 2020 14:59:37 -0500
Subject: additional qol changes

---
 src/client/util/SettingsManager.scss | 38 ++++++++++++++++++++++++------------
 src/client/util/SettingsManager.tsx  |  6 +++++-
 src/client/views/MainView.scss       | 12 +++++++-----
 src/server/Websocket/Websocket.ts    |  7 ++++++-
 4 files changed, 44 insertions(+), 19 deletions(-)

(limited to 'src/client/views/MainView.scss')

diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 5839fa748..9b6a2ccae 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -3,6 +3,8 @@
 .dialogue-box {
     background-color: whitesmoke !important;
     color: grey;
+    width: 400px;
+    height: 300px;
 
     button {
         background: $lighter-alt-accent;
@@ -14,6 +16,7 @@
         letter-spacing: 2px;
         font-size: 75%;
         padding: 10px;
+        margin: 10px;
         transition: transform 0.2s;
         margin: 2px;
     }
@@ -23,6 +26,23 @@
     display: flex;
     flex-direction: column;
 
+    button {
+        width: 100px;
+        align-self: center;
+        background: $darker-alt-accent;
+    }
+
+    .delete-button {
+        background: rgb(227, 86, 86);
+    }
+
+    .close-button {
+        position: absolute;
+        right: 1em;
+        top: 1em;
+    }
+
+
     input {
         border-radius: 5px;
         border: none;
@@ -32,8 +52,7 @@
 
     .settings-body {
         display: flex;
-        flex-direction: row;
-
+        justify-content: space-between;
 
         .settings-type {
             display: flex;
@@ -44,13 +63,14 @@
 
         .settings-content {
             padding-left: 1em;
+            padding-right: 1em;
             display: flex;
             flex-direction: column;
-            justify-content: space-between;
-            text-align: left;
+            justify-content: space-around;
+            // text-align: left;
 
-            button {
-                background: $darker-alt-accent;
+            ::placeholder {
+                color: $intermediate-color;
             }
 
             input {
@@ -84,12 +104,6 @@
         font-size: 120%;
     }
 
-    .close-button {
-        position: absolute;
-        right: 1em;
-        top: 1em;
-    }
-
     .container {
         display: block;
         position: relative;
diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 652af438b..6f852a3e6 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -101,7 +101,11 @@ export default class SettingsManager extends React.Component<{}> {
                         </div>
                         : undefined}
                     {this.settingsContent === "data" ?
-                        <div className="settings-content">hiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii</div>
+                        <div className="settings-content">
+                            WARNING: <br />
+                            THIS WILL ERASE ALL YOUR CURRENT DOCUMENTS STORED ON DASH. IF YOU WISH TO PROCEED, CLICK THE BUTTON BELOW.
+                            <button className="delete-button">DELETE</button>
+                        </div>
                         : undefined}
                 </div>
 
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index ab0a8e49b..0bc07fa43 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -5,6 +5,7 @@
 .mainView-tabButtons {
     position: relative;
     width: 100%;
+
     .documentView-node-topmost {
         height: 200% !important;
     }
@@ -12,8 +13,8 @@
 
 .mainContent-div {
     position: relative;
-    width:100%;
-    height:100%;
+    width: 100%;
+    height: 100%;
 }
 
 .mainView-contentArea {
@@ -21,6 +22,7 @@
         height: 200% !important;
     }
 }
+
 // add nodes menu. Note that the + button is actually an input label, not an actual button.
 .mainView-docButtons {
     position: absolute;
@@ -79,8 +81,8 @@
 
 .mainView-logout {
     position: absolute;
-    right: 5;
-    bottom: 5;
+    right: 0;
+    bottom: 0;
     font-size: 8px;
 }
 
@@ -90,7 +92,7 @@
 
 .mainView-libraryFlyout {
     height: 100%;
-    width:100%;
+    width: 100%;
     position: absolute;
     display: flex;
     flex-direction: column;
diff --git a/src/server/Websocket/Websocket.ts b/src/server/Websocket/Websocket.ts
index 6dda6956e..9e6ad1c72 100644
--- a/src/server/Websocket/Websocket.ts
+++ b/src/server/Websocket/Websocket.ts
@@ -28,7 +28,7 @@ export namespace WebSocket {
 
     function initialize(isRelease: boolean) {
         const endpoint = io();
-        endpoint.on("connection", function(socket: Socket) {
+        endpoint.on("connection", function (socket: Socket) {
             _socket = socket;
 
             socket.use((_packet, next) => {
@@ -89,6 +89,11 @@ export namespace WebSocket {
         await Database.Instance.deleteAll('newDocuments');
     }
 
+    // export async function deleteUserDocuments() {
+    //     await Database.Instance.deleteAll();
+    //     await Database.Instance.deleteAll('newDocuments');
+    // }
+
     export async function deleteAll() {
         await Database.Instance.deleteAll();
         await Database.Instance.deleteAll('newDocuments');
-- 
cgit v1.2.3-70-g09d2