-
+
{!server && ()}
- {(server && connectionError) && (
+ {(server && connectionError) && (Connection Issue
- There was an issue connecting to the machine at {server.address}. Please check the
- server is running and try again.
+ There was an issue connecting to {server.address}.
+ Please check the game is running and try again.
)}
@@ -175,10 +181,36 @@ export default function ServerPage() {
}}/>
)}
-
-
-
+
+ {server?.id && (
+
+
+
Delete {server.name}
+
+
+
+ Confirm Deletion
+
+ You'll need to re-enter the server information if you want to use it in the future...
+
+
+
+ Cancel
+ {
+ await db.servers.delete(server.id);
+ navigate('/');
+ }}>
+ Continue
+
+
+
+
+ )}
+
+
);
-}
\ No newline at end of file
+}
+
+export default ServerCardInPage;
\ No newline at end of file
diff --git a/aimenet-web/app/cards/page.tsx b/aimenet-web/src/pages/card-manager.tsx
similarity index 82%
rename from aimenet-web/app/cards/page.tsx
rename to aimenet-web/src/pages/card-manager.tsx
index 3c5bafd..e4bfe11 100644
--- a/aimenet-web/app/cards/page.tsx
+++ b/aimenet-web/src/pages/card-manager.tsx
@@ -1,22 +1,22 @@
-"use client";
-
-import React from "react";
-import {Separator} from "@/components/ui/separator";
-import {Footer} from "@/components/footer";
-import {Button} from "@/components/ui/button";
-import {Plus, Server, Trash} from "lucide-react";
-import {useRouter} from "next/navigation";
+import {useNavigate} from "react-router-dom";
import {useLiveQuery} from "dexie-react-hooks";
+import {Plus, Server, Trash} from "lucide-react";
+
import {AimeCard, db} from "@/lib/database";
-import {LoadingIndicator} from "@/components/loading-indicator";
-import {CardCreationDialog} from "@/components/card-creation-form";
+
+import {Button} from "@/components/ui/button";
import {
ContextMenu,
ContextMenuContent,
ContextMenuItem,
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";
import {IncognitoStorageWarning} from "@/components/incognito-warning";
import {NoCardsNotification} from "@/components/no-cards-notification";
@@ -56,26 +56,26 @@ function CardList(props: { cards: AimeCard[] | undefined }) {
);
}
-export default function CardManagerPage() {
- const router = useRouter();
+function CardManagerPage() {
+ const navigate = useNavigate();
const cards = useLiveQuery(() => db.cards.toArray());
return (
-
-
Cards
-
-
+
{cards ? : }
-
+
);
-}
\ No newline at end of file
+}
+
+export default CardManagerPage;
\ No newline at end of file
diff --git a/aimenet-web/app/page.tsx b/aimenet-web/src/pages/server-listing.tsx
similarity index 66%
rename from aimenet-web/app/page.tsx
rename to aimenet-web/src/pages/server-listing.tsx
index f088042..36b91e3 100644
--- a/aimenet-web/app/page.tsx
+++ b/aimenet-web/src/pages/server-listing.tsx
@@ -1,29 +1,27 @@
-"use client";
-
import {z} from "zod";
-import Link from "next/link";
-import React, {useState} from "react";
import TimeAgo from "react-timeago";
+import React, {useState} from "react";
import {useForm} from "react-hook-form";
-import {useRouter} from "next/navigation";
-import {AppRouterInstance} from "next/dist/shared/lib/app-router-context.shared-runtime";
+import {useNavigate} from 'react-router-dom';
+import {useLiveQuery} from "dexie-react-hooks";
+import {zodResolver} from "@hookform/resolvers/zod";
import {
- ChevronRight,
Earth,
History,
Plus,
ShieldAlert,
SquareArrowOutUpRight,
- Trash, WalletCards
+ Trash,
+ WalletCards
} from "lucide-react";
-import {useLiveQuery} from "dexie-react-hooks";
+
import {AimeServer, db} from "@/lib/database";
-import {zodResolver} from "@hookform/resolvers/zod";
-import {Card} from "@/components/ui/card";
+
import {Input} from "@/components/ui/input";
import {Button} from "@/components/ui/button";
-import {Footer} from "@/components/footer";
-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";
import {
ContextMenu,
ContextMenuContent,
@@ -31,20 +29,17 @@ import {
ContextMenuSeparator,
ContextMenuTrigger
} from "@/components/ui/context-menu";
-import {Alert, AlertDescription, AlertTitle} from "@/components/ui/alert";
-import {Form, FormControl, FormField, FormItem, FormMessage} from "@/components/ui/form";
-import {LoadingIndicator} from "@/components/loading-indicator";
+
+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({
address: z.string().startsWith("http")
});
-function redirectToServerPage(router: AppRouterInstance, server: AimeServer) {
- router.push(`/servers/${server.id}`);
-}
-
function ServerList(props: { servers: AimeServer[] | undefined }) {
- const router = useRouter();
+ const navigate = useNavigate();
if (!props.servers) {
return ();
@@ -66,31 +61,21 @@ function ServerList(props: { servers: AimeServer[] | undefined }) {
{props.servers.map(s =>
-
-
-
-
{s.name}
-
- {s.lastConnected > 0 && (
-
-
-
-
- )}
-
-
- {s.address}
-
-
-
-
-
-
+ navigate(`/servers/${s.id}`)}>
+ {s.lastConnected > 0 && (
+
+
+
+
+ )}
+
+
+ {s.address}
+
+
- redirectToServerPage(router, s)}>
+ navigate(`/servers/${s.id}`)}>
Select Server
@@ -105,7 +90,7 @@ function ServerList(props: { servers: AimeServer[] | undefined }) {
}
function ServerAddForm() {
- const router = useRouter();
+ const navigate = useNavigate();
const form = useForm>({
resolver: zodResolver(serverAdditionSchema),
defaultValues: {
@@ -136,9 +121,9 @@ function ServerAddForm() {
name: `Server #${newId}`
});
- router.push(`/servers/${newId}`);
+ navigate(`/servers/${newId}`);
} else {
- router.push(`/servers/${existingServer.id}`);
+ navigate(`/servers/${existingServer.id}`);
}
}
@@ -165,11 +150,12 @@ function ServerAddForm() {
HTTPS Warning
AimeNet doesn't support HTTPS out-the-box.
- If you're using HTTPS, ensure a reverse-proxy or
- HTTP.SYS
- has been configured and a valid, trusted SSL certificate has been configured.
+ If you're using HTTPS, ensure a reverse-proxy or
+
+ HTTP.SYS
+ has been configured and a valid, trusted SSL certificate has been configured.
@@ -201,26 +187,26 @@ function ServerAddForm() {
);
}
-export default function ServerListingPage() {
+function ServerListing() {
+ const navigate = useNavigate();
const servers = useLiveQuery(() => db.servers.toArray());
- const router = useRouter();
return (
-