diff --git a/aimenet-web/src/components/am-header.tsx b/aimenet-web/src/components/am-header.tsx new file mode 100644 index 0000000..fcff32c --- /dev/null +++ b/aimenet-web/src/components/am-header.tsx @@ -0,0 +1,14 @@ +import React from "react"; +import {Separator} from "@/components/ui/separator.tsx"; + +export function AMHeader(props: { title: string, children?: Readonly }) { + return ( + <> +
+

{props.title}

+ {props.children} +
+ + + ); +} \ No newline at end of file diff --git a/aimenet-web/src/pages/card-in-screen.tsx b/aimenet-web/src/pages/card-in-screen.tsx index c70f3b9..ac467c3 100644 --- a/aimenet-web/src/pages/card-in-screen.tsx +++ b/aimenet-web/src/pages/card-in-screen.tsx @@ -6,12 +6,12 @@ import {ChevronRight, Circle, CircleCheckBig, Home, Plus, ServerOff, Wallet} fro import {AimeCard, AimeServer, db} from "@/lib/database"; import {getServerInfo, serverCardIn} from "@/lib/aime-net"; -import {AMFooter} from "@/components/am-footer.tsx"; import {Button} from "@/components/ui/button"; import {useToast} from "@/components/ui/use-toast"; -import {Separator} from "@/components/ui/separator"; import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert"; +import {AMHeader} from "@/components/am-header.tsx"; +import {AMFooter} from "@/components/am-footer.tsx"; import {AimeCardEntry} from "@/components/aime-card"; import {LoadingIndicator} from "@/components/loading-indicator"; import {CardCreationDialog} from "@/components/card-creation-form"; @@ -124,14 +124,12 @@ function ServerCardInPage() { return ( <>
-
-

{server?.name ?? "Server"}

+ -
- + {!server && ()} {(server && connectionError) && ( diff --git a/aimenet-web/src/pages/card-manager.tsx b/aimenet-web/src/pages/card-manager.tsx index a0adc08..e4bfe11 100644 --- a/aimenet-web/src/pages/card-manager.tsx +++ b/aimenet-web/src/pages/card-manager.tsx @@ -4,9 +4,7 @@ import {Plus, Server, Trash} from "lucide-react"; import {AimeCard, db} from "@/lib/database"; -import {AMFooter} from "@/components/am-footer.tsx"; import {Button} from "@/components/ui/button"; -import {Separator} from "@/components/ui/separator"; import { ContextMenu, ContextMenuContent, @@ -14,6 +12,8 @@ import { ContextMenuTrigger } from "@/components/ui/context-menu"; +import {AMHeader} from "@/components/am-header.tsx"; +import {AMFooter} from "@/components/am-footer.tsx"; import {AimeCardEntry} from "@/components/aime-card"; import {LoadingIndicator} from "@/components/loading-indicator"; import {CardCreationDialog} from "@/components/card-creation-form"; @@ -62,14 +62,12 @@ function CardManagerPage() { return (
-
-

Cards

+ -
- +
{cards ? : } diff --git a/aimenet-web/src/pages/server-listing.tsx b/aimenet-web/src/pages/server-listing.tsx index b18461e..36b91e3 100644 --- a/aimenet-web/src/pages/server-listing.tsx +++ b/aimenet-web/src/pages/server-listing.tsx @@ -17,10 +17,8 @@ import { import {AimeServer, db} from "@/lib/database"; -import {AMFooter} from "@/components/am-footer.tsx"; import {Input} from "@/components/ui/input"; import {Button} from "@/components/ui/button"; -import {Separator} from "@/components/ui/separator"; import {LoadingIndicator} from "@/components/loading-indicator"; import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert"; import {Form, FormControl, FormField, FormItem, FormMessage} from "@/components/ui/form"; @@ -31,6 +29,9 @@ import { ContextMenuSeparator, ContextMenuTrigger } from "@/components/ui/context-menu"; + +import {AMFooter} from "@/components/am-footer.tsx"; +import {AMHeader} from "@/components/am-header.tsx"; import {AMCard, AMCardDetail} from "@/components/am-card.tsx"; const serverAdditionSchema = z.object({ @@ -192,14 +193,12 @@ function ServerListing() { return (
-
-

AimeNet

+ -
- +