Сделал отображение подзаметок в пошереной заметке

frontend-park-mail-ru · May 26, 2024 · 6b60247 · 6b60247
1 parent 5aafc74
commit 6b60247
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/public/src/components/Editor/Plugin.ts b/public/src/components/Editor/Plugin.ts
@@ -5,6 +5,7 @@ import {AppNoteRequests, AppSharedNoteRequests} from '../../modules/api';
 import {AppDispatcher} from "../../modules/dispatcher";
 import {AppToasts} from "../../modules/toasts";
 import {AppNoteStore, NoteStoreActions} from "../../modules/stores/NoteStore";
+import {AppRouter} from '../../modules/router';
 
 interface EditorPlugin {
     pluginName: string;
@@ -1072,11 +1073,9 @@ const RenderSubNote = (subNoteId:string) => {
     subNoteContainer.appendChild(subNoteTitle)
 
     const isOwner= AppNotesStore.state.selectedNote?.owner_id == AppUserStore.state.user_id
+    const isAuth = AppUserStore.state.isAuth
 
-    console.log(1)
-    console.log(isOwner)
-    if (isOwner && pluginSettings.isEditable) {
-        console.log(2)
+    if (isAuth && isOwner && pluginSettings.isEditable) {
         const deleteSubNoteBtnContainer = document.createElement("div")
         deleteSubNoteBtnContainer.className = "delete-subnote-btn-container"
 
@@ -1085,7 +1084,6 @@ const RenderSubNote = (subNoteId:string) => {
         deleteSubNoteBtn.className = "delete-subnote-btn"
 
         if (pluginSettings.isEditable) {
-            console.log(3)
             deleteSubNoteBtnContainer.onclick = (e) => {
                 e.stopPropagation()
                 subNoteWrapper.remove();
@@ -1132,13 +1130,19 @@ const RenderSubNote = (subNoteId:string) => {
         });
     }
 
-    if (pluginSettings.isEditable) {
-        subNoteWrapper.onclick = () => {
-            if (!subNoteWrapper.dataset.deleted && loaded) {
+    subNoteWrapper.onclick = () => {
+        if (!subNoteWrapper.dataset.deleted && loaded) {
+            if (isAuth) {
                 AppDispatcher.dispatch(NotesActions.OPEN_NOTE, subNoteId)
             } else {
-                AppToasts.error("Заметка не найдена")
+                AppSharedNoteRequests.Get(subNoteId).then(result => {
+                    AppRouter.openSharedNotePage(result)
+                }).catch((e) => {
+                    AppToasts.error("Заметка не найдена")
+                });
             }
+        } else {
+            AppToasts.error("Заметка не найдена")
         }
     }
 

diff --git a/public/src/modules/router.tsx b/public/src/modules/router.tsx
@@ -135,9 +135,6 @@ export class Router extends ScReact.Component<any, routerState> {
             page = this.pages['/notes'];
         }
 
-        console.log("history.pushState")
-        console.log(path)
-        console.log(raw)
         history.pushState(null, null, path);
 
         if (page === undefined) {
@@ -182,7 +179,7 @@ export class Router extends ScReact.Component<any, routerState> {
     }
 
     public openSharedNotePage (note:NoteType) {
-        history.pushState(null, null, "/notes/" + note.id);
+        // history.pushState(null, null, "/notes/" + note.id);
 
         this.setState(s => ({
             ...s,

diff --git a/public/src/pages/SharedNote/index.tsx b/public/src/pages/SharedNote/index.tsx
@@ -2,8 +2,6 @@ import {ScReact} from "@veglem/screact";
 import "./style.sass"
 import "../../components/Editor/Editor.sass"
 import {ViewerWrapper} from "../../components/ViewerWrapper/ViewerWrapper";
-import {AppNotesStore} from "../../modules/stores/NotesStore";
-import {NoteStoreActions} from "../../modules/stores/NoteStore";
 
 export class SharedNotePage extends ScReact.Component<any, any> {
     state = {
@@ -15,19 +13,13 @@ export class SharedNotePage extends ScReact.Component<any, any> {
             ...state,
             fullScreen: true
         }))
-        document.getElementById("header").classList.add("fullscreen")
     }
 
     closeFullScreen = () => {
         this.setState(state => ({
             ...state,
             fullScreen: false
         }))
-        document.getElementById("header").classList.remove("fullscreen")
-    }
-
-    componentWillUnmount() {
-        console.log("asdfasdfas")
     }
 
     render () {