From 3efb87bcd8462f8c7685426f4fb67158f6360929 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Sat, 7 Mar 2026 23:47:38 +0100 Subject: [PATCH] Refactor --- {src/app => app}/cell.module.scss | 0 {src/app => app}/cell.scss | 0 {src/app => app}/cell.tsx | 0 {src/app => app}/globals.scss | 0 {src/app => app}/input-form.module.scss | 0 {src/app => app}/input-form.scss | 0 {src/app => app}/input-form.tsx | 10 +++------- {src/app => app}/layout.tsx | 10 ++++------ {src/app => app}/maze.module.css | 0 {src/app => app}/maze.tsx | 4 ++-- {src/app => app}/message-banner.module.css | 0 {src/app => app}/message-banner.tsx | 2 +- {src/app => app}/model/coordinates.ts | 0 {src/app => app}/model/maze.ts | 0 {src/app => app}/page.module.scss | 0 {src/app => app}/page.tsx | 0 {src/app => app}/state/action.ts | 0 {src/app => app}/state/reducer.ts | 2 +- {src/app => app}/state/state.ts | 0 {src/app => app}/state/userpathhandler.ts | 0 {src/app => app}/validating-input-field.tsx | 0 next-env.d.ts | 2 +- package.json | 3 ++- {src/app => public}/favicon.ico | Bin 24 files changed, 14 insertions(+), 19 deletions(-) rename {src/app => app}/cell.module.scss (100%) rename {src/app => app}/cell.scss (100%) rename {src/app => app}/cell.tsx (100%) rename {src/app => app}/globals.scss (100%) rename {src/app => app}/input-form.module.scss (100%) rename {src/app => app}/input-form.scss (100%) rename {src/app => app}/input-form.tsx (96%) rename {src/app => app}/layout.tsx (67%) rename {src/app => app}/maze.module.css (100%) rename {src/app => app}/maze.tsx (90%) rename {src/app => app}/message-banner.module.css (100%) rename {src/app => app}/message-banner.tsx (95%) rename {src/app => app}/model/coordinates.ts (100%) rename {src/app => app}/model/maze.ts (100%) rename {src/app => app}/page.module.scss (100%) rename {src/app => app}/page.tsx (100%) rename {src/app => app}/state/action.ts (100%) rename {src/app => app}/state/reducer.ts (97%) rename {src/app => app}/state/state.ts (100%) rename {src/app => app}/state/userpathhandler.ts (100%) rename {src/app => app}/validating-input-field.tsx (100%) rename {src/app => public}/favicon.ico (100%) diff --git a/src/app/cell.module.scss b/app/cell.module.scss similarity index 100% rename from src/app/cell.module.scss rename to app/cell.module.scss diff --git a/src/app/cell.scss b/app/cell.scss similarity index 100% rename from src/app/cell.scss rename to app/cell.scss diff --git a/src/app/cell.tsx b/app/cell.tsx similarity index 100% rename from src/app/cell.tsx rename to app/cell.tsx diff --git a/src/app/globals.scss b/app/globals.scss similarity index 100% rename from src/app/globals.scss rename to app/globals.scss diff --git a/src/app/input-form.module.scss b/app/input-form.module.scss similarity index 100% rename from src/app/input-form.module.scss rename to app/input-form.module.scss diff --git a/src/app/input-form.scss b/app/input-form.scss similarity index 100% rename from src/app/input-form.scss rename to app/input-form.scss diff --git a/src/app/input-form.tsx b/app/input-form.tsx similarity index 96% rename from src/app/input-form.tsx rename to app/input-form.tsx index bd4538c..4b427b0 100644 --- a/src/app/input-form.tsx +++ b/app/input-form.tsx @@ -8,12 +8,8 @@ import { } from "./state/action.ts"; import styles from "./input-form.module.scss"; import "./input-form.scss"; -import {State} from "@/app/state/state.ts"; -import { - ValidatingInputNumberField, - ValidatingInputRegExpField, - ValidatorFunction -} from "@/app/validating-input-field.tsx"; +import {State} from "./state/state.ts"; +import {ValidatingInputNumberField, ValidatingInputRegExpField, ValidatorFunction} from "./validating-input-field.tsx"; export default function InputForm({state, dispatch}: { state: State, @@ -39,7 +35,7 @@ export default function InputForm({state, dispatch}: { dispatch(actionLoadingFailed(reason)); }); }; - const validateSizeInput: ValidatorFunction = value => { + const validateSizeInput: ValidatorFunction = (value: string) => { const numberValue = Number(value); if (isNaN(numberValue) || "" === value || (Math.floor(numberValue) !== numberValue)) { return { diff --git a/src/app/layout.tsx b/app/layout.tsx similarity index 67% rename from src/app/layout.tsx rename to app/layout.tsx index 7cbe3d5..f5b9e79 100644 --- a/src/app/layout.tsx +++ b/app/layout.tsx @@ -4,17 +4,15 @@ import "./globals.scss"; export const metadata: Metadata = { title: "A-Maze-R! Create your own Maze!", description: "A Maze Generator by fritteli", - icons: "./favicon.ico" + icons: "/favicon.ico" }; -export default function RootLayout({children}: Readonly<{ +export default function RootLayout({children}: { children: React.ReactNode; -}>) { +}) { return ( - - {children} - + {children} ); } diff --git a/src/app/maze.module.css b/app/maze.module.css similarity index 100% rename from src/app/maze.module.css rename to app/maze.module.css diff --git a/src/app/maze.tsx b/app/maze.tsx similarity index 90% rename from src/app/maze.tsx rename to app/maze.tsx index bab0423..2fdf410 100644 --- a/src/app/maze.tsx +++ b/app/maze.tsx @@ -1,8 +1,8 @@ import Cell from "./cell.tsx"; import styles from "./maze.module.css"; -import {State} from "@/app/state/state.ts"; +import {State} from "./state/state.ts"; import {ActionDispatch, JSX} from "react"; -import {Action} from "@/app/state/action.ts"; +import {Action} from "./state/action.ts"; export default function Maze({state, dispatch}: { diff --git a/src/app/message-banner.module.css b/app/message-banner.module.css similarity index 100% rename from src/app/message-banner.module.css rename to app/message-banner.module.css diff --git a/src/app/message-banner.tsx b/app/message-banner.tsx similarity index 95% rename from src/app/message-banner.tsx rename to app/message-banner.tsx index a33eaf8..ae07173 100644 --- a/src/app/message-banner.tsx +++ b/app/message-banner.tsx @@ -1,6 +1,6 @@ import {Action, actionClosedMessageBanner} from "./state/action.ts"; import styles from "./message-banner.module.css"; -import {State} from "@/app/state/state.ts"; +import {State} from "./state/state.ts"; import {ActionDispatch} from "react"; export default function MessageBanner({state, dispatch}: diff --git a/src/app/model/coordinates.ts b/app/model/coordinates.ts similarity index 100% rename from src/app/model/coordinates.ts rename to app/model/coordinates.ts diff --git a/src/app/model/maze.ts b/app/model/maze.ts similarity index 100% rename from src/app/model/maze.ts rename to app/model/maze.ts diff --git a/src/app/page.module.scss b/app/page.module.scss similarity index 100% rename from src/app/page.module.scss rename to app/page.module.scss diff --git a/src/app/page.tsx b/app/page.tsx similarity index 100% rename from src/app/page.tsx rename to app/page.tsx diff --git a/src/app/state/action.ts b/app/state/action.ts similarity index 100% rename from src/app/state/action.ts rename to app/state/action.ts diff --git a/src/app/state/reducer.ts b/app/state/reducer.ts similarity index 97% rename from src/app/state/reducer.ts rename to app/state/reducer.ts index da97b26..2c3e524 100644 --- a/src/app/state/reducer.ts +++ b/app/state/reducer.ts @@ -9,7 +9,7 @@ import { ID_ACTION_STARTED_LOADING, ID_ACTION_TOGGLED_SHOW_SOLUTION } from "./action.ts"; -import Maze from "@/app/model/maze.ts"; +import Maze from "../model/maze.ts"; export default function reduce(state: State, action: Action): State { switch (action.type) { diff --git a/src/app/state/state.ts b/app/state/state.ts similarity index 100% rename from src/app/state/state.ts rename to app/state/state.ts diff --git a/src/app/state/userpathhandler.ts b/app/state/userpathhandler.ts similarity index 100% rename from src/app/state/userpathhandler.ts rename to app/state/userpathhandler.ts diff --git a/src/app/validating-input-field.tsx b/app/validating-input-field.tsx similarity index 100% rename from src/app/validating-input-field.tsx rename to app/validating-input-field.tsx diff --git a/next-env.d.ts b/next-env.d.ts index 9edff1c..c4b7818 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,6 @@ /// /// -import "./.next/types/routes.d.ts"; +import "./.next/dev/types/routes.d.ts"; // NOTE: This file should not be edited // see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/package.json b/package.json index e352429..cf4c1db 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "dev": "next dev", "build": "next build", "start": "next start", - "lint": "eslint" + "lint": "eslint", + "lint:fix": "eslint --fix" }, "dependencies": { "next": "16.1.6", diff --git a/src/app/favicon.ico b/public/favicon.ico similarity index 100% rename from src/app/favicon.ico rename to public/favicon.ico