From 11a75540df99e1358e4d0f7eeab4ab5667f39fcd Mon Sep 17 00:00:00 2001
From: YarikMix <43493788+YarikMix@users.noreply.github.com>
Date: Sat, 18 May 2024 01:39:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D0=BE=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=BE=D0=B4=20=D1=88=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B3=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=82=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/src/assets/viber.png                   | Bin 0 -> 1717 bytes
 public/src/components/Modal/Modal.sass        |   9 ++++++
 public/src/components/Modal/Modal.tsx         |   2 +-
 .../src/components/NoteEditor/NoteEditor.tsx  |  26 ++++++++++++++++--
 public/src/components/NoteMenu/NoteMenu.tsx   |  24 ++++++++++------
 .../src/components/SharePanel/SharePanel.tsx  |   3 +-
 6 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 public/src/assets/viber.png

diff --git a/public/src/assets/viber.png b/public/src/assets/viber.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f5c00dbd9753928573b67ffa17b8e4612cb1acf
GIT binary patch
literal 1717
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
LNkvXXu0mjfsb@8&

literal 0
HcmV?d00001

diff --git a/public/src/components/Modal/Modal.sass b/public/src/components/Modal/Modal.sass
index 0a2fc5b5..ff1c76ee 100644
--- a/public/src/components/Modal/Modal.sass
+++ b/public/src/components/Modal/Modal.sass
@@ -25,6 +25,15 @@
 			animation: 0.3s superScaleIn ease-in-out
 			opacity: 1
 
+	&.short
+		.modal-content
+			border-radius: 0
+			background: none
+			padding: 0
+
+		.close-modal-btn
+			top: 28px
+
 	.overlay
 		position: absolute
 		top: 0
diff --git a/public/src/components/Modal/Modal.tsx b/public/src/components/Modal/Modal.tsx
index 21b2e14e..98008082 100644
--- a/public/src/components/Modal/Modal.tsx
+++ b/public/src/components/Modal/Modal.tsx
@@ -21,7 +21,7 @@ export class Modal extends ScReact.Component<any, any> {
 
     render() {
         return (
-            <div className={'modal-wrapper ' + (this.props.open ? 'active' : '')}>
+            <div className={'modal-wrapper ' + (this.props.open ? 'active ' : '') + (this.props.hideTitle ? "short " : "")}>
                 <div className="overlay" ref={ref => this.overlayRef = ref}></div>
                 <div className="modal-content">
                     <h2 className="modal-content__title">{this.props.title ? this.props.title : ""}</h2>
diff --git a/public/src/components/NoteEditor/NoteEditor.tsx b/public/src/components/NoteEditor/NoteEditor.tsx
index 0104bcb6..2058d592 100644
--- a/public/src/components/NoteEditor/NoteEditor.tsx
+++ b/public/src/components/NoteEditor/NoteEditor.tsx
@@ -28,6 +28,7 @@ type NoteEditorType = {
     emojiModalOpen: boolean
     backgroundModalOpen: boolean
     fullScreen: boolean
+    shareModalOpen: boolean
 }
 
 type NoteEditorProps = {
@@ -47,11 +48,10 @@ export class NoteEditor extends ScReact.Component<NoteEditorProps, NoteEditorTyp
         tagsModalOpen: false,
         emojiModalOpen: false,
         backgroundModalOpen: false,
+        shareModalOpen: false,
         fullScreen: false
     };
 
-    private savingLabelRef;
-
     componentDidMount() {
         AppNotesStore.SubscribeToStore(this.updateState);
         AppNoteStore.AddSaver(this.saveNote);
@@ -206,6 +206,20 @@ export class NoteEditor extends ScReact.Component<NoteEditorProps, NoteEditorTyp
         }))
     }
 
+    openShareModal = () => {
+        this.setState(state => ({
+            ...state,
+            shareModalOpen: true
+        }))
+    }
+
+    closeShareModal = () => {
+        this.setState(state => ({
+            ...state,
+            shareModalOpen: false
+        }))
+    }
+
     render() {
         const isSubNote = this.state.selectedNote?.parent != "00000000-0000-0000-0000-000000000000" ? "hidden" : ""
         const isOwner = this.state.selectedNote?.owner_id == AppUserStore.state.user_id
@@ -246,6 +260,13 @@ export class NoteEditor extends ScReact.Component<NoteEditorProps, NoteEditorTyp
                        content={<BackgroundPicker />}
                 />
 
+                <Modal open={this.state.shareModalOpen}
+                       handleClose={this.closeShareModal}
+                       reset={false}
+                       hideTitle={true}
+                       content={<SharePanel />}
+                />
+
                 <div className="note-background" style={`background: ${this.state.selectedNote?.header};`}>
 
                 </div>
@@ -380,6 +401,7 @@ export class NoteEditor extends ScReact.Component<NoteEditorProps, NoteEditorTyp
                             openTagList={this.openTagsModal}
                             openEmojiList={this.openEmojiModal}
                             openBackgroundList={this.openBackgroundModal}
+                            openSharePanel={this.openShareModal}
                         /> : ""
                     }
 
diff --git a/public/src/components/NoteMenu/NoteMenu.tsx b/public/src/components/NoteMenu/NoteMenu.tsx
index dbafe1a6..a861c3e2 100644
--- a/public/src/components/NoteMenu/NoteMenu.tsx
+++ b/public/src/components/NoteMenu/NoteMenu.tsx
@@ -71,6 +71,10 @@ export class NoteMenu extends ScReact.Component<any, any> {
         AppDispatcher.dispatch(NotesActions.EXPORT_TO_PDF)
     }
 
+    sharePanel = () => {
+        this.toggleMenu()
+        this.props.openSharePanel()
+    }
 
     render() {
         return (
@@ -81,15 +85,15 @@ export class NoteMenu extends ScReact.Component<any, any> {
                     </div>
                 </div>
                 <div className="options" ref={ref => this.noteMenuRef = ref}>
-                    <div className="options-item" onClick={this.deleteNote}>
-                        <Img src="trash.svg" className="icon"/>
-                        <span>Удалить заметку</span>
+                    <div className="options-item" onclick={this.sharePanel}>
+                        <Img src="link.svg" className="icon"/>
+                        <span>Поделиться</span>
                     </div>
-                    <div className="options-item" onClick={this.exportToPdf}>
+                    <div className="options-item" onclick={this.exportToPdf}>
                         <Img src="pdf.svg" className="icon"/>
                         <span>Скачать в pdf</span>
                     </div>
-                    <div className="options-item" onClick={this.exportToZip}>
+                    <div className="options-item" onclick={this.exportToZip}>
                         <Img src="zip.svg" className="icon"/>
                         <span>Скачать в zip</span>
                     </div>
@@ -97,18 +101,22 @@ export class NoteMenu extends ScReact.Component<any, any> {
                         <Img src={this.props.note.favorite ? "star-filled.svg" : "star.svg"} className="icon"/>
                         <span>{this.props.note.favorite ? "Удалить из избранного" : "В избранное"}</span>
                     </div>
-                    <div className="options-item mobile-option" onClick={this.tagList}>
+                    <div className="options-item mobile-option" onclick={this.tagList}>
                         <Img src="tag.svg" className="icon"/>
                         <span>Изменить тэги</span>
                     </div>
-                    <div className="options-item mobile-option" onClick={this.emojiList}>
+                    <div className="options-item mobile-option" onclick={this.emojiList}>
                         <Img src="emoji.svg" className="icon"/>
                         <span>Изменить иконку</span>
                     </div>
-                    <div className="options-item mobile-option" onClick={this.backgroundList}>
+                    <div className="options-item mobile-option" onclick={this.backgroundList}>
                         <Img src="image.svg" className="icon"/>
                         <span>Изменить шапку</span>
                     </div>
+                    <div className="options-item" onclick={this.deleteNote}>
+                        <Img src="trash.svg" className="icon"/>
+                        <span>Удалить заметку</span>
+                    </div>
                 </div>
             </div>
         )
diff --git a/public/src/components/SharePanel/SharePanel.tsx b/public/src/components/SharePanel/SharePanel.tsx
index fd1e07dc..7a207fa0 100644
--- a/public/src/components/SharePanel/SharePanel.tsx
+++ b/public/src/components/SharePanel/SharePanel.tsx
@@ -21,7 +21,7 @@ export class SharePanel extends ScReact.Component<any, any> {
                         <span>Просматривать могут все, у кого есть ссылка</span>
                         <ToggleButton />
                     </div>
-                    <input type="text" disabled className="share_panel__share-link-container__input" value="http://localhost:8010/notes/0a48fb5e-eb2b-41f4-9e41-87544842f539"/>
+                    <input type="text" disabled className="share_panel__share-link-container__input" value="https://you-note.ru/notes/4a644626-c335-4728-bb82-f63e9844eb74"/>
                     <Button label="Скопировать"/>
                 </div>
                 <div className="share_panel__social-btns-container">
@@ -30,6 +30,7 @@ export class SharePanel extends ScReact.Component<any, any> {
                         <Img src="vk.png" className="social-icon"/>
                         <Img src="odnoklassniki.png" className="social-icon" />
                         <Img src="whatsapp.png" className="social-icon" />
+                        <Img src="viber.png" className="social-icon" />
                     </div>
                 </div>
             </div>