diff --git a/leaky-ships/components/Gamefield/BorderTiles.tsx b/leaky-ships/components/Gamefield/BorderTiles.tsx index d55f3c1..4a7e514 100644 --- a/leaky-ships/components/Gamefield/BorderTiles.tsx +++ b/leaky-ships/components/Gamefield/BorderTiles.tsx @@ -1,5 +1,5 @@ import { CSSProperties, Dispatch, SetStateAction } from "react" -import { borderCN, cornerCN, fieldIndex } from "../../lib/utils/helpers" +import { borderCN, cornerCN, fieldIndex } from "@lib/utils/helpers" import { Position, MouseCursor } from "../../interfaces/frontend" type TilesType = { diff --git a/leaky-ships/components/Gamefield/Gamefield.tsx b/leaky-ships/components/Gamefield/Gamefield.tsx index 3ca4420..a65b0be 100644 --- a/leaky-ships/components/Gamefield/Gamefield.tsx +++ b/leaky-ships/components/Gamefield/Gamefield.tsx @@ -6,7 +6,7 @@ import EventBar from "./EventBar" import HitElems from "./HitElems" import Labeling from "./Labeling" import Ships from "./Ships" -import useGameEvent from "../../lib/hooks/useGameEvent" +import useGameEvent from "@lib/hooks/useGameEvent" import Targets from "./Targets" function Gamefield() { diff --git a/leaky-ships/components/Gamefield/Labeling.tsx b/leaky-ships/components/Gamefield/Labeling.tsx index bbdf784..fdd8b5e 100644 --- a/leaky-ships/components/Gamefield/Labeling.tsx +++ b/leaky-ships/components/Gamefield/Labeling.tsx @@ -1,6 +1,6 @@ import classNames from "classnames" import { CSSProperties } from "react" -import { fieldIndex } from "../../lib/utils/helpers" +import { fieldIndex } from "@lib/utils/helpers" import { Field } from "../../interfaces/frontend" function Labeling({ count }: { count: number }) { diff --git a/leaky-ships/pages/api/auth.ts b/leaky-ships/pages/api/user/auth.ts similarity index 63% rename from leaky-ships/pages/api/auth.ts rename to leaky-ships/pages/api/user/auth.ts index 519dc33..a566ba2 100644 --- a/leaky-ships/pages/api/auth.ts +++ b/leaky-ships/pages/api/user/auth.ts @@ -1,11 +1,11 @@ import type { NextApiRequest, NextApiResponse } from "next" -import sendError from "../../lib/backend/components/sendError" -import getTokenFromCookie from "../../lib/backend/components/getTokenFromCookie" -import checkTokenIsValid from "../../lib/backend/components/checkTokenIsValid" -import getTokenDB from "../../lib/backend/components/getTokenDB" -import getPlayerByIdDB from "../../lib/backend/components/getPlayerByIdDB" -import createTokenDB from "../../lib/backend/components/createTokenDB" -import sendResponse from "../../lib/backend/components/sendResponse" +import sendError from "@backend/components/sendError" +import getTokenFromCookie from "@backend/components/getTokenFromCookie" +import checkTokenIsValid from "@backend/components/checkTokenIsValid" +import getTokenDB from "@backend/components/getTokenDB" +import getPlayerByIdDB from "@backend/components/getPlayerByIdDB" +import createTokenDB from "@backend/components/createTokenDB" +import sendResponse from "@backend/components/sendResponse" interface Data { token: string diff --git a/leaky-ships/pages/api/data.ts b/leaky-ships/pages/api/user/data.ts similarity index 65% rename from leaky-ships/pages/api/data.ts rename to leaky-ships/pages/api/user/data.ts index fef39f7..bfafa1d 100644 --- a/leaky-ships/pages/api/data.ts +++ b/leaky-ships/pages/api/user/data.ts @@ -1,11 +1,11 @@ import type { NextApiRequest, NextApiResponse } from "next" import type { Game } from "@prisma/client" -import getTokenFromBody from "../../lib/backend/components/getTokenFromBody" -import checkTokenIsValid from "../../lib/backend/components/checkTokenIsValid" -import getTokenDB from "../../lib/backend/components/getTokenDB" -import getPlayerByIdDB from "../../lib/backend/components/getPlayerByIdDB" -import sendResponse from "../../lib/backend/components/sendResponse" -import sendError from "../../lib/backend/components/sendError" +import getTokenFromBody from "@backend/components/getTokenFromBody" +import checkTokenIsValid from "@backend/components/checkTokenIsValid" +import getTokenDB from "@backend/components/getTokenDB" +import getPlayerByIdDB from "@backend/components/getPlayerByIdDB" +import sendResponse from "@backend/components/sendResponse" +import sendError from "@backend/components/sendError" interface Data { games: Game[] diff --git a/leaky-ships/pages/api/login.ts b/leaky-ships/pages/api/user/login.ts similarity index 79% rename from leaky-ships/pages/api/login.ts rename to leaky-ships/pages/api/user/login.ts index 5cbe9c0..680edc2 100644 --- a/leaky-ships/pages/api/login.ts +++ b/leaky-ships/pages/api/user/login.ts @@ -1,15 +1,15 @@ import type { NextApiRequest, NextApiResponse } from "next" -import logging from "../../lib/backend/logging" -import getPlayerByNameDB from "../../lib/backend/components/getPlayerByNameDB" -import checkPasswordIsValid from "../../lib/backend/components/checkPasswordIsValid" -import createTokenDB from "../../lib/backend/components/createTokenDB" -import sendResponse from "../../lib/backend/components/sendResponse" import { setCookie } from "cookies-next" -import prisma from "../../lib/prisma" import jwt from "jsonwebtoken" -import sendError, { API } from "../../lib/backend/components/sendError" -import getUserFromBody from "../../lib/backend/components/getUserFromBody" -import { rejectionErrors } from "../../lib/backend/errors" +import prisma from "@lib/prisma" +import logging from "@backend/logging" +import getPlayerByNameDB from "@backend/components/getPlayerByNameDB" +import checkPasswordIsValid from "@backend/components/checkPasswordIsValid" +import createTokenDB from "@backend/components/createTokenDB" +import sendResponse from "@backend/components/sendResponse" +import sendError, { API } from "@backend/components/sendError" +import getUserFromBody from "@backend/components/getUserFromBody" +import { rejectionErrors } from "@lib/backend/errors" interface Data { loggedIn: boolean diff --git a/leaky-ships/pages/api/loginCheck.ts b/leaky-ships/pages/api/user/loginCheck.ts similarity index 60% rename from leaky-ships/pages/api/loginCheck.ts rename to leaky-ships/pages/api/user/loginCheck.ts index 0672c54..5c914c7 100644 --- a/leaky-ships/pages/api/loginCheck.ts +++ b/leaky-ships/pages/api/user/loginCheck.ts @@ -1,10 +1,10 @@ import type { NextApiRequest, NextApiResponse } from "next" -import sendError from "../../lib/backend/components/sendError" -import getTokenFromCookie from "../../lib/backend/components/getTokenFromCookie" -import checkTokenIsValid from "../../lib/backend/components/checkTokenIsValid" -import getTokenDB from "../../lib/backend/components/getTokenDB" -import getPlayerByIdDB from "../../lib/backend/components/getPlayerByIdDB" -import sendResponse from "../../lib/backend/components/sendResponse" +import sendError from "@backend/components/sendError" +import getTokenFromCookie from "@backend/components/getTokenFromCookie" +import checkTokenIsValid from "@backend/components/checkTokenIsValid" +import getTokenDB from "@backend/components/getTokenDB" +import getPlayerByIdDB from "@backend/components/getPlayerByIdDB" +import sendResponse from "@backend/components/sendResponse" interface Data { token: string diff --git a/leaky-ships/pages/api/logout.ts b/leaky-ships/pages/api/user/logout.ts similarity index 67% rename from leaky-ships/pages/api/logout.ts rename to leaky-ships/pages/api/user/logout.ts index 61996e0..f10eb6d 100644 --- a/leaky-ships/pages/api/logout.ts +++ b/leaky-ships/pages/api/user/logout.ts @@ -1,10 +1,10 @@ import type { NextApiRequest, NextApiResponse } from "next" -import checkTokenIsValid from "../../lib/backend/components/checkTokenIsValid" -import sendResponse from "../../lib/backend/components/sendResponse" -import sendError from "../../lib/backend/components/sendError" +import checkTokenIsValid from "@backend/components/checkTokenIsValid" +import sendResponse from "@backend/components/sendResponse" +import sendError from "@backend/components/sendError" import { deleteCookie } from "cookies-next" -import getTokenDB from "../../lib/backend/components/getTokenDB" -import getTokenFromCookie from "../../lib/backend/components/getTokenFromCookie" +import getTokenDB from "@backend/components/getTokenDB" +import getTokenFromCookie from "@backend/components/getTokenFromCookie" interface Data { loggedOut: boolean diff --git a/leaky-ships/pages/api/register.ts b/leaky-ships/pages/api/user/register.ts similarity index 67% rename from leaky-ships/pages/api/register.ts rename to leaky-ships/pages/api/user/register.ts index 2708f47..be02362 100644 --- a/leaky-ships/pages/api/register.ts +++ b/leaky-ships/pages/api/user/register.ts @@ -1,13 +1,13 @@ import type { NextApiRequest, NextApiResponse } from "next" import bcrypt from "bcrypt" -import sendError from "../../lib/backend/components/sendError" -import sendResponse from "../../lib/backend/components/sendResponse" -import getUserFromBody from "../../lib/backend/components/getUserFromBody" -import getTokenFromCookie from "../../lib/backend/components/getTokenFromCookie" -import checkTokenIsValid from "../../lib/backend/components/checkTokenIsValid" -import getTokenDB from "../../lib/backend/components/getTokenDB" -import updatePlayerDB from "../../lib/backend/components/updatePlayerDB" -import getPlayerByIdDB from "../../lib/backend/components/getPlayerByIdDB" +import sendError from "@backend/components/sendError" +import sendResponse from "@backend/components/sendResponse" +import getUserFromBody from "@backend/components/getUserFromBody" +import getTokenFromCookie from "@backend/components/getTokenFromCookie" +import checkTokenIsValid from "@backend/components/checkTokenIsValid" +import getTokenDB from "@backend/components/getTokenDB" +import updatePlayerDB from "@backend/components/updatePlayerDB" +import getPlayerByIdDB from "@backend/components/getPlayerByIdDB" interface Data { registered: boolean diff --git a/leaky-ships/pages/api/remove.ts b/leaky-ships/pages/api/user/remove.ts similarity index 67% rename from leaky-ships/pages/api/remove.ts rename to leaky-ships/pages/api/user/remove.ts index 5a69d18..04e9ab3 100644 --- a/leaky-ships/pages/api/remove.ts +++ b/leaky-ships/pages/api/user/remove.ts @@ -1,10 +1,10 @@ import { NextApiRequest, NextApiResponse } from "next" -import getPlayerByNameDB from "../../lib/backend/components/getPlayerByNameDB" -import checkPasswordIsValid from "../../lib/backend/components/checkPasswordIsValid" -import sendResponse from "../../lib/backend/components/sendResponse" -import prisma from "../../lib/prisma" -import sendError from "../../lib/backend/components/sendError" -import getUserFromBody from "../../lib/backend/components/getUserFromBody" +import getPlayerByNameDB from "@backend/components/getPlayerByNameDB" +import checkPasswordIsValid from "@backend/components/checkPasswordIsValid" +import sendResponse from "@backend/components/sendResponse" +import prisma from "@lib/prisma" +import sendError from "@backend/components/sendError" +import getUserFromBody from "@backend/components/getUserFromBody" interface Data { loggedIn: boolean diff --git a/leaky-ships/pages/api/ws.ts b/leaky-ships/pages/api/ws.ts index 3af9995..25db49b 100644 --- a/leaky-ships/pages/api/ws.ts +++ b/leaky-ships/pages/api/ws.ts @@ -2,7 +2,7 @@ import type { NextApiRequest } from "next" import type { NextApiResponseWithSocket } from "../../interfaces/NextApiSocket" import { Server } from "socket.io" import jwt from "jsonwebtoken" -import prisma from "../../lib/prisma" +import prisma from "@lib/prisma" export interface ServerToClientEvents { // noArg: () => void diff --git a/leaky-ships/pages/dev/index.tsx b/leaky-ships/pages/dev/index.tsx index 30359fb..2af864f 100644 --- a/leaky-ships/pages/dev/index.tsx +++ b/leaky-ships/pages/dev/index.tsx @@ -6,6 +6,7 @@ import { useState } from "react" import Logo from "../../components/Logo" import BurgerMenu from "../../components/BurgerMenu" import OptionButton from "../../components/OptionButton" +import getAccessToken from "@lib/frontend/getAccessToken" export default function Home() { const [heWantsToPlay, setHeWantsToPlay] = useState(false) @@ -23,7 +24,7 @@ export default function Home() { />
- Raum erstellen + + getAccessToken().then((token) => + fetch("/api/create", { + method: "GET", + }) + ) + } + icon={faPlus} + > + Raum erstellen + Raum beitreten Zuschauen
diff --git a/leaky-ships/pages/dev/socket.tsx b/leaky-ships/pages/dev/socket.tsx index 6fb62aa..15a9ce6 100644 --- a/leaky-ships/pages/dev/socket.tsx +++ b/leaky-ships/pages/dev/socket.tsx @@ -1,6 +1,6 @@ import { ChangeEventHandler, useEffect, useState } from "react" import { io, Socket } from "socket.io-client" -import getAccessToken from "../../lib/frontend/getAccessToken" +import getAccessToken from "@lib/frontend/getAccessToken" import type { ClientToServerEvents, ServerToClientEvents } from "../api/ws" let socket: Socket diff --git a/leaky-ships/tsconfig.json b/leaky-ships/tsconfig.json index 99710e8..b0e4a74 100644 --- a/leaky-ships/tsconfig.json +++ b/leaky-ships/tsconfig.json @@ -13,7 +13,11 @@ "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve", - "incremental": true + "incremental": true, + "paths": { + "@lib/*": ["./lib/*"], + "@backend/*": ["./lib/backend/*"] + } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], "exclude": ["node_modules"]