diff --git a/bun.lockb b/bun.lockb index 46b7e53..1ce9291 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/components/lib/elements/LinkList.tsx b/components/lib/elements/LinkList.tsx index d70b1e8..370e28e 100644 --- a/components/lib/elements/LinkList.tsx +++ b/components/lib/elements/LinkList.tsx @@ -69,6 +69,7 @@ export default function LinkList({ {...props} className={twMerge( "flex flex-row items-center gap-1", + "twui-link-list", props.className )} > diff --git a/components/lib/mdx/markdown/MarkdownEditorDeprecated.tsx b/components/lib/mdx/markdown/MarkdownEditorDeprecated.tsx deleted file mode 100644 index c6079ca..0000000 --- a/components/lib/mdx/markdown/MarkdownEditorDeprecated.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import MDEditor from "@uiw/react-md-editor"; -import rehypeSanitize from "rehype-sanitize"; -import React from "react"; -import remarkGfm from "remark-gfm"; -import rehypePrismPlus from "rehype-prism-plus"; -import ReactDOM from "react-dom"; - -export default function MarkdownEditor() { - const [value, setValue] = React.useState( - `**Hello world!!!** ` - ); - - React.useEffect(() => { - console.log("value", value); - }, [value]); - - return ReactDOM.createPortal( - , - document.getElementById("markdown-modal-root") as HTMLElement - ); -} diff --git a/components/lib/mdx/markdown/MarkdownEditorSelectorButtons.tsx b/components/lib/mdx/markdown/MarkdownEditorSelectorButtons.tsx index 5a1ae69..619a119 100644 --- a/components/lib/mdx/markdown/MarkdownEditorSelectorButtons.tsx +++ b/components/lib/mdx/markdown/MarkdownEditorSelectorButtons.tsx @@ -1,7 +1,6 @@ import React from "react"; import Button from "../../layout/Button"; import Border from "../../elements/Border"; -import { LocalStorageDict } from "@/package-shared/dict/local-storage-dict"; type Props = { preview: boolean; @@ -18,45 +17,30 @@ export default function MarkdownEditorSelectorButtons({ }: Props) { const [ready, setReady] = React.useState(false); + const defSbsName = "TWUIMarkdownEditorDefaultSideBySide"; + const defPrevName = "TWUIMarkdownEditorDefaultPreview"; + React.useEffect(() => { if (!ready) return; if (sideBySide) { - localStorage.setItem( - LocalStorageDict["MarkdownEditorDefaultSideBySide"], - "true" - ); + localStorage.setItem(defSbsName, "true"); } else { - localStorage.removeItem( - LocalStorageDict["MarkdownEditorDefaultSideBySide"] - ); + localStorage.removeItem(defSbsName); } if (preview) { - localStorage.setItem( - LocalStorageDict["MarkdownEditorDefaultPreview"], - "true" - ); + localStorage.setItem(defPrevName, "true"); } else { - localStorage.removeItem( - LocalStorageDict["MarkdownEditorDefaultPreview"] - ); + localStorage.removeItem(defPrevName); } }, [sideBySide, preview, ready]); React.useEffect(() => { - if ( - localStorage.getItem( - LocalStorageDict["MarkdownEditorDefaultPreview"] - ) - ) { + if (localStorage.getItem(defPrevName)) { setPreview(true); } - if ( - !localStorage.getItem( - LocalStorageDict["MarkdownEditorDefaultSideBySide"] - ) - ) { + if (!localStorage.getItem(defSbsName)) { setSideBySide(false); } diff --git a/components/pages/Home/index.tsx b/components/pages/Home/index.tsx index 6b2162e..efbddd4 100644 --- a/components/pages/Home/index.tsx +++ b/components/pages/Home/index.tsx @@ -17,6 +17,7 @@ export default function Main() { - + - {HeaderLinks.map((link, index) => { - return ( - - - {index < HeaderLinks.length - 1 && } - - ); - })} + - - + + {SocialLinks.map((link, index) => { return ; })} diff --git a/layouts/main/Header.tsx b/layouts/main/Header.tsx index 2ff5ec5..2403675 100644 --- a/layouts/main/Header.tsx +++ b/layouts/main/Header.tsx @@ -1,11 +1,11 @@ import { twMerge } from "tailwind-merge"; import { HeaderLinks } from "./(data)/links"; -import HeaderLink from "./(partials)/HeaderLink"; import Row from "@/components/lib/layout/Row"; import Logo from "@/components/general/Logo"; import { Menu } from "lucide-react"; import Button from "@/components/lib/layout/Button"; import React from "react"; +import LinkList from "@/components/lib/elements/LinkList"; type Props = { menuOpen: boolean; @@ -22,13 +22,15 @@ export default function Header({ menuOpen, setMenuOpen }: Props) { )} > - {HeaderLinks.map((link, index) => { - return ; - })} + - diff --git a/layouts/main/index.tsx b/layouts/main/index.tsx index b16fd94..838c08b 100644 --- a/layouts/main/index.tsx +++ b/layouts/main/index.tsx @@ -1,12 +1,8 @@ -import Main from "@/components/lib/layout/Main"; import React, { PropsWithChildren } from "react"; import Aside from "./Aside"; import Header from "./Header"; import Footer from "./Footer"; import { twMerge } from "tailwind-merge"; -import Stack from "@/components/lib/layout/Stack"; -import { HeaderLinks } from "./(data)/links"; -import HeaderLink from "./(partials)/HeaderLink"; import MobileMenu from "./(sections)/MobileMenu"; type Props = PropsWithChildren & {}; diff --git a/package.json b/package.json index 7ec54ad..0ebbc91 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "@moduletrace/datasquirel": "^5.1.0", "@moduletrace/twui": "file:./components/lib", "gray-matter": "^4.0.3", + "html-to-react": "^1.7.0", "lodash": "^4.17.21", "lucide-react": "^0.462.0", "next": "15.0.3", diff --git a/pages/404.tsx b/pages/404.tsx index f9166d5..8af5a58 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -26,12 +26,14 @@ export default function Home() { Page Not Found!