Use plurals for directories names

octet-stream · Feb 28, 2024 · 5ae1a68 · 5ae1a68
1 parent 35844ba
commit 5ae1a68
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 28 deletions.
diff --git a/...napshot-next-mikro-orm-trpc-template.json → ...napshot-next-mikro-orm-trpc-template.json b/...napshot-next-mikro-orm-trpc-template.json → ...napshot-next-mikro-orm-trpc-template.json
diff --git a/db/migration/Migration20230130005748.ts → db/migrations/Migration20230130005748.ts b/db/migration/Migration20230130005748.ts → db/migrations/Migration20230130005748.ts
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -7,8 +7,8 @@ import type {FC} from "react"
 import Head from "next/head"
 import isString from "lodash/isString"
 
-import "styles/tailwind.css"
-import "styles/global.css"
+import "../styles/tailwind.css"
+import "../styles/global.css"
 
 import type {SerializedPageDataProps} from "../lib/types/PageDataProps"
 

diff --git a/src/pages/view/[id].tsx b/src/pages/view/[id].tsx
@@ -4,23 +4,23 @@ import type {FC} from "react"
 
 import Head from "next/head"
 
-import {getPageDataStaticProps} from "lib/utils/getPageDataStaticProps"
-import {patchStaticPaths} from "lib/utils/patchStaticPaths"
-import type {PageDataProps} from "lib/types/PageDataProps"
+import {getPageDataStaticProps} from "../../lib/utils/getPageDataStaticProps"
+import {patchStaticPaths} from "../../lib/utils/patchStaticPaths"
+import type {PageDataProps} from "../../lib/types/PageDataProps"
 
-import {Note} from "server/db/entity"
-import {getORM} from "server/lib/db/orm"
-import {router} from "server/trpc/router"
-import type {ONoteOutput} from "server/trpc/types/note/NoteOutput"
+import {Note} from "../../server/db/entities"
 
-import {NoteStateContextProvider} from "contexts/NoteStateContext"
-import {FakeNotesContext} from "contexts/FakeNotesContext"
+import {getORM} from "../../server/lib/db/orm"
+import {router} from "../../server/trpc/router"
+import type {ONoteOutput} from "../../server/trpc/types/note/NoteOutput"
 
-import {BaseLayout} from "layouts/BaseLayout"
+import {NoteStateContextProvider} from "../../contexts/NoteStateContext"
+import {FakeNotesContext} from "../../contexts/FakeNotesContext"
 
-import {NoteCreateModal} from "components/NoteModal"
+import {BaseLayout} from "../../layouts/BaseLayout"
 
-import {NoteView} from "views/NoteView/NoteView"
+import {NoteCreateModal} from "../../components/NoteModal"
+import {NoteView} from "../../views/NoteView"
 
 export const getStaticPaths = patchStaticPaths(async () => {
   const orm = await getORM()

diff --git a/src/server/db/entity/Completion.ts → src/server/db/entities/Completion.ts b/src/server/db/entity/Completion.ts → src/server/db/entities/Completion.ts
diff --git a/src/server/db/entity/Node.ts → src/server/db/entities/Node.ts b/src/server/db/entity/Node.ts → src/server/db/entities/Node.ts
diff --git a/src/server/db/entity/Note.ts → src/server/db/entities/Note.ts b/src/server/db/entity/Note.ts → src/server/db/entities/Note.ts
diff --git a/src/server/db/entity/Record.ts → src/server/db/entities/Record.ts b/src/server/db/entity/Record.ts → src/server/db/entities/Record.ts
diff --git a/src/server/db/entity/index.ts → src/server/db/entities/index.ts b/src/server/db/entity/index.ts → src/server/db/entities/index.ts
diff --git a/src/server/lib/db/config.ts b/src/server/lib/db/config.ts
@@ -3,7 +3,7 @@ import {resolve, join} from "node:path"
 import {defineConfig} from "@mikro-orm/mysql"
 import {z, ZodIssueCode} from "zod"
 
-import {Note, Completion} from "server/db/entity"
+import * as entities from "../../db/entities"
 
 const ROOT = resolve("db")
 
@@ -45,11 +45,11 @@ export const getConfig = async () => {
 
     implicitTransactions: true,
     migrations: {
-      path: join(ROOT, "migration")
+      path: join(ROOT, "migrations")
     },
     seeder: {
-      path: join(ROOT, "seed")
+      path: join(ROOT, "seeders")
     },
-    entities: [Note, Completion]
+    entities: Object.values(entities)
   })
 }
diff --git a/src/server/trpc/routes/note/create.ts b/src/server/trpc/routes/note/create.ts
@@ -3,7 +3,7 @@ import {procedure} from "../../procedures/server"
 import {NoteCreateInput} from "../../types/note/NoteCreateInput"
 import {NoteOutput} from "../../types/note/NoteOutput"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 export const create = procedure
   .input(NoteCreateInput)

diff --git a/src/server/trpc/routes/note/getById.ts b/src/server/trpc/routes/note/getById.ts
@@ -4,7 +4,7 @@ import {NoteOutput} from "../../types/note/NoteOutput"
 import {notFound} from "../../errors/notFound"
 import {Node} from "../../types/common/Node"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 export const getById = procedure
   .input(Node)

diff --git a/src/server/trpc/routes/note/remove.test.ts b/src/server/trpc/routes/note/remove.test.ts
@@ -7,7 +7,7 @@ import {withTRPC} from "../../../__macros__/withTRPC"
 import {setup, cleanup} from "../../../__helpers__/database"
 import type {WithTRPCContext} from "../../../__macros__/withTRPC"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 const test = anyTest as TestFn<WithTRPCContext>
 

diff --git a/src/server/trpc/routes/note/remove.ts b/src/server/trpc/routes/note/remove.ts
@@ -5,7 +5,7 @@ import {RemoveOutput} from "../../types/note/RemoveOutput"
 import {NoteRemoveInput} from "../../types/note/NoteRemoveInput"
 import {NoteStatus} from "../../types/common/NoteStatus"
 
-import {Note} from "../../../db/entity/Note"
+import {Note} from "../../../db/entities"
 
 export const remove = procedure
   .input(NoteRemoveInput)

diff --git a/src/server/trpc/routes/note/restore.test.ts b/src/server/trpc/routes/note/restore.test.ts
@@ -8,7 +8,7 @@ import {setup, cleanup} from "../../../__helpers__/database"
 import type {WithTRPCContext} from "../../../__macros__/withTRPC"
 
 import {NoteStatus} from "../../types/common/NoteStatus"
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 const test = anyTest as TestFn<WithTRPCContext>
 

diff --git a/src/server/trpc/routes/note/restore.ts b/src/server/trpc/routes/note/restore.ts
@@ -5,7 +5,7 @@ import {procedure} from "../../procedures/server"
 import {notFound} from "../../errors/notFound"
 import {Node} from "../../types/common/Node"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 export const restore = procedure
   .input(Node)

diff --git a/src/server/trpc/routes/note/update.test.ts b/src/server/trpc/routes/note/update.test.ts
@@ -8,7 +8,7 @@ import {setup, cleanup} from "../../../__helpers__/database"
 import type {WithTRPCContext} from "../../../__macros__/withTRPC"
 
 import {NoteStatus} from "../../types/common/NoteStatus"
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 const test = anyTest as TestFn<WithTRPCContext>
 

diff --git a/src/server/trpc/routes/note/update.ts b/src/server/trpc/routes/note/update.ts
@@ -6,7 +6,7 @@ import {notFound} from "../../errors/notFound"
 import {NoteUpdateInput} from "../../types/note/NoteUpdateInput"
 import {NoteOutput} from "../../types/note/NoteOutput"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 export const update = procedure
   .input(NoteUpdateInput)

diff --git a/src/server/trpc/routes/notes/list.test.ts b/src/server/trpc/routes/notes/list.test.ts
@@ -8,7 +8,7 @@ import type {WithTRPCContext} from "../../../__macros__/withTRPC"
 
 import {runIsolatied} from "../../../lib/db/orm"
 
-import {Note} from "../../../db/entity"
+import {Note} from "../../../db/entities"
 
 const test = anyTest as TestFn<WithTRPCContext>
 

diff --git a/src/server/trpc/routes/notes/list.ts b/src/server/trpc/routes/notes/list.ts
@@ -6,7 +6,7 @@ import {NotesPageInput} from "../../types/note/NotesPageInput"
 import {NotesPageOutput} from "../../types/note/NotesPageOutput"
 import {NoteStatusFilter} from "../../types/common/NoteStatusFilter"
 
-import {Note} from "../../../db/entity/Note"
+import {Note} from "../../../db/entities"
 
 export const list = procedure
   .use(withPageAssert)