From 333dbaa4f38e3316b8c2d54008115ce15f7cd481 Mon Sep 17 00:00:00 2001 From: Aaron Delasy Date: Sun, 20 Oct 2024 14:49:05 +0300 Subject: [PATCH] Consistent imports/classes code style --- .prettierrc | 13 +++++++++ app/games/[gameId]/page.tsx | 10 +++---- app/games/[gameId]/result.tsx | 10 +++---- app/header.tsx | 12 ++++---- app/layout.tsx | 6 ++-- app/leaderboard/page.tsx | 4 +-- app/maps/page.tsx | 6 ++-- app/maps/review/page.tsx | 2 +- app/page.tsx | 22 +++++++------- app/play/[level]/page.tsx | 16 +++++----- app/play/[level]/test-mode.tsx | 20 ++++++------- app/play/page.tsx | 7 ++--- app/playground/page.tsx | 10 +++---- app/prompts/[promptId]/page.tsx | 20 ++++++------- app/prompts/page.tsx | 14 ++++----- app/provider.tsx | 2 +- app/result.tsx | 18 ++++++------ app/test/page.tsx | 8 ++--- components/ConvexClientProvider.tsx | 2 +- components/CopyMapButton.tsx | 4 +-- components/Map.tsx | 14 ++++----- components/MapBuilder.tsx | 18 ++++++------ components/ModelSelector.tsx | 2 +- components/ThemeToggle.tsx | 4 +-- components/UserMenu.tsx | 6 ++-- components/Visualizer.tsx | 4 +-- convex/games.ts | 4 +-- convex/leaderboard.ts | 2 +- convex/maps.ts | 29 +++++++++---------- convex/models.ts | 2 +- convex/playerresults.ts | 2 +- convex/prompts.ts | 7 +++-- convex/results.ts | 2 +- convex/scores.ts | 2 +- convex/users.ts | 4 +-- lib/utils.ts | 14 --------- models/claude-3-5-sonnet.ts | 2 +- models/gemini-1.5-pro.ts | 2 +- models/gpt-4o.ts | 4 +-- models/index.ts | 4 +-- package.json | 4 +-- prettier.config.js | 6 ---- simulators/zombie-survival/ZombieSurvival.ts | 2 +- simulators/zombie-survival/entities/Box.ts | 2 +- simulators/zombie-survival/entities/Player.ts | 2 +- simulators/zombie-survival/entities/Rock.ts | 2 +- simulators/zombie-survival/entities/Zombie.ts | 2 +- simulators/zombie-survival/lib/entityAt.ts | 2 +- simulators/zombie-survival/lib/pathfinder.ts | 4 +-- tailwind.config.ts | 2 +- 50 files changed, 178 insertions(+), 184 deletions(-) create mode 100644 .prettierrc delete mode 100644 prettier.config.js diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..86a9642 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,13 @@ +{ + "importOrder": [ + "^react$", + "", + "^(@|.)/(.*)(? +

Game {params.gameId}

Model: {game?.modelId}

{results === undefined || results.length === 0 ? ( -
-
+
+

Game starting...

) : ( diff --git a/app/games/[gameId]/result.tsx b/app/games/[gameId]/result.tsx index 9e70015..db7478e 100644 --- a/app/games/[gameId]/result.tsx +++ b/app/games/[gameId]/result.tsx @@ -1,11 +1,11 @@ "use client"; -import { Doc } from "@/convex/_generated/dataModel"; -import { api } from "@/convex/_generated/api"; import { useQuery } from "convex/react"; +import Link from "next/link"; import { MapStatus } from "@/components/MapStatus"; import { Visualizer } from "@/components/Visualizer"; -import Link from "next/link"; +import { api } from "@/convex/_generated/api"; +import { Doc } from "@/convex/_generated/dataModel"; export const Result = ({ result }: { result: Doc<"results"> }) => { const map = useQuery(api.maps.getMapByLevel, { @@ -24,13 +24,13 @@ export const Result = ({ result }: { result: Doc<"results"> }) => {
Level {map.level} {result.status === "failed" ? ( -
+
{result.error}
) : ( diff --git a/app/header.tsx b/app/header.tsx index 9df5b7c..62516af 100644 --- a/app/header.tsx +++ b/app/header.tsx @@ -1,11 +1,11 @@ "use client"; +import { useAuthActions } from "@convex-dev/auth/react"; import { GitHubLogoIcon } from "@radix-ui/react-icons"; +import { useConvexAuth, useQuery } from "convex/react"; +import dynamic from "next/dynamic"; import Image from "next/image"; import Link from "next/link"; -import dynamic from "next/dynamic"; -import { useAuthActions } from "@convex-dev/auth/react"; -import { useConvexAuth, useQuery } from "convex/react"; import { Button } from "@/components/ui/button"; import { api } from "@/convex/_generated/api"; @@ -36,7 +36,7 @@ export default function Header() { const isAdminQuery = useQuery(api.users.isAdmin); return ( -
+
Logo SurviveTheNight @@ -89,12 +89,12 @@ export default function Header() {
{!isAuthenticated ? ( diff --git a/app/layout.tsx b/app/layout.tsx index bddcd60..0faf2f2 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,9 +1,9 @@ -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -import "./globals.css"; import { ConvexAuthNextjsServerProvider } from "@convex-dev/auth/nextjs/server"; +import { type Metadata } from "next"; +import { Inter } from "next/font/google"; import Header from "./header"; import { Providers } from "./provider"; +import "./globals.css"; const inter = Inter({ subsets: ["latin"] }); diff --git a/app/leaderboard/page.tsx b/app/leaderboard/page.tsx index d8a4c10..02daa17 100644 --- a/app/leaderboard/page.tsx +++ b/app/leaderboard/page.tsx @@ -1,8 +1,6 @@ "use client"; -import { api } from "@/convex/_generated/api"; import { useQuery } from "convex/react"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; import { Table, TableBody, @@ -12,6 +10,8 @@ import { TableHeader, TableRow, } from "@/components/ui/table"; +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import { api } from "@/convex/_generated/api"; // Define the types for the data interface Ranking { diff --git a/app/maps/page.tsx b/app/maps/page.tsx index 215fd4b..442c6ff 100644 --- a/app/maps/page.tsx +++ b/app/maps/page.tsx @@ -1,9 +1,9 @@ "use client"; -import { Input } from "@/components/ui/input"; -import React, { useEffect, useState } from "react"; -import { Button } from "@/components/ui/button"; +import { useEffect, useState } from "react"; import { useMutation } from "convex/react"; +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; import { api } from "@/convex/_generated/api"; export default function AddMapPage() { diff --git a/app/maps/review/page.tsx b/app/maps/review/page.tsx index 02af57e..2071686 100644 --- a/app/maps/review/page.tsx +++ b/app/maps/review/page.tsx @@ -1,5 +1,6 @@ "use client"; +import { useMutation, useQuery } from "convex/react"; import { Map } from "@/components/Map"; import { Button } from "@/components/ui/button"; import { @@ -10,7 +11,6 @@ import { CardTitle, } from "@/components/ui/card"; import { api } from "@/convex/_generated/api"; -import { useMutation, useQuery } from "convex/react"; const Page = () => { const isAdmin = useQuery(api.users.isAdmin); diff --git a/app/page.tsx b/app/page.tsx index 9d0a7ef..2335124 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,18 +1,18 @@ "use client"; import { useQuery } from "convex/react"; -import { api } from "@/convex/_generated/api"; +import Link from "next/link"; +import Result from "./result"; +import { Button } from "@/components/ui/button"; import { Table, TableBody, TableCell, TableHead, + TableHeader, TableRow, } from "@/components/ui/table"; -import { TableHeader } from "@/components/ui/table"; -import Link from "next/link"; -import { Button } from "@/components/ui/button"; -import Result from "./result"; +import { api } from "@/convex/_generated/api"; export default function GamePage() { const results = useQuery(api.results.getLastCompletedResults); @@ -20,7 +20,7 @@ export default function GamePage() { if (results === undefined) { return ( -
+

Recent Games

Loading...

@@ -29,7 +29,7 @@ export default function GamePage() { if (results.length === 0) { return ( -
+

Recent Games

No results yet

@@ -37,10 +37,10 @@ export default function GamePage() { } return ( -
-
+
+

Recent Games

-
+
{results.map((result) => ( ))} @@ -48,7 +48,7 @@ export default function GamePage() {
-
+

LLM Leaderboard