diff --git a/.env b/.env new file mode 100644 index 000000000..a1c899d42 --- /dev/null +++ b/.env @@ -0,0 +1,12 @@ +// replace with your own PostgreSQL database connection string +DATABASE_URL=postgresql://sendou@localhost:5432/sendou_ink_trpc?schema=public + +// these are needed for logging in. +// you can get them by making an application on https://discord.com/developers +DISCORD_CLIENT_ID=581483359159582722 +DISCORD_CLIENT_SECRET=qxFxBlALcRsqUG2m7WYLHJ8rzjbddBTx +DISCORD_CALLBACK_URL=http://localhost:3001/auth/discord/callback +COOKIE_SECRET=secret +FRONTEND_URL=http://localhost:3000 + +VITE_BACKEND_URL=http://localhost:3001 diff --git a/.gitignore b/old/.gitignore similarity index 100% rename from .gitignore rename to old/.gitignore diff --git a/App.tsx b/old/App.tsx similarity index 72% rename from App.tsx rename to old/App.tsx index 1157d5c40..02d89305d 100644 --- a/App.tsx +++ b/old/App.tsx @@ -1,8 +1,8 @@ import { Router } from "solid-app-router"; import type { Component } from "solid-js"; import { Routes } from "./Routes"; -import { Layout } from "./scenes/layout/components/Layout"; -import { UserProvider } from "./utils/UserContext"; +import { Layout } from "./old/scenes/layout/components/Layout"; +import { UserProvider } from "./old/utils/UserContext"; const App: Component = () => { return ( diff --git a/Routes.tsx b/old/Routes.tsx similarity index 75% rename from Routes.tsx rename to old/Routes.tsx index d9ec6a6cd..f3c625165 100644 --- a/Routes.tsx +++ b/old/Routes.tsx @@ -1,11 +1,11 @@ import { Routes as SolidAppRoutes, Route } from "solid-app-router"; import { lazy } from "solid-js"; -import { MapPoolTab } from "./scenes/tournament/components/MapPoolTab"; -import { TeamsTab } from "./scenes/tournament/components/TeamsTab"; -import TournamentData from "./scenes/tournament/TournamentPage.data"; +import { MapPoolTab } from "./old/scenes/tournament/components/MapPoolTab"; +import { TeamsTab } from "./old/scenes/tournament/components/TeamsTab"; +import TournamentData from "./old/scenes/tournament/TournamentPage.data"; const TournamentsPage = lazy( - () => import("./scenes/tournament/components/TournamentPage") + () => import("./old/scenes/tournament/components/TournamentPage") ); export function Routes() { diff --git a/components/AvatarWithName.tsx b/old/components/AvatarWithName.tsx similarity index 100% rename from components/AvatarWithName.tsx rename to old/components/AvatarWithName.tsx diff --git a/components/ErrorMessage.tsx b/old/components/ErrorMessage.tsx similarity index 100% rename from components/ErrorMessage.tsx rename to old/components/ErrorMessage.tsx diff --git a/components/icons/Discord.tsx b/old/components/icons/Discord.tsx similarity index 100% rename from components/icons/Discord.tsx rename to old/components/icons/Discord.tsx diff --git a/components/icons/Search.tsx b/old/components/icons/Search.tsx similarity index 100% rename from components/icons/Search.tsx rename to old/components/icons/Search.tsx diff --git a/components/icons/Twitter.tsx b/old/components/icons/Twitter.tsx similarity index 100% rename from components/icons/Twitter.tsx rename to old/components/icons/Twitter.tsx diff --git a/index.html b/old/index.html similarity index 100% rename from index.html rename to old/index.html diff --git a/index.tsx b/old/index.tsx similarity index 100% rename from index.tsx rename to old/index.tsx diff --git a/package-lock.json b/old/package-lock.json similarity index 100% rename from package-lock.json rename to old/package-lock.json diff --git a/package.json b/old/package.json similarity index 100% rename from package.json rename to old/package.json diff --git a/public/img/layout/analyzer.webp b/old/public/img/layout/analyzer.webp similarity index 100% rename from public/img/layout/analyzer.webp rename to old/public/img/layout/analyzer.webp diff --git a/public/img/layout/badges.webp b/old/public/img/layout/badges.webp similarity index 100% rename from public/img/layout/badges.webp rename to old/public/img/layout/badges.webp diff --git a/public/img/layout/battle.webp b/old/public/img/layout/battle.webp similarity index 100% rename from public/img/layout/battle.webp rename to old/public/img/layout/battle.webp diff --git a/public/img/layout/browse.webp b/old/public/img/layout/browse.webp similarity index 100% rename from public/img/layout/browse.webp rename to old/public/img/layout/browse.webp diff --git a/public/img/layout/calendar.webp b/old/public/img/layout/calendar.webp similarity index 100% rename from public/img/layout/calendar.webp rename to old/public/img/layout/calendar.webp diff --git a/public/img/layout/gear.webp b/old/public/img/layout/gear.webp similarity index 100% rename from public/img/layout/gear.webp rename to old/public/img/layout/gear.webp diff --git a/public/img/layout/leaderboards.webp b/old/public/img/layout/leaderboards.webp similarity index 100% rename from public/img/layout/leaderboards.webp rename to old/public/img/layout/leaderboards.webp diff --git a/public/img/layout/links.webp b/old/public/img/layout/links.webp similarity index 100% rename from public/img/layout/links.webp rename to old/public/img/layout/links.webp diff --git a/public/img/layout/logo.webp b/old/public/img/layout/logo.webp similarity index 100% rename from public/img/layout/logo.webp rename to old/public/img/layout/logo.webp diff --git a/public/img/layout/maps.webp b/old/public/img/layout/maps.webp similarity index 100% rename from public/img/layout/maps.webp rename to old/public/img/layout/maps.webp diff --git a/public/img/layout/planner.webp b/old/public/img/layout/planner.webp similarity index 100% rename from public/img/layout/planner.webp rename to old/public/img/layout/planner.webp diff --git a/public/img/layout/rankings.webp b/old/public/img/layout/rankings.webp similarity index 100% rename from public/img/layout/rankings.webp rename to old/public/img/layout/rankings.webp diff --git a/public/img/layout/rotations.webp b/old/public/img/layout/rotations.webp similarity index 100% rename from public/img/layout/rotations.webp rename to old/public/img/layout/rotations.webp diff --git a/public/img/layout/top500.webp b/old/public/img/layout/top500.webp similarity index 100% rename from public/img/layout/top500.webp rename to old/public/img/layout/top500.webp diff --git a/public/img/layout/u.webp b/old/public/img/layout/u.webp similarity index 100% rename from public/img/layout/u.webp rename to old/public/img/layout/u.webp diff --git a/public/img/layout/xtrends.webp b/old/public/img/layout/xtrends.webp similarity index 100% rename from public/img/layout/xtrends.webp rename to old/public/img/layout/xtrends.webp diff --git a/public/img/modes/CB.webp b/old/public/img/modes/CB.webp similarity index 100% rename from public/img/modes/CB.webp rename to old/public/img/modes/CB.webp diff --git a/public/img/modes/RM.webp b/old/public/img/modes/RM.webp similarity index 100% rename from public/img/modes/RM.webp rename to old/public/img/modes/RM.webp diff --git a/public/img/modes/SZ.webp b/old/public/img/modes/SZ.webp similarity index 100% rename from public/img/modes/SZ.webp rename to old/public/img/modes/SZ.webp diff --git a/public/img/modes/TC.webp b/old/public/img/modes/TC.webp similarity index 100% rename from public/img/modes/TC.webp rename to old/public/img/modes/TC.webp diff --git a/public/img/modes/TW.webp b/old/public/img/modes/TW.webp similarity index 100% rename from public/img/modes/TW.webp rename to old/public/img/modes/TW.webp diff --git a/public/img/stages/ancho-v-games.webp b/old/public/img/stages/ancho-v-games.webp similarity index 100% rename from public/img/stages/ancho-v-games.webp rename to old/public/img/stages/ancho-v-games.webp diff --git a/public/img/stages/arowana-mall.webp b/old/public/img/stages/arowana-mall.webp similarity index 100% rename from public/img/stages/arowana-mall.webp rename to old/public/img/stages/arowana-mall.webp diff --git a/public/img/stages/blackbelly-skatepark.webp b/old/public/img/stages/blackbelly-skatepark.webp similarity index 100% rename from public/img/stages/blackbelly-skatepark.webp rename to old/public/img/stages/blackbelly-skatepark.webp diff --git a/public/img/stages/camp-triggerfish.webp b/old/public/img/stages/camp-triggerfish.webp similarity index 100% rename from public/img/stages/camp-triggerfish.webp rename to old/public/img/stages/camp-triggerfish.webp diff --git a/public/img/stages/goby-arena.webp b/old/public/img/stages/goby-arena.webp similarity index 100% rename from public/img/stages/goby-arena.webp rename to old/public/img/stages/goby-arena.webp diff --git a/public/img/stages/humpback-pump-track.webp b/old/public/img/stages/humpback-pump-track.webp similarity index 100% rename from public/img/stages/humpback-pump-track.webp rename to old/public/img/stages/humpback-pump-track.webp diff --git a/public/img/stages/inkblot-art-academy.webp b/old/public/img/stages/inkblot-art-academy.webp similarity index 100% rename from public/img/stages/inkblot-art-academy.webp rename to old/public/img/stages/inkblot-art-academy.webp diff --git a/public/img/stages/kelp-dome.webp b/old/public/img/stages/kelp-dome.webp similarity index 100% rename from public/img/stages/kelp-dome.webp rename to old/public/img/stages/kelp-dome.webp diff --git a/public/img/stages/makomart.webp b/old/public/img/stages/makomart.webp similarity index 100% rename from public/img/stages/makomart.webp rename to old/public/img/stages/makomart.webp diff --git a/public/img/stages/manta-maria.webp b/old/public/img/stages/manta-maria.webp similarity index 100% rename from public/img/stages/manta-maria.webp rename to old/public/img/stages/manta-maria.webp diff --git a/public/img/stages/moray-towers.webp b/old/public/img/stages/moray-towers.webp similarity index 100% rename from public/img/stages/moray-towers.webp rename to old/public/img/stages/moray-towers.webp diff --git a/public/img/stages/musselforge-fitness.webp b/old/public/img/stages/musselforge-fitness.webp similarity index 100% rename from public/img/stages/musselforge-fitness.webp rename to old/public/img/stages/musselforge-fitness.webp diff --git a/public/img/stages/new-albacore-hotel.webp b/old/public/img/stages/new-albacore-hotel.webp similarity index 100% rename from public/img/stages/new-albacore-hotel.webp rename to old/public/img/stages/new-albacore-hotel.webp diff --git a/public/img/stages/piranha-pit.webp b/old/public/img/stages/piranha-pit.webp similarity index 100% rename from public/img/stages/piranha-pit.webp rename to old/public/img/stages/piranha-pit.webp diff --git a/public/img/stages/port-mackerel.webp b/old/public/img/stages/port-mackerel.webp similarity index 100% rename from public/img/stages/port-mackerel.webp rename to old/public/img/stages/port-mackerel.webp diff --git a/public/img/stages/shellendorf-institute.webp b/old/public/img/stages/shellendorf-institute.webp similarity index 100% rename from public/img/stages/shellendorf-institute.webp rename to old/public/img/stages/shellendorf-institute.webp diff --git a/public/img/stages/skipper-pavilion.webp b/old/public/img/stages/skipper-pavilion.webp similarity index 100% rename from public/img/stages/skipper-pavilion.webp rename to old/public/img/stages/skipper-pavilion.webp diff --git a/public/img/stages/snapper-canal.webp b/old/public/img/stages/snapper-canal.webp similarity index 100% rename from public/img/stages/snapper-canal.webp rename to old/public/img/stages/snapper-canal.webp diff --git a/public/img/stages/starfish-mainstage.webp b/old/public/img/stages/starfish-mainstage.webp similarity index 100% rename from public/img/stages/starfish-mainstage.webp rename to old/public/img/stages/starfish-mainstage.webp diff --git a/public/img/stages/sturgeon-shipyard.webp b/old/public/img/stages/sturgeon-shipyard.webp similarity index 100% rename from public/img/stages/sturgeon-shipyard.webp rename to old/public/img/stages/sturgeon-shipyard.webp diff --git a/public/img/stages/the-reef.webp b/old/public/img/stages/the-reef.webp similarity index 100% rename from public/img/stages/the-reef.webp rename to old/public/img/stages/the-reef.webp diff --git a/public/img/stages/wahoo-world.webp b/old/public/img/stages/wahoo-world.webp similarity index 100% rename from public/img/stages/wahoo-world.webp rename to old/public/img/stages/wahoo-world.webp diff --git a/public/img/stages/walleye-warehouse.webp b/old/public/img/stages/walleye-warehouse.webp similarity index 100% rename from public/img/stages/walleye-warehouse.webp rename to old/public/img/stages/walleye-warehouse.webp diff --git a/public/svg/background-pattern.svg b/old/public/svg/background-pattern.svg similarity index 100% rename from public/svg/background-pattern.svg rename to old/public/svg/background-pattern.svg diff --git a/scenes/layout/components/HamburgerButton.tsx b/old/scenes/layout/components/HamburgerButton.tsx similarity index 100% rename from scenes/layout/components/HamburgerButton.tsx rename to old/scenes/layout/components/HamburgerButton.tsx diff --git a/scenes/layout/components/Layout.tsx b/old/scenes/layout/components/Layout.tsx similarity index 100% rename from scenes/layout/components/Layout.tsx rename to old/scenes/layout/components/Layout.tsx diff --git a/scenes/layout/components/MobileNav.tsx b/old/scenes/layout/components/MobileNav.tsx similarity index 100% rename from scenes/layout/components/MobileNav.tsx rename to old/scenes/layout/components/MobileNav.tsx diff --git a/scenes/layout/components/SearchInput.tsx b/old/scenes/layout/components/SearchInput.tsx similarity index 100% rename from scenes/layout/components/SearchInput.tsx rename to old/scenes/layout/components/SearchInput.tsx diff --git a/scenes/layout/components/UserItem.tsx b/old/scenes/layout/components/UserItem.tsx similarity index 100% rename from scenes/layout/components/UserItem.tsx rename to old/scenes/layout/components/UserItem.tsx diff --git a/scenes/layout/router.ts b/old/scenes/layout/router.ts similarity index 100% rename from scenes/layout/router.ts rename to old/scenes/layout/router.ts diff --git a/scenes/layout/service.ts b/old/scenes/layout/service.ts similarity index 97% rename from scenes/layout/service.ts rename to old/scenes/layout/service.ts index 9cb8c1ac5..9345e23d1 100644 --- a/scenes/layout/service.ts +++ b/old/scenes/layout/service.ts @@ -1,4 +1,4 @@ -import prisma from "../../prisma/client"; +import prisma from "../../../prisma/client"; import type { Strategy as DiscordStrategy } from "passport-discord"; export async function upsertUser({ diff --git a/scenes/layout/styles/HamburgerButton.module.css b/old/scenes/layout/styles/HamburgerButton.module.css similarity index 100% rename from scenes/layout/styles/HamburgerButton.module.css rename to old/scenes/layout/styles/HamburgerButton.module.css diff --git a/scenes/layout/styles/Layout.module.css b/old/scenes/layout/styles/Layout.module.css similarity index 100% rename from scenes/layout/styles/Layout.module.css rename to old/scenes/layout/styles/Layout.module.css diff --git a/scenes/layout/styles/MobileNav.module.css b/old/scenes/layout/styles/MobileNav.module.css similarity index 100% rename from scenes/layout/styles/MobileNav.module.css rename to old/scenes/layout/styles/MobileNav.module.css diff --git a/scenes/layout/styles/SearchInput.module.css b/old/scenes/layout/styles/SearchInput.module.css similarity index 100% rename from scenes/layout/styles/SearchInput.module.css rename to old/scenes/layout/styles/SearchInput.module.css diff --git a/scenes/layout/styles/UserItem.module.css b/old/scenes/layout/styles/UserItem.module.css similarity index 100% rename from scenes/layout/styles/UserItem.module.css rename to old/scenes/layout/styles/UserItem.module.css diff --git a/scenes/layout/utils.ts b/old/scenes/layout/utils.ts similarity index 100% rename from scenes/layout/utils.ts rename to old/scenes/layout/utils.ts diff --git a/scenes/tournament/TournamentPage.data.ts b/old/scenes/tournament/TournamentPage.data.ts similarity index 100% rename from scenes/tournament/TournamentPage.data.ts rename to old/scenes/tournament/TournamentPage.data.ts diff --git a/scenes/tournament/components/ActionSection.tsx b/old/scenes/tournament/components/ActionSection.tsx similarity index 100% rename from scenes/tournament/components/ActionSection.tsx rename to old/scenes/tournament/components/ActionSection.tsx diff --git a/scenes/tournament/components/InfoBanner.tsx b/old/scenes/tournament/components/InfoBanner.tsx similarity index 100% rename from scenes/tournament/components/InfoBanner.tsx rename to old/scenes/tournament/components/InfoBanner.tsx diff --git a/scenes/tournament/components/MapPoolTab.tsx b/old/scenes/tournament/components/MapPoolTab.tsx similarity index 100% rename from scenes/tournament/components/MapPoolTab.tsx rename to old/scenes/tournament/components/MapPoolTab.tsx diff --git a/scenes/tournament/components/TeamsTab.tsx b/old/scenes/tournament/components/TeamsTab.tsx similarity index 100% rename from scenes/tournament/components/TeamsTab.tsx rename to old/scenes/tournament/components/TeamsTab.tsx diff --git a/scenes/tournament/components/TournamentPage.tsx b/old/scenes/tournament/components/TournamentPage.tsx similarity index 100% rename from scenes/tournament/components/TournamentPage.tsx rename to old/scenes/tournament/components/TournamentPage.tsx diff --git a/scenes/tournament/router.ts b/old/scenes/tournament/router.ts similarity index 100% rename from scenes/tournament/router.ts rename to old/scenes/tournament/router.ts diff --git a/scenes/tournament/service.ts b/old/scenes/tournament/service.ts similarity index 98% rename from scenes/tournament/service.ts rename to old/scenes/tournament/service.ts index 24b9e7eec..b7213eb65 100644 --- a/scenes/tournament/service.ts +++ b/old/scenes/tournament/service.ts @@ -1,4 +1,4 @@ -import prisma from "../../prisma/client"; +import prisma from "../../../prisma/client"; export async function findTournamentByNameForUrl({ organizationNameForUrl, diff --git a/scenes/tournament/styles/ActionSection.module.css b/old/scenes/tournament/styles/ActionSection.module.css similarity index 100% rename from scenes/tournament/styles/ActionSection.module.css rename to old/scenes/tournament/styles/ActionSection.module.css diff --git a/scenes/tournament/styles/InfoBanner.module.css b/old/scenes/tournament/styles/InfoBanner.module.css similarity index 100% rename from scenes/tournament/styles/InfoBanner.module.css rename to old/scenes/tournament/styles/InfoBanner.module.css diff --git a/scenes/tournament/styles/MapPoolTab.module.css b/old/scenes/tournament/styles/MapPoolTab.module.css similarity index 100% rename from scenes/tournament/styles/MapPoolTab.module.css rename to old/scenes/tournament/styles/MapPoolTab.module.css diff --git a/scenes/tournament/styles/TeamsTab.module.css b/old/scenes/tournament/styles/TeamsTab.module.css similarity index 100% rename from scenes/tournament/styles/TeamsTab.module.css rename to old/scenes/tournament/styles/TeamsTab.module.css diff --git a/scenes/tournament/styles/TournamentPage.module.css b/old/scenes/tournament/styles/TournamentPage.module.css similarity index 100% rename from scenes/tournament/styles/TournamentPage.module.css rename to old/scenes/tournament/styles/TournamentPage.module.css diff --git a/server.ts b/old/server.ts similarity index 90% rename from server.ts rename to old/server.ts index e6eccf00f..f1aaa5586 100644 --- a/server.ts +++ b/old/server.ts @@ -7,11 +7,11 @@ import session from "express-session"; import cookieParser from "cookie-parser"; import passport from "passport"; import { Strategy as DiscordStrategy } from "passport-discord"; -import { tournament as tournamentRouter } from "./scenes/tournament/router"; -import { layout as layoutRouter } from "./scenes/layout/router"; -import { createContext, createRouter } from "./utils/trpc-server"; +import { tournament as tournamentRouter } from "./old/scenes/tournament/router"; +import { layout as layoutRouter } from "./old/scenes/layout/router"; +import { createContext, createRouter } from "./old/utils/trpc-server"; import * as trpcExpress from "@trpc/server/adapters/express/dist/trpc-server-adapters-express.cjs"; -import { upsertUser } from "./scenes/layout/service"; +import { upsertUser } from "./old/scenes/layout/service"; const PORT = 3001; diff --git a/styles/AvatarWithName.module.css b/old/styles/AvatarWithName.module.css similarity index 100% rename from styles/AvatarWithName.module.css rename to old/styles/AvatarWithName.module.css diff --git a/styles/ErrorMessage.module.css b/old/styles/ErrorMessage.module.css similarity index 100% rename from styles/ErrorMessage.module.css rename to old/styles/ErrorMessage.module.css diff --git a/styles/global.css b/old/styles/global.css similarity index 100% rename from styles/global.css rename to old/styles/global.css diff --git a/tsconfig.json b/old/tsconfig.json similarity index 100% rename from tsconfig.json rename to old/tsconfig.json diff --git a/utils/UserContext.tsx b/old/utils/UserContext.tsx similarity index 100% rename from utils/UserContext.tsx rename to old/utils/UserContext.tsx diff --git a/utils/constants.ts b/old/utils/constants.ts similarity index 100% rename from utils/constants.ts rename to old/utils/constants.ts diff --git a/utils/trpc-client.ts b/old/utils/trpc-client.ts similarity index 94% rename from utils/trpc-client.ts rename to old/utils/trpc-client.ts index 996ab40d1..cef006843 100644 --- a/utils/trpc-client.ts +++ b/old/utils/trpc-client.ts @@ -1,6 +1,6 @@ import { createTRPCClient } from "@trpc/client"; import type { inferProcedureOutput } from "@trpc/server"; -import type { AppRouter } from "../server"; +import type { AppRouter } from "../../server"; import superjson from "superjson"; // TODO: transformer superjson diff --git a/utils/trpc-server.ts b/old/utils/trpc-server.ts similarity index 100% rename from utils/trpc-server.ts rename to old/utils/trpc-server.ts diff --git a/utils/types.ts b/old/utils/types.ts similarity index 100% rename from utils/types.ts rename to old/utils/types.ts diff --git a/utils/useForm.ts b/old/utils/useForm.ts similarity index 100% rename from utils/useForm.ts rename to old/utils/useForm.ts diff --git a/vite.config.ts b/old/vite.config.ts similarity index 100% rename from vite.config.ts rename to old/vite.config.ts diff --git a/prisma/seed.ts b/prisma/seed.ts index e24abd1c6..7461ac992 100644 --- a/prisma/seed.ts +++ b/prisma/seed.ts @@ -1,5 +1,5 @@ import pkg from "@prisma/client"; -import { stages as stagesList } from "../utils/constants"; +import { stages as stagesList } from "../old/utils/constants"; const { PrismaClient } = pkg; const prisma = new PrismaClient(); import faker from "faker";