Updates

.gitignore

@@ -38,3 +38,5 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+dsql-schema-to-typedef.json
+.data

components/lib/(partials)/ModalComponent.tsx

@@ -1,4 +1,4 @@
-import React, { DetailedHTMLProps, HTMLAttributes } from "react";
+import React from "react";
 import { twMerge } from "tailwind-merge";
 import ReactDOM from "react-dom";
 import Button from "../layout/Button";
@@ -22,9 +22,11 @@ export default function ModalComponent({ open, setOpen, ...props }: Props) {
         <div
             className={twMerge(
                 "fixed z-[200] top-0 left-0 w-screen h-screen",
-                "flex flex-col items-center justify-center",
+                "flex flex-col items-center justify-center p-4",
                 "twui-modal-root"
             )}
+            role="dialog"
+            aria-modal="true"
         >
             <div
                 className={twMerge(
@@ -38,7 +40,7 @@ export default function ModalComponent({ open, setOpen, ...props }: Props) {
             <Paper
                 {..._.omit(props, ["targetWrapperProps"])}
                 className={twMerge(
-                    "z-10 max-w-[500px] bg-background-light dark:bg-background-dark",
+                    "z-10 max-w-modal bg-background-light dark:bg-background-dark",
                     "w-full relative max-h-[95vh] overflow-y-auto",
                     "twui-modal-content",
                     props.className

components/lib/(partials)/PopoverComponent.tsx

@@ -69,7 +69,7 @@ export default function PopoverComponent({
         <Paper
             {...props}
             className={twMerge(
-                "max-w-[300px]",
+                "max-w-[300px] z-[250]",
                 "twui-popover-content",
                 props.className
             )}
@@ -80,6 +80,8 @@ export default function PopoverComponent({
             onMouseLeave={
                 trigger === "hover" ? popoverLeaveFn : props.onMouseLeave
             }
+            role="dialog"
+            aria-modal="true"
         >
             {/* <div
                 className="absolute w-0 h-0 border-8 border-transparent bg-white"

components/lib/Readme.md

@@ -8,10 +8,20 @@ You need a couple of packages and settings to integrate this package
 
 ### Packages
 
--   React
--   React Dom
--   Tailwind CSS **version 4**
+- React
+- React Dom
+- Tailwind CSS **version 4**
 
 ### CSS Base
 
 This package contains a `base.css` file which has all the base css rules required to run. This css file must be imported in your base project, and it can be update in a separate `.css` file.
+
+### Install packages
+
+```sh
+bun add lucide-react tailwind-merge html-to-react gray-matter mdx typescript lodash react-code-blocks react-responsive-modal next-mdx-remote remark-gfm rehype-prism-plus openai
+```
+
+```sh
+bun add -D @types/ace @types/react @types/react-dom tailwindcss @types/mdx @next/mdx
+```

components/lib/base.css

@@ -2,6 +2,8 @@
 
 @theme inline {
     --breakpoint-xs: 350px;
+    --breakpoint-xxs: 300px;
+    --breakpoint-xxl: 1600px;
 
     --color-background-light: #ffffff;
     --color-foreground-light: #171717;
@@ -58,6 +60,9 @@
     --radius-default-xs: 1px;
     --radius-default-lg: 7px;
     --radius-default-xl: 10px;
+
+    --container-container: 1200px;
+    --container-modal: 800px;
 }
 
 @custom-variant dark (&:where(.dark, .dark *));
@@ -153,3 +158,16 @@ option {
 .normal-text {
     @apply text-foreground-light dark:text-foreground-dark;
 }
+
+ol {
+    list-style: decimal;
+}
+
+ul {
+    list-style: disc;
+}
+
+ul,
+ol {
+    margin-left: 25px;
+}

components/lib/composites/docs/TWUIDocsLink.tsx

@@ -115,7 +115,7 @@ export default function TWUIDocsLink({
                             <TWUIDocsLink
                                 key={index}
                                 docLink={link}
-                                className="text-sm opacity-70"
+                                className="opacity-70"
                                 autoExpandAll={autoExpandAll}
                                 child
                             />

components/lib/composites/docs/TWUIDocsRightAside.tsx

@@ -53,8 +53,6 @@ export default function TWUIDocsRightAside({
 
                     const nextElementH3 = nextElement.querySelector("h3");
 
-                    console.log("nextElement", nextElement);
-
                     const isNextElementH2 =
                         nextElement.querySelector("h2") !== null;
 

components/lib/editors/AceEditor.tsx

@@ -1,14 +1,16 @@
 import React, { MutableRefObject } from "react";
 import { twMerge } from "tailwind-merge";
 import AceEditorModes from "./ace-editor-modes";
+import { AceEditorOptions } from "@moduletrace/datasquirel/dist/package-shared/types";
 
 export type AceEditorComponentType = {
-    editorRef?: MutableRefObject<AceAjax.Editor>;
+    editorRef?: MutableRefObject<AceAjax.Editor | undefined>;
     readOnly?: boolean;
     /** Function to call when Ctrl+Enter is pressed */
     ctrlEnterFn?: (editor: AceAjax.Editor) => void;
     content?: string;
     placeholder?: string;
+    title?: string;
     mode?: (typeof AceEditorModes)[number];
     fontSize?: string;
     previewMode?: boolean;
@@ -18,7 +20,9 @@ export type AceEditorComponentType = {
         React.HTMLAttributes<HTMLDivElement>,
         HTMLDivElement
     >;
-    refresh?: number;
+    refreshDepArr?: any[];
+    editorOptions?: AceEditorOptions;
+    showLabel?: boolean;
 };
 
 let timeout: any;
@@ -40,13 +44,15 @@ export default function AceEditor({
     previewMode,
     onChange,
     delay = 500,
-    refresh: externalRefresh,
+    refreshDepArr,
     wrapperProps,
+    editorOptions,
+    showLabel,
+    title,
 }: AceEditorComponentType) {
     try {
-        const editorElementRef = React.useRef<HTMLDivElement>(null);
-        // const editorRefInstance = React.useRef<AceAjax.Editor>(null);
-        const editorRefInstance = React.useRef<any>(null);
+        const editorElementRef = React.useRef<HTMLDivElement>(undefined);
+        const editorRefInstance = React.useRef<AceAjax.Editor>(undefined);
 
         const [refresh, setRefresh] = React.useState(0);
         const [darkMode, setDarkMode] = React.useState(false);
@@ -69,7 +75,13 @@ export default function AceEditor({
                 theme: darkMode
                     ? "ace/theme/tomorrow_night_eighties"
                     : "ace/theme/ace_light",
-                value: content,
+                value: (() => {
+                    try {
+                        return JSON.stringify(JSON.parse(content), null, 4);
+                    } catch (error) {
+                        return content;
+                    }
+                })(),
                 placeholder: placeholder ? placeholder : "",
                 enableBasicAutocompletion: true,
                 enableLiveAutocompletion: true,
@@ -78,9 +90,7 @@ export default function AceEditor({
                 showLineNumbers: previewMode ? false : true,
                 wrap: true,
                 wrapMethod: "code",
-                // onchange: (e) => {
-                //     console.log(e);
-                // },
+                ...editorOptions,
             });
 
             editor.commands.addCommand({
@@ -97,7 +107,9 @@ export default function AceEditor({
                     clearTimeout(timeout);
 
                     setTimeout(() => {
-                        onChange(editor.getValue());
+                        try {
+                            onChange(editor.getValue());
+                        } catch (error) {}
                     }, delay);
                 }
             });
@@ -108,7 +120,7 @@ export default function AceEditor({
             return function () {
                 editor.destroy();
             };
-        }, [refresh, darkMode, ready, externalRefresh]);
+        }, [refresh, darkMode, ready, mode, ...(refreshDepArr || [])]);
 
         React.useEffect(() => {
             const htmlClassName = document.documentElement.className;
@@ -123,12 +135,23 @@ export default function AceEditor({
                 <div
                     {...wrapperProps}
                     className={twMerge(
-                        "w-full h-[400px] block rounded-default overflow-hidden",
-                        "border border-slate-200 border-solid",
+                        "w-full h-[400px] block rounded-default",
+                        "border border-slate-200 border-solid relative",
                         "dark:border-white/20",
-                        wrapperProps?.className
+                        showLabel && title ? "pt-4" : "",
+                        wrapperProps?.className,
                     )}
                 >
+                    {showLabel && title ? (
+                        <label
+                            className={twMerge(
+                                "bg-background-light dark:bg-background-dark text-xs",
+                                "-top-3 left-2 px-2 py-1 absolute z-10",
+                            )}
+                        >
+                            {title}
+                        </label>
+                    ) : null}
                     <div
                         ref={editorElementRef as any}
                         className="w-full h-full"
@@ -139,7 +162,7 @@ export default function AceEditor({
     } catch (error: any) {
         return (
             <React.Fragment>
-                <span className="text-sm m-0">
+                <span className="m-0">
                     Editor Error:{" "}
                     <b className="text-red-600">{error.message}</b>
                 </span>

components/lib/editors/TinyMCE/index.tsx

@@ -3,9 +3,9 @@ import { RawEditorOptions, TinyMCE, Editor } from "./tinymce";
 import { twMerge } from "tailwind-merge";
 import twuiSlugToNormalText from "../../utils/slug-to-normal-text";
 import Border from "../../elements/Border";
+import useTinyMCE from "./useTinyMCE";
 
 export type TinyMCEEditorProps<KeyType extends string> = {
-    tinyMCE?: TinyMCE | null;
     options?: RawEditorOptions;
     editorRef?: React.MutableRefObject<Editor | null>;
     setEditor?: React.Dispatch<React.SetStateAction<Editor>>;
@@ -24,19 +24,17 @@ export type TinyMCEEditorProps<KeyType extends string> = {
     showLabel?: boolean;
     useParentCSS?: boolean;
     placeholder?: string;
+    refreshDependencyArray?: any[];
 };
 
-let interval: any;
-
 /**
  * # Tiny MCE Editor Component
  * @className_wrapper twui-rte-wrapper
  */
 export default function TinyMCEEditor<KeyType extends string>({
     options,
-    editorRef,
-    setEditor,
-    tinyMCE,
+    editorRef: passedEditorRef,
+    setEditor: passedSetEditor,
     wrapperProps,
     defaultValue,
     changeHandler,
@@ -46,30 +44,52 @@ export default function TinyMCEEditor<KeyType extends string>({
     showLabel,
     useParentCSS,
     placeholder,
+    refreshDependencyArray,
 }: TinyMCEEditorProps<KeyType>) {
+    const { tinyMCE } = useTinyMCE();
+
     const editorComponentRef = React.useRef<HTMLDivElement>(null);
+    const editorRef = passedEditorRef || React.useRef<Editor>(null);
+
+    const EDITOR_VALUE_CHANGE_TIMEOUT = 500;
 
     const FINAL_HEIGHT = options?.height || 500;
     const [themeReady, setThemeReady] = React.useState(false);
     const [ready, setReady] = React.useState(false);
     const [darkMode, setDarkMode] = React.useState(false);
+    const [refresh, setRefresh] = React.useState(0);
+    const [editor, setEditor] = React.useState<Editor>();
 
     const title = name ? twuiSlugToNormalText(name) : "Rich Text";
 
     React.useEffect(() => {
-        const htmlClassName = document.documentElement.className;
-        if (htmlClassName.match(/dark/i)) setDarkMode(true);
-        setTimeout(() => {
-            setThemeReady(true);
-        }, 200);
-    }, []);
-
-    React.useEffect(() => {
-        if (!editorComponentRef.current || !themeReady) {
+        if (!tinyMCE) {
             return;
         }
 
-        tinyMCE?.init({
+        const htmlClassName = document.documentElement.className;
+
+        if (htmlClassName.match(/dark/i)) setDarkMode(true);
+
+        setTimeout(() => {
+            setThemeReady(true);
+        }, 200);
+    }, [tinyMCE]);
+
+    let valueTimeout: any;
+
+    const id = crypto.randomUUID();
+
+    React.useEffect(() => {
+        if (!editorComponentRef.current || !themeReady || !tinyMCE) {
+            return;
+        }
+
+        const baseUrl =
+            process.env.NEXT_PUBLIC_TINYMCE_BASE_URL ||
+            "https://www.datasquirel.com/tinymce-public";
+
+        tinyMCE.init({
             height: FINAL_HEIGHT,
             menubar: false,
             plugins:
@@ -79,20 +99,33 @@ export default function TinyMCEEditor<KeyType extends string>({
             content_style:
                 "body { font-family:Helvetica,Arial,sans-serif; font-size:14px; background-color: transparent }",
             init_instance_callback: (editor) => {
-                setEditor?.(editor as any);
-                if (editorRef) editorRef.current = editor as any;
+                setEditor(editor as any);
+                if (editorRef) {
+                    editorRef.current = editor;
+                    passedSetEditor?.(editor);
+                }
                 if (defaultValue) editor.setContent(defaultValue);
                 setReady(true);
 
+                // editor.on("change", (e) => {
+                //     changeHandler?.(editor.getContent());
+                // });
+
                 editor.on("input", (e) => {
-                    changeHandler?.(editor.getContent());
+                    if (changeHandler) {
+                        window.clearTimeout(valueTimeout);
+
+                        valueTimeout = setTimeout(() => {
+                            changeHandler(editor.getContent());
+                        }, EDITOR_VALUE_CHANGE_TIMEOUT);
+                    }
                 });
 
                 if (useParentCSS) {
                     useParentStyles(editor);
                 }
             },
-            base_url: "https://datasquirel.com/tinymce-public",
+            base_url: baseUrl,
             body_class: "twui-tinymce",
             placeholder,
             relative_urls: true,
@@ -106,9 +139,22 @@ export default function TinyMCEEditor<KeyType extends string>({
         });
 
         return function () {
-            tinyMCE?.remove();
+            if (!ready) return;
+
+            const instance = editorComponentRef.current
+                ? tinyMCE?.get(editorComponentRef.current?.id)
+                : undefined;
+            instance?.remove();
         };
-    }, [tinyMCE, themeReady]);
+    }, [tinyMCE, themeReady, refresh, ...(refreshDependencyArray || [])]);
+
+    React.useEffect(() => {
+        const instance = editorRef.current;
+
+        if (instance) {
+            instance.setContent(defaultValue || "");
+        }
+    }, [defaultValue]);
 
     return (
         <div
@@ -116,17 +162,20 @@ export default function TinyMCEEditor<KeyType extends string>({
             className={twMerge(
                 "relative w-full [&_.tox-tinymce]:!border-none",
                 "bg-background-light dark:bg-background-dark",
-                wrapperWrapperProps?.className
+                wrapperWrapperProps?.className,
             )}
+            onInput={(e) => {
+                console.log(`Input Detected`);
+            }}
         >
             {showLabel && (
                 <label
                     className={twMerge(
                         "absolute z-10 -top-[7px] left-[10px] px-2 text-xs",
                         "bg-background-light dark:bg-background-dark text-gray-500",
-                        "dark:text-white/80 rounded"
+                        "dark:text-white/80 rounded",
                     )}
-                    htmlFor={name || "twui-tinymce"}
+                    htmlFor={id}
                 >
                     {title}
                 </label>
@@ -135,7 +184,7 @@ export default function TinyMCEEditor<KeyType extends string>({
                 {...borderProps}
                 className={twMerge(
                     "dark:border-white/30 p-0 pt-2",
-                    borderProps?.className
+                    borderProps?.className,
                 )}
             >
                 <div
@@ -148,9 +197,9 @@ export default function TinyMCEEditor<KeyType extends string>({
                     }}
                     className={twMerge(
                         "bg-slate-200 dark:bg-slate-700 rounded-sm w-full",
-                        "twui-rte-wrapper"
+                        "twui-rte-wrapper",
                     )}
-                    id={name || "twui-tinymce"}
+                    id={id}
                 ></div>
             </Border>
         </div>

components/lib/editors/TinyMCE/useTinyMCE.tsx

@@ -4,31 +4,49 @@ import { TinyMCE } from "./tinymce";
 let interval: any;
 
 export default function useTinyMCE() {
-    const [tinyMCE, setTinyMCE] = React.useState<TinyMCE | null>(null);
+    const [tinyMCE, setTinyMCE] = React.useState<TinyMCE>();
+    const [refresh, setRefresh] = React.useState(0);
+    const [scriptLoaded, setScriptLoaded] = React.useState(false);
 
     React.useEffect(() => {
-        // @ts-ignore
-        if (window.tinymce) {
-            console.log("Tinymce already exists");
-            // @ts-ignore
-            setTinyMCE(window.tinymce);
+        if (refresh >= 5) return;
+
+        const clientWindow = window as Window & { tinymce?: TinyMCE };
+
+        if (clientWindow.tinymce) {
+            setScriptLoaded(true);
             return;
         }
 
         const script = document.createElement("script");
-        script.src = "https://datasquirel.com/tinymce-public/tinymce.min.js";
+
+        const baseUrl =
+            process.env.NEXT_PUBLIC_TINYMCE_BASE_URL ||
+            "https://www.datasquirel.com/tinymce-public";
+
+        script.src = `${baseUrl}/tinymce.min.js`;
         script.async = true;
 
-        document.head.appendChild(script);
-
         script.onload = () => {
-            // @ts-ignore
-            if (window.tinymce) {
-                // @ts-ignore
-                setTinyMCE(window.tinymce);
-            }
+            setScriptLoaded(true);
         };
-    }, []);
+
+        document.head.appendChild(script);
+    }, [refresh]);
+
+    React.useEffect(() => {
+        if (!scriptLoaded) return;
+
+        const clientWindow = window as Window & { tinymce?: TinyMCE };
+
+        let tinyMCE = clientWindow.tinymce;
+
+        if (tinyMCE) {
+            setTinyMCE(tinyMCE);
+        } else {
+            setRefresh((prev) => prev + 1);
+        }
+    }, [scriptLoaded]);
 
     return { tinyMCE };
 }

components/lib/elements/Border.tsx

@@ -1,4 +1,4 @@
-import { DetailedHTMLProps, HTMLAttributes } from "react";
+import { DetailedHTMLProps, HTMLAttributes, RefObject } from "react";
 import { twMerge } from "tailwind-merge";
 
 export type TWUI_BORDER_PROPS = DetailedHTMLProps<
@@ -6,13 +6,18 @@ export type TWUI_BORDER_PROPS = DetailedHTMLProps<
     HTMLDivElement
 > & {
     spacing?: "normal" | "loose" | "tight" | "wide" | "tightest";
+    componentRef?: RefObject<HTMLDivElement>;
 };
 
 /**
  * # Toggle Component
  * @className_wrapper twui-border
  */
-export default function Border({ spacing, ...props }: TWUI_BORDER_PROPS) {
+export default function Border({
+    spacing,
+    componentRef,
+    ...props
+}: TWUI_BORDER_PROPS) {
     return (
         <div
             {...props}
@@ -29,6 +34,7 @@ export default function Border({ spacing, ...props }: TWUI_BORDER_PROPS) {
                 "twui-border",
                 props.className
             )}
+            ref={componentRef}
         >
             {props.children}
         </div>

components/lib/elements/Card.tsx

@@ -40,7 +40,7 @@ export default function Card({
             ref={elRef}
             {...props}
             className={twMerge(
-                "flex flex-row items-center p-4 rounded-default bg-white dark:bg-white/10",
+                "flex flex-row items-center p-4 rounded-default bg-background-light dark:bg-background-dark",
                 "border border-slate-200 dark:border-white/10 border-solid",
                 noHover ? "" : "twui-card",
                 props.className

components/lib/elements/CopySlug.tsx

@@ -0,0 +1,59 @@
+import React, {
+    ComponentProps,
+    Dispatch,
+    ReactNode,
+    SetStateAction,
+} from "react";
+import { Copy, LucideProps } from "lucide-react";
+import Button from "../layout/Button";
+
+type Props = Omit<ComponentProps<typeof Button>, "title"> & {
+    slugText: string;
+    justIcon?: boolean;
+    noIcon?: boolean;
+    title?: string;
+    outlined?: boolean;
+    successMsg?: string | ReactNode;
+    icon?: ReactNode;
+    iconProps?: LucideProps;
+    setToastOpen?: Dispatch<SetStateAction<boolean>>;
+};
+
+export default function CopySlug({
+    slugText,
+    justIcon,
+    noIcon,
+    title,
+    outlined,
+    successMsg,
+    iconProps,
+    icon,
+    setToastOpen,
+    ...props
+}: Props) {
+    return (
+        <Button
+            title={title || slugText}
+            size="smaller"
+            variant="ghost"
+            color="gray"
+            {...props}
+            onClick={(e) => {
+                navigator.clipboard.writeText(slugText).then(() => {
+                    setToastOpen?.(false);
+
+                    setTimeout(() => {
+                        setToastOpen?.(true);
+                    }, 100);
+                });
+                props.onClick?.(e);
+            }}
+            style={{ ...(outlined ? {} : { padding: 0 }), ...props.style }}
+        >
+            {noIcon
+                ? null
+                : icon || <Copy size={outlined ? 15 : 20} {...iconProps} />}
+            {!justIcon && (title ? title : "Copy Slug")}
+        </Button>
+    );
+}

components/lib/elements/Dropdown.tsx

@@ -9,6 +9,8 @@ export const TWUIDropdownContentPositions = [
     "left",
     "bottom-left",
     "top-left",
+    "top",
+    "bottom",
     "right",
     "bottom-right",
     "top-right",
@@ -160,6 +162,8 @@ export default function Dropdown({
                         ? "right-0 top-[100%]"
                         : position == "center"
                         ? "left-[50%] -translate-x-[50%] top-[100%]"
+                        : position == "top"
+                        ? "left-[50%] -translate-x-[50%] bottom-[100%]"
                         : "top-[100%]",
                     above ? "-translate-y-[120%]" : "",
                     open ? "flex" : "hidden",

components/lib/elements/HeaderNavLinkComponent.tsx

@@ -103,7 +103,7 @@ export default function HeaderNavLinkComponent({
 
                     <Dropdown
                         target={mainLinkComponent}
-                        position="bottom-right"
+                        position="center"
                         hoverOpen
                         className="hidden xl:flex"
                     >

components/lib/elements/LinkList.tsx

@@ -13,6 +13,7 @@ import Button from "../layout/Button";
 
 export type TWUI_LINK_LIST_LINK_OBJECT = {
     title?: string;
+    component?: ReactNode;
     url?: string;
     strict?: boolean;
     icon?: ReactNode;
@@ -70,7 +71,7 @@ export default function LinkList({
             className={twMerge(
                 "flex flex-row items-center gap-1",
                 "twui-link-list",
-                props.className
+                props.className,
             )}
         >
             {links
@@ -104,7 +105,7 @@ export default function LinkList({
                                     {...link.buttonProps}
                                     className={twMerge(
                                         "p-2 cursor-pointer whitespace-nowrap",
-                                        linkProps?.className
+                                        linkProps?.className,
                                     )}
                                     onClick={(e) => {
                                         link.onClick?.(e);
@@ -113,7 +114,7 @@ export default function LinkList({
                                 >
                                     <Row>
                                         {link.icon}
-                                        {link.title}
+                                        {link.component || link.title}
                                     </Row>
                                 </Button>
                                 {finalDivider}
@@ -130,7 +131,8 @@ export default function LinkList({
                                 {...link.linkProps}
                                 className={twMerge(
                                     "p-2 cursor-pointer whitespace-nowrap",
-                                    linkProps?.className
+                                    linkProps?.className,
+                                    link.linkProps?.className,
                                 )}
                                 strict={link.strict}
                                 onClick={(e) => {
@@ -143,7 +145,7 @@ export default function LinkList({
                                     link.iconPosition == "before"
                                         ? link.icon
                                         : null}
-                                    {link.title}
+                                    {link.component || link.title}
                                     {link.iconPosition == "after"
                                         ? link.icon
                                         : null}

components/lib/elements/Loading.tsx

@@ -31,14 +31,18 @@ export default function Loading({ size, svgClassName, ...props }: Props) {
     })();
 
     return (
-        <div role="status" {...props}>
+        <div
+            role="status"
+            {...props}
+            className={twMerge(`twui-loading`, props.className)}
+        >
             <svg
                 aria-hidden="true"
                 className={twMerge(
                     "text-gray animate-spin dark:text-gray-dark fill-primary",
                     "dark:fill-white twui-loading",
                     sizeClassName,
-                    svgClassName
+                    svgClassName,
                 )}
                 viewBox="0 0 100 101"
                 fill="none"

components/lib/elements/LoadingOverlay.tsx

@@ -2,31 +2,44 @@ import { ComponentProps, DetailedHTMLProps, HTMLAttributes } from "react";
 import { twMerge } from "tailwind-merge";
 import Center from "../layout/Center";
 import Loading from "./Loading";
+import Row from "../layout/Row";
+import Span from "../layout/Span";
 
 type Props = DetailedHTMLProps<
     HTMLAttributes<HTMLDivElement>,
     HTMLDivElement
 > & {
     loadingProps?: ComponentProps<typeof Loading>;
+    label?: string;
+    fixed?: boolean;
 };
 
 /**
  * # Loading Overlay Component
  * @className_wrapper twui-loading-overlay
  */
-export default function LoadingOverlay({ loadingProps, ...props }: Props) {
+export default function LoadingOverlay({
+    loadingProps,
+    label,
+    fixed,
+    ...props
+}: Props) {
     return (
         <div
             {...props}
             className={twMerge(
-                "absolute top-0 left-0 w-full h-full z-[500]",
+                "top-0 left-0 w-full h-full z-[500]",
                 "bg-background-light/90 dark:bg-background-dark/90",
+                fixed ? "fixed" : "absolute",
                 props.className,
-                "twui-loading-overlay"
+                "twui-loading-overlay",
             )}
         >
             <Center>
-                <Loading {...loadingProps} />
+                <Row>
+                    <Loading {...loadingProps} />
+                    {label && <Span>{label}</Span>}
+                </Row>
             </Center>
         </div>
     );

components/lib/elements/Modal.tsx

@@ -32,6 +32,7 @@ export type TWUI_MODAL_PROPS = DetailedHTMLProps<
     trigger?: (typeof TWUIPopoverTriggers)[number];
     debounce?: number;
     onClose?: () => any;
+    hoverOpen?: boolean;
 };
 
 /**
@@ -55,6 +56,7 @@ export default function Modal(props: TWUI_MODAL_PROPS) {
         trigger = "hover",
         debounce = 500,
         onClose,
+        hoverOpen,
     } = props;
 
     const [ready, setReady] = React.useState(false);
@@ -65,6 +67,9 @@ export default function Modal(props: TWUI_MODAL_PROPS) {
         const modalRoot = document.getElementById(IDName);
 
         if (modalRoot) {
+            if (isPopover) {
+                modalRoot.style.zIndex = "1000";
+            }
             setReady(true);
         } else {
             const newModalRootEl = document.createElement("div");
@@ -141,15 +146,19 @@ export default function Modal(props: TWUI_MODAL_PROPS) {
             {target ? (
                 <div
                     {...targetWrapperProps}
-                    onClick={(e) => setOpen(!open)}
+                    onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        setOpen(!open);
+                    }}
                     ref={finalTargetRef}
                     onMouseEnter={
-                        isPopover && trigger === "hover"
+                        isPopover && (trigger === "hover" || hoverOpen)
                             ? popoverEnterFn
                             : targetWrapperProps?.onMouseEnter
                     }
                     onMouseLeave={
-                        isPopover && trigger === "hover"
+                        isPopover && (trigger === "hover" || hoverOpen)
                             ? popoverLeaveFn
                             : targetWrapperProps?.onMouseLeave
                     }

components/lib/elements/Paper.tsx

@@ -23,7 +23,7 @@ export default function Paper({
             {...props}
             ref={componentRef as any}
             className={twMerge(
-                "flex flex-col items-start p-4 rounded bg-white dark:bg-white/10 gap-4",
+                "flex flex-col items-start p-4 rounded bg-background-light dark:bg-background-dark gap-4",
                 "border border-slate-200 dark:border-white/10 border-solid w-full",
                 "relative",
                 "twui-paper",

components/lib/elements/RemoteCodeBlock.tsx

@@ -0,0 +1,49 @@
+import React from "react";
+import { serialize } from "next-mdx-remote/serialize";
+import remarkGfm from "remark-gfm";
+import rehypePrismPlus from "rehype-prism-plus";
+import { MDXRemote, MDXRemoteSerializeResult } from "next-mdx-remote";
+import { useMDXComponents } from "../mdx/mdx-components";
+
+export const TWUIPrismLanguages = ["shell", "javascript"] as const;
+
+type Props = {
+    content: string;
+    refresh?: number;
+};
+
+/**
+ * # CodeBlock
+ *
+ * @className `twui-remote-code-block-wrapper`
+ */
+export default function RemoteCodeBlock({ content, refresh }: Props) {
+    const [mdxSource, setMdxSource] =
+        React.useState<MDXRemoteSerializeResult<any>>();
+
+    const { components } = useMDXComponents();
+
+    React.useEffect(() => {
+        serialize(content, {
+            mdxOptions: {
+                remarkPlugins: [remarkGfm],
+                rehypePlugins: [rehypePrismPlus],
+            },
+        }).then((mdxSrc) => {
+            setMdxSource(mdxSrc);
+        });
+    }, [refresh]);
+
+    if (!mdxSource) {
+        return null;
+    }
+
+    return (
+        <MDXRemote
+            {...mdxSource}
+            components={{
+                ...components,
+            }}
+        />
+    );
+}

components/lib/elements/Search.tsx

@@ -21,6 +21,7 @@ export type SearchProps<KeyType extends string> = DetailedHTMLProps<
     >;
     loading?: boolean;
     placeholder?: string;
+    componentRef?: React.RefObject<HTMLInputElement | null>;
 };
 
 /**
@@ -37,9 +38,12 @@ export default function Search<KeyType extends string>({
     buttonProps,
     loading,
     placeholder,
+    componentRef,
     ...props
 }: SearchProps<KeyType>) {
-    const [input, setInput] = React.useState("");
+    const [input, setInput] = React.useState(
+        props.defaultValue?.toString() || ""
+    );
 
     React.useEffect(() => {
         clearTimeout(timeout);
@@ -50,19 +54,19 @@ export default function Search<KeyType extends string>({
         }, delay);
     }, [input]);
 
-    const inputRef = React.useRef<HTMLInputElement>(null);
+    const inputRef = componentRef || React.useRef<HTMLInputElement>(null);
 
-    React.useEffect(() => {
-        if (props.autoFocus) {
-            inputRef.current?.focus();
-        }
-    }, []);
+    // React.useEffect(() => {
+    //     if (props.autoFocus) {
+    //         inputRef.current?.focus();
+    //     }
+    // }, []);
 
     return (
         <Row
             {...props}
             className={twMerge(
-                "relative xl:flex-nowrap items-stretch gap-0",
+                "relative xl:flex-nowrap items-stretch gap-0 flex-nowrap",
                 "twui-search-wrapper",
                 props?.className
             )}
@@ -74,12 +78,12 @@ export default function Search<KeyType extends string>({
                 value={input}
                 onChange={(e) => setInput(e.target.value)}
                 className={twMerge(
-                    "rounded-r-none",
+                    "rounded-r-none!",
                     "twui-search-input",
                     inputProps?.className
                 )}
                 wrapperProps={{
-                    className: "rounded-r-none",
+                    className: "rounded-r-none!",
                 }}
                 componentRef={inputRef}
             />
@@ -89,7 +93,7 @@ export default function Search<KeyType extends string>({
                 variant="outlined"
                 color="gray"
                 className={twMerge(
-                    "rounded-l-none ml-[1px]",
+                    "rounded-l-none! ml-[1px]",
                     "twui-search-button",
                     buttonProps?.className
                 )}

components/lib/elements/StarRating.tsx

@@ -14,6 +14,7 @@ type StarProps = {
     starProps?: LucideProps;
     allowRating?: boolean;
     setValueExternal?: React.Dispatch<React.SetStateAction<number>>;
+    changeHandler?: (value: number) => void;
 };
 
 export type TWUI_STAR_RATING_PROPS = DetailedHTMLProps<
@@ -35,6 +36,7 @@ export default function StarRating({
     starProps,
     allowRating,
     setValueExternal,
+    changeHandler,
     ...props
 }: TWUI_STAR_RATING_PROPS) {
     const totalArray = Array(total).fill(null);
@@ -58,7 +60,7 @@ export default function StarRating({
             className={twMerge(
                 "flex flex-row items-center gap-0 -ml-[2px]",
                 "twui-star-rating",
-                props.className
+                props.className,
             )}
             onMouseEnter={() => {
                 sectionHovered.current = true;
@@ -68,6 +70,8 @@ export default function StarRating({
             }}
         >
             {totalArray.map((_, index) => {
+                const isActive = index + 1 <= finalValue;
+
                 return (
                     <StarComponent
                         {...{
@@ -83,6 +87,8 @@ export default function StarRating({
                             selectedStarValue,
                             sectionHovered,
                             setSelectedStarValue,
+                            isActive,
+                            changeHandler,
                         }}
                         key={index}
                     />
@@ -93,34 +99,31 @@ export default function StarRating({
 }
 
 function StarComponent({
-    value = 0,
     size = 20,
     starProps,
     index,
     allowRating,
-    finalValue,
     setFinalValue,
     starClicked,
     sectionHovered,
     setSelectedStarValue,
     selectedStarValue,
+    isActive,
+    changeHandler,
 }: StarProps & {
     index: number;
-    finalValue: number;
     setFinalValue: React.Dispatch<React.SetStateAction<number>>;
     setSelectedStarValue: React.Dispatch<React.SetStateAction<number>>;
     starClicked: React.MutableRefObject<boolean>;
     sectionHovered: React.MutableRefObject<boolean>;
     selectedStarValue: number;
+    isActive: boolean;
 }) {
-    const isActive = index < finalValue;
-
     return (
         <div
             className={twMerge("p-[2px]", allowRating && "cursor-pointer")}
             onMouseEnter={() => {
                 if (!allowRating) return;
-
                 setFinalValue(index + 1);
             }}
             onMouseLeave={() => {
@@ -145,6 +148,7 @@ function StarComponent({
 
                 starClicked.current = true;
                 setSelectedStarValue(index + 1);
+                changeHandler?.(index + 1);
             }}
         >
             <Star
@@ -155,7 +159,7 @@ function StarComponent({
                         "text-orange-500 dark:text-orange-400 fill-orange-500 dark:fill-orange-400",
                     // allowRating &&
                     //     "hover:text-orange-500 hover:dark:text-orange-400 hover:fill-orange-500 hover:dark:fill-orange-400",
-                    starProps?.className
+                    starProps?.className,
                 )}
                 {...starProps}
             />

components/lib/elements/Table.tsx

@@ -31,7 +31,7 @@ export default function Table({ data }: Props) {
                             <th
                                 key={header}
                                 className={twMerge(
-                                    "px-3 py-2 text-left text-sm opacity-50",
+                                    "px-3 py-2 text-left opacity-50",
                                     "font-semibold"
                                 )}
                                 title={header}
@@ -58,7 +58,7 @@ export default function Table({ data }: Props) {
                                 <td
                                     key={`${header}-${index}`}
                                     className={twMerge(
-                                        "px-3 py-2 whitespace-nowrap text-sm text-foreground-light",
+                                        "px-3 py-2 whitespace-nowrap text-foreground-light",
                                         "dark:text-foreground-dark max-w-[200px] overflow-hidden",
                                         "overflow-ellipsis"
                                     )}

components/lib/elements/Tabs.tsx

@@ -8,7 +8,7 @@ import twuiSlugify from "../utils/slugify";
 export type TWUITabsObject = {
     title: string;
     value?: string;
-    content: React.ReactNode;
+    content?: React.ReactNode;
     defaultActive?: boolean;
 };
 
@@ -26,6 +26,9 @@ export type TWUI_TOGGLE_PROPS = React.ComponentProps<typeof Stack> & {
      */
     switchComponent?: ReactNode;
     setActiveValue?: React.Dispatch<React.SetStateAction<string | undefined>>;
+    changeHandler?: (value: TWUITabsObject) => void;
+    defaultValue?: string | null;
+    hrefUpdate?: boolean;
 };
 
 /**
@@ -34,6 +37,8 @@ export type TWUI_TOGGLE_PROPS = React.ComponentProps<typeof Stack> & {
  * @className twui-tab-buttons
  * @className twui-tab-button-active
  * @className twui-tab-buttons-wrapper
+ * @className twui-tab-buttons-container
+ * @className twui-tabs-border
  */
 export default function Tabs({
     tabsContentArray,
@@ -43,6 +48,9 @@ export default function Tabs({
     debounce = 100,
     switchComponent,
     setActiveValue: existingSetActiveValue,
+    changeHandler,
+    defaultValue,
+    hrefUpdate,
     ...props
 }: TWUI_TOGGLE_PROPS) {
     const finalTabsContentArray = tabsContentArray
@@ -50,28 +58,60 @@ export default function Tabs({
         .filter((ct) => Boolean(ct?.title)) as TWUITabsObject[];
 
     const values = finalTabsContentArray.map(
-        (obj) => obj.value || twuiSlugify(obj.title)
+        (obj) => obj.value || twuiSlugify(obj.title),
     );
 
     const defaultActiveObj = finalTabsContentArray.find(
-        (ctn) => ctn.defaultActive
+        (ctn) => ctn.defaultActive,
     );
 
     const [activeValue, setActiveValue] = React.useState(
-        defaultActiveObj
-            ? defaultActiveObj?.value || twuiSlugify(defaultActiveObj.title)
-            : values[0] || undefined
+        defaultValue
+            ? defaultValue
+            : defaultActiveObj
+              ? defaultActiveObj?.value || twuiSlugify(defaultActiveObj.title)
+              : values[0] || undefined,
     );
+    const [ready, setReady] = React.useState(false);
 
     const targetContent = finalTabsContentArray.find(
         (ctn) =>
-            ctn.value == activeValue || twuiSlugify(ctn.title) == activeValue
+            ctn.value == activeValue || twuiSlugify(ctn.title) == activeValue,
     );
 
     React.useEffect(() => {
+        if (!ready) return;
         existingSetActiveValue?.(activeValue);
+        if (targetContent && activeValue) {
+            changeHandler?.(targetContent);
+
+            if (hrefUpdate) {
+                const url = new URL(window.location.href);
+                url.searchParams.set("tab", activeValue);
+                window.history.pushState({}, "", url);
+            }
+        }
     }, [activeValue]);
 
+    React.useEffect(() => {
+        if (hrefUpdate) {
+            const url = new URL(window.location.href);
+
+            const activeTab = url.searchParams.get("tab");
+
+            if (activeTab && activeValue !== activeTab) {
+                setActiveValue(undefined);
+                setActiveValue(activeTab);
+            }
+
+            setTimeout(() => {
+                setReady(true);
+            }, 500);
+        } else {
+            setReady(true);
+        }
+    }, []);
+
     return (
         <Stack
             {...props}
@@ -82,24 +122,25 @@ export default function Tabs({
                 className={twMerge(
                     "w-full",
                     "twui-tab-buttons-wrapper",
-                    tabsButtonsWrapperProps?.className
+                    tabsButtonsWrapperProps?.className,
                 )}
             >
                 <Border
-                    className="p-0 w-full overflow-hidden"
+                    className="p-0 w-full overflow-hidden twui-tabs-border"
                     {...tabsBorderProps}
                 >
                     <Row
                         className={twMerge(
                             "gap-0 items-stretch w-full flex-nowrap overflow-x-auto",
-                            centered && "justify-center"
+                            centered && "justify-center",
+                            "twui-tab-buttons-container",
                         )}
                     >
                         {values.map((value, index) => {
                             const targetObject = finalTabsContentArray.find(
                                 (ctn) =>
                                     ctn.value == value ||
-                                    twuiSlugify(ctn.title) == value
+                                    twuiSlugify(ctn.title) == value,
                             );
 
                             const isActive = value == activeValue;
@@ -112,7 +153,7 @@ export default function Tabs({
                                             ? "bg-primary dark:bg-primary-dark text-white outline-none twui-tab-button-active"
                                             : "text-slate-400 dark:text-white/40 hover:text-slate-800 dark:hover:text-white" +
                                                   " cursor-pointer",
-                                        "twui-tab-buttons"
+                                        "twui-tab-buttons",
                                     )}
                                     onClick={() => {
                                         setActiveValue(undefined);

components/lib/elements/Tag.tsx

@@ -51,7 +51,7 @@ export default function Tag({
                     ? "bg-orange-700 outline-orange-700"
                     : color == "gray"
                     ? twMerge(
-                          "bg-slate-100 outline-slate-200 dark:bg-white/10 dark:outline-white/20",
+                          "bg-slate-100 outline-slate-200 dark:bg-gray-dark dark:outline-gray-dark",
                           "text-slate-800 dark:text-white"
                       )
                     : "bg-primary text-white outline-primbg-primary twui-tag-primary",

components/lib/elements/Toast.tsx

@@ -14,6 +14,7 @@ export type TWUIToastProps = DetailedHTMLProps<
 > & {
     open?: boolean;
     setOpen?: React.Dispatch<React.SetStateAction<boolean>>;
+    closeDispatch?: (open?: boolean) => void;
     closeDelay?: number;
     color?: (typeof ToastStyles)[number];
 };
@@ -33,6 +34,7 @@ export default function Toast({
     setOpen,
     closeDelay = 4000,
     color,
+    closeDispatch,
     ...props
 }: TWUIToastProps) {
     const [ready, setReady] = React.useState(false);
@@ -56,10 +58,12 @@ export default function Toast({
 
         timeout = setTimeout(() => {
             setOpen?.(false);
+            closeDispatch?.(open);
         }, closeDelay);
 
         return function () {
             setOpen?.(false);
+            closeDispatch?.(open);
         };
     }, [ready, open]);
 
@@ -70,15 +74,15 @@ export default function Toast({
         <Card
             {...props}
             className={twMerge(
-                "absolute bottom-4 right-4 z-[250] border-none",
+                "fixed bottom-4 right-4 z-[250] border-none",
                 "pl-6 pr-8 py-4 bg-primary dark:bg-primary-dark",
                 color == "success"
-                    ? "bg-success dark:bg-success-dark twui-toast-success"
+                    ? "bg-success-dark dark:bg-success-dark twui-toast-success"
                     : color == "error"
-                    ? "bg-error dark:bg-error-dark twui-toast-error"
-                    : "",
+                      ? "bg-error dark:bg-error-dark twui-toast-error"
+                      : "",
                 props.className,
-                "twui-toast"
+                "twui-toast",
             )}
             onMouseEnter={() => {
                 window.clearTimeout(timeout);
@@ -86,22 +90,28 @@ export default function Toast({
             onMouseLeave={(e) => {
                 timeout = setTimeout(() => {
                     setOpen?.(false);
+                    closeDispatch?.(open);
                 }, closeDelay);
             }}
         >
             <Span
                 className={twMerge(
                     "absolute top-2 right-2 z-[100] cursor-pointer",
-                    "text-white"
+                    "text-white",
                 )}
                 onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
                     setOpen?.(false);
+                    closeDispatch?.(open);
                 }}
             >
                 <X size={15} />
             </Span>
-            <Span className={twMerge("text-white")}>{props.children}</Span>
+            <Span className={twMerge("text-white! font-semibold")}>
+                {props.children}
+            </Span>
         </Card>,
-        document.getElementById(IDName) as HTMLElement
+        document.getElementById(IDName) as HTMLElement,
     );
 }

components/lib/elements/ai/AIPromptActionSection.tsx

@@ -0,0 +1,81 @@
+import { Send, X } from "lucide-react";
+import React, { Dispatch, SetStateAction } from "react";
+import { ChatCompletionMessageParam } from "openai/resources/index";
+import Row from "../../layout/Row";
+import Button from "../../layout/Button";
+import CopySlug from "../CopySlug";
+import AIPromptHistoryModal from "./AIPromptHistoryModal";
+
+type Props = {
+    streamRes: string;
+    setStreamRes: Dispatch<SetStateAction<string>>;
+    setPrompt: Dispatch<SetStateAction<string>>;
+    loading: boolean;
+    promptFn: (prompt: string) => void;
+    history: ChatCompletionMessageParam[];
+    prompt: string;
+    currentPromptRef: React.MutableRefObject<string>;
+    promptInputRef: React.RefObject<HTMLTextAreaElement>;
+};
+
+export default function AIPromptActionSection({
+    streamRes,
+    setStreamRes,
+    loading,
+    promptFn,
+    history,
+    prompt,
+    setPrompt,
+    currentPromptRef,
+    promptInputRef,
+}: Props) {
+    return (
+        <Row className="w-full justify-between">
+            <Row className="gap-4">
+                {streamRes.match(/./) && (
+                    <React.Fragment>
+                        <Button
+                            title="Clear AI Result"
+                            variant="ghost"
+                            size="smaller"
+                            color="gray"
+                            className="px-0"
+                            beforeIcon={<X size={20} />}
+                            onClick={() => {
+                                setStreamRes("");
+                            }}
+                        />
+                        <CopySlug
+                            slugText={streamRes}
+                            justIcon
+                            iconProps={{ size: 18 }}
+                            title="Copy Content"
+                        />
+                    </React.Fragment>
+                )}
+            </Row>
+            <Row>
+                <AIPromptHistoryModal history={history} />
+            </Row>
+            <Row>
+                <Button
+                    title="Send Prompt"
+                    beforeIcon={<Send size={20} />}
+                    loading={loading}
+                    className="p-2"
+                    onClick={() => {
+                        currentPromptRef.current = prompt;
+                        setTimeout(() => {
+                            setPrompt("");
+                            if (promptInputRef.current) {
+                                promptInputRef.current.value = "";
+                            }
+                        }, 200);
+                        promptFn(prompt);
+                    }}
+                    loadingProps={{ size: "smaller" }}
+                />
+            </Row>
+        </Row>
+    );
+}

components/lib/elements/ai/AIPromptBlock.tsx

@@ -0,0 +1,104 @@
+import { ChatCompletionMessageParam } from "openai/resources/index";
+import React from "react";
+import Paper from "../Paper";
+import Stack from "../../layout/Stack";
+import AIPromptPreview from "./AIPromptPreview";
+import LoadingOverlay from "../LoadingOverlay";
+import Textarea from "../../form/Textarea";
+import AIPromptActionSection from "./AIPromptActionSection";
+import Card from "../Card";
+import Row from "../../layout/Row";
+import Span from "../../layout/Span";
+import { MessageCircleMore } from "lucide-react";
+
+type Props = {
+    model?: string;
+    promptFn: (prompt: string) => void;
+    history?: ChatCompletionMessageParam[];
+    loading?: boolean;
+    mdRes?: string;
+    setMdRes: React.Dispatch<React.SetStateAction<string>>;
+    placeholder?: string;
+};
+
+export default function AIPromptBlock({
+    model,
+    promptFn,
+    history = [],
+    loading = false,
+    mdRes = "",
+    setMdRes,
+    placeholder,
+}: Props) {
+    const [prompt, setPrompt] = React.useState("");
+    const currentPromptRef = React.useRef("");
+    const promptInputRef = React.useRef<HTMLTextAreaElement>(null);
+
+    return (
+        <Paper className="">
+            <Stack className="w-full">
+                {currentPromptRef.current && (
+                    <Row className="w-full justify-end">
+                        <Card className="py-1.5 px-2.5 text-xs">
+                            <Row>
+                                <Span>{currentPromptRef.current}</Span>
+                                <MessageCircleMore
+                                    size={15}
+                                    opacity={0.5}
+                                    className="-mt-px"
+                                />
+                            </Row>
+                        </Card>
+                    </Row>
+                )}
+                <AIPromptPreview
+                    setStreamRes={setMdRes}
+                    streamRes={mdRes}
+                    history={history}
+                    loading={loading}
+                />
+                <Stack className="w-full relative">
+                    {loading && <LoadingOverlay />}
+                    <Textarea
+                        placeholder={
+                            placeholder ||
+                            (model ? `Prompt ${model}` : "Prompt AI")
+                        }
+                        wrapperProps={{ className: "outline-none" }}
+                        wrapperWrapperProps={{ className: "w-full" }}
+                        value={prompt}
+                        onChange={(e) => {
+                            setPrompt(e.target.value);
+                        }}
+                        onKeyDown={(e) => {
+                            if (e.key == "Enter" && !e.ctrlKey && !e.shiftKey) {
+                                e.preventDefault();
+                                currentPromptRef.current = prompt;
+                                setTimeout(() => {
+                                    setPrompt("");
+                                    if (promptInputRef.current) {
+                                        promptInputRef.current.value = "";
+                                    }
+                                }, 200);
+                                promptFn(prompt);
+                            }
+                        }}
+                        componentRef={promptInputRef}
+                        // autoFocus
+                    />
+                    <AIPromptActionSection
+                        loading={loading}
+                        promptFn={promptFn}
+                        setStreamRes={setMdRes}
+                        streamRes={mdRes}
+                        history={history}
+                        prompt={prompt}
+                        setPrompt={setPrompt}
+                        currentPromptRef={currentPromptRef}
+                        promptInputRef={promptInputRef as any}
+                    />
+                </Stack>
+            </Stack>
+        </Paper>
+    );
+}

components/lib/elements/ai/AIPromptHistoryModal.tsx

@@ -0,0 +1,99 @@
+import React from "react";
+import { ChatCompletionMessageParam } from "openai/resources/index";
+import { twMerge } from "tailwind-merge";
+import { Bot, User } from "lucide-react";
+import Modal from "../Modal";
+import Button from "../../layout/Button";
+import Stack from "../../layout/Stack";
+import H2 from "../../layout/H2";
+import Span from "../../layout/Span";
+import Divider from "../../layout/Divider";
+import Row from "../../layout/Row";
+import Card from "../Card";
+import Border from "../Border";
+import MarkdownEditorPreviewComponent from "../../mdx/markdown/MarkdownEditorPreviewComponent";
+
+type Props = {
+    history: ChatCompletionMessageParam[];
+};
+
+export default function AIPromptHistoryModal({ history }: Props) {
+    if (!history[0]) return null;
+
+    return (
+        <Modal
+            target={
+                <Button
+                    title="View Chat History"
+                    size="smaller"
+                    color="gray"
+                    variant="outlined"
+                >
+                    View History
+                </Button>
+            }
+            className="max-w-[900px] bg-slate-100 dark:bg-white/5 xl:p-8"
+        >
+            <Stack className="gap-10 w-full">
+                <Stack className="gap-1">
+                    <H2 className="!text-xl m-0">Chat History</H2>
+                    <Span className="text-xs">
+                        AI chat history for this session.
+                    </Span>
+                </Stack>
+
+                <Divider />
+
+                {history.map((hst, index) => {
+                    if (hst.role == "user") {
+                        return (
+                            <Row
+                                key={index}
+                                className="w-full items-start justify-end"
+                            >
+                                <Card
+                                    className={twMerge(
+                                        "bg-background-dark text-foreground-dark dark:!bg-background-light dark:text-foreground-light"
+                                    )}
+                                >
+                                    {hst.content?.toString()}
+                                </Card>
+
+                                <Border className="w-10 h-10 rounded-full p-2 items-center justify-center">
+                                    <User />
+                                </Border>
+                            </Row>
+                        );
+                    }
+                    return (
+                        <Row
+                            key={index}
+                            className="w-full items-start flex-nowrap"
+                        >
+                            <Stack>
+                                <Border
+                                    className={twMerge(
+                                        "w-10 h-10 rounded-full items-center justify-center bg-white p-2",
+                                        "dark:bg-background-dark"
+                                    )}
+                                >
+                                    <Bot />
+                                </Border>
+                            </Stack>
+                            <Card className="grow overflow-x-auto xl:p-8">
+                                <MarkdownEditorPreviewComponent
+                                    value={hst.content?.toString() || ""}
+                                    maxHeight="none"
+                                    wrapperProps={{
+                                        className:
+                                            "border-none p-0 ai-response-content w-full",
+                                    }}
+                                />
+                            </Card>
+                        </Row>
+                    );
+                })}
+            </Stack>
+        </Modal>
+    );
+}

components/lib/elements/ai/AIPromptPreview.tsx

@@ -0,0 +1,53 @@
+import Divider from "../../layout/Divider";
+import Stack from "../../layout/Stack";
+import React from "react";
+import MarkdownEditorPreviewComponent from "../../mdx/markdown/MarkdownEditorPreviewComponent";
+import { ChatCompletionMessageParam } from "openai/resources/index";
+
+type Props = {
+    streamRes: string;
+    setStreamRes: React.Dispatch<React.SetStateAction<string>>;
+    history: ChatCompletionMessageParam[];
+    loading?: boolean;
+};
+
+export default function AIPromptPreview({
+    setStreamRes,
+    streamRes,
+    history,
+    loading,
+}: Props) {
+    const responseContentRef = React.useRef<HTMLDivElement>(null);
+    const isContentInterrupted = React.useRef(false);
+
+    React.useEffect(() => {
+        if (isContentInterrupted.current) return;
+
+        if (responseContentRef.current) {
+            responseContentRef.current.scrollTop =
+                responseContentRef.current.scrollHeight;
+        }
+    }, [streamRes]);
+
+    if (loading || !streamRes?.match(/./)) return null;
+
+    return (
+        <Stack className="w-full">
+            <MarkdownEditorPreviewComponent
+                value={streamRes}
+                maxHeight="40vh"
+                wrapperProps={{
+                    className: "border-none p-0 ai-response-content",
+                    componentRef: responseContentRef as any,
+                    onMouseEnter: () => {
+                        isContentInterrupted.current = true;
+                    },
+                    onMouseLeave: () => {
+                        isContentInterrupted.current = false;
+                    },
+                }}
+            />
+            <Divider />
+        </Stack>
+    );
+}

components/lib/elements/lucide-icon.tsx

@@ -0,0 +1,20 @@
+import type { LucideProps } from "lucide-react";
+import * as icons from "lucide-react";
+import React from "react";
+
+export type TWUILucideIconName = keyof typeof icons;
+
+export type TWUILucideIconProps = LucideProps & {
+    name: TWUILucideIconName;
+};
+
+export default function LucideIcon({ name, ...props }: TWUILucideIconProps) {
+    const IconComponent = icons[name] as any;
+
+    if (!IconComponent) {
+        console.warn(`Lucide icon "${name}" not found`);
+        return null;
+    }
+
+    return <IconComponent {...props} />;
+}

components/lib/form/Checkbox.tsx

@@ -11,10 +11,14 @@ import Row from "../layout/Row";
 import { Info } from "lucide-react";
 import Span from "../layout/Span";
 
-export type CheckboxProps = React.DetailedHTMLProps<
-    React.HTMLAttributes<HTMLDivElement>,
-    HTMLDivElement
+export type CheckboxProps = Omit<
+    React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLDivElement>,
+        HTMLDivElement
+    >,
+    "title"
 > & {
+    title?: string | ReactNode;
     wrapperProps?: DetailedHTMLProps<
         HTMLAttributes<HTMLDivElement>,
         HTMLDivElement
@@ -29,6 +33,7 @@ export type CheckboxProps = React.DetailedHTMLProps<
     setChecked?: React.Dispatch<React.SetStateAction<boolean>>;
     checked?: boolean;
     readOnly?: boolean;
+    noLabel?: boolean;
     size?: number;
     changeHandler?: (value: boolean) => void;
     info?: string | ReactNode;
@@ -54,16 +59,18 @@ export default function Checkbox({
     changeHandler,
     info,
     wrapperWrapperProps,
+    noLabel,
+    title,
     ...props
 }: CheckboxProps) {
     const finalSize = size || 20;
 
     const [checked, setChecked] = React.useState(
-        defaultChecked || externalChecked || false
+        defaultChecked || externalChecked || false,
     );
 
-    const finalTitle = props.title
-        ? props.title
+    const finalTitle = title
+        ? title
         : `Checkbox-${Math.round(Math.random() * 100000)}`;
 
     React.useEffect(() => {
@@ -86,7 +93,7 @@ export default function Checkbox({
                     "flex items-start md:items-center gap-2 flex-wrap md:flex-nowrap",
                     readOnly ? "opacity-70 pointer-events-none" : "",
                     wrapperClassName,
-                    wrapperProps?.className
+                    wrapperProps?.className,
                 )}
                 onClick={() => {
                     setChecked(!checked);
@@ -101,7 +108,7 @@ export default function Checkbox({
                             ? "bg-primary twui-checkbox-checked text-white outline-slate-400"
                             : "dark:outline-white/50 outline-2 -outline-offset-2 twui-checkbox-unchecked",
                         "twui-checkbox",
-                        props.className
+                        props.className,
                     )}
                     style={{
                         minWidth: finalSize + "px",
@@ -112,21 +119,23 @@ export default function Checkbox({
                 >
                     {checked && <CheckMarkSVG />}
                 </div>
-                <Stack className="gap-0.5">
-                    <div
-                        {...labelProps}
-                        className={twMerge(
-                            "select-none whitespace-normal md:whitespace-nowrap",
-                            labelProps?.className
-                        )}
-                    >
-                        {label || finalTitle}
-                    </div>
-                </Stack>
+                {!noLabel && (
+                    <Stack className="gap-0.5">
+                        <div
+                            {...labelProps}
+                            className={twMerge(
+                                "select-none whitespace-normal md:whitespace-nowrap",
+                                labelProps?.className,
+                            )}
+                        >
+                            {label || finalTitle}
+                        </div>
+                    </Stack>
+                )}
             </div>
             {info && (
-                <Row className="gap-1" title={info.toString()}>
-                    <Info size={12} className="opacity-40" />
+                <Row className="gap-1 flex-nowrap" title={info.toString()}>
+                    <Info size={13} className="opacity-40 min-w-[20px]" />
                     <Span size="smaller" className="opacity-70">
                         {info}
                     </Span>

components/lib/form/FileUpload.tsx

@@ -11,13 +11,25 @@ import fileInputToBase64 from "../utils/form/fileInputToBase64";
 import Row from "../layout/Row";
 import Input from "./Input";
 import Loading from "../elements/Loading";
+import Tag from "../elements/Tag";
+
+type FileInputUtils = {
+    clearFileInput?: () => void;
+};
 
 type ImageUploadProps = DetailedHTMLProps<
     React.HTMLAttributes<HTMLDivElement>,
     HTMLDivElement
 > & {
     onChangeHandler?: (
-        fileData: FileInputToBase64FunctionReturn | undefined
+        fileData: FileInputToBase64FunctionReturn | undefined,
+        inputRef?: React.RefObject<HTMLInputElement | null>,
+        utils?: FileInputUtils,
+    ) => any;
+    changeHandler?: (
+        fileData: FileInputToBase64FunctionReturn | undefined,
+        inputRef?: React.RefObject<HTMLInputElement | null>,
+        utils?: FileInputUtils,
     ) => any;
     onClear?: () => void;
     fileInputProps?: DetailedHTMLProps<
@@ -48,6 +60,7 @@ type ImageUploadProps = DetailedHTMLProps<
     existingFile?: FileInputToBase64FunctionReturn;
     existingFileUrl?: string;
     icon?: ReactNode;
+    externalSetFileURL?: React.Dispatch<string | undefined>;
     labelSpanProps?: ComponentProps<typeof Span>;
     loading?: boolean;
     multiple?: boolean;
@@ -74,17 +87,20 @@ export default function FileUpload({
     loading,
     multiple,
     onClear,
+    changeHandler,
+    externalSetFileURL,
     ...props
 }: ImageUploadProps) {
     const [file, setFile] = React.useState<
         FileInputToBase64FunctionReturn | undefined
     >(existingFile);
     const [fileUrl, setFileUrl] = React.useState<string | undefined>(
-        existingFileUrl
+        existingFileUrl,
     );
 
     const [fileDraggedOver, setFileDraggedOver] = React.useState(false);
     const inputRef = React.useRef<HTMLInputElement>(null);
+    const tempFileURLRef = React.useRef<string>("");
 
     React.useEffect(() => {
         if (existingFileUrl) {
@@ -98,6 +114,19 @@ export default function FileUpload({
         }
     }, [existingFile]);
 
+    function clearFileInput() {
+        setFile(undefined);
+        externalSetFile?.(undefined);
+        onChangeHandler?.(undefined);
+        changeHandler?.(undefined);
+        if (inputRef.current) {
+            inputRef.current.value = "";
+        }
+        onClear?.();
+    }
+
+    const fileInputUtils: FileInputUtils = { clearFileInput };
+
     return (
         <Stack
             {...props}
@@ -136,9 +165,14 @@ export default function FileUpload({
                             (res) => {
                                 setFile(res);
                                 externalSetFile?.(res);
-                                onChangeHandler?.(res);
+                                onChangeHandler?.(
+                                    res,
+                                    inputRef,
+                                    fileInputUtils,
+                                );
+                                changeHandler?.(res, inputRef, fileInputUtils);
                                 fileInputProps?.onChange?.(e);
-                            }
+                            },
                         );
                     }
                 }}
@@ -157,7 +191,7 @@ export default function FileUpload({
                     className={twMerge(
                         "w-full relative h-full items-center justify-center overflow-hidden",
                         "pb-10",
-                        previewImageWrapperProps?.className
+                        previewImageWrapperProps?.className,
                     )}
                 >
                     <Stack>
@@ -188,16 +222,10 @@ export default function FileUpload({
                             variant="ghost"
                             className={twMerge(
                                 "absolute p-2 top-2 right-2 z-20 bg-background-light dark:bg-background-dark",
-                                "hover:bg-white dark:hover:bg-black"
+                                "hover:bg-white dark:hover:bg-black",
                             )}
                             onClick={(e) => {
-                                setFile(undefined);
-                                externalSetFile?.(undefined);
-                                onChangeHandler?.(undefined);
-                                if (inputRef.current) {
-                                    inputRef.current.value = "";
-                                }
-                                onClear?.();
+                                clearFileInput();
                             }}
                             title="Cancel File Upload Button"
                         >
@@ -220,36 +248,48 @@ export default function FileUpload({
                     className="w-full relative h-full items-center justify-center overflow-hidden"
                     {...previewImageWrapperProps}
                 >
-                    {disablePreview ? (
-                        <Span className="opacity-50" size="small">
-                            Image Uploaded!
-                        </Span>
-                    ) : fileUrl.match(/\.pdf$|\.txt$/) ? (
-                        <Row>
-                            <FileArchive size={36} strokeWidth={1} />
-                            <Stack className="gap-0">
-                                <Span size="smaller" className="opacity-70">
-                                    {fileUrl}
-                                </Span>
-                            </Stack>
-                        </Row>
-                    ) : (
-                        <img
-                            src={fileUrl}
-                            className="w-full object-contain overflow-hidden"
-                            {...previewImageProps}
-                        />
-                    )}
+                    <Stack className="w-full">
+                        {disablePreview ? (
+                            <Span className="opacity-50" size="small">
+                                Image Uploaded!
+                            </Span>
+                        ) : fileUrl.match(/\.pdf$|\.txt$/) ? (
+                            <Row>
+                                <FileArchive size={36} strokeWidth={1} />
+                                <Stack className="gap-0">
+                                    <Span size="smaller" className="opacity-70">
+                                        {fileUrl}
+                                    </Span>
+                                </Stack>
+                            </Row>
+                        ) : (
+                            <img
+                                src={fileUrl}
+                                className="w-full object-contain overflow-hidden"
+                                {...previewImageProps}
+                            />
+                        )}
+
+                        <Tag
+                            variant="outlined"
+                            color="gray"
+                            className="w-full py-2 text-sm"
+                        >
+                            {fileUrl}
+                        </Tag>
+                    </Stack>
+
                     <Button
                         variant="ghost"
                         className={twMerge(
                             "absolute p-2 top-2 right-2 z-20 bg-white dark:bg-black",
-                            "hover:bg-white dark:hover:bg-black"
+                            "hover:bg-white dark:hover:bg-black",
                         )}
                         onClick={(e) => {
                             setFile(undefined);
                             externalSetFile?.(undefined);
                             onChangeHandler?.(undefined);
+                            changeHandler?.(undefined);
                             setFileUrl(undefined);
                         }}
                         title="Cancel File Button"
@@ -263,7 +303,7 @@ export default function FileUpload({
                         "w-full h-full cursor-pointer hover:bg-slate-100/50 dark:hover:bg-white/5",
                         "border-dashed border-2",
                         fileDraggedOver ? "bg-slate-100 dark:bg-white/10" : "",
-                        placeHolderWrapper?.className
+                        placeHolderWrapper?.className,
                     )}
                     onClick={(e) => {
                         inputRef.current?.click();
@@ -300,14 +340,15 @@ export default function FileUpload({
                                 setFile(res);
                                 externalSetFile?.(res);
                                 onChangeHandler?.(res);
-                            }
+                                changeHandler?.(res);
+                            },
                         );
                     }}
                     {...placeHolderWrapper}
                 >
                     <Center
                         className={twMerge(
-                            fileDraggedOver ? "pointer-events-none" : ""
+                            fileDraggedOver ? "pointer-events-none" : "",
                         )}
                     >
                         <Stack className="items-center gap-2">
@@ -319,6 +360,59 @@ export default function FileUpload({
                             >
                                 {label || "Click to Upload File"}
                             </Span>
+                            {externalSetFileURL ? (
+                                <Row
+                                    className="flex-nowrap gap-0 items-stretch"
+                                    onClick={(e) => {
+                                        e.preventDefault();
+                                        e.stopPropagation();
+                                    }}
+                                >
+                                    <Input
+                                        placeholder="Add Media URL"
+                                        className="text-sm"
+                                        wrapperProps={{ className: "h-full" }}
+                                        wrapperWrapperProps={{
+                                            className: "h-full",
+                                        }}
+                                        changeHandler={(value) => {
+                                            tempFileURLRef.current = value;
+                                        }}
+                                        onKeyUp={(e) => {
+                                            if (e.key == "Enter") {
+                                                if (tempFileURLRef.current) {
+                                                    setFileUrl(
+                                                        tempFileURLRef.current,
+                                                    );
+                                                    externalSetFileURL(
+                                                        tempFileURLRef.current,
+                                                    );
+                                                }
+                                            }
+                                        }}
+                                    />
+                                    <Button
+                                        title="Add Media URL"
+                                        variant="outlined"
+                                        className="py-0 px-3"
+                                        color="gray"
+                                        onClick={(e) => {
+                                            e.preventDefault();
+
+                                            if (tempFileURLRef.current) {
+                                                setFileUrl(
+                                                    tempFileURLRef.current,
+                                                );
+                                                externalSetFileURL(
+                                                    tempFileURLRef.current,
+                                                );
+                                            }
+                                        }}
+                                    >
+                                        <span className="text-2xl">+</span>
+                                    </Button>
+                                </Row>
+                            ) : null}
                         </Stack>
                     </Center>
                 </Card>

components/lib/form/Form.tsx

@@ -1,11 +1,12 @@
 import _ from "lodash";
-import { DetailedHTMLProps, FormHTMLAttributes } from "react";
+import { DetailedHTMLProps, FormHTMLAttributes, RefObject } from "react";
 import { twMerge } from "tailwind-merge";
 
 type Props<T extends { [key: string]: any } = { [key: string]: any }> =
     DetailedHTMLProps<FormHTMLAttributes<HTMLFormElement>, HTMLFormElement> & {
         submitHandler?: (e: React.FormEvent<HTMLFormElement>, data: T) => void;
         changeHandler?: (e: React.FormEvent<HTMLFormElement>, data: T) => void;
+        formRef?: RefObject<HTMLFormElement>;
     };
 
 /**
@@ -13,8 +14,8 @@ type Props<T extends { [key: string]: any } = { [key: string]: any }> =
  * @className twui-form
  */
 export default function Form<
-    T extends { [key: string]: any } = { [key: string]: any }
->({ ...props }: Props<T>) {
+    T extends { [key: string]: any } = { [key: string]: any },
+>({ formRef, ...props }: Props<T>) {
     const finalProps = _.omit(props, ["submitHandler", "changeHandler"]);
 
     return (
@@ -23,7 +24,7 @@ export default function Form<
             className={twMerge(
                 "flex flex-col items-stretch gap-2 w-full bg-transparent",
                 "twui-form",
-                props.className
+                props.className,
             )}
             onSubmit={(e) => {
                 e.preventDefault();
@@ -42,6 +43,7 @@ export default function Form<
                 props.changeHandler?.(e, data);
                 props.onChange?.(e);
             }}
+            ref={formRef}
         >
             {props.children}
         </form>

components/lib/form/ImageUpload.tsx

@@ -10,13 +10,15 @@ import imageInputToBase64, {
 } from "../utils/form/imageInputToBase64";
 import { twMerge } from "tailwind-merge";
 import Tag from "../elements/Tag";
+import Input from "./Input";
+import Row from "../layout/Row";
 
 type ImageUploadProps = DetailedHTMLProps<
     React.HTMLAttributes<HTMLDivElement>,
     HTMLDivElement
 > & {
     onChangeHandler?: (
-        imgData: ImageInputToBase64FunctionReturn | undefined
+        imgData: ImageInputToBase64FunctionReturn | undefined,
     ) => any;
     fileInputProps?: DetailedHTMLProps<
         React.InputHTMLAttributes<HTMLInputElement>,
@@ -45,6 +47,7 @@ type ImageUploadProps = DetailedHTMLProps<
         React.SetStateAction<ImageInputToBase64FunctionReturn[] | undefined>
     >;
     setLoading?: React.Dispatch<React.SetStateAction<boolean>>;
+    setImgURL?: React.Dispatch<React.SetStateAction<string | undefined>>;
     externalImage?: ImageInputToBase64FunctionReturn;
     restoreImageFn?: () => void;
 };
@@ -67,6 +70,7 @@ export default function ImageUpload({
     multiple,
     restoreImageFn,
     setLoading,
+    setImgURL,
     ...props
 }: ImageUploadProps) {
     const [imageObject, setImageObject] = React.useState<
@@ -74,6 +78,11 @@ export default function ImageUpload({
     >(externalImage);
     const [src, setSrc] = React.useState<string | undefined>(existingImageUrl);
     const inputRef = React.useRef<HTMLInputElement>(null);
+    const imageUrlRef = React.useRef("");
+
+    React.useEffect(() => {
+        setImgURL?.(src);
+    }, [src]);
 
     React.useEffect(() => {
         if (existingImageUrl) setSrc(existingImageUrl);
@@ -84,7 +93,7 @@ export default function ImageUpload({
             {...props}
             className={twMerge(
                 "w-full h-[300px] overflow-hidden",
-                props?.className
+                props?.className,
             )}
         >
             <input
@@ -123,7 +132,7 @@ export default function ImageUpload({
                                 externalSetImage?.(res);
                                 fileInputProps?.onChange?.(e);
                                 setLoading?.(false);
-                            }
+                            },
                         );
                     }
                 }}
@@ -138,7 +147,7 @@ export default function ImageUpload({
                     {label && (
                         <label
                             className={twMerge(
-                                "absolute top-0 left-0 text-xs z-50"
+                                "absolute top-0 left-0 text-xs z-50",
                             )}
                         >
                             <Tag color="gray">
@@ -157,10 +166,10 @@ export default function ImageUpload({
                             {...previewImageProps}
                         />
                     )}
-                    <Button
-                        variant="ghost"
+                    <div
                         className={twMerge(
-                            "absolute p-1 top-2 right-2 z-20 bg-background-light dark:bg-background-dark"
+                            "absolute p-1 top-2 right-2 z-20 bg-background-light dark:bg-background-dark",
+                            "cursor-pointer",
                         )}
                         onClick={(e) => {
                             setSrc(undefined);
@@ -174,13 +183,13 @@ export default function ImageUpload({
                         title="Cancel Image Upload Button"
                     >
                         <X className="text-slate-950 dark:text-white" />
-                    </Button>
+                    </div>
                 </Card>
             ) : (
                 <Card
                     className={twMerge(
                         "w-full h-full cursor-pointer hover:bg-slate-100 dark:hover:bg-white/20",
-                        placeHolderWrapper?.className
+                        placeHolderWrapper?.className,
                     )}
                     onClick={(e) => {
                         const targetEl = e.target as HTMLElement | undefined;
@@ -199,6 +208,30 @@ export default function ImageUpload({
                             <Span size="smaller" variant="faded">
                                 {label || "Click to Upload Image"}
                             </Span>
+                            <Stack className="cancel-upload w-full items-stretch gap-1">
+                                <Input
+                                    placeholder="Eg. https://example.com/img.png"
+                                    className="text-sm twui-image-url-input"
+                                    title="Enter Image URL"
+                                    wrapperWrapperProps={{ className: "mt-2" }}
+                                    changeHandler={(value) => {
+                                        imageUrlRef.current = value;
+                                    }}
+                                    showLabel
+                                />
+                                <Button
+                                    title="Restore Image Button"
+                                    size="smaller"
+                                    variant="outlined"
+                                    color="gray"
+                                    onClick={() => {
+                                        if (!imageUrlRef.current) return;
+                                        setSrc(imageUrlRef.current);
+                                    }}
+                                >
+                                    Set Image URL
+                                </Button>
+                            </Stack>
                             {existingImageUrl && (
                                 <Button
                                     title="Restore Image Button"

components/lib/form/Input/NumberInputButtons.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect, useRef, useState } from "react";
 import Row from "../../layout/Row";
 import { Info, Minus, Plus } from "lucide-react";
 import twuiNumberfy from "../../utils/numberfy";
@@ -7,10 +7,10 @@ import { InputProps } from ".";
 let pressInterval: any;
 let pressTimeout: any;
 
-type Props = Pick<InputProps<any>, "min" | "max" | "step"> & {
-    updateValue: (v: string) => void;
-    getNormalizedValue: (v: string) => void;
-    buttonDownRef: React.MutableRefObject<boolean>;
+type Props = Pick<InputProps<any>, "min" | "max" | "step" | "decimal"> & {
+    value: string;
+    setValue: React.Dispatch<React.SetStateAction<string>>;
+    buttonDownRef: React.RefObject<boolean>;
     inputRef: React.RefObject<HTMLInputElement | null>;
 };
 
@@ -18,21 +18,50 @@ type Props = Pick<InputProps<any>, "min" | "max" | "step"> & {
  * # Input Number Text Buttons
  */
 export default function NumberInputButtons({
-    getNormalizedValue,
-    updateValue,
+    value,
+    setValue,
     min,
     max,
     step,
     buttonDownRef,
     inputRef,
+    decimal,
 }: Props) {
     const PRESS_TRIGGER_TIMEOUT = 200;
     const DEFAULT_STEP = 1;
 
+    const [buttonDown, setButtonDown] = useState(false);
+
+    // function getNormalizedValue(value: string) {
+    //     if (numberText) {
+    //         if (props.max && twuiNumberfy(value) > twuiNumberfy(props.max))
+    //             return getFinalValue(props.max);
+
+    //         if (props.min && twuiNumberfy(value) < twuiNumberfy(props.min))
+    //             return getFinalValue(props.min);
+
+    //         return getFinalValue(value);
+    //     } else {
+    //         return value;
+    //     }
+    // }
+
+    useEffect(() => {
+        buttonDownRef.current = buttonDown;
+        if (buttonDown) {
+            setValue(inputRef.current?.value || "");
+        } else {
+            setTimeout(() => {
+                setValue(inputRef.current?.value || "");
+            }, 50);
+        }
+    }, [buttonDown]);
+
     function incrementDownPress() {
         window.clearTimeout(pressTimeout);
+        setButtonDown(true);
+
         pressTimeout = setTimeout(() => {
-            buttonDownRef.current = true;
             pressInterval = setInterval(() => {
                 increment();
             }, 50);
@@ -40,14 +69,15 @@ export default function NumberInputButtons({
     }
 
     function incrementDownCancel() {
-        buttonDownRef.current = false;
+        setButtonDown(false);
         window.clearTimeout(pressTimeout);
         window.clearInterval(pressInterval);
     }
 
     function decrementDownPress() {
+        setButtonDown(true);
+
         pressTimeout = setTimeout(() => {
-            buttonDownRef.current = true;
             pressInterval = setInterval(() => {
                 decrement();
             }, 50);
@@ -55,37 +85,51 @@ export default function NumberInputButtons({
     }
 
     function decrementDownCancel() {
-        buttonDownRef.current = false;
+        setButtonDown(false);
         window.clearTimeout(pressTimeout);
         window.clearInterval(pressInterval);
     }
 
     function increment() {
-        const existingValue = inputRef.current?.value;
-        const existingNumberValue = twuiNumberfy(existingValue);
+        if (!inputRef.current) return;
 
-        if (max && existingNumberValue >= twuiNumberfy(max)) {
-            return updateValue(String(max));
-        } else if (min && existingNumberValue < twuiNumberfy(min)) {
-            return updateValue(String(min));
+        const existingValue = inputRef.current.value;
+        const existingNumberValue = twuiNumberfy(existingValue, decimal);
+
+        let new_value = "";
+
+        if (max && existingNumberValue >= twuiNumberfy(max, decimal)) {
+            new_value = twuiNumberfy(max, decimal).toLocaleString();
+        } else if (min && existingNumberValue < twuiNumberfy(min, decimal)) {
+            new_value = twuiNumberfy(min, decimal).toLocaleString();
         } else {
-            updateValue(
-                String(existingNumberValue + twuiNumberfy(step || DEFAULT_STEP))
-            );
+            new_value = (
+                existingNumberValue +
+                twuiNumberfy(step || DEFAULT_STEP, decimal)
+            ).toLocaleString();
         }
+
+        inputRef.current.value = new_value;
     }
 
     function decrement() {
-        const existingValue = inputRef.current?.value;
-        const existingNumberValue = twuiNumberfy(existingValue);
+        if (!inputRef.current) return;
 
-        if (min && existingNumberValue <= twuiNumberfy(min)) {
-            updateValue(String(min));
+        const existingValue = inputRef.current?.value;
+        const existingNumberValue = twuiNumberfy(existingValue, decimal);
+
+        let new_value = "";
+
+        if (min && existingNumberValue <= twuiNumberfy(min, decimal)) {
+            new_value = twuiNumberfy(min, decimal).toLocaleString();
         } else {
-            updateValue(
-                String(existingNumberValue - twuiNumberfy(step || DEFAULT_STEP))
-            );
+            new_value = (
+                existingNumberValue -
+                twuiNumberfy(step || DEFAULT_STEP, decimal)
+            ).toLocaleString();
         }
+
+        inputRef.current.value = new_value;
     }
 
     return (

components/lib/form/Input/index.tsx

@@ -6,34 +6,31 @@ import React, {
     ReactNode,
     RefObject,
     TextareaHTMLAttributes,
+    useRef,
 } from "react";
 import { twMerge } from "tailwind-merge";
 import Span from "../../layout/Span";
-import Button from "../../layout/Button";
 import { Eye, EyeOff, Info, InfoIcon, X } from "lucide-react";
 import { AutocompleteOptions } from "../../types";
 import twuiNumberfy from "../../utils/numberfy";
 import Dropdown from "../../elements/Dropdown";
-import Card from "../../elements/Card";
 import Stack from "../../layout/Stack";
 import NumberInputButtons from "./NumberInputButtons";
 import twuiSlugToNormalText from "../../utils/slug-to-normal-text";
-import twuiUseReady from "../../hooks/useReady";
 import Row from "../../layout/Row";
 import Paper from "../../elements/Paper";
 import { TWUISelectValidityObject } from "../Select";
 
-let timeout: any;
-let validationFnTimeout: any;
-let externalValueChangeTimeout: any;
-
-export type InputProps<KeyType extends string> = DetailedHTMLProps<
-    InputHTMLAttributes<HTMLInputElement>,
-    HTMLInputElement
+export type InputProps<KeyType extends string> = Omit<
+    DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>,
+    "prefix" | "suffix"
 > &
-    DetailedHTMLProps<
-        TextareaHTMLAttributes<HTMLTextAreaElement>,
-        HTMLTextAreaElement
+    Omit<
+        DetailedHTMLProps<
+            TextareaHTMLAttributes<HTMLTextAreaElement>,
+            HTMLTextAreaElement
+        >,
+        "prefix" | "suffix"
     > & {
         label?: string;
         variant?: "normal" | "warning" | "error" | "inactive";
@@ -60,21 +57,24 @@ export type InputProps<KeyType extends string> = DetailedHTMLProps<
         invalidMessage?: string;
         validationFunction?: (
             value: string,
-            element?: HTMLInputElement | HTMLTextAreaElement
+            element?: HTMLInputElement | HTMLTextAreaElement,
         ) => Promise<TWUISelectValidityObject>;
-        changeHandler?: (
-            value: string,
-            element?: HTMLInputElement | HTMLTextAreaElement
-        ) => void;
+        changeHandler?: (value: string) => void;
         autoComplete?: (typeof AutocompleteOptions)[number];
         name?: KeyType;
         valueUpdate?: string;
         numberText?: boolean;
+        rawNumber?: boolean;
         setReady?: React.Dispatch<React.SetStateAction<boolean>>;
         decimal?: number;
         info?: string | ReactNode;
         ready?: boolean;
         validity?: TWUISelectValidityObject;
+        clearInputProps?: React.DetailedHTMLProps<
+            React.HTMLAttributes<HTMLDivElement>,
+            HTMLDivElement
+        >;
+        // refreshDefaultValue?: number;
     };
 
 let refreshes = 0;
@@ -87,7 +87,7 @@ let refreshes = 0;
  * @className twui-clear-input-field-button
  */
 export default function Input<KeyType extends string>(
-    inputProps: InputProps<KeyType>
+    inputProps: InputProps<KeyType>,
 ) {
     const {
         label,
@@ -114,10 +114,22 @@ export default function Input<KeyType extends string>(
         info,
         changeHandler,
         validity: existingValidity,
+        clearInputProps,
+        rawNumber,
+        // refreshDefaultValue,
         ...props
     } = inputProps;
 
+    const componentRefreshesRef = useRef(0);
+    let timeoutRef = useRef<any>(null);
+    let validationFnTimeoutRef = useRef<any>(null);
+    let externalValueChangeTimeoutRef = useRef<any>(null);
+
+    refreshes++;
+    componentRefreshesRef.current++;
+
     function getFinalValue(v: any) {
+        if (rawNumber) return twuiNumberfy(v);
         if (numberText) {
             return (
                 twuiNumberfy(v, decimal).toLocaleString() +
@@ -136,16 +148,19 @@ export default function Input<KeyType extends string>(
     const [validity, setValidity] = React.useState<TWUISelectValidityObject>(
         existingValidity || {
             isValid: true,
-        }
+        },
     );
 
     const inputRef = componentRef || React.useRef<HTMLInputElement>(null);
     const textAreaRef = componentRef || React.useRef<HTMLTextAreaElement>(null);
     const buttonDownRef = React.useRef(false);
 
+    const [value, setValue] = React.useState(
+        props.defaultValue ? String(props.defaultValue) : "",
+    );
     const [focus, setFocus] = React.useState(false);
     const [inputType, setInputType] = React.useState(
-        numberText ? "text" : props.type
+        numberText ? "text" : props.type,
     );
 
     const DEFAULT_DEBOUNCE = 500;
@@ -156,42 +171,26 @@ export default function Input<KeyType extends string>(
         props.placeholder ||
         (props.name ? twuiSlugToNormalText(props.name) : undefined);
 
-    function getNormalizedValue(value: string) {
-        if (numberText) {
-            if (props.max && twuiNumberfy(value) > twuiNumberfy(props.max))
-                return getFinalValue(props.max);
-
-            if (props.min && twuiNumberfy(value) < twuiNumberfy(props.min))
-                return getFinalValue(props.min);
-
-            return getFinalValue(value);
-        } else {
-            return value;
-        }
-    }
-
     React.useEffect(() => {
+        // if (!existingReady) return;
         if (!existingValidity) return;
         setValidity(existingValidity);
     }, [existingValidity]);
 
-    const updateValueFn = (
-        val: string,
-        el?: HTMLInputElement | HTMLTextAreaElement
-    ) => {
+    const updateValueFn = (val: string) => {
         if (buttonDownRef.current) return;
 
         if (changeHandler) {
-            window.clearTimeout(externalValueChangeTimeout);
-            externalValueChangeTimeout = setTimeout(() => {
-                changeHandler(val, el);
+            window.clearTimeout(externalValueChangeTimeoutRef.current);
+            externalValueChangeTimeoutRef.current = setTimeout(() => {
+                changeHandler(val);
             }, finalDebounce);
         }
 
         if (typeof val == "string") {
             if (!val.match(/./)) {
                 setValidity({ isValid: true });
-                props.value = "";
+                setValue("");
                 if (istextarea && textAreaRef.current) {
                     textAreaRef.current.value = "";
                 } else if (inputRef?.current) {
@@ -200,23 +199,25 @@ export default function Input<KeyType extends string>(
                 return;
             }
 
-            window.clearTimeout(timeout);
+            window.clearTimeout(timeoutRef.current);
 
-            if (validationRegex && !validationFunction) {
-                timeout = setTimeout(() => {
+            if (validationRegex) {
+                timeoutRef.current = setTimeout(() => {
                     setValidity({
                         isValid: validationRegex.test(val),
                         msg: "Value mismatch",
                     });
                 }, finalDebounce);
-            } else if (validationFunction) {
-                window.clearTimeout(validationFnTimeout);
+            }
 
-                validationFnTimeout = setTimeout(() => {
+            if (validationFunction) {
+                window.clearTimeout(validationFnTimeoutRef.current);
+
+                validationFnTimeoutRef.current = setTimeout(() => {
                     if (validationRegex && !validationRegex.test(val)) {
                         return;
                     }
-                    validationFunction(val, el).then((res) => {
+                    validationFunction(val).then((res) => {
                         setValidity(res);
                     });
                 }, finalDebounce);
@@ -225,29 +226,46 @@ export default function Input<KeyType extends string>(
     };
 
     React.useEffect(() => {
+        // if (!existingReady) return;
         if (typeof props.value !== "string" || !props.value.match(/./)) return;
-        updateValueFn(String(props.value));
+        setValue(String(props.value));
     }, [props.value]);
 
+    // React.useEffect(() => {
+    //     if (!refreshDefaultValue) return;
+    //     console.log("Name:", props.title || props.name);
+    //     console.log("props.defaultValue", props.defaultValue);
+    //     // setValue(String(props.defaultValue || ""));
+    // }, [refreshDefaultValue]);
+
+    React.useEffect(() => {
+        // if (!existingReady) return;
+        if (istextarea && textAreaRef.current) {
+        } else if (inputRef?.current) {
+            inputRef.current.value = getFinalValue(value);
+        }
+        updateValueFn(value);
+    }, [value]);
+
     function handleValueChange(
         e: React.ChangeEvent<HTMLInputElement> &
-            React.ChangeEvent<HTMLTextAreaElement>
+            React.ChangeEvent<HTMLTextAreaElement>,
     ) {
         const newValue = e.target.value;
-        updateValue(newValue, e.target);
+        setValue(newValue);
         props.onChange?.(e);
     }
 
-    function updateValue(
-        v: string,
-        el?: HTMLInputElement | HTMLTextAreaElement
-    ) {
-        if (istextarea && textAreaRef.current) {
-        } else if (inputRef?.current) {
-            inputRef.current.value = getFinalValue(v);
-        }
-        updateValueFn(v, el);
-    }
+    // function updateValue(
+    //     v: string,
+    //     el?: HTMLInputElement | HTMLTextAreaElement,
+    // ) {
+    //     if (istextarea && textAreaRef.current) {
+    //     } else if (inputRef?.current) {
+    //         inputRef.current.value = getFinalValue(v);
+    //     }
+    //     updateValueFn(v);
+    // }
 
     const targetComponent = istextarea ? (
         <textarea
@@ -256,9 +274,9 @@ export default function Input<KeyType extends string>(
             }
             {...props}
             className={twMerge(
-                "w-full outline-none bg-transparent",
+                "w-full outline-none bg-transparent grow",
                 "twui-textarea",
-                props.className
+                props.className,
             )}
             ref={textAreaRef}
             onFocus={(e) => {
@@ -285,9 +303,9 @@ export default function Input<KeyType extends string>(
                 "w-full outline-none bg-transparent border-none",
                 "hover:border-none hover:outline-none focus:border-none focus:outline-none",
                 "dark:bg-transparent dark:outline-none dark:border-none",
-                "p-0",
+                "p-0 grow",
                 "twui-input",
-                props.className
+                props.className,
             )}
             ref={inputRef}
             onFocus={(e) => {
@@ -301,6 +319,7 @@ export default function Input<KeyType extends string>(
             onChange={handleValueChange}
             type={inputType}
             defaultValue={defaultInitialValue}
+            autoComplete={autoComplete}
             value={props.value ? getFinalValue(props.value) : undefined}
         />
     );
@@ -310,8 +329,8 @@ export default function Input<KeyType extends string>(
             title={`${finalLabel}${props.required ? " (Required)" : ""}`}
             {...wrapperWrapperProps}
             className={twMerge(
-                "w-full gap-1.5 relative z-0 hover:z-10",
-                wrapperWrapperProps?.className
+                "w-full gap-1.5 relative z-0 hover:z-100",
+                wrapperWrapperProps?.className,
             )}
         >
             <div
@@ -345,7 +364,7 @@ export default function Input<KeyType extends string>(
                             : "opacity-50 pointer-events-none"
                         : undefined,
                     "twui-input-wrapper",
-                    wrapperProps?.className
+                    wrapperProps?.className,
                 )}
             >
                 {showLabel && (
@@ -357,7 +376,7 @@ export default function Input<KeyType extends string>(
                             "dark:text-foreground-dark/80 dark:bg-background-dark whitespace-nowrap",
                             "overflow-hidden overflow-ellipsis z-20 px-1.5 rounded-t-default",
                             "twui-input-label",
-                            labelProps?.className
+                            labelProps?.className,
                         )}
                     >
                         {finalLabel}
@@ -370,21 +389,19 @@ export default function Input<KeyType extends string>(
                     </label>
                 )}
 
-                {prefix && (
-                    <div className="opacity-60 pointer-events-none whitespace-nowrap">
-                        {prefix}
-                    </div>
-                )}
+                {prefix && prefix}
 
                 {targetComponent}
 
                 {props.type == "search" || props.readOnly ? null : (
                     <div
                         title="Clear Input Field"
+                        {...clearInputProps}
                         className={twMerge(
-                            "p-1 -my-2 -mx-1 opacity-0 cursor-pointer",
+                            "p-1 -my-2 -mx-1 opacity-0 cursor-pointer w-7 h-7",
                             "bg-background-light dark:bg-background-dark",
-                            "twui-clear-input-field-button"
+                            "twui-clear-input-field-button",
+                            clearInputProps?.className,
                         )}
                         onClick={(e) => {
                             e.preventDefault();
@@ -396,10 +413,11 @@ export default function Input<KeyType extends string>(
                                 textAreaRef.current.value = "";
                             }
 
-                            updateValue("");
+                            setValue("");
+                            clearInputProps?.onClick?.(e);
                         }}
                     >
-                        <X size={15} />
+                        <X className="w-full h-full" />
                     </div>
                 )}
 
@@ -428,73 +446,42 @@ export default function Input<KeyType extends string>(
                     </div>
                 ) : null}
 
-                {suffix ? (
-                    <div
-                        {...suffixProps}
-                        className={twMerge(
-                            "opacity-60 pointer-events-none whitespace-nowrap",
-                            suffixProps?.className
-                        )}
-                    >
-                        {suffix}
-                    </div>
-                ) : null}
+                {suffix ? suffix : null}
 
                 {numberText ? (
                     <NumberInputButtons
-                        updateValue={updateValue}
+                        setValue={setValue}
                         inputRef={inputRef}
-                        getNormalizedValue={getNormalizedValue}
+                        value={value}
                         max={props.max}
                         min={props.min}
                         step={props.step}
                         buttonDownRef={buttonDownRef}
+                        decimal={decimal}
                     />
                 ) : null}
-
-                {/* {info && (
-                    <Dropdown
-                        target={
-                            <Button
-                                variant="ghost"
-                                color="gray"
-                                title="Input Info Button"
-                            >
-                                <Info
-                                    size={15}
-                                    className="opacity-50 hover:opacity-100"
-                                />
-                            </Button>
-                        }
-                        hoverOpen
-                    >
-                        <Card className="min-w-[250px] text-sm p-6">
-                            {typeof info == "string" ? (
-                                <Span className="text-sm">{info}</Span>
-                            ) : (
-                                info
-                            )}
-                        </Card>
-                    </Dropdown>
-                )} */}
             </div>
             {info && (
                 <Dropdown
                     target={
                         <Row className="gap-1">
                             <Info size={12} className="opacity-40" />
-                            <Span size="smaller" className="opacity-70">
+                            <Span
+                                size="smaller"
+                                className="opacity-70 hover:opacity-100"
+                            >
                                 {info}
                             </Span>
                         </Row>
                     }
                     openDebounce={700}
+                    className="z-1000"
                     hoverOpen
                 >
                     <Paper
                         className={twMerge(
                             "min-w-[250px] shadow-lg shadow-slate-200 dark:shadow-white/10",
-                            "max-w-[300px] w-full"
+                            "max-w-[300px] w-full bg-background-light! dark:bg-background-dark! z-1000",
                         )}
                     >
                         <Stack className="gap-2 items-center">

components/lib/form/Radios.tsx

@@ -0,0 +1,79 @@
+import {
+    ComponentProps,
+    DetailedHTMLProps,
+    InputHTMLAttributes,
+    LabelHTMLAttributes,
+} from "react";
+import Row from "../layout/Row";
+import twuiSlugify from "../utils/slugify";
+import twuiSlugToNormalText from "../utils/slug-to-normal-text";
+import { twMerge } from "tailwind-merge";
+
+type Value = {
+    value: string;
+    title?: string;
+    default?: boolean;
+};
+
+export type TWUI_FORM_RADIO_PROPS = {
+    values: Value[];
+    name: string;
+    inputProps?: DetailedHTMLProps<
+        InputHTMLAttributes<HTMLInputElement>,
+        HTMLInputElement
+    >;
+    labelProps?: DetailedHTMLProps<
+        LabelHTMLAttributes<HTMLLabelElement>,
+        HTMLLabelElement
+    >;
+    wrapperProps?: ComponentProps<typeof Row>;
+    changeHandler?: (value: string) => void;
+};
+
+/**
+ * # Form Radios Component
+ * @className twui-textarea
+ */
+export default function Radios({
+    values,
+    name,
+    inputProps,
+    labelProps,
+    wrapperProps,
+    changeHandler,
+}: TWUI_FORM_RADIO_PROPS) {
+    const finalName = twuiSlugify(name);
+    const finalTitle = twuiSlugToNormalText(finalName);
+
+    return (
+        <Row
+            title={finalTitle}
+            {...wrapperProps}
+            className={twMerge("gap-4", wrapperProps?.className)}
+        >
+            {values.map((v, i) => {
+                const valueName = twuiSlugify(`${finalName}-${v.value}`);
+                const valueTitle = v.title || twuiSlugToNormalText(v.value);
+
+                return (
+                    <Row key={i} className="gap-1.5">
+                        <input
+                            id={valueName}
+                            type="radio"
+                            defaultChecked={v.default}
+                            name={finalName}
+                            onChange={(e) => {
+                                const targetValue = v.value;
+                                changeHandler?.(targetValue);
+                            }}
+                            {...inputProps}
+                        />
+                        <label htmlFor={valueName} {...labelProps}>
+                            {valueTitle}
+                        </label>
+                    </Row>
+                );
+            })}
+        </Row>
+    );
+}

components/lib/form/SearchSelect.tsx

@@ -47,17 +47,23 @@ export default function SearchSelect<
     const [currentOptions, setCurrentOptions] =
         React.useState<TWUISelectOptionObject<KeyType, T>[]>(options);
 
-    const defaultOption = options.find((opt) => opt.default) || options[0];
+    const defaultOption = (options.find((opt) => opt.default) || options[0]) as
+        | TWUISelectOptionObject<KeyType, T>
+        | undefined;
 
     const [value, setValue] = React.useState<
-        TWUISelectOptionObject<KeyType, T>
-    >({
-        value: defaultOption.value,
-        data: defaultOption.data,
-    });
+        TWUISelectOptionObject<KeyType, T> | undefined
+    >(
+        defaultOption
+            ? {
+                  value: defaultOption?.value,
+                  data: defaultOption?.data,
+              }
+            : undefined
+    );
 
     const [inputValue, setInputValue] = React.useState<string>(
-        defaultOption.value
+        defaultOption?.value || ""
     );
     const [selectIndex, setSelectIndex] = React.useState<number | undefined>();
 
@@ -91,11 +97,14 @@ export default function SearchSelect<
     }, [open]);
 
     React.useEffect(() => {
-        dispatchState?.(value.data);
-        setInputValue(value.value);
+        if (value) {
+            dispatchState?.(value.data);
+            setInputValue(value.value);
+            changeHandler?.(value.value);
+        }
+
         clearTimeout(focusTimeout);
         setOpen(false);
-        changeHandler?.(value.value);
         setSelectIndex(undefined);
     }, [value]);
 
@@ -191,7 +200,7 @@ export default function SearchSelect<
                 target={
                     <Input
                         type="text"
-                        placeholder="Search"
+                        placeholder={props.title || "Search Options"}
                         value={inputValue}
                         prefix={(<Search size={18} />) as any}
                         suffix={(<ChevronDown size={20} />) as any}
@@ -240,12 +249,13 @@ export default function SearchSelect<
                             setSelectIndex(undefined);
                         }}
                         componentRef={inputRef}
+                        showLabel={showLabel}
                     />
                 }
                 targetWrapperProps={{ className: "w-full" }}
                 contentWrapperProps={{ className: "w-full" }}
                 className="w-full"
-                externalOpen={open}
+                externalOpen={currentOptions?.[0] && open}
             >
                 <Paper
                     className={twMerge(
@@ -254,37 +264,39 @@ export default function SearchSelect<
                     componentRef={contentWrapperRef}
                 >
                     <Stack className="w-full items-start gap-0">
-                        {currentOptions.map((_o, index) => {
-                            const isTargetOption = index === selectIndex;
-                            const targetOptionClasses = twMerge(
-                                "bg-background-dark dark:bg-background-light text-foreground-dark dark:text-foreground-light",
-                                "twui-select-target-option"
-                            );
+                        {currentOptions?.[0]
+                            ? currentOptions.map((_o, index) => {
+                                  const isTargetOption = index === selectIndex;
+                                  const targetOptionClasses = twMerge(
+                                      "bg-background-dark dark:bg-background-light text-foreground-dark dark:text-foreground-light",
+                                      "twui-select-target-option"
+                                  );
 
-                            return (
-                                <React.Fragment key={index}>
-                                    <Button
-                                        title={_o.title || "Option"}
-                                        variant="ghost"
-                                        onClick={(e) => {
-                                            e.preventDefault();
-                                            setValue(_o);
-                                            setOpen(false);
-                                        }}
-                                        className={twMerge(
-                                            "w-full text-foreground-light dark:text-foreground-dark",
-                                            "hover:bg-gray/20 dark:hover:bg-gray-dark/20",
-                                            isTargetOption
-                                                ? targetOptionClasses
-                                                : ""
-                                        )}
-                                    >
-                                        {_o.value}
-                                    </Button>
-                                    <Divider />
-                                </React.Fragment>
-                            );
-                        })}
+                                  return (
+                                      <React.Fragment key={index}>
+                                          <Button
+                                              title={_o.title || "Option"}
+                                              variant="ghost"
+                                              onClick={(e) => {
+                                                  e.preventDefault();
+                                                  setValue(_o);
+                                                  setOpen(false);
+                                              }}
+                                              className={twMerge(
+                                                  "w-full text-foreground-light dark:text-foreground-dark",
+                                                  "hover:bg-gray/20 dark:hover:bg-gray-dark/20",
+                                                  isTargetOption
+                                                      ? targetOptionClasses
+                                                      : ""
+                                              )}
+                                          >
+                                              {_o.value}
+                                          </Button>
+                                          <Divider />
+                                      </React.Fragment>
+                                  );
+                              })
+                            : null}
                     </Stack>
                 </Paper>
             </Dropdown>

components/lib/form/Select.tsx

@@ -25,8 +25,8 @@ export type TWUISelectValidityObject = {
 };
 
 export type TWUISelectOptionObject<
-    KeyType extends string,
-    T extends { [k: string]: any } = any
+    KeyType extends string = string,
+    T extends { [k: string]: any } = { [k: string]: any }
 > = {
     title?: string;
     value: KeyType;
@@ -36,7 +36,7 @@ export type TWUISelectOptionObject<
 
 export type TWUISelectProps<
     KeyType extends string,
-    T extends { [k: string]: any } = any
+    T extends { [k: string]: any } = { [k: string]: any }
 > = DetailedHTMLProps<
     SelectHTMLAttributes<HTMLSelectElement>,
     HTMLSelectElement
@@ -168,6 +168,7 @@ export default function Select<
 
                 <select
                     id={selectID}
+                    aria-label={props["aria-label"] || props.title}
                     {...props}
                     className={twMerge(
                         "w-full pl-3 py-2 rounded-default appearance-none pr-8",
@@ -231,9 +232,9 @@ export default function Select<
                         }
                         hoverOpen
                     >
-                        <Card className="min-w-[250px] text-sm p-6">
+                        <Card className="min-w-[250px] p-6">
                             {typeof info == "string" ? (
-                                <Span className="text-sm">{info}</Span>
+                                <Span>{info}</Span>
                             ) : (
                                 info
                             )}

components/lib/hooks/useIntersectionObserver.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useRef } from "react";
 
 type Param = {
     elementRef?: React.RefObject<Element | undefined>;
@@ -9,8 +9,6 @@ type Param = {
     delay?: number;
 };
 
-let timeout: any;
-
 export default function useIntersectionObserver({
     elementRef,
     className,
@@ -19,6 +17,8 @@ export default function useIntersectionObserver({
     delay,
     elId,
 }: Param) {
+    let timeoutRef = useRef<any>(null);
+
     const [isIntersecting, setIsIntersecting] = React.useState(false);
     const [refresh, setRefresh] = React.useState(0);
 
@@ -27,10 +27,10 @@ export default function useIntersectionObserver({
     const observerCallback: IntersectionObserverCallback = React.useCallback(
         (entries, observer) => {
             const entry = entries[0];
-            window.clearTimeout(timeout);
+            window.clearTimeout(timeoutRef.current);
 
             if (entry.isIntersecting) {
-                timeout = setTimeout(() => {
+                timeoutRef.current = setTimeout(() => {
                     setIsIntersecting(true);
 
                     if (removeIntersected) {
@@ -41,7 +41,7 @@ export default function useIntersectionObserver({
                 setIsIntersecting(false);
             }
         },
-        []
+        [],
     );
 
     React.useEffect(() => {

components/lib/hooks/useReady.tsx

@@ -6,7 +6,7 @@ type Params = {
 
 let timeout: any;
 
-export default function twuiUseReady(params?: Params) {
+export default function useReady(params?: Params) {
     const [ready, setReady] = React.useState(false);
 
     const finalTimeout = params?.timeout || 300;

components/lib/hooks/useStatus.tsx

@@ -0,0 +1,35 @@
+import React from "react";
+
+type Params = {
+    initialLoading?: boolean;
+    initialReady?: boolean;
+    initialOpen?: boolean;
+};
+
+export type UseStatusStatusType = {
+    msg?: string;
+    error?: boolean;
+};
+
+export default function useStatus(params?: Params) {
+    const [refresh, setRefresh] = React.useState(0);
+    const [loading, setLoading] = React.useState(
+        params?.initialLoading || false,
+    );
+    const [status, setStatus] = React.useState<UseStatusStatusType>({});
+    const [ready, setReady] = React.useState(params?.initialReady || false);
+    const [open, setOpen] = React.useState(params?.initialOpen || false);
+
+    return {
+        refresh,
+        setRefresh,
+        loading,
+        setLoading,
+        status,
+        setStatus,
+        ready,
+        setReady,
+        open,
+        setOpen,
+    };
+}

components/lib/hooks/useWebSocket.tsx

@@ -1,26 +1,26 @@
-import React from "react";
+import React, { useRef } from "react";
 
 export type UseWebsocketHookParams = {
     debounce?: number;
     url: string;
     disableReconnect?: boolean;
+    /** Interval to ping the websocket. So that the connection doesn't go down. Default 30000ms (30 seconds)  */
     keepAliveDuration?: number;
+    /** Interval in ms to force-refresh the connection */
     refreshConnection?: number;
 };
 
 export const WebSocketEventNames = ["wsDataEvent", "wsMessageEvent"] as const;
 
-let tries = 0;
-
 /**
  * # Use Websocket Hook
  * @event wsDataEvent Listen for event named `wsDataEvent` on `window` to receive Data events
  * @event wsMessageEvent Listen for event named `wsMessageEvent` on `window` to receive Message events
  *
- * @example window.addEventLiatener("wsDataEvent", (e)=>{
+ * @example window.addEventListener("wsDataEvent", (e)=>{
  *    console.log(e.detail.data) // type object
  * })
- * @example window.addEventLiatener("wsMessageEvent", (e)=>{
+ * @example window.addEventListener("wsMessageEvent", (e)=>{
  *      console.log(e.detail.message) // type string
  * })
  */
@@ -33,22 +33,31 @@ export default function useWebSocket<
     keepAliveDuration,
     refreshConnection,
 }: UseWebsocketHookParams) {
-    const DEBOUNCE = debounce || 200;
+    const DEBOUNCE = debounce || 500;
     const KEEP_ALIVE_DURATION = keepAliveDuration || 1000 * 30;
-    const KEEP_ALIVE_TIMEOUT = 1000 * 60 * 3;
-
     const KEEP_ALIVE_MESSAGE = "twui::ping";
 
-    let uptime = 0;
+    const tries = useRef(0);
 
-    let reconnectInterval: any;
-    let msgInterval: any;
-    let sendInterval: any;
-    let keepAliveInterval: any;
+    // Refs to avoid stale closures in callbacks
+    const urlRef = useRef(url);
+    const disableReconnectRef = useRef(disableReconnect);
+    const keepAliveDurationRef = useRef(KEEP_ALIVE_DURATION);
 
-    const [socket, setSocket] = React.useState<WebSocket | undefined>(
-        undefined
-    );
+    React.useEffect(() => {
+        urlRef.current = url;
+        disableReconnectRef.current = disableReconnect;
+        keepAliveDurationRef.current = KEEP_ALIVE_DURATION;
+    });
+
+    const msgInterval = useRef<any>(null);
+    const sendInterval = useRef<any>(null);
+    const keepAliveInterval = useRef<any>(null);
+    const refreshInterval = useRef<any>(null);
+    const reconnectTimeout = useRef<any>(null);
+
+    const [socket, setSocket] = React.useState<WebSocket | undefined>(undefined);
+    const socketRef = useRef<WebSocket | undefined>(undefined);
 
     const messageQueueRef = React.useRef<string[]>([]);
     const sendMessageQueueRef = React.useRef<string[]>([]);
@@ -73,142 +82,121 @@ export default function useWebSocket<
      * # Connect to Websocket
      */
     const connect = React.useCallback(() => {
-        const wsURL = url;
+        const currentUrl = urlRef.current;
+        const domain = window.location.origin;
+        const wsURL = currentUrl.startsWith("ws")
+            ? currentUrl
+            : domain.replace(/^http/, "ws") + ("/" + currentUrl).replace(/\/\//g, "/");
+
         if (!wsURL) return;
 
-        let ws = new WebSocket(wsURL);
+        const ws = new WebSocket(wsURL);
 
-        ws.onopen = (ev) => {
-            window.clearInterval(reconnectInterval);
-            window.clearInterval(keepAliveInterval);
-            keepAliveInterval = setInterval(() => {
-                if (ws.readyState === WebSocket.OPEN) {
-                    ws.send(KEEP_ALIVE_MESSAGE);
-                    uptime += KEEP_ALIVE_DURATION;
-                    if (uptime >= KEEP_ALIVE_TIMEOUT) {
-                        console.log("Websocket connection timed out ...");
-                        window.clearInterval(keepAliveInterval);
-                        ws.close();
-                    }
-                }
-            }, KEEP_ALIVE_DURATION);
-            setSocket(ws);
-            tries = 0;
-            console.log(`Websocket connected to ${wsURL}`);
-            uptime = 0;
+        ws.onerror = () => {
+            console.log(`Websocket ERROR:`);
         };
 
         ws.onmessage = (ev) => {
-            window.clearInterval(msgInterval);
             messageQueueRef.current.push(ev.data);
-            msgInterval = setInterval(handleReceivedMessageQueue, DEBOUNCE);
-            if (ev.data !== KEEP_ALIVE_MESSAGE) {
-                uptime = 0;
-            }
+        };
+
+        ws.onopen = () => {
+            window.clearInterval(keepAliveInterval.current);
+
+            keepAliveInterval.current = window.setInterval(() => {
+                if (ws.readyState === WebSocket.OPEN) {
+                    ws.send(KEEP_ALIVE_MESSAGE);
+                }
+            }, keepAliveDurationRef.current);
+
+            tries.current = 0;
+            socketRef.current = ws;
+            setSocket(ws);
+            console.log(`Websocket connected to ${wsURL}`);
         };
 
         ws.onclose = (ev) => {
-            console.log("Websocket closed!");
+            console.log("Websocket closed!", {
+                code: ev.code,
+                reason: ev.reason,
+                wasClean: ev.wasClean,
+            });
 
-            if (disableReconnect) return;
+            window.clearInterval(keepAliveInterval.current);
+            socketRef.current = undefined;
+            setSocket(undefined);
 
-            console.log("Attempting to reconnect ...");
-            console.log("URL:", url);
-            window.clearInterval(keepAliveInterval);
+            if (disableReconnectRef.current) return;
 
-            reconnectInterval = setInterval(() => {
-                if (tries >= 3) {
-                    return window.clearInterval(reconnectInterval);
-                }
+            if (tries.current >= 3) {
+                console.log("Max reconnect attempts reached.");
+                return;
+            }
 
-                console.log("Attempting to reconnect ...");
-                tries++;
-
-                connect();
-            }, 1000);
+            tries.current += 1;
+            const backoff = Math.min(1000 * 2 ** tries.current, 30000);
+            console.log(`Attempting to reconnect in ${backoff}ms... (attempt ${tries.current})`);
+            reconnectTimeout.current = window.setTimeout(connect, backoff);
         };
     }, []);
 
-    /**
-     * # Window Close Handler
-     */
-    const handleWindowClose = React.useCallback(() => {
-        console.log("Window Unloaded ...");
-    }, [socket]);
-
-    /**
-     * # Window Focus Handler
-     */
-    const handleWindowFocus = React.useCallback(() => {
-        if (socket?.readyState === WebSocket.CLOSED) {
-            console.log("Websocket closed ... Attempting to reconnect ...");
-            connect();
-        }
-        if (socket?.readyState === WebSocket.OPEN) {
-            console.log("Websocket connection alive ...");
-            socket.send(KEEP_ALIVE_MESSAGE);
-            uptime = 0;
-        }
-    }, [socket]);
-
     /**
      * # Initial Connection
      */
     React.useEffect(() => {
         connect();
 
-        return function () {
-            window.clearInterval(reconnectInterval);
+        return () => {
+            window.clearTimeout(reconnectTimeout.current);
+            window.clearInterval(keepAliveInterval.current);
+            window.clearInterval(refreshInterval.current);
+            socketRef.current?.close();
         };
     }, []);
 
     /**
-     * # Window Close and Focus Handlers
+     * # Refresh Connection Interval
      */
+    React.useEffect(() => {
+        if (!refreshConnection) return;
+
+        refreshInterval.current = window.setInterval(() => {
+            console.log("Refreshing WebSocket connection...");
+            window.clearTimeout(reconnectTimeout.current);
+            socketRef.current?.close();
+            tries.current = 0;
+            connect();
+        }, refreshConnection);
+
+        return () => window.clearInterval(refreshInterval.current);
+    }, [refreshConnection]);
+
     React.useEffect(() => {
         if (!socket) return;
 
-        window.addEventListener("beforeunload", handleWindowClose, {
-            once: true,
-        });
-        window.addEventListener("focus", handleWindowFocus);
+        sendInterval.current = setInterval(handleSendMessageQueue, DEBOUNCE);
+        msgInterval.current = setInterval(handleReceivedMessageQueue, DEBOUNCE);
 
-        return function () {
-            window.removeEventListener("focus", handleWindowFocus);
-            window.removeEventListener("beforeunload", handleWindowClose);
+        return () => {
+            window.clearInterval(sendInterval.current);
+            window.clearInterval(msgInterval.current);
         };
     }, [socket]);
 
-    /**
-     * # Refresh Connection
-     */
-    React.useEffect(() => {
-        console.log("Refreshing connection ...");
-
-        if (!socket) return;
-        if (socket.readyState !== WebSocket.CLOSED) {
-            socket?.close();
-        }
-        connect();
-    }, [refreshConnection]);
-
     /**
      * Received Message Queue Handler
      */
     const handleReceivedMessageQueue = React.useCallback(() => {
-        if (messageQueueRef.current.length > 0) {
-            const newMessage = messageQueueRef.current.shift();
-            if (!newMessage) return;
-            try {
-                const jsonData = JSON.parse(newMessage);
-                dispatchCustomEvent("wsMessageEvent", newMessage);
-                dispatchCustomEvent("wsDataEvent", jsonData);
-            } catch (error) {
-                console.log("Unable to parse string. Returning string.");
-            }
-        } else {
-            window.clearInterval(msgInterval);
-            uptime = 0;
+        try {
+            const msg = messageQueueRef.current.shift();
+
+            if (!msg) return;
+
+            const jsonData = JSON.parse(msg);
+            dispatchCustomEvent("wsMessageEvent", msg);
+            dispatchCustomEvent("wsDataEvent", jsonData);
+        } catch (error) {
+            console.log("Unable to parse string. Returning string.");
         }
     }, []);
 
@@ -216,30 +204,35 @@ export default function useWebSocket<
      * Send Message Queue Handler
      */
     const handleSendMessageQueue = React.useCallback(() => {
-        if (sendMessageQueueRef.current.length > 0) {
-            const newMessage = sendMessageQueueRef.current.shift();
-            if (!newMessage) return;
-            socket?.send(newMessage);
-        } else {
-            window.clearInterval(sendInterval);
+        const ws = socketRef.current;
+        if (!ws || ws.readyState !== WebSocket.OPEN) {
+            window.clearInterval(sendInterval.current);
+            return;
         }
-    }, [socket]);
+
+        const newMessage = sendMessageQueueRef.current.shift();
+        if (!newMessage) return;
+
+        ws.send(newMessage);
+    }, []);
 
     /**
      * # Send Data Function
      */
-    const sendData = React.useCallback(
-        (data: T) => {
-            try {
-                window.clearInterval(sendInterval);
-                sendMessageQueueRef.current.push(JSON.stringify(data));
-                sendInterval = setInterval(handleSendMessageQueue, DEBOUNCE);
-            } catch (error: any) {
-                console.log("Error Sending socket message", error.message);
+    const sendData = React.useCallback((data: T) => {
+        try {
+            const queueItemJSON = JSON.stringify(data);
+
+            const existingQueue = sendMessageQueueRef.current.find(
+                (q) => q === queueItemJSON
+            );
+            if (!existingQueue) {
+                sendMessageQueueRef.current.push(queueItemJSON);
             }
-        },
-        [socket]
-    );
+        } catch (error: any) {
+            console.log("Error Sending socket message", error.message);
+        }
+    }, []);
 
     return { socket, sendData };
 }

components/lib/hooks/useWebSocketEventHandler.tsx

@@ -18,9 +18,10 @@ export default function useWebSocketEventHandler<
         const dataEventListenerCallback = (e: Event) => {
             const customEvent = e as CustomEvent;
             const data = customEvent.detail.data as T | undefined;
-            const message = customEvent.detail.message as string | undefined;
+            const __msg = customEvent.detail.message as string | undefined;
+
             if (data) setData(data);
-            if (message) setMessage(message);
+            if (__msg && typeof __msg == "string") setMessage(__msg);
         };
 
         const messageEventName: (typeof WebSocketEventNames)[number] =

components/lib/hooks/userWindowFocus.tsx

@@ -0,0 +1,24 @@
+import { useCallback, useEffect, useState } from "react";
+
+export default function useWindowFocus() {
+    const [isWindowFocused, setIsWindowFocused] = useState(false);
+
+    const windowFocusCb = useCallback(() => {
+        setIsWindowFocused(true);
+    }, []);
+
+    const windowBlurCb = useCallback(() => {
+        setIsWindowFocused(false);
+    }, []);
+
+    useEffect(() => {
+        window.addEventListener("focus", windowFocusCb);
+        window.addEventListener("blur", windowBlurCb);
+        return function () {
+            window.removeEventListener("focus", windowFocusCb);
+            window.removeEventListener("blur", windowBlurCb);
+        };
+    }, []);
+
+    return { isWindowFocused };
+}

components/lib/layout/Button.tsx

@@ -1,4 +1,4 @@
-import {
+import React, {
     AnchorHTMLAttributes,
     ButtonHTMLAttributes,
     ComponentProps,
@@ -8,6 +8,7 @@ import {
 } from "react";
 import { twMerge } from "tailwind-merge";
 import Loading from "../elements/Loading";
+import LucideIcon, { TWUILucideIconName } from "../elements/lucide-icon";
 
 export type TWUIButtonProps = DetailedHTMLProps<
     ButtonHTMLAttributes<HTMLButtonElement>,
@@ -34,8 +35,8 @@ export type TWUIButtonProps = DetailedHTMLProps<
         AnchorHTMLAttributes<HTMLAnchorElement>,
         HTMLAnchorElement
     >;
-    beforeIcon?: React.ReactNode;
-    afterIcon?: React.ReactNode;
+    beforeIcon?: TWUILucideIconName | React.JSX.Element;
+    afterIcon?: TWUILucideIconName | React.JSX.Element;
     buttonContentProps?: DetailedHTMLProps<
         HTMLAttributes<HTMLDivElement>,
         HTMLDivElement
@@ -117,132 +118,132 @@ export default function Button({
                 return twMerge(
                     "bg-primary hover:bg-primary-hover text-white",
                     "dark:bg-primary-dark hover:dark:bg-primary-dark-hover text-white",
-                    "twui-button-primary"
+                    "twui-button-primary",
                 );
             if (color == "secondary")
                 return twMerge(
                     "bg-secondary hover:bg-secondary-hover text-white",
-                    "twui-button-secondary"
+                    "twui-button-secondary",
                 );
             if (color == "white")
                 return twMerge(
                     "!bg-white hover:!bg-slate-200 !text-slate-800",
-                    "twui-button-white"
+                    "twui-button-white",
                 );
             if (color == "accent")
                 return twMerge(
                     "bg-accent hover:bg-accent-hover text-white",
-                    "twui-button-accent"
+                    "twui-button-accent",
                 );
             if (color == "gray")
                 return twMerge(
                     "bg-gray hover:bg-gray-hover text-foreground-light",
                     "dark:bg-gray-dark hover:dark:bg-gray-dark-hover dark:text-foreground-dark",
-                    "twui-button-gray"
+                    "twui-button-gray",
                 );
             if (color == "success")
                 return twMerge(
                     "bg-success hover:bg-success-hover text-white",
                     "dark:bg-success hover:dark:bg-success-hover text-white",
-                    "twui-button-success"
+                    "twui-button-success",
                 );
             if (color == "error")
                 return twMerge(
                     "bg-error hover:bg-error-hover text-white",
                     "dark:bg-error hover:dark:bg-error-hover text-white",
-                    "twui-button-error"
+                    "twui-button-error",
                 );
         } else if (variant == "outlined") {
             if (color == "primary" || !color)
                 return twMerge(
                     "bg-transparent outline outline-1 outline-primary",
                     "text-primary-text dark:text-primary-dark-text dark:outline-primary-dark-outline",
-                    "twui-button-primary-outlined"
+                    "twui-button-primary-outlined",
                 );
             if (color == "secondary")
                 return twMerge(
                     "bg-transparent outline outline-1 outline-secondary",
                     "text-secondary",
-                    "twui-button-secondary-outlined"
+                    "twui-button-secondary-outlined",
                 );
             if (color == "accent")
                 return twMerge(
                     "bg-transparent outline outline-1 outline-accent",
                     "text-accent",
-                    "twui-button-accent-outlined"
+                    "twui-button-accent-outlined",
                 );
             if (color == "gray")
                 return twMerge(
                     "bg-transparent outline outline-1 outline-slate-300",
                     "text-slate-600 dark:text-white/60 dark:outline-white/30",
-                    "twui-button-gray-outlined"
+                    "twui-button-gray-outlined",
                 );
             if (color == "white")
                 return twMerge(
                     "bg-transparent outline outline-1 outline-white/50",
                     "text-white",
-                    "twui-button-white-outlined"
+                    "twui-button-white-outlined",
                 );
             if (color == "error")
                 return twMerge(
                     "bg-transparent outline outline-1 outline-error text-error",
                     "dark:outline-error dark:text-error-dark",
-                    "twui-button-error-outlined"
+                    "twui-button-error-outlined",
                 );
         } else if (variant == "ghost") {
             if (color == "primary" || !color)
                 return twMerge(
                     "bg-transparent dark:bg-transparent outline-none p-2",
                     "text-primary-text dark:text-primary-dark-text hover:bg-transparent dark:hover:bg-transparent",
-                    "twui-button-primary-ghost"
+                    "twui-button-primary-ghost",
                 );
             if (color == "secondary")
                 return twMerge(
                     "bg-transparent dark:bg-transparent outline-none p-2",
                     "text-secondary hover:bg-transparent dark:hover:bg-transparent",
-                    "twui-button-secondary-ghost"
+                    "twui-button-secondary-ghost",
                 );
             if (color == "text")
                 return twMerge(
                     "bg-transparent dark:bg-transparent outline-none p-2 dark:text-foreground-dark",
                     "text-foreground-light hover:bg-transparent dark:hover:bg-transparent",
-                    "twui-button-secondary-ghost"
+                    "twui-button-secondary-ghost",
                 );
             if (color == "accent")
                 return twMerge(
                     "bg-transparent dark:bg-transparent outline-none p-2",
                     "text-accent hover:bg-transparent dark:hover:bg-transparent",
-                    "twui-button-accent-ghost"
+                    "twui-button-accent-ghost",
                 );
             if (color == "gray")
                 return twMerge(
                     "bg-transparent dark:bg-transparent outline-none p-2 hover:bg-transparent dark:hover:bg-transparent",
                     "text-slate-600 dark:text-white/70 hover:opacity-80",
-                    "twui-button-gray-ghost"
+                    "twui-button-gray-ghost",
                 );
             if (color == "error")
                 return twMerge(
                     "bg-transparent outline-none p-2",
                     "text-red-600 dark:text-red-400",
-                    "twui-button-error-ghost"
+                    "twui-button-error-ghost",
                 );
             if (color == "warning")
                 return twMerge(
                     "bg-transparent outline-none p-2",
                     "text-yellow-600",
-                    "twui-button-warning-ghost"
+                    "twui-button-warning-ghost",
                 );
             if (color == "success")
                 return twMerge(
                     "bg-transparent outline-none p-2",
                     "text-success",
-                    "twui-button-success-ghost"
+                    "twui-button-success-ghost",
                 );
             if (color == "white")
                 return twMerge(
                     "bg-transparent outline-none p-2",
                     "text-white",
-                    "twui-button-white-ghost"
+                    "twui-button-white-ghost",
                 );
         }
 
@@ -258,17 +259,17 @@ export default function Button({
                 props.disabled ? "opacity-40 cursor-not-allowed" : "",
                 "twui-button-general",
                 size == "small"
-                    ? "px-3 py-1.5 text-sm twui-button-small"
+                    ? "px-3 py-1.5 twui-button-small text-sm"
                     : size == "smaller"
-                    ? "px-2 py-1 text-xs twui-button-smaller"
-                    : size == "large"
-                    ? "text-lg twui-button-large"
-                    : size == "larger"
-                    ? "px-5 py-3 text-xl twui-button-larger"
-                    : "twui-button-base",
+                      ? "px-2 py-1 text-xs twui-button-smaller"
+                      : size == "large"
+                        ? "text-lg twui-button-large"
+                        : size == "larger"
+                          ? "px-5 py-3 text-xl twui-button-larger"
+                          : "twui-button-base",
                 finalClassName,
                 loading ? "pointer-events-none opacity-80" : "",
-                props.className
+                props.className,
             )}
             aria-label={props.title}
         >
@@ -278,12 +279,24 @@ export default function Button({
                     "flex flex-row items-center gap-2 whitespace-nowrap",
                     loading ? "opacity-0" : "",
                     "twui-button-content-wrapper",
-                    buttonContentProps?.className
+                    buttonContentProps?.className,
                 )}
             >
-                {beforeIcon && beforeIcon}
+                {beforeIcon ? (
+                    typeof beforeIcon == "string" ? (
+                        <LucideIcon name={beforeIcon as TWUILucideIconName} />
+                    ) : (
+                        beforeIcon
+                    )
+                ) : null}
                 {props.children}
-                {afterIcon && afterIcon}
+                {afterIcon ? (
+                    typeof afterIcon == "string" ? (
+                        <LucideIcon name={afterIcon as TWUILucideIconName} />
+                    ) : (
+                        afterIcon
+                    )
+                ) : null}
             </div>
 
             {loading && (

components/lib/layout/Container.tsx

@@ -12,7 +12,7 @@ export default function Container({
         <div
             {...props}
             className={twMerge(
-                "flex w-full max-w-[1200px] gap-4 justify-between",
+                "flex w-full max-w-container gap-4 justify-between",
                 "flex-wrap flex-col xl:flex-row items-start xl:items-center",
                 "twui-container",
                 props.className

components/lib/layout/H5.tsx

@@ -12,7 +12,7 @@ export default function H5({
         <h5
             {...props}
             className={twMerge(
-                "text-sm mb-4",
+                "mb-4",
                 "twui-headings twui-heading",
                 "twui-h5",
                 props.className

components/lib/layout/Img.tsx

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import React, { DetailedHTMLProps, ImgHTMLAttributes } from "react";
+import React, { DetailedHTMLProps, ImgHTMLAttributes, ReactNode } from "react";
 import { twMerge } from "tailwind-merge";
 
 export type TWUIImageProps = DetailedHTMLProps<
@@ -14,13 +14,23 @@ export type TWUIImageProps = DetailedHTMLProps<
     fallbackImageSrc?: string;
     srcLight?: string;
     srcDark?: string;
+    imgErrSrc?: string;
+    imgErrComp?: ReactNode;
+    imgErrSrcLight?: string;
+    imgErrSrcDark?: string;
 };
 
 /**
  * # Image Component
  * @className twui-img
  */
-export default function Img({ ...props }: TWUIImageProps) {
+export default function Img({
+    imgErrSrc,
+    imgErrComp,
+    imgErrSrcDark,
+    imgErrSrcLight,
+    ...props
+}: TWUIImageProps) {
     const width = props.size || props.width;
     const height = props.size || props.height;
     const sizeRatio = width && height ? Number(width) / Number(height) : 1;
@@ -70,13 +80,16 @@ export default function Img({ ...props }: TWUIImageProps) {
 
     if (imageError) {
         return (
-            <img
-                loading="lazy"
-                {...interpolatedProps}
-                src={
-                    "https://static.datasquirel.com/images/user-images/user-2/castcord-image-preset_thumbnail.jpg"
-                }
-            />
+            imgErrComp || (
+                <img
+                    loading="lazy"
+                    {...interpolatedProps}
+                    src={
+                        imgErrSrc ||
+                        "https://static.datasquirel.com/images/user-images/user-2/castcord-image-preset_thumbnail.jpg"
+                    }
+                />
+            )
         );
     }
 

components/lib/layout/LoadingRectangleBlock.tsx

@@ -9,6 +9,7 @@ export type LoadingRectangleBlockProps = DetailedHTMLProps<
 /**
  * # A loading Rectangle block
  * @className twui-loading-rectangle-block
+ * @className twui-loading-block
  */
 export default function LoadingRectangleBlock({
     ...props
@@ -19,8 +20,8 @@ export default function LoadingRectangleBlock({
             className={twMerge(
                 "flex items-center w-full h-10 animate-pulse bg-slate-200 rounded",
                 "dark:bg-slate-800",
-                "twui-loading-rectangle-block",
-                props.className
+                "twui-loading-rectangle-block twui-loading-block",
+                props.className,
             )}
         >
             {props.children}

components/lib/layout/Spacer.tsx

@@ -18,7 +18,7 @@ export default function Spacer({ horizontal, ...props }: Props) {
         <div
             {...props}
             className={twMerge(
-                "grow",
+                "",
                 horizontal ? "w-10" : "w-full h-10",
                 "twui-spacer",
                 props.className

components/lib/layout/Span.tsx

@@ -8,10 +8,12 @@ import { twMerge } from "tailwind-merge";
 export default function Span({
     size,
     variant,
+    truncate,
     ...props
 }: DetailedHTMLProps<HTMLAttributes<HTMLHeadingElement>, HTMLHeadingElement> & {
     size?: "normal" | "small" | "smaller" | "large" | "larger";
     variant?: "normal" | "faded";
+    truncate?: { lines?: number; width?: number };
 }) {
     return (
         <span
@@ -23,8 +25,9 @@ export default function Span({
                 size == "large" && "text-lg",
                 size == "larger" && "text-xl",
                 variant == "faded" && "opacity-50",
+                truncate ? `` : ``,
                 "twui-span",
-                props.className
+                props.className,
             )}
         >
             {props.children}

components/lib/mdx/markdown/MarkdownEditor.tsx

@@ -1,4 +1,4 @@
-import React, { ComponentProps } from "react";
+import React, { ComponentProps, useRef } from "react";
 import { twMerge } from "tailwind-merge";
 import MarkdownEditorPreviewComponent from "./MarkdownEditorPreviewComponent";
 import MarkdownEditorComponent from "./MarkdownEditorComponent";
@@ -6,6 +6,7 @@ import MarkdownEditorSelectorButtons from "./MarkdownEditorSelectorButtons";
 import Row from "../../layout/Row";
 import Stack from "../../layout/Stack";
 import AceEditor from "../../editors/AceEditor";
+import useStatus from "../../hooks/useStatus";
 
 type Props = {
     value?: string;
@@ -14,6 +15,7 @@ type Props = {
     changeHandler?: (content: string) => void;
     editorProps?: ComponentProps<typeof AceEditor>;
     maxHeight?: string;
+    noToggleButtons?: boolean;
 };
 
 export default function MarkdownEditor({
@@ -23,42 +25,58 @@ export default function MarkdownEditor({
     changeHandler,
     editorProps,
     maxHeight: existingMaxHeight,
+    noToggleButtons,
 }: Props) {
     const [value, setValue] = React.useState<any>(existingValue || ``);
 
     const [sideBySide, setSideBySide] = React.useState(
-        defaultSideBySide || false
+        defaultSideBySide || false,
     );
     const [preview, setPreview] = React.useState(false);
+    const { refresh, setRefresh } = useStatus();
+    const updatingFromExtValueRef = useRef(false);
 
     const maxHeight = existingMaxHeight || "600px";
 
     React.useEffect(() => {
+        if (updatingFromExtValueRef.current) return;
         setExistingValue?.(value);
         changeHandler?.(value);
     }, [value]);
 
+    React.useEffect(() => {
+        if (!existingValue) return;
+        updatingFromExtValueRef.current = true;
+        setValue(existingValue);
+        setTimeout(() => {
+            updatingFromExtValueRef.current = false;
+            setRefresh((prev) => prev + 1);
+        }, 500);
+    }, [existingValue]);
+
     return (
         <Stack className="w-full items-stretch">
-            <MarkdownEditorSelectorButtons
-                {...{ preview, setPreview, setSideBySide, sideBySide }}
-            />
+            {!noToggleButtons && (
+                <MarkdownEditorSelectorButtons
+                    {...{ preview, setPreview, setSideBySide, sideBySide }}
+                />
+            )}
 
             {sideBySide ? (
                 <Row
                     className={twMerge(
                         `w-full grid xl:grid-cols-2 gap-6 max-h-[${maxHeight}]`,
-                        "overflow-auto"
+                        "overflow-auto",
                     )}
                 >
                     <MarkdownEditorComponent
                         setValue={setValue}
                         value={value}
                         maxHeight={maxHeight}
+                        refreshDepArr={[refresh]}
                         {...editorProps}
                     />
                     <MarkdownEditorPreviewComponent
-                        setValue={setValue}
                         value={value}
                         maxHeight={maxHeight}
                     />
@@ -69,7 +87,6 @@ export default function MarkdownEditor({
                 >
                     {preview ? (
                         <MarkdownEditorPreviewComponent
-                            setValue={setValue}
                             value={value}
                             maxHeight={maxHeight}
                         />
@@ -78,6 +95,7 @@ export default function MarkdownEditor({
                             setValue={setValue}
                             value={value}
                             maxHeight={maxHeight}
+                            refreshDepArr={[refresh]}
                             {...editorProps}
                         />
                     )}

components/lib/mdx/markdown/MarkdownEditorPreviewComponent.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { ComponentProps, RefObject } from "react";
 import { twMerge } from "tailwind-merge";
 import { serialize } from "next-mdx-remote/serialize";
 import remarkGfm from "remark-gfm";
@@ -10,14 +10,14 @@ import EmptyContent from "../../elements/EmptyContent";
 
 type Props = {
     value: string;
-    setValue: React.Dispatch<any>;
     maxHeight: string;
+    wrapperProps?: ComponentProps<typeof Border>;
 };
 
 export default function MarkdownEditorPreviewComponent({
     value,
-    setValue,
     maxHeight,
+    wrapperProps,
 }: Props) {
     try {
         const [mdxSource, setMdxSource] =
@@ -48,17 +48,17 @@ export default function MarkdownEditorPreviewComponent({
                     .then((mdxSrc) => {
                         setMdxSource(mdxSrc);
                     })
-                    .catch((err) => {
-                        console.log(`Markdown Parsing Error => ${err.message}`);
-                    });
+                    .catch((err) => {});
             } catch (error) {}
         }, [value]);
 
         return (
             <Border
+                {...wrapperProps}
                 className={twMerge(
                     `w-full max-h-[${maxHeight}] h-[${maxHeight}] block px-6 pb-10`,
-                    "overflow-auto"
+                    "overflow-auto",
+                    wrapperProps?.className
                 )}
             >
                 {mdxSource ? (

components/lib/mdx/mdx-components.tsx

@@ -23,12 +23,15 @@ export function useMDXComponents(params?: Params) {
             pre: ({ children, ...props }) => {
                 if (React.isValidElement(children) && children.props) {
                     return (
+                        // @ts-ignore
                         <CodeBlock {...props} backgroundColor={codeBgColor}>
+                            {/* @ts-ignore */}
                             {children.props.children}
                         </CodeBlock>
                     );
                 }
                 return (
+                    // @ts-ignore
                     <CodeBlock {...props} backgroundColor={codeBgColor}>
                         {children}
                     </CodeBlock>
@@ -61,6 +64,7 @@ export function useMDXComponents(params?: Params) {
                 );
             },
             img: (props) => (
+                // @ts-ignore
                 <img
                     {...props}
                     className="w-full h-auto shadow-lg rounded-default overflow-hidden"

components/lib/next-js/hooks/useMDXComponents.tsx

@@ -22,6 +22,7 @@ export default function useMDXComponents({
         pre: ({ children, ...props }) => {
             if (React.isValidElement(children) && children.props) {
                 return (
+                    // @ts-ignore
                     <CodeBlock {...props} backgroundColor={codeBgColor}>
                         {/* @ts-ignore */}
                         {children.props.children}
@@ -29,6 +30,7 @@ export default function useMDXComponents({
                 );
             }
             return (
+                // @ts-ignore
                 <CodeBlock {...props} backgroundColor={codeBgColor}>
                     {children}
                 </CodeBlock>

components/lib/utils/ejson.ts

@@ -0,0 +1,38 @@
+/**
+ * # EJSON parse string
+ */
+function parse(
+    string: string | null | number,
+    reviver?: (this: any, key: string, value: any) => any,
+): { [s: string]: any } | { [s: string]: any }[] | undefined {
+    if (!string) return undefined;
+    if (typeof string == "object") return string;
+    if (typeof string !== "string") return undefined;
+    try {
+        return JSON.parse(string, reviver);
+    } catch (error) {
+        return undefined;
+    }
+}
+
+/**
+ * # EJSON stringify object
+ */
+function stringify(
+    value: any,
+    replacer?: ((this: any, key: string, value: any) => any) | null,
+    space?: string | number,
+): string | undefined {
+    try {
+        return JSON.stringify(value, replacer || undefined, space);
+    } catch (error) {
+        return undefined;
+    }
+}
+
+const TWUIEJSON = {
+    parse,
+    stringify,
+};
+
+export default TWUIEJSON;

components/lib/utils/fetch/fetchApi.ts

@@ -1,19 +1,27 @@
 import _ from "lodash";
+import twuiSerializeQuery from "../serialize-query";
+
+export const FetchAPIMethods = [
+    "POST",
+    "GET",
+    "DELETE",
+    "PUT",
+    "PATCH",
+    "post",
+    "get",
+    "delete",
+    "put",
+    "patch",
+] as const;
 
 type FetchApiOptions<T extends { [k: string]: any } = { [k: string]: any }> = {
-    method:
-        | "POST"
-        | "GET"
-        | "DELETE"
-        | "PUT"
-        | "PATCH"
-        | "post"
-        | "get"
-        | "delete"
-        | "put"
-        | "patch";
+    method: (typeof FetchAPIMethods)[number];
     body?: T | string;
     headers?: FetchHeader;
+    query?: T;
+    csrfValue?: string;
+    csrfKey?: string;
+    fetchOptions?: RequestInit;
 };
 
 type FetchHeader = HeadersInit & {
@@ -32,32 +40,22 @@ export type FetchApiReturn = {
  */
 export default async function fetchApi<
     T extends { [k: string]: any } = { [k: string]: any },
-    R extends any = any
->(
-    url: string,
-    options?: FetchApiOptions<T>,
-    csrf?: boolean,
-    /**
-     * Key to use to grab local Storage csrf value.
-     */
-    localStorageCSRFKey?: string,
-    /**
-     * Key with which to set the request header csrf
-     * value
-     */
-    csrfHeaderKey?: string
-): Promise<R> {
+    R extends any = any,
+>(url: string, options?: FetchApiOptions<T>): Promise<R> {
     let data;
 
-    const csrfKey = "x-dsql-csrf-key";
-    const csrfValue = localStorage.getItem(localStorageCSRFKey || csrfKey);
-
     let finalHeaders = {
         "Content-Type": "application/json",
     } as FetchHeader;
 
-    if (csrf && csrfValue) {
-        finalHeaders[localStorageCSRFKey || csrfKey] = csrfValue;
+    if (options?.csrfKey && options.csrfValue) {
+        finalHeaders[options.csrfKey] = options.csrfValue;
+    }
+
+    let finalURL = url;
+
+    if (options?.query) {
+        finalURL += twuiSerializeQuery(options.query);
     }
 
     if (typeof options === "string") {
@@ -66,7 +64,7 @@ export default async function fetchApi<
 
             switch (options) {
                 case "post":
-                    fetchData = await fetch(url, {
+                    fetchData = await fetch(finalURL, {
                         method: options,
                         headers: finalHeaders,
                     } as RequestInit);
@@ -74,7 +72,7 @@ export default async function fetchApi<
                     break;
 
                 default:
-                    fetchData = await fetch(url);
+                    fetchData = await fetch(finalURL);
                     data = fetchData.json();
                     break;
             }
@@ -95,14 +93,15 @@ export default async function fetchApi<
                 options.headers = _.merge(options.headers, finalHeaders);
 
                 const finalOptions: any = { ...options };
-                fetchData = await fetch(url, finalOptions);
+
+                fetchData = await fetch(finalURL, finalOptions);
             } else {
                 const finalOptions = {
                     ...options,
                     headers: finalHeaders,
                 } as RequestInit;
 
-                fetchData = await fetch(url, finalOptions);
+                fetchData = await fetch(finalURL, finalOptions);
             }
 
             data = fetchData.json();
@@ -112,7 +111,7 @@ export default async function fetchApi<
         }
     } else {
         try {
-            let fetchData = await fetch(url);
+            let fetchData = await fetch(finalURL);
             data = await fetchData.json();
         } catch (error: any) {
             console.log("FetchAPI error #3:", error.message);

components/lib/utils/form/fileInputToBase64.ts

@@ -35,7 +35,7 @@ export default async function fileInputToBase64({
                     resolve(reader.result?.toString());
                 };
                 reader.onerror = function (/** @type {*} */ error: any) {
-                    console.log("Error: ", error.message);
+                    console.log("File Input to Base64 Error: ", error.message);
                 };
             }
         );

components/lib/utils/numberfy.ts

@@ -25,7 +25,6 @@ export default function twuiNumberfy(num: any, decimals?: number): number {
             return Number(numberfiedNum.toFixed(existingDecimals));
         return Math.round(numberfiedNum);
     } catch (error: any) {
-        console.log(`Numberfy ERROR: ${error.message}`);
         return 0;
     }
 }

components/lib/utils/serialize-query.ts

@@ -0,0 +1,42 @@
+import TWUIEJSON from "./ejson";
+
+/**
+ * # Serialize Query
+ */
+export default function twuiSerializeQuery(query: any): string {
+    let str = "?";
+
+    if (typeof query !== "object") {
+        console.log("Invalid Query type");
+        return str;
+    }
+    if (Array.isArray(query)) {
+        console.log("Query is an Array. This is invalid.");
+        return str;
+    }
+    if (!query) {
+        console.log("No Query provided.");
+        return str;
+    }
+
+    const keys = Object.keys(query);
+
+    const queryArr: string[] = [];
+
+    keys.forEach((key) => {
+        if (!key || !query[key]) return;
+        const value = query[key];
+
+        if (typeof value === "object") {
+            const jsonStr = TWUIEJSON.stringify(value);
+            queryArr.push(`${key}=${encodeURIComponent(String(jsonStr))}`);
+        } else if (typeof value === "string" || typeof value === "number") {
+            queryArr.push(`${key}=${encodeURIComponent(value)}`);
+        } else {
+            queryArr.push(`${key}=${String(value)}`);
+        }
+    });
+
+    str += queryArr.join("&");
+    return str;
+}

components/lib/utils/slugify.ts

@@ -31,7 +31,6 @@ export default function twuiSlugify(
 
         return finalStr.replace(/-$/, "");
     } catch (error: any) {
-        console.log(`Slugify ERROR: ${error.message}`);
         return "";
     }
 }

components/pages/Home/(data)/work.ts

@@ -7,6 +7,7 @@ export const work = {
                 description: "Clould-based SQL data management system.",
                 href: "https://datasquirel.com",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: [
                     "Node JS",
                     "SQL",
@@ -24,6 +25,7 @@ export const work = {
                 description: "Mortgage Broker in Utah",
                 href: "https://summitlending.com",
                 image: "/images/work/devops/server-management.png",
+                metrics: ["500+ leads/month", "99.99% uptime"],
                 technologies: [
                     "Next JS",
                     "Tailwind CSS",
@@ -38,32 +40,71 @@ export const work = {
                 description: "A new age of remote work. Targeted at developers",
                 href: "https://coderank.net",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: [
                     "Next JS",
                     "Docker",
                     "VSCode Web Editor",
-                    "NGINX Reverse Proxy",
+                    "NGINX",
                 ],
             },
             {
-                title: "Ifuekosa LLC",
-                image: "/images/work/devops/server-management.png",
-                description:
-                    "Tax Preparation, Notary and Business Consulting Services in New Jersey",
-                href: "https://ifuekosallc.com/",
-                technologies: ["Wordpress", "Docker", "Email Server"],
+                title: "Mediajury",
+                description: "The ultimate debate platform",
+                href: "https://mediajury.org",
+                metrics: [""],
+                technologies: [
+                    "SQL",
+                    "MariaDB",
+                    "Next JS",
+                    "Docker",
+                    "NGINX",
+                    "Typescript",
+                    "Bun JS",
+                    "Tailwind CSS",
+                ],
+            },
+            {
+                title: "Circlenav",
+                description: "The AI search engine done right",
+                href: "https://circlenav.net",
+                metrics: [""],
+                technologies: [
+                    "SearXNG",
+                    "NextJS",
+                    "Docker",
+                    "Grok (XAI)",
+                    "Websockets",
+                ],
             },
         ],
     },
     Devops: {
         href: "/work/devops",
         portfolio: [
+            {
+                title: "TurboCI",
+                description: "Cloud VPS orchestrator that runs any workload",
+                href: "https://turboci.tben.me",
+                metrics: [""],
+                technologies: [
+                    "Bun",
+                    "Shell",
+                    "Typescript",
+                    "APIs",
+                    "Hetzner",
+                    "AWS",
+                    "GCP",
+                    "Azure",
+                ],
+            },
             {
                 title: "Personal Mail Server",
                 description:
                     "Self Hosted Email solution for all my personal projects",
                 href: "https://box.mailben.xyz/mail",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: ["Linux", "Docker", "Mailinabox"],
             },
             {
@@ -72,6 +113,7 @@ export const work = {
                     "Self Hosted repository for Git projects, NPM modules, Docker images, and more",
                 href: "https://git.tben.me/tben",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: ["Gitea", "Linux"],
             },
         ],
@@ -81,11 +123,35 @@ export const work = {
         href: "/work/devops",
         portfolio: [
             {
-                title: "Turbo Sync NPM Module",
+                title: "TurboCI",
+                description: "Cloud VPS orchestrator that runs any workload",
+                href: "https://turboci.tben.me",
+                metrics: [""],
+                technologies: [
+                    "Bun",
+                    "Shell",
+                    "Typescript",
+                    "APIs",
+                    "Hetzner",
+                    "AWS",
+                    "GCP",
+                    "Azure",
+                ],
+            },
+            {
+                title: "Bun SQLite",
+                description:
+                    "A schema-driven SQLite manager for Bun, featuring automatic schema synchronization, type-safe CRUD operations, vector embedding support, and TypeScript type definition generation.",
+                href: "https://git.tben.me/Moduletrace/bun-sqlite",
+                technologies: ["SQLite", "Bun", "Shell", "Typescript"],
+            },
+            {
+                title: "Turbo Sync",
                 description:
                     "The easiest way to synchronize local and remote directories in real time",
                 href: "https://git.tben.me/Moduletrace/turbo-sync",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: ["Node JS", "Bun JS", "Shell Scripting", "Rsync"],
             },
             {
@@ -93,6 +159,7 @@ export const work = {
                 description: "Run multiple concurrent processes",
                 href: "https://git.tben.me/Moduletrace/batchrun",
                 image: "/images/work/devops/server-management.png",
+                metrics: [""],
                 technologies: ["Node JS"],
             },
         ],

components/pages/Home/(sections)/AboutSection.tsx

@@ -1,17 +1,40 @@
 import H2 from "@/components/lib/layout/H2";
+import Link from "@/components/lib/layout/Link";
+import Row from "@/components/lib/layout/Row";
 import Section from "@/components/lib/layout/Section";
 import Span from "@/components/lib/layout/Span";
 import Stack from "@/components/lib/layout/Stack";
+import { UserRoundSearch } from "lucide-react";
 
 export default function AboutSection() {
     return (
         <Section>
             <Stack className="w-full max-w-full xl:max-w-[50vw]">
-                <H2 className="leading-snug">About Me</H2>
+                <H2 className="leading-snug">
+                    I Build & Operate Production Systems
+                </H2>
                 <Span>
-                    I'm passionate and dedicated to solving problems using the
-                    best technologies available.
+                    I'm Benjamin Toby. DevOps/Platform engineer and CTO at
+                    Summit Lending. I design, deploy, and operate infrastructure
+                    that supports real businesses:
                 </Span>
+                <ul className="space-y-4">
+                    <li>Automated CI/CD pipelines (TurboCI)</li>
+                    <li>Multi-cloud deployments (AWS, GCP, Azure, Hetzner)</li>
+                    <li>NGINX hardening, TLS, caching, rate limiting</li>
+                    <li>Full-stack delivery (Next.js, Bun, SQL)</li>
+                </ul>
+                <Span>
+                    I focus on measurable outcomes: faster deployments, lower
+                    costs, fewer incidents.
+                </Span>
+
+                <Link className="dotted-text" href="/about">
+                    <Row>
+                        <UserRoundSearch size={19} />
+                        <Span>View Resume</Span>
+                    </Row>
+                </Link>
             </Stack>
         </Section>
     );

components/pages/Home/(sections)/MyWorkSection.tsx

@@ -6,10 +6,11 @@ import Span from "@/components/lib/layout/Span";
 import Stack from "@/components/lib/layout/Stack";
 import { work } from "../(data)/work";
 import Link from "@/components/lib/layout/Link";
-import React from "react";
+import React, { Fragment } from "react";
 import Row from "@/components/lib/layout/Row";
 import Divider from "@/components/lib/layout/Divider";
 import { twMerge } from "tailwind-merge";
+import { CheckCircle2, Circle } from "lucide-react";
 
 type Props = {
     noTitle?: boolean;
@@ -19,7 +20,7 @@ type Props = {
 export default function MyWorkSection({ noTitle, expand }: Props) {
     const categories = Object.keys(work) as (keyof typeof work)[];
     const [category, setCategory] = React.useState<keyof typeof work>(
-        categories[0]
+        categories[0],
     );
 
     if (expand) {
@@ -53,7 +54,7 @@ export default function MyWorkSection({ noTitle, expand }: Props) {
                                                             key={index}
                                                         />
                                                     );
-                                                }
+                                                },
                                             )}
                                         </div>
                                     </Stack>
@@ -88,7 +89,7 @@ export default function MyWorkSection({ noTitle, expand }: Props) {
                                         "cursor-pointer",
                                         isActive
                                             ? ""
-                                            : "opacity-40 hover:opacity-70"
+                                            : "opacity-40 hover:opacity-70",
                                     )}
                                     onClick={() => setCategory(ctgr)}
                                 >
@@ -129,24 +130,44 @@ export function MyWorkPortfolioCard({
                 <Link
                     target="_blank"
                     href={portfolio.href}
-                    className="text-sm text-wrap break-all border-none"
+                    className="text-sm text-wrap break-all border- dotted-text"
                 >
                     {portfolio.href}
                 </Link>
                 <Span>{portfolio.description}</Span>
+                {portfolio.metrics?.[0] && (
+                    <Fragment>
+                        <Divider />
+                        <Row className="gap-4">
+                            {portfolio.metrics.map((tch, _i) => (
+                                <React.Fragment key={_i}>
+                                    <Row>
+                                        <CheckCircle2 size={15} />
+                                        <Span className="text-xs dark:text-white/40">
+                                            {tch}
+                                        </Span>
+                                    </Row>
+                                </React.Fragment>
+                            ))}
+                        </Row>
+                    </Fragment>
+                )}
                 {portfolio.technologies?.[0] && (
-                    <Row className="gap-4">
-                        {portfolio.technologies.map((tch, _i) => (
-                            <React.Fragment key={_i}>
-                                <Span className="text-sm dark:text-white/40">
-                                    {tch}
-                                </Span>
-                                {_i < portfolio.technologies.length - 1 && (
-                                    <Divider vertical />
-                                )}
-                            </React.Fragment>
-                        ))}
-                    </Row>
+                    <Fragment>
+                        <Divider />
+                        <Row className="gap-4 opacity-60">
+                            {portfolio.technologies.map((tch, _i) => (
+                                <React.Fragment key={_i}>
+                                    <Span className="text-xs dark:text-white/40">
+                                        {tch}
+                                    </Span>
+                                    {_i < portfolio.technologies.length - 1 && (
+                                        <Divider vertical />
+                                    )}
+                                </React.Fragment>
+                            ))}
+                        </Row>
+                    </Fragment>
                 )}
             </Stack>
         </Card>

components/pages/Home/(sections)/footer-cta-section.tsx

@@ -0,0 +1,53 @@
+import Button from "@/components/lib/layout/Button";
+import H2 from "@/components/lib/layout/H2";
+import Row from "@/components/lib/layout/Row";
+import Section from "@/components/lib/layout/Section";
+import Span from "@/components/lib/layout/Span";
+import Stack from "@/components/lib/layout/Stack";
+import { Contact, Mail } from "lucide-react";
+
+export default function FooterCTASection() {
+    return (
+        <Section>
+            <Stack className="w-full max-w-full xl:max-w-[50vw] gap-8">
+                <H2 className="leading-snug">Need Help With Infrastructure?</H2>
+                <Span>
+                    Whether it's CI/CD, cost optimization, or production
+                    hardening, I can help.
+                </Span>
+
+                <Row className="items-stretch flex-col md:flex-row w-full md:w-auto gap-4">
+                    <Button
+                        title="Contact Me"
+                        beforeIcon={
+                            <Contact size={17} className="font-normal" />
+                        }
+                        href="/contact"
+                        className="grow w-full"
+                    >
+                        Schedule a Call
+                    </Button>
+                    <Button
+                        title="View My Work"
+                        beforeIcon={<Mail size={17} className="font-normal" />}
+                        href={`mailto:${process.env.NEXT_PUBLIC_EMAIL_ADDRESS}`}
+                        className="grow w-full bg-transparent!"
+                        variant="outlined"
+                    >
+                        Email Me
+                    </Button>
+                    {/* <Button
+                        beforeIcon={
+                            <ScrollText size={17} className="font-normal" />
+                        }
+                        href="/contact"
+                        variant="outlined"
+                        className="grow w-full"
+                    >
+                        Resume
+                    </Button> */}
+                </Row>
+            </Stack>
+        </Section>
+    );
+}

components/pages/Home/index.tsx

@@ -1,21 +1,42 @@
+import LucideIcon from "@/components/lib/elements/lucide-icon";
 import Button from "@/components/lib/layout/Button";
+import Divider from "@/components/lib/layout/Divider";
 import H1 from "@/components/lib/layout/H1";
 import Row from "@/components/lib/layout/Row";
 import Section from "@/components/lib/layout/Section";
 import Span from "@/components/lib/layout/Span";
 import Stack from "@/components/lib/layout/Stack";
-import { Contact, ScrollText } from "lucide-react";
+import { Contact, ScrollText, Terminal } from "lucide-react";
 
 export default function Main() {
     return (
         <Section>
             <Stack className="w-full max-w-full xl:max-w-[50vw]">
-                <Span>Howdy Tech Enthusiasts! I'm Benjamin Toby</Span>
-                <H1 className="leading-snug">
-                    Software Engineer, DevOps Engineer, Full Stack Developer,
-                    Software Architect, Philosopher, Solar Energy Enthusiast.
+                <Span>Benjamin Toby</Span>
+                <H1 className="leading-snug m-0!">
+                    DevOps & Platform Engineer
                 </H1>
-                <Row className="items-stretch flex-col md:flex-row w-full md:w-auto">
+                <Span className="text-xl">
+                    I help teams ship faster, cut infrastructure costs, and
+                    achieve reliable production systems.
+                </Span>
+                <Row className="my-4 gap-6">
+                    <Row>
+                        <LucideIcon name="CheckCircle2" size={20} />
+                        <Span>99.99% uptime targets</Span>
+                    </Row>
+                    <Divider vertical />
+                    <Row>
+                        <LucideIcon name="CheckCircle2" size={20} />
+                        <Span>~10 deployments/week</Span>
+                    </Row>
+                    <Divider vertical />
+                    <Row>
+                        <LucideIcon name="CheckCircle2" size={20} />
+                        <Span>Over 80% Operations cost reduction</Span>
+                    </Row>
+                </Row>
+                <Row className="items-stretch flex-col md:flex-row w-full md:w-auto gap-4">
                     <Button
                         title="Contact Me"
                         beforeIcon={
@@ -24,7 +45,18 @@ export default function Main() {
                         href="/contact"
                         className="grow w-full"
                     >
-                        Contact Me
+                        Book a Consultation
+                    </Button>
+                    <Button
+                        title="View My Work"
+                        beforeIcon={
+                            <Terminal size={17} className="font-normal" />
+                        }
+                        href="/work"
+                        className="grow w-full bg-transparent!"
+                        variant="outlined"
+                    >
+                        View My Work
                     </Button>
                     {/* <Button
                         beforeIcon={

components/pages/about/index.tsx

@@ -1,21 +1,76 @@
+import Button from "@/components/lib/layout/Button";
+import Divider from "@/components/lib/layout/Divider";
 import H1 from "@/components/lib/layout/H1";
+import H2 from "@/components/lib/layout/H2";
 import Link from "@/components/lib/layout/Link";
+import P from "@/components/lib/layout/P";
 import Row from "@/components/lib/layout/Row";
 import Section from "@/components/lib/layout/Section";
 import Span from "@/components/lib/layout/Span";
 import Stack from "@/components/lib/layout/Stack";
-import { Mail } from "lucide-react";
+import { Terminal } from "lucide-react";
 
 export default function Main() {
     return (
         <Section>
-            <Stack className="w-full max-w-full xl:max-w-[50vw]">
+            <Stack className="w-full max-w-full xl:max-w-[50vw] gap-8">
+                {/* <Span className="leading-snug -mb-6 text-sm">
+                    I Build & Operate Production Systems
+                </Span> */}
                 <H1 className="leading-snug">About Me</H1>
                 <Span>
-                    I'm a man of few words. My{" "}
-                    <Link href="/skills">Skills</Link> and{" "}
-                    <Link href="/work">Work</Link> speak for themselves.
+                    I'm Benjamin Toby, a DevOps/Platform engineer and CTO at
+                    Summit Lending. I build and operate production systems that
+                    support real businesses.
                 </Span>
+
+                <Divider />
+
+                <H2>What I Do</H2>
+                <Span>I focus on infrastructure and reliability:</Span>
+                <ul className="space-y-4">
+                    <li>CI/CD automation and deployment pipelines</li>
+                    <li>Multi-cloud architecture (AWS, GCP, Azure, Hetzner)</li>
+                    <li>NGINX hardening, TLS, caching, rate limiting</li>
+                    <li>Full-stack delivery with Next.js, Bun, and SQL</li>
+                </ul>
+
+                <Divider />
+
+                <H2>Background</H2>
+                <P>
+                    I started as a full-stack developer and moved into DevOps
+                    and platform engineering out of necessity, building systems
+                    that could scale without breaking. That led to Summit
+                    Lending, where I manage all engineering, from infrastructure
+                    to product.
+                </P>
+                <P>
+                    Along the way I built TurboCI, a deployment orchestration
+                    tool, and Datasquirel, a cloud SQL platform. I write about
+                    what I learn on my <a href="/blog">blog</a>.
+                </P>
+
+                <Divider />
+
+                <Span>
+                    I focus on measurable outcomes: faster deployments, lower
+                    costs, fewer incidents.
+                </Span>
+
+                <Row className="items-stretch flex-col md:flex-row w-full md:w-auto gap-4">
+                    <Button
+                        title="View My Work"
+                        beforeIcon={
+                            <Terminal size={17} className="font-normal" />
+                        }
+                        href="/work"
+                        className="grow w-full bg-transparent!"
+                        variant="outlined"
+                    >
+                        View My Work
+                    </Button>
+                </Row>
             </Stack>
         </Section>
     );

components/pages/blog/(sections)/BlogPostsListCard.tsx

@@ -3,7 +3,7 @@ import H2 from "@/components/lib/layout/H2";
 import Row from "@/components/lib/layout/Row";
 import Span from "@/components/lib/layout/Span";
 import Stack from "@/components/lib/layout/Stack";
-import { DSQL_TBENME_BLOG_POSTS } from "@/types";
+import { DSQL_TBEN_ME_BLOG_POSTS } from "@/types/dsql";
 import {
     ArrowRight,
     ArrowUpRight,
@@ -13,7 +13,7 @@ import {
 import React from "react";
 
 type Props = {
-    post: DSQL_TBENME_BLOG_POSTS;
+    post: DSQL_TBEN_ME_BLOG_POSTS;
 };
 
 export default function BlogPostsListCard({ post }: Props) {

components/pages/contact/(sections)/book-call.tsx

@@ -0,0 +1,3 @@
+export default async function BookCall() {
+    return null;
+}

components/pages/contact/index.tsx

@@ -12,14 +12,19 @@ export default function Main() {
             <Stack className="w-full max-w-full xl:max-w-[50vw]">
                 <H1 className="leading-snug">Contact Me</H1>
                 <Span>
-                    Have a great idea? Want to collaborate? Let's make it
-                    happen.
+                    Need help with CI/CD, cost optimization, or production
+                    reliability? Book a call or send a message.
                 </Span>
 
-                <Link href="mailto:ben@tben.me" className="border-none">
+                <Link
+                    href={`mailto:${process.env.NEXT_PUBLIC_EMAIL_ADDRESS}`}
+                    className="border-none"
+                >
                     <Row className="items-center">
                         <Mail size={20} className="mt-1" />
-                        <Span className="text-2xl">ben@tben.me</Span>
+                        <Span className="text-2xl">
+                            {process.env.NEXT_PUBLIC_EMAIL_ADDRESS}
+                        </Span>
                     </Row>
                 </Link>
             </Stack>

layouts/main/(data)/shcema.ts

@@ -0,0 +1,50 @@
+export const SchemaJSON = {
+    "@context": "https://schema.org",
+    "@graph": [
+        {
+            "@type": "Organization",
+            "@id": "https://tben.me/#organization",
+            name: "Tben INC",
+            url: "https://tben.me/",
+            logo: {
+                "@type": "ImageObject",
+                "@id": "https://tben.me/#logo",
+                url: "https://tben.me/logo.png",
+            },
+            sameAs: ["https://www.linkedin.com/in/benjamin-toby/"],
+        },
+        {
+            "@type": "WebSite",
+            "@id": "https://tben.me/#website",
+            url: "https://tben.me/",
+            name: "Tben INC",
+            publisher: {
+                "@id": "https://tben.me/#organization",
+            },
+            potentialAction: {
+                "@type": "SearchAction",
+                target: {
+                    "@type": "EntryPoint",
+                    urlTemplate:
+                        "https://tben.me/search?q={search_term_string}",
+                },
+                "query-input": "required name=search_term_string",
+            },
+        },
+        {
+            "@type": "Person",
+            "@id": "https://tben.me/#benjamin-toby",
+            name: "Benjamin Toby",
+            url: "https://tben.me/",
+            email: "mailto:ben@tben.me",
+            sameAs: [
+                "https://www.linkedin.com/in/benjamin-toby/",
+                "https://git.tben.me/tben",
+            ],
+            worksFor: {
+                "@id": "https://tben.me/#organization",
+            },
+            jobTitle: "Founder",
+        },
+    ],
+};

layouts/main/index.tsx

@@ -4,14 +4,35 @@ import Header from "./Header";
 import Footer from "./Footer";
 import { twMerge } from "tailwind-merge";
 import MobileMenu from "./(sections)/MobileMenu";
+import Head from "next/head";
+import { SchemaJSON } from "./(data)/shcema";
 
-type Props = PropsWithChildren & {};
+type Props = PropsWithChildren & {
+    meta?: {
+        title?: string;
+        description?: string;
+    };
+};
 
-export default function Layout({ children }: Props) {
+export default function Layout({ children, meta }: Props) {
     const [menuOpen, setMenuOpen] = React.useState(false);
 
     return (
         <div className="flex flex-row items-stretch w-full min-h-screen">
+            <Head>
+                <title>
+                    {meta?.title || "10X Software/Devops Engineer | Tben.me"}
+                </title>
+                {meta?.description && (
+                    <meta name="description" content={meta?.description} />
+                )}
+                <script
+                    type="application/ld+json"
+                    dangerouslySetInnerHTML={{
+                        __html: JSON.stringify(SchemaJSON),
+                    }}
+                ></script>
+            </Head>
             <Aside />
             <div className={twMerge("flex flex-col items-start gap-0", "grow")}>
                 <Header {...{ menuOpen, setMenuOpen }} />

package.json

@@ -6,11 +6,12 @@
         "dev": "next dev",
         "build": "next build",
         "start": "next start",
+        "schema-to-typedef": "bunx dsql-schema-to-typedef",
         "lint": "next lint"
     },
     "dependencies": {
         "@moduletrace/buncid": "^1.0.7",
-        "@moduletrace/datasquirel": "^5.1.0",
+        "@moduletrace/datasquirel": "^5.7.51",
         "@moduletrace/twui": "file:./components/lib",
         "gray-matter": "^4.0.3",
         "html-to-react": "^1.7.0",
@@ -18,6 +19,7 @@
         "lucide-react": "^0.462.0",
         "next": "15.0.3",
         "next-mdx-remote": "^5.0.0",
+        "openai": "^6.21.0",
         "prism-themes": "^1.9.0",
         "react": "19.0.0-rc-66855b96-20241106",
         "react-dom": "19.0.0-rc-66855b96-20241106",

pages/about.tsx

@@ -3,7 +3,7 @@ import Main from "@/components/pages/about";
 
 export default function ContactPage() {
     return (
-        <Layout>
+        <Layout meta={{ title: "About Me | Tben.me" }}>
             <Main />
         </Layout>
     );

pages/blog/[slug]/index.tsx

@@ -2,24 +2,30 @@ import Layout from "@/layouts/main";
 import Main from "@/components/pages/blog/slug";
 import { GetStaticPaths, GetStaticProps } from "next";
 import datasquirel from "@moduletrace/datasquirel";
-import { DSQL_TBENME_BLOG_POSTS, PagePropsType } from "@/types";
+import { PagePropsType } from "@/types";
 import { APIResponseObject } from "@moduletrace/datasquirel/dist/package-shared/types";
 import { serialize } from "next-mdx-remote/serialize";
 import remarkGfm from "remark-gfm";
 import rehypePrismPlus from "rehype-prism-plus";
 import matter from "gray-matter";
+import { DSQL_TBEN_ME_BLOG_POSTS } from "@/types/dsql";
 
-export default function SingleBlogPost() {
+export default function SingleBlogPost({ blogPost }: PagePropsType) {
     return (
-        <Layout>
+        <Layout
+            meta={{
+                title: blogPost?.meta_title,
+                description: blogPost?.meta_description,
+            }}
+        >
             <Main />
         </Layout>
     );
 }
 
 export const getStaticProps: GetStaticProps<PagePropsType> = async (ctx) => {
-    const blogPostRes: APIResponseObject<DSQL_TBENME_BLOG_POSTS[]> =
-        await datasquirel.crud<DSQL_TBENME_BLOG_POSTS>({
+    const blogPostRes: APIResponseObject<DSQL_TBEN_ME_BLOG_POSTS> =
+        await datasquirel.crud<DSQL_TBEN_ME_BLOG_POSTS>({
             action: "get",
             table: "blog_posts",
             query: {
@@ -27,6 +33,9 @@ export const getStaticProps: GetStaticProps<PagePropsType> = async (ctx) => {
                     slug: {
                         value: ctx.params?.slug,
                     },
+                    published: {
+                        value: "1",
+                    },
                 },
             },
         });
@@ -64,10 +73,17 @@ export const getStaticProps: GetStaticProps<PagePropsType> = async (ctx) => {
 };
 
 export const getStaticPaths: GetStaticPaths = async (ctx) => {
-    const blogPostRes: APIResponseObject<DSQL_TBENME_BLOG_POSTS[]> =
-        await datasquirel.crud<DSQL_TBENME_BLOG_POSTS>({
+    const blogPostRes: APIResponseObject<DSQL_TBEN_ME_BLOG_POSTS> =
+        await datasquirel.crud<DSQL_TBEN_ME_BLOG_POSTS>({
             action: "get",
             table: "blog_posts",
+            query: {
+                query: {
+                    published: {
+                        value: "1",
+                    },
+                },
+            },
         });
 
     const blogPosts = blogPostRes.payload;

pages/blog/index.tsx

@@ -2,8 +2,9 @@ import Layout from "@/layouts/main";
 import Main from "@/components/pages/blog";
 import { GetStaticProps } from "next";
 import datasquirel from "@moduletrace/datasquirel";
-import { DSQL_TBENME_BLOG_POSTS, PagePropsType } from "@/types";
+import { PagePropsType } from "@/types";
 import { APIResponseObject } from "@moduletrace/datasquirel/dist/package-shared/types";
+import { DSQL_TBEN_ME_BLOG_POSTS } from "@/types/dsql";
 
 export default function BlogPage() {
     return (
@@ -14,8 +15,8 @@ export default function BlogPage() {
 }
 
 export const getStaticProps: GetStaticProps<PagePropsType> = async (ctx) => {
-    const blogPosts: APIResponseObject<DSQL_TBENME_BLOG_POSTS[]> =
-        await datasquirel.crud<DSQL_TBENME_BLOG_POSTS>({
+    const blogPosts: APIResponseObject<DSQL_TBEN_ME_BLOG_POSTS> =
+        await datasquirel.crud<DSQL_TBEN_ME_BLOG_POSTS>({
             action: "get",
             table: "blog_posts",
             query: {
@@ -23,6 +24,11 @@ export const getStaticProps: GetStaticProps<PagePropsType> = async (ctx) => {
                     field: "id",
                     strategy: "DESC",
                 },
+                query: {
+                    published: {
+                        value: "1",
+                    },
+                },
             },
         });
 

pages/contact.tsx

@@ -3,7 +3,7 @@ import Main from "@/components/pages/contact";
 
 export default function ContactPage() {
     return (
-        <Layout>
+        <Layout meta={{ title: "Contact Me | Tben.me" }}>
             <Main />
         </Layout>
     );

pages/index.tsx

@@ -1,14 +1,19 @@
 import Layout from "@/layouts/main";
-import H1 from "@/components/lib/layout/H1";
 import Main from "@/components/pages/Home";
 import AboutSection from "@/components/pages/Home/(sections)/AboutSection";
 import Divider from "@/components/lib/layout/Divider";
 import MySkillsSection from "@/components/pages/Home/(sections)/MySkillsSection";
 import MyWorkSection from "@/components/pages/Home/(sections)/MyWorkSection";
+import FooterCTASection from "@/components/pages/Home/(sections)/footer-cta-section";
 
 export default function Home() {
     return (
-        <Layout>
+        <Layout
+            meta={{
+                description:
+                    "Software Engineer, DevOps Engineer, Full Stack Developer, Software Architect, Philosopher, Solar Energy Enthusiast.",
+            }}
+        >
             <Main />
             <Divider />
             <AboutSection />
@@ -16,6 +21,8 @@ export default function Home() {
             <MySkillsSection />
             <Divider />
             <MyWorkSection />
+            <Divider />
+            <FooterCTASection />
         </Layout>
     );
 }

pages/skills.tsx

@@ -5,7 +5,7 @@ import MySkillsSection from "@/components/pages/Home/(sections)/MySkillsSection"
 
 export default function SkillsPage() {
     return (
-        <Layout>
+        <Layout meta={{ title: "My Skills | Tben.me" }}>
             <Main />
             <Divider />
             <MySkillsSection noTitle expand />

pages/work.tsx

@@ -5,7 +5,7 @@ import MyWorkSection from "@/components/pages/Home/(sections)/MyWorkSection";
 
 export default function WorkPage() {
     return (
-        <Layout>
+        <Layout meta={{ title: "My Work | Tben.me" }}>
             <Main />
             <Divider />
             <MyWorkSection noTitle expand />

public/robots.txt

@@ -0,0 +1,11 @@
+# https://www.tben.me robots.txt
+
+User-agent: *
+Allow: /
+
+# Sitemaps
+Sitemap: https://www.tben.me/sitemap.xml
+
+# Optional: disallow common non-content paths (uncomment if needed)
+Disallow: /api/
+Disallow: /_next/

public/sitemap.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <!-- Homepage -->
+  <url>
+    <loc>https://www.tben.me/</loc>
+    <changefreq>weekly</changefreq>
+    <priority>1.0</priority>
+  </url>
+
+  <!-- Main Pages -->
+  <url>
+    <loc>https://www.tben.me/about</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/skills</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.7</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/work</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.8</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/blog</loc>
+    <changefreq>weekly</changefreq>
+    <priority>0.8</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/contact</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.6</priority>
+  </url>
+
+  <!-- Blog Posts -->
+  <url>
+    <loc>https://www.tben.me/blog/nginx-reverse-proxy-caching-rate-limiting-static-files</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.6</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/blog/solving-the-database-hassle</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/blog/find-your-perfect-framework</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.5</priority>
+  </url>
+  <url>
+    <loc>https://www.tben.me/blog/choosing-your-tech-stack</loc>
+    <changefreq>monthly</changefreq>
+    <priority>0.5</priority>
+  </url>
+</urlset>

scripts/substack/save-all-notes.ts

@@ -0,0 +1,159 @@
+// @ts-ignore
+const articles_objects = [];
+
+const substack_href = "https://substack.com/@benjamintoby";
+
+// @ts-ignore
+async function sleep(wait) {
+    return new Promise((res) => {
+        setTimeout(() => {
+            res(true);
+        }, wait);
+    });
+}
+
+function grabContentHeight() {
+    return document.querySelector(
+        "div[style='max-width: 568px;']",
+        // @ts-ignore
+    )?.offsetHeight;
+}
+
+async function scrollToEnd() {
+    let last_content_height = grabContentHeight();
+
+    while (true) {
+        window.scrollTo({
+            top: document.body.scrollHeight,
+            behavior: "smooth",
+        });
+
+        await sleep(5000);
+
+        const current_content_height = grabContentHeight();
+
+        if (current_content_height > last_content_height) {
+            last_content_height = current_content_height;
+        } else {
+            break;
+        }
+    }
+}
+
+async function main() {
+    await scrollToEnd();
+
+    const articles = Array.from(
+        document.querySelectorAll("div[role='article']"),
+    );
+
+    console.log(`Handling ${articles.length} Articles ...`);
+
+    for (let i = 0; i < articles.length; i++) {
+        let present_articles = Array.from(
+            document.querySelectorAll("div[role='article']"),
+        );
+
+        console.log(`Found ${present_articles.length} Present Articles!`);
+
+        while (i > present_articles.length - 1) {
+            window.scrollTo({
+                top: document.body.scrollHeight,
+                behavior: "smooth",
+            });
+
+            console.log(`Searching for Article #${i} ...`);
+
+            await sleep(5000);
+
+            present_articles = Array.from(
+                document.querySelectorAll("div[role='article']"),
+            );
+        }
+
+        const article = present_articles[i];
+
+        console.log(`Handling Article #${i} ...`);
+
+        const content_div = article.querySelector(`.FeedProseMirror`);
+        const date_link = Array.from(article.querySelectorAll("a")).find((a) =>
+            Boolean(a.getAttribute("title")),
+        );
+
+        if (!content_div) continue;
+
+        const content_div_first_paragraph = content_div.querySelector(`p`);
+
+        if (!content_div_first_paragraph) continue;
+
+        let window_url = window.location.href;
+        const initial_text_content = content_div.textContent;
+
+        const article_object = {
+            title: initial_text_content,
+            content: initial_text_content,
+            html: content_div.innerHTML,
+            images: [],
+            date: date_link?.getAttribute("title"),
+        };
+
+        const article_images = Array.from(
+            article.querySelectorAll("picture img"),
+        );
+
+        if (article_images?.[0]) {
+            for (let img = 0; img < article_images.length; img++) {
+                if (img > 0) {
+                    const article_image = article_images[img];
+                    // @ts-ignore
+                    const article_image_srcset = article_image.srcset;
+                    const largest_image = article_image_srcset
+                        .split(` `)
+                        .at(-2);
+                    // @ts-ignore
+                    article_object.images.push(largest_image);
+                }
+            }
+        }
+
+        const more_content = Array.from(article.querySelectorAll("a"))
+            .find((el) => el.textContent.includes("See more"))
+            ?.click();
+
+        await sleep(2000);
+
+        let new_window_url = window.location.href;
+
+        if (new_window_url === window_url) {
+            const new_article_content =
+                article.querySelector(`.FeedProseMirror`);
+
+            if (new_article_content) {
+                article_object.content = new_article_content.textContent;
+                article_object.html = new_article_content.innerHTML;
+            }
+
+            articles_objects.push(article_object);
+        } else {
+            const text_sample = content_div_first_paragraph.textContent;
+            const target_content_div = Array.from(
+                document.querySelectorAll(".ProseMirror.FeedProseMirror"),
+            ).find((el) => el.textContent.includes(text_sample));
+
+            if (target_content_div) {
+                article_object.content = target_content_div.textContent;
+                article_object.html = target_content_div.innerHTML;
+            }
+
+            articles_objects.push(article_object);
+
+            window.history.back();
+            await sleep(2000);
+        }
+    }
+
+    // @ts-ignore
+    console.log(articles_objects);
+}
+
+main();

styles/globals.css

@@ -60,9 +60,17 @@
 }
 
 .twui-a {
-    @apply !text-foreground-light/70 dark:!text-foreground-dark/70 border-none;
+    @apply !text-foreground-light/70 dark:!text-foreground-dark/70 border-none hover:dark:!text-white hover:opacity-100;
 }
 
 .twui-a.active {
     @apply !text-foreground-light dark:!text-foreground-dark font-bold;
 }
+
+.dotted-text {
+    @apply border-0 border-b-2 border-dotted border-foreground-light/20 dark:!border-foreground-dark/20 pb-[2px];
+}
+
+.dotted-text:hover {
+    text-decoration: none !important;
+}

types.ts

@@ -1,22 +1,8 @@
 import { MDXRemoteSerializeResult } from "next-mdx-remote";
+import { DSQL_TBEN_ME_BLOG_POSTS } from "./types/dsql";
 
 export type PagePropsType = {
-    blogPosts?: DSQL_TBENME_BLOG_POSTS[] | null;
-    blogPost?: DSQL_TBENME_BLOG_POSTS | null;
+    blogPosts?: DSQL_TBEN_ME_BLOG_POSTS[] | null;
+    blogPost?: DSQL_TBEN_ME_BLOG_POSTS | null;
     mdxSource?: MDXRemoteSerializeResult<any, any> | null;
 };
-
-export type DSQL_TBENME_BLOG_POSTS = {
-    id?: number;
-    title?: string;
-    slug?: string;
-    excerpt?: string;
-    body?: string;
-    metadata?: string;
-    date_created?: string;
-    date_created_code?: number;
-    date_created_timestamp?: string;
-    date_updated?: string;
-    date_updated_code?: number;
-    date_updated_timestamp?: string;
-};

types/dsql.ts

@@ -0,0 +1,55 @@
+export const DsqlTables = [
+    "blog_posts",
+    "portfolio",
+    "documents",
+] as const
+
+export type DSQL_TBEN_ME_BLOG_POSTS = {
+    id?: number;
+    title?: string;
+    slug?: string;
+    excerpt?: string;
+    body?: string;
+    metadata?: string;
+    published?: 0 | 1;
+    meta_title?: string;
+    meta_description?: string;
+    date_created?: string;
+    date_created_code?: number;
+    date_created_timestamp?: string;
+    date_updated?: string;
+    date_updated_code?: number;
+    date_updated_timestamp?: string;
+}
+
+export type DSQL_TBEN_ME_PORTFOLIO = {
+    id?: number;
+    title?: string;
+    description?: string;
+    url?: string;
+    image?: string;
+    full_description?: string;
+    starting_date?: string;
+    completion_date?: string;
+    project_order?: number;
+    date_created?: string;
+    date_created_code?: number;
+    date_created_timestamp?: string;
+    date_updated?: string;
+    date_updated_code?: number;
+    date_updated_timestamp?: string;
+}
+
+export type DSQL_TBEN_ME_DOCUMENTS = {
+    id?: number;
+    project_name?: string;
+    html?: string;
+    date_created?: string;
+    date_created_code?: number;
+    date_created_timestamp?: string;
+    date_updated?: string;
+    date_updated_code?: number;
+    date_updated_timestamp?: string;
+}
+
+export type DSQL_TBEN_ME_ALL_TYPEDEFS = DSQL_TBEN_ME_BLOG_POSTS & DSQL_TBEN_ME_PORTFOLIO & DSQL_TBEN_ME_DOCUMENTS