{
+ navigator.clipboard.writeText(props.children[0].props.children[0]);
+ setCopied(true);
+ }}
+ >
{copied === true ? (
@@ -34,4 +63,4 @@ function CopyToClipboard(props) {
);
}
-export { CopyToClipboard };
+export { CopyToClipboard, CodeCopyBtn };
diff --git a/src/components/markdown.jsx b/src/components/markdown.jsx
index 78f1496..6f63e04 100644
--- a/src/components/markdown.jsx
+++ b/src/components/markdown.jsx
@@ -2,14 +2,47 @@ import rehypeMathjax from "rehype-mathjax";
import remarkMath from "remark-math";
import ReactMarkdown from "react-markdown";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { darcula, github } from "react-syntax-highlighter/dist/esm/styles/hljs";
+
+import { CodeCopyBtn } from "./copytocb";
+
+let theme = window.matchMedia("(prefers-color-scheme: dark)").matches
+ ? "dark"
+ : "light";
+
+function CodeBlock(props) {
+ return (
+
+ {props.children[0]}
+
+ );
+}
+
function RenderMarkdown(props) {
return (
);
}
+function Pre({ children }) {
+ return (
+
+ {children}
+ {children}
+
+ );
+}
+
export default RenderMarkdown;
diff --git a/src/index.css b/src/index.css
index 4dda074..6f25b54 100644
--- a/src/index.css
+++ b/src/index.css
@@ -3,8 +3,9 @@
@tailwind utilities;
-/* styles for displaying markdown */
+
@layer base {
+ /* styles for displaying markdown */
.md h1 {
@apply text-6xl;
}
@@ -28,6 +29,7 @@
@apply border-l-4 pl-2 rounded-lg ml-4 mt-2 mb-2;
@apply bg-zinc-200 border-zinc-400;
@apply dark:bg-zinc-800 dark:border-zinc-600;
+ @apply pb-2;
}
.md hr {
@@ -50,7 +52,7 @@
@apply list-decimal list-inside ml-4;
}
- .md code {
+ .md-code {
@apply p-1;
@apply rounded-lg;
@apply bg-zinc-200 border-zinc-400;
@@ -66,4 +68,21 @@
}
.md p, .math-inline { display: inline-block; }
+ .md li p {
+ display: inline;
+ }
+
+ /* other styles */
+
+ .blog-pre {
+ @apply mt-2 mb-2 relative;
+ }
+
+ .code-copy-btn {
+ @apply text-zinc-400 dark:text-zinc-300 absolute right-2 top-2 cursor-pointer;
+ }
+
+ .code-copy-btn:hover {
+ @apply text-zinc-500 dark:text-zinc-400;
+ }
}
\ No newline at end of file
diff --git a/src/pages/create.jsx b/src/pages/create.jsx
index f6cfa31..b9d8d48 100644
--- a/src/pages/create.jsx
+++ b/src/pages/create.jsx
@@ -3,6 +3,7 @@ import { ChevronDoubleRightIcon } from "@heroicons/react/24/outline";
import { CheckBox } from "../components/checkbox";
import { useState } from "react";
import RenderMarkdown from "../components/markdown";
+import printDate from "../components/utils";
function CreateNote() {
const [preview, setPreview] = useState(false);
@@ -10,12 +11,20 @@ function CreateNote() {
const [text, setText] = useState(localStorage.getItem("NoteText"));
const [name, setName] = useState(localStorage.getItem("NoteName"));
+ const [date, setDate] = useState(Date.now());
+
+ setInterval(() => {
+ if (preview) {
+ setDate(Date.now());
+ }
+ }, 1000);
+
let inputStyle = `form-control block px-3 py-1.5 text-base font-normal text-gray-700 dark:text-white bg-white dark:bg-zinc-900 bg-clip-padding border border-solid border-gray-300 rounded-lg transition ease-in-out focus:border-blue-600 focus:outline-none`;
return (
- Написать заметку
+ {`${preview ? "" : "Написать заметку"}`}
{
- localStorage.setItem("NoteName", e.target.value);
setName(e.target.value);
+ localStorage.setItem("NoteName", e.target.value);
}}
/>
+ {preview && (
+
+
+ {name}
+
+
+ {printDate(Date.now())}
+
+
{text}
@@ -80,7 +101,7 @@ function CreateNote() {
}
>
- Отправить
+ {publicState ? "Сохранить" : "Опубликовать"}
diff --git a/src/pages/pubError.jsx b/src/pages/pubError.jsx
index ed1e668..e58dcfc 100644
--- a/src/pages/pubError.jsx
+++ b/src/pages/pubError.jsx
@@ -1,8 +1,12 @@
import printDate from "../components/utils";
import { ChevronDoubleLeftIcon } from "@heroicons/react/24/outline";
import { Button, IconWithText } from "../components/button";
+import { useSearchParams } from "react-router-dom";
function PubError() {
+ const [searchParams] = useSearchParams();
+ let err = searchParams.get("err");
+
return (
- Заметка не была опубликована из-за неизвестной ошибки
+ {err ? err : "Заметка не была опубликована из-за неизвестной ошибки"}
diff --git a/src/pages/publish.jsx b/src/pages/publish.jsx
index 5e7258a..49fdbfc 100644
--- a/src/pages/publish.jsx
+++ b/src/pages/publish.jsx
@@ -9,11 +9,19 @@ function Publish() {
if (!done) {
done = true;
+ let err = false;
const note = {
name: localStorage.getItem("NoteName"),
text: localStorage.getItem("NoteText"),
};
+ if (!note.name) {
+ err = "Заметка не была опубликована, так как отсутствует название.";
+ }
+ if (!note.text) {
+ err = "Заметка не была опубликована, так как отсутствует текст.";
+ }
+
fetch(`/publish`, {
method: "POST",
headers: {
@@ -30,7 +38,7 @@ function Publish() {
navigate(`/pubNotesSafe/${data.id}`, { replace: true });
})
.catch(() => {
- navigate(`/pubError`, { replace: true });
+ navigate(`/pubError?err=${err}`, { replace: true });
});
})
.catch(() => {