From 51b525b5f727311628cba1809e078b67543ddfa4 Mon Sep 17 00:00:00 2001
From: srichman333 <sarah_n_richman@brown.edu>
Date: Mon, 14 Aug 2023 23:22:55 -0400
Subject: merge

---
 src/client/util/SettingsManager.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/client/util/SettingsManager.tsx')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index b2b5be070..6acba8af4 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -450,7 +450,7 @@ export class SettingsManager extends React.Component<{}> {
                     </div>
 
                     <div className="settings-user">
-                        <div style={{ color: 'black' }}>{DashVersion}</div>
+                        <div style={{ color: this.userBackgroundColor }}>{DashVersion}</div>
                         <div className="settings-username" style={{ color: this.userBackgroundColor }}>
                             {Doc.CurrentUserEmail}
                         </div>
-- 
cgit v1.2.3-70-g09d2


From 0a3f6776c4bc22778948800e906b44d39e685af9 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 22 Aug 2023 00:56:33 -0400
Subject: fixed some errors

---
 src/client/util/SettingsManager.tsx                | 30 +++++++++++++++++++---
 .../components/Recommendation/Recommendation.tsx   |  4 +--
 src/client/views/nodes/ComparisonBox.tsx           |  2 +-
 3 files changed, 30 insertions(+), 6 deletions(-)

(limited to 'src/client/util/SettingsManager.tsx')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 6acba8af4..a2e5e54fe 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -169,9 +169,33 @@ export class SettingsManager extends React.Component<{}> {
                 />
                 {userTheme === ColorScheme.Custom && (
                     <Group formLabel="Custom Theme">
-                        <ColorPicker tooltip={'User Color'} color={this.userColor} type={Type.SEC} icon={<FaFillDrip />} selectedColor={this.userColor} setSelectedColor={this.switchUserColor} />
-                        <ColorPicker tooltip={'User Background Color'} color={this.userColor} type={Type.SEC} icon={<FaPalette />} selectedColor={this.userBackgroundColor} setSelectedColor={this.switchUserBackgroundColor} />
-                        <ColorPicker tooltip={'User Variant Color'} color={this.userColor} type={Type.SEC} icon={<FaPalette />} selectedColor={this.userVariantColor} setSelectedColor={this.switchUserVariantColor} />
+                        <ColorPicker
+                            tooltip={'User Color'} //
+                            color={this.userColor}
+                            type={Type.SEC}
+                            icon={<FaFillDrip />}
+                            selectedColor={this.userColor}
+                            setSelectedColor={this.switchUserColor}
+                            setFinalColor={this.switchUserColor}
+                        />
+                        <ColorPicker
+                            tooltip={'User Background Color'}
+                            color={this.userColor}
+                            type={Type.SEC}
+                            icon={<FaPalette />}
+                            selectedColor={this.userBackgroundColor}
+                            setSelectedColor={this.switchUserBackgroundColor}
+                            setFinalColor={this.switchUserBackgroundColor}
+                        />
+                        <ColorPicker
+                            tooltip={'User Variant Color'}
+                            color={this.userColor}
+                            type={Type.SEC}
+                            icon={<FaPalette />}
+                            selectedColor={this.userVariantColor}
+                            setSelectedColor={this.switchUserVariantColor}
+                            setFinalColor={this.switchUserVariantColor}
+                        />
                     </Group>
                 )}
             </div>
diff --git a/src/client/views/newlightbox/components/Recommendation/Recommendation.tsx b/src/client/views/newlightbox/components/Recommendation/Recommendation.tsx
index 2c2f04b9f..96846673b 100644
--- a/src/client/views/newlightbox/components/Recommendation/Recommendation.tsx
+++ b/src/client/views/newlightbox/components/Recommendation/Recommendation.tsx
@@ -25,11 +25,11 @@ export const Recommendation = (props: IRecommendation) => {
                     switch (type) {
                         case 'YouTube':
                             console.log('create ', type, 'document');
-                            doc = Docs.Create.VideoDocument(data, { title: title, _width: 400, _height: 315, transcript: transcript });
+                            doc = Docs.Create.VideoDocument(data, { title: title, _width: 400, _height: 315, transcript });
                             break;
                         case 'Video':
                             console.log('create ', type, 'document');
-                            doc = Docs.Create.VideoDocument(data, { title: title, _width: 400, _height: 315, transcript: transcript });
+                            doc = Docs.Create.VideoDocument(data, { title: title, _width: 400, _height: 315, transcript });
                             break;
                         case 'Webpage':
                             console.log('create ', type, 'document');
diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx
index ca5ec9389..a334e75f1 100644
--- a/src/client/views/nodes/ComparisonBox.tsx
+++ b/src/client/views/nodes/ComparisonBox.tsx
@@ -96,7 +96,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<ViewBoxAnnotatabl
         const anchor = Docs.Create.ConfigDocument({
             title: 'CompareAnchor:' + this.rootDoc.title,
             // set presentation timing properties for restoring view
-            presTransition: 1000,
+            presentation_transition: 1000,
             annotationOn: this.rootDoc,
         });
         if (anchor) {
-- 
cgit v1.2.3-70-g09d2


From 83dbf518c73debb52c6b1994beef5473dce739f7 Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Tue, 22 Aug 2023 13:09:51 -0400
Subject: global showLinkLines toggle

---
 src/client/util/SettingsManager.tsx                            | 10 ++++++++++
 .../collectionFreeForm/CollectionFreeFormLinkView.tsx          |  4 ++--
 .../collectionFreeForm/CollectionFreeFormLinksView.tsx         |  1 +
 src/client/views/nodes/DocumentView.tsx                        |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/client/util/SettingsManager.tsx')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 6acba8af4..8fff069f4 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -179,6 +179,7 @@ export class SettingsManager extends React.Component<{}> {
     }
 
     @computed get formatsContent() {
+        console.log(BoolCast(Doc.UserDoc().showLinkLines));
         return (
             <div className="prefs-content">
                 <Toggle
@@ -235,6 +236,15 @@ export class SettingsManager extends React.Component<{}> {
                     size={Size.XSMALL}
                     color={this.userColor}
                 />
+                <Toggle
+                    formLabel={'Show Link Lines'}
+                    formLabelPlacement={'right'}
+                    toggleType={ToggleType.SWITCH}
+                    onClick={e => (Doc.UserDoc().showLinkLines = !Doc.UserDoc().showLinkLines)}
+                    toggleStatus={BoolCast(Doc.UserDoc().showLinkLines)}
+                    size={Size.XSMALL}
+                    color={this.userColor}
+                />
             </div>
         );
     }
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
index fb8ec93b2..fd9aa3fa5 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
@@ -59,7 +59,7 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo
             0
         ); // since the render code depends on querying the Dom through getBoudndingClientRect, we need to delay triggering render()
         setTimeout(
-            action(() => (!LinkDocs.length || !linkDoc.link_displayLine) && (this._opacity = 0.05)),
+            action(() => (!LinkDocs.length || !(linkDoc.link_displayLine || Doc.UserDoc().showLinkLines)) && (this._opacity = 0.05)),
             750
         ); // this will unhighlight the link line.
         const a = A.ContentDiv.getBoundingClientRect();
@@ -269,7 +269,7 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo
             link.link_displayArrow = false;
         }
 
-        return link.opacity === 0 || !a.width || !b.width || (!link.link_displayLine && !aActive && !bActive) ? null : (
+        return link.opacity === 0 || !a.width || !b.width || (!(Doc.UserDoc().showLinkLines || link.link_displayLine) && !aActive && !bActive) ? null : (
             <>
                 <defs>
                     <marker id={`${link[Id] + 'arrowhead'}`} markerWidth="4" markerHeight="3" refX="0" refY="1.5" orient="auto">
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 420e6a318..6013551d9 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -6,6 +6,7 @@ import { LightboxView } from '../../LightboxView';
 import './CollectionFreeFormLinksView.scss';
 import { CollectionFreeFormLinkView } from './CollectionFreeFormLinkView';
 import React = require('react');
+import { LinkManager } from '../../../util/LinkManager';
 
 @observer
 export class CollectionFreeFormLinksView extends React.Component {
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 39c8d3348..533a047b1 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -993,7 +993,7 @@ export class DocumentViewInternal extends DocComponent<DocumentViewInternalProps
         // the small blue dots that mark the endpoints of links
         TraceMobx();
         if (this.props.hideLinkAnchors || this.layoutDoc.layout_hideLinkAnchors || this.props.dontRegisterView || this.layoutDoc.layout_unrendered) return null;
-        const filtered = DocUtils.FilterDocs(this.directLinks, this.props.childFilters?.() ?? [], []).filter(d => d.link_displayLine);
+        const filtered = DocUtils.FilterDocs(this.directLinks, this.props.childFilters?.() ?? [], []).filter(d => d.link_displayLine || Doc.UserDoc().showLinkLines);
         return filtered.map(link => (
             <div className="documentView-anchorCont" key={link[Id]}>
                 <DocumentView
-- 
cgit v1.2.3-70-g09d2


From 98e8e59d4cac428ee55db478f7402a7c12eb5ce5 Mon Sep 17 00:00:00 2001
From: geireann <geireann.lindfield@gmail.com>
Date: Tue, 22 Aug 2023 14:38:19 -0400
Subject: from last

---
 src/client/util/SettingsManager.tsx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/client/util/SettingsManager.tsx')

diff --git a/src/client/util/SettingsManager.tsx b/src/client/util/SettingsManager.tsx
index 8fff069f4..453aba81a 100644
--- a/src/client/util/SettingsManager.tsx
+++ b/src/client/util/SettingsManager.tsx
@@ -179,7 +179,6 @@ export class SettingsManager extends React.Component<{}> {
     }
 
     @computed get formatsContent() {
-        console.log(BoolCast(Doc.UserDoc().showLinkLines));
         return (
             <div className="prefs-content">
                 <Toggle
-- 
cgit v1.2.3-70-g09d2

