From c700e6fb32a4be2f4d97ceecd29c4eb72178e506 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Mon, 12 Aug 2024 16:35:43 -0700 Subject: [PATCH] feat: move to modules --- src/controllers/{ => api}/book.ts | 0 src/controllers/{ => api}/random.ts | 2 +- src/controllers/{ => api}/read.ts | 0 src/controllers/{ => api}/verses.ts | 2 +- src/controllers/{ => api}/version.ts | 0 src/controllers/{auth.ts => auth/index.ts} | 0 src/controllers/{ => auth}/user.ts | 2 +- src/controllers/notes.ts | 2 +- src/mod.ts | 18 +++++++++--------- src/routers/{ => api}/book.ts | 2 +- src/routers/{ => api}/notes.ts | 0 src/routers/{ => api}/read.ts | 4 ++-- src/routers/{ => api}/verses.ts | 2 +- src/routers/{auth.ts => auth/index.ts} | 2 +- src/routers/{ => auth}/user.ts | 2 +- src/utils/book.ts | 2 +- src/validators/version.ts | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) rename src/controllers/{ => api}/book.ts (100%) rename src/controllers/{ => api}/random.ts (95%) rename src/controllers/{ => api}/read.ts (100%) rename src/controllers/{ => api}/verses.ts (95%) rename src/controllers/{ => api}/version.ts (100%) rename src/controllers/{auth.ts => auth/index.ts} (100%) rename src/controllers/{ => auth}/user.ts (95%) rename src/routers/{ => api}/book.ts (91%) rename src/routers/{ => api}/notes.ts (100%) rename src/routers/{ => api}/read.ts (97%) rename src/routers/{ => api}/verses.ts (93%) rename src/routers/{auth.ts => auth/index.ts} (94%) rename src/routers/{ => auth}/user.ts (68%) diff --git a/src/controllers/book.ts b/src/controllers/api/book.ts similarity index 100% rename from src/controllers/book.ts rename to src/controllers/api/book.ts diff --git a/src/controllers/random.ts b/src/controllers/api/random.ts similarity index 95% rename from src/controllers/random.ts rename to src/controllers/api/random.ts index e8f3603..a04b7eb 100644 --- a/src/controllers/random.ts +++ b/src/controllers/api/random.ts @@ -1,4 +1,4 @@ -import { getVersionTable, testaments } from "$/controllers/read.ts"; +import { getVersionTable, testaments } from "./read.ts"; import { Context } from "hono"; import { connect } from "$/database/index.ts"; import { Version } from "$/constants.ts"; diff --git a/src/controllers/read.ts b/src/controllers/api/read.ts similarity index 100% rename from src/controllers/read.ts rename to src/controllers/api/read.ts diff --git a/src/controllers/verses.ts b/src/controllers/api/verses.ts similarity index 95% rename from src/controllers/verses.ts rename to src/controllers/api/verses.ts index 4820aca..ffd40e7 100644 --- a/src/controllers/verses.ts +++ b/src/controllers/api/verses.ts @@ -1,5 +1,5 @@ import { connect } from "$/database/index.ts"; -import { toValidName } from "$/controllers/read.ts"; +import { toValidName } from "$/controllers/api/read.ts"; export const GetAcrossVersions = async (book: string, chapter: string, verse_num: string) => { diff --git a/src/controllers/version.ts b/src/controllers/api/version.ts similarity index 100% rename from src/controllers/version.ts rename to src/controllers/api/version.ts diff --git a/src/controllers/auth.ts b/src/controllers/auth/index.ts similarity index 100% rename from src/controllers/auth.ts rename to src/controllers/auth/index.ts diff --git a/src/controllers/user.ts b/src/controllers/auth/user.ts similarity index 95% rename from src/controllers/user.ts rename to src/controllers/auth/user.ts index 617bf1c..9db197e 100644 --- a/src/controllers/user.ts +++ b/src/controllers/auth/user.ts @@ -1,7 +1,7 @@ import { Context } from "hono"; import { getUser } from "$/middlewares/user.ts"; import { z } from "zod"; -import { getCookie } from "jsr:@hono/hono/cookie"; +import { getCookie } from "hono/cookie"; export const getUserInfo = async (c: Context) => { const header = c.req.header().authorization; diff --git a/src/controllers/notes.ts b/src/controllers/notes.ts index e25afa2..e15da3e 100644 --- a/src/controllers/notes.ts +++ b/src/controllers/notes.ts @@ -1,7 +1,7 @@ import { Context } from "hono"; import { getUser } from "$/middlewares/user.ts"; import { getToken } from "$/middlewares/authorization.ts"; -import { getCookie } from "jsr:@hono/hono/cookie"; +import { getCookie } from "hono/cookie"; const getNotes = async (c: Context): Promise => { const kv = await Deno.openKv(); diff --git a/src/mod.ts b/src/mod.ts index 79f9b72..331f054 100644 --- a/src/mod.ts +++ b/src/mod.ts @@ -1,16 +1,16 @@ import { Hono } from "hono"; import "https://deno.land/x/dotenv@v3.2.2/load.ts"; import { cors } from "jsr:@hono/hono/cors"; -import router_book from "$/routers/book.ts"; -import router_auth from "$/routers/auth.ts"; -import router_notes from "$/routers/notes.ts"; +import router_book from "$/routers/api/book.ts"; +import router_auth from "$/routers/auth/index.ts"; +import router_notes from "$/routers/api/notes.ts"; import { isAuthenticated } from "$/middlewares/authorization.ts"; -import router_user from "$/routers/user.ts"; -import { getBooks, getTestamentBooks } from "$/controllers/book.ts"; -import { deleteUser } from "$/controllers/user.ts"; -import { router_read } from "$/routers/read.ts"; -import { getVersions, versions } from "$/controllers/version.ts"; -import { router_verses } from "$/routers/verses.ts"; +import router_user from "$/routers/auth/user.ts"; +import { getBooks, getTestamentBooks } from "$/controllers/api/book.ts"; +import { deleteUser } from "$/controllers/auth/user.ts"; +import { router_read } from "$/routers/api/read.ts"; +import { getVersions, versions } from "$/controllers/api/version.ts"; +import { router_verses } from "$/routers/api/verses.ts"; const DEV_ORIGINS: string[] = JSON.parse(Deno.env.get("ORIGINS") || "[]"); const origin = [ diff --git a/src/routers/book.ts b/src/routers/api/book.ts similarity index 91% rename from src/routers/book.ts rename to src/routers/api/book.ts index 710faeb..e7f19d2 100644 --- a/src/routers/book.ts +++ b/src/routers/api/book.ts @@ -1,6 +1,6 @@ import { Hono } from "hono"; import { validator } from "jsr:@hono/hono/validator"; -import { getBookInfo } from "$/controllers/book.ts"; +import { getBookInfo } from "$/controllers/api/book.ts"; import { invalidBookError } from "$/validators/book.ts"; import { existBook, getNameByAbbreviation, isAbbreviation } from "$/utils/book.ts"; diff --git a/src/routers/notes.ts b/src/routers/api/notes.ts similarity index 100% rename from src/routers/notes.ts rename to src/routers/api/notes.ts diff --git a/src/routers/read.ts b/src/routers/api/read.ts similarity index 97% rename from src/routers/read.ts rename to src/routers/api/read.ts index cd3569a..e2f8fe0 100644 --- a/src/routers/read.ts +++ b/src/routers/api/read.ts @@ -6,8 +6,8 @@ import { getOneVerseVersion, SearchVersion, validVersion, -} from "$/controllers/read.ts"; -import { randomVerse } from "$/controllers/random.ts"; +} from "$/controllers/api/read.ts"; +import { randomVerse } from "$/controllers/api/random.ts"; import { invalidVersionResponse } from "$/validators/version.ts"; import { invalidBookError, invalidChapterError, validVerse } from "$/validators/book.ts"; import { Query, validQueries } from "$/validators/search.ts"; diff --git a/src/routers/verses.ts b/src/routers/api/verses.ts similarity index 93% rename from src/routers/verses.ts rename to src/routers/api/verses.ts index 3ce0d95..2e94ec2 100644 --- a/src/routers/verses.ts +++ b/src/routers/api/verses.ts @@ -2,7 +2,7 @@ import { Hono } from "hono"; import { existBook, getInfoBook } from "$/utils/book.ts"; import { invalidBookError, invalidChapterError, validVerse } from "$/validators/book.ts"; import { validator } from "jsr:@hono/hono/validator"; -import { GetAcrossVersions } from "$/controllers/verses.ts"; +import { GetAcrossVersions } from "$/controllers/api/verses.ts"; export const router_verses = new Hono(); diff --git a/src/routers/auth.ts b/src/routers/auth/index.ts similarity index 94% rename from src/routers/auth.ts rename to src/routers/auth/index.ts index fa84a0d..0ea73c4 100644 --- a/src/routers/auth.ts +++ b/src/routers/auth/index.ts @@ -1,5 +1,5 @@ import { Hono } from "hono"; -import { login, logout, signup } from "$/controllers/auth.ts"; +import { login, logout, signup } from "$/controllers/auth/index.ts"; import { z } from "zod"; import { validator } from "jsr:@hono/hono/validator"; diff --git a/src/routers/user.ts b/src/routers/auth/user.ts similarity index 68% rename from src/routers/user.ts rename to src/routers/auth/user.ts index 3e2fae1..4a1eb78 100644 --- a/src/routers/user.ts +++ b/src/routers/auth/user.ts @@ -1,5 +1,5 @@ import { Hono } from "hono"; -import { getUserInfo } from "$/controllers/user.ts"; +import { getUserInfo } from "$/controllers/auth/user.ts"; const router_user = new Hono(); diff --git a/src/utils/book.ts b/src/utils/book.ts index 9243389..672a398 100644 --- a/src/utils/book.ts +++ b/src/utils/book.ts @@ -1,5 +1,5 @@ import { books } from "$/constants.ts"; -import { format, toValidName } from "$/controllers/read.ts"; +import { format, toValidName } from "$/controllers/api/read.ts"; const oldTestamentbooks = books.filter((b) => { return b.testament === "Antiguo Testamento"; diff --git a/src/validators/version.ts b/src/validators/version.ts index 38932f3..63919d8 100644 --- a/src/validators/version.ts +++ b/src/validators/version.ts @@ -1,4 +1,4 @@ -import { getVersions, validVersion } from "$/controllers/read.ts"; +import { getVersions, validVersion } from "$/controllers/api/read.ts"; import { Context } from "hono"; export const invalidVersionResponse = (c: Context, version: string) => {