Merge branch 'code'

nanqic · Feb 12, 2024 · 87448f4 · 87448f4
2 parents ca16498 + a201f7e
commit 87448f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,5 @@
+<<<<<<< HEAD
+=======
+.gitattributes merge=ours
+>>>>>>> code
 .env merge=ours
diff --git a/src/components/Nav.jsx b/src/components/Nav.jsx
@@ -12,7 +12,6 @@ export default function
     const params = useParams();
 
     useEffect(() => {
-        console.log(!params.dir || params.dir?.endsWith('.md'), params.foldername);
         if (localStorage.getItem("theme")) {
             import(`assets/theme-wheat.css`)
             setTheme('wheat')

diff --git a/src/components/TextEdit.jsx b/src/components/TextEdit.jsx
@@ -43,7 +43,7 @@ export default function TextEdit({ content, setContent, setEditing }) {
     const handleSave = async () => {
         let title, res, userInput;
         const re = /(?<=(#|-) )\S{1,32}/
-        title = content.match(re).shift()
+        title = content.match(re)?.shift()
 
         if (location.pathname.endsWith('/repl')) {
             userInput = window.prompt("确认保存", `${title}`)
@@ -117,7 +117,7 @@ export default function TextEdit({ content, setContent, setEditing }) {
                 <path d="M3 5.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5M3 8a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9A.5.5 0 0 1 3 8m0 2.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5" />
             </svg>
         ),
-        execute: () => window.open(`${import.meta.env.VITE_SERVER_URL}/markmap${location.pathname.replace("/@markmap", "")}`)
+        execute: () => window.open(`${import.meta.env.VITE_SERVER_URL}${import.meta.env.VITE_SERVER_PATH}${location.pathname.replace("/@markmap", "")}`)
     }
 
     const clear = {
@@ -148,7 +148,7 @@ export default function TextEdit({ content, setContent, setEditing }) {
         code,
         br,
         clear,
-        { ...help, execute: () => window.open('https://box.hdcxb.net/markmap', '_blank') },
+        { ...help, execute: () => window.open(`https://box.hdcxb.net${import.meta.env.VITE_SERVER_PATH}`, '_blank') },
         divider,
         localStorage.getItem("token") && save,
     ];

diff --git a/src/pages/MarkmapLoader.jsx b/src/pages/MarkmapLoader.jsx
@@ -60,7 +60,7 @@ const MarkmapLoader = () => {
   }, [params])
 
   const loadUsers = async () => {
-    const dirsUrl = `${import.meta.env.VITE_SERVER_URL}/api/fs/dirs?path=markmap`
+    const dirsUrl = `${import.meta.env.VITE_SERVER_URL}/api/fs/dirs?path=${import.meta.env.VITE_SERVER_PATH}`
     const { data } = await postRequest(dirsUrl)
     const userArr = data.map(item => item.name)
     dispatch({ type: 'SET_USERLIST', payload: userArr });
@@ -74,7 +74,7 @@ const MarkmapLoader = () => {
   }
 
   async function loadUserFiles(user) {
-    const listUrl = `${import.meta.env.VITE_SERVER_URL}/api/fs/list?path=markmap`;
+    const listUrl = `${import.meta.env.VITE_SERVER_URL}/api/fs/list?path=${import.meta.env.VITE_SERVER_PATH}`;
     const dirsContent = (await postRequest(`${listUrl}/${user}`))?.data.content;
     dispatch({ type: 'SET_DIRS', payload: dirsContent?.filter(filterFile).map(x => x.name.slice(0, -3)) });
     const dirfiles = dirsContent && await Promise.all(dirsContent?.filter(file => file.is_dir)?.map(async dir => {
@@ -87,7 +87,7 @@ const MarkmapLoader = () => {
   }
 
   const loadText = async (filename) => {
-    const fileUrl = `${import.meta.env.VITE_SERVER_URL}/p/markmap/${params.foldername}/${filename}`
+    const fileUrl = `${import.meta.env.VITE_SERVER_URL}/p${import.meta.env.VITE_SERVER_PATH}/${params.foldername}/${filename}`
     let resp = await textRequest(fileUrl)
     setContent(resp)
   }