Сделал страницу просмотра шереной заметки

frontend-park-mail-ru · May 19, 2024 · 503c4e6 · 503c4e6
1 parent 72561fd
commit 503c4e6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/public/src/components/NoteEditor/NoteEditor.tsx b/public/src/components/NoteEditor/NoteEditor.tsx
@@ -375,7 +375,7 @@ export class NoteEditor extends ScReact.Component<NoteEditorProps, NoteEditorTyp
                         <Collaborators/>
                     </div>
 
-                    <div className={isSubNote ? "hidden" : ""}>
+                    <div className={!isOwner || isSubNote ? "hidden" : ""}>
                         <Tooltip
                             hoverTooltip={this.state.selectedNote?.favorite ? "Удалить из избранного" : "В избранное"}
                             showHoverTooltip={true}

diff --git a/public/src/components/SharePanel/SharePanel.tsx b/public/src/components/SharePanel/SharePanel.tsx
@@ -6,6 +6,7 @@ import {Img} from "../Image/Image";
 import {AppNotesStore, NotesActions} from "../../modules/stores/NotesStore";
 import {parseNoteTitle} from "../../modules/utils";
 import {AppDispatcher} from "../../modules/dispatcher";
+import {AppToasts} from "../../modules/toasts";
 
 export class SharePanel extends ScReact.Component<any, any> {
 
@@ -36,6 +37,11 @@ export class SharePanel extends ScReact.Component<any, any> {
         social_window.focus();
     }
 
+    copyNoteURL = async () => {
+        await navigator.clipboard.writeText(window.location.href)
+        AppToasts.info("Ссылка на заметку скопирована")
+    }
+
     render() {
         return (
             <div className="share_panel">
@@ -52,8 +58,8 @@ export class SharePanel extends ScReact.Component<any, any> {
                         <span>Просматривать могут все, у кого есть ссылка</span>
                         <ToggleButton value={this.props.public} onToggle={this.handleToggle}/>
                     </div>
-                    <input type="text" disabled className="share_panel__share-link-container__input" value="https://you-note.ru/notes/4a644626-c335-4728-bb82-f63e9844eb74"/>
-                    <Button label="Скопировать"/>
+                    <input type="text" disabled className="share_panel__share-link-container__input" value={window.location.href} />
+                    <Button label="Скопировать" onClick={this.copyNoteURL} />
                 </div>
                 <div className="share_panel__social-btns-container">
                     <h3>Поделиться через соц. сети</h3>

diff --git a/public/src/modules/router.tsx b/public/src/modules/router.tsx
@@ -137,6 +137,8 @@ export class Router extends ScReact.Component<any, routerState> {
             }));
 
             page.loader(path).then((props) => {
+                console.log("123")
+                console.log(props)
                 this.setState(s => ({
                     ...s,
                     currPage: page.page,

diff --git a/public/src/pages/Notes/loader.ts b/public/src/pages/Notes/loader.ts
@@ -37,8 +37,15 @@ export const NotesLoader = async (path:string) => {
                             // history.pushState(null, '', '/notes');
                             // resolve({notes: store.notes});
 
-                            AppRouter.go("/404")
-                            reject()
+                            AppSharedNoteRequests.Get(noteId).then(note => {
+                                console.log(note)
+                                resolve({notes: store.notes, note: note, tags: store.tags});
+                            }).catch(() => {
+                                AppRouter.go("/404")
+
+                                reject()
+                            });
+
                         });
                     } else {
                         resolve({notes: store.notes, tags: store.tags});

diff --git a/public/src/pages/SharedNote/style.sass b/public/src/pages/SharedNote/style.sass
@@ -11,4 +11,3 @@
 		background: #1b2735
 		border-radius: 12px
 		padding: 20px
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,3 @@
		background: #1b2735
		border-radius: 12px
		padding: 20px