From fe53185779347d2be12b38ad8333b037f8f7503c Mon Sep 17 00:00:00 2001 From: Aelita4 Date: Sun, 24 Dec 2023 23:25:57 +0100 Subject: [PATCH] Move database-related files to "db" subdir --- src/lib/{ => db}/accessTokens.ts | 3 +-- src/lib/{ => db}/mongodb.ts | 0 src/lib/{ => db}/users.ts | 6 +++--- src/lib/utils/validateAccessToken.ts | 2 +- src/pages/admin/accessTokens.astro | 4 +++- src/pages/api/auth/generateAccessToken.ts | 2 +- src/pages/game/index.astro | 5 ++--- src/pages/login.astro | 2 +- src/pages/register.astro | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) rename src/lib/{ => db}/accessTokens.ts (91%) rename src/lib/{ => db}/mongodb.ts (100%) rename src/lib/{ => db}/users.ts (89%) diff --git a/src/lib/accessTokens.ts b/src/lib/db/accessTokens.ts similarity index 91% rename from src/lib/accessTokens.ts rename to src/lib/db/accessTokens.ts index f3d236e..da09682 100644 --- a/src/lib/accessTokens.ts +++ b/src/lib/db/accessTokens.ts @@ -1,5 +1,5 @@ import { AccessTokens } from './mongodb'; -import type AccessToken from '../types/AccessToken'; +import type AccessToken from '../../types/AccessToken'; import { createHash } from 'crypto'; export const createAccessToken = async (accessToken: AccessToken) => { @@ -38,6 +38,5 @@ export const getAllAccessTokens = async () => { const accessTokens = await AccessTokens(); const arrayOfTokens = await accessTokens.find({}).toArray() as AccessToken[]; let arr = [master].concat(arrayOfTokens); - // return accessTokens.find({}).toArray() as Promise; return arr; } \ No newline at end of file diff --git a/src/lib/mongodb.ts b/src/lib/db/mongodb.ts similarity index 100% rename from src/lib/mongodb.ts rename to src/lib/db/mongodb.ts diff --git a/src/lib/users.ts b/src/lib/db/users.ts similarity index 89% rename from src/lib/users.ts rename to src/lib/db/users.ts index d8c9f77..c4be9a4 100644 --- a/src/lib/users.ts +++ b/src/lib/db/users.ts @@ -1,6 +1,6 @@ -import { Users } from './mongodb'; -import type User from '../types/User'; -import type Resources from '../types/Resources'; +import { Users } from '../db/mongodb'; +import type User from '../../types/User'; +import type Resources from '../../types/Resources'; export const getAllUsers = async () => { const users = await Users(); diff --git a/src/lib/utils/validateAccessToken.ts b/src/lib/utils/validateAccessToken.ts index b45d201..c0a14a4 100644 --- a/src/lib/utils/validateAccessToken.ts +++ b/src/lib/utils/validateAccessToken.ts @@ -1,5 +1,5 @@ import type AccessToken from "../../types/AccessToken"; -import { getAccessToken } from "../accessTokens"; +import { getAccessToken } from "../db/accessTokens"; export default async function validateAccessToken(request: Request): Promise { const accessToken = request.url.split("?")[1]?.split("&").filter((x) => x.split("=")[0] === "token")[0].split("=")[1]; diff --git a/src/pages/admin/accessTokens.astro b/src/pages/admin/accessTokens.astro index 3872882..b6693b2 100644 --- a/src/pages/admin/accessTokens.astro +++ b/src/pages/admin/accessTokens.astro @@ -1,6 +1,6 @@ --- import Layout from "../../layouts/Layout.astro"; -import { getAllAccessTokens } from "../../lib/accessTokens"; +import { getAllAccessTokens } from "../../lib/db/accessTokens"; const tokens = await getAllAccessTokens(); @@ -43,5 +43,7 @@ const type = { \ No newline at end of file diff --git a/src/pages/api/auth/generateAccessToken.ts b/src/pages/api/auth/generateAccessToken.ts index 6f06074..641a103 100644 --- a/src/pages/api/auth/generateAccessToken.ts +++ b/src/pages/api/auth/generateAccessToken.ts @@ -1,7 +1,7 @@ import { randomBytes, createHash } from "crypto"; import type { APIRoute } from "astro"; import type AccessToken from "../../../types/AccessToken"; -import { createAccessToken } from "../../../lib/accessTokens"; +import { createAccessToken } from "../../../lib/db/accessTokens"; export const POST: APIRoute = async({ request }) => { const data = await request.json().catch(() => {return new Response( diff --git a/src/pages/game/index.astro b/src/pages/game/index.astro index 6946d9a..b90307d 100644 --- a/src/pages/game/index.astro +++ b/src/pages/game/index.astro @@ -1,7 +1,7 @@ --- import Layout from '../../layouts/Layout.astro'; import NavBar from '../../components/NavBar.astro'; -import { getUserResources, updateUserResources } from '../../lib/users'; +import { getUserResources, updateUserResources } from '../../lib/db/users'; import { getHighestWeightedLanguage, getLocales } from '../../lib/lang/langDriver'; String.prototype.format = function() { @@ -23,12 +23,11 @@ await updateUserResources(username, { const langResources = await getLocales(getHighestWeightedLanguage(Astro.request.headers.get('accept-language')), 'resources'); const langGame = await getLocales(getHighestWeightedLanguage(Astro.request.headers.get('accept-language')), 'game'); -// console.log(resources); --- - {langGame['Link_logout']} + {langGame['Link_logout']}

{langGame['Header_user'].format(username)}

  • {langResources['Label_coal']}: {resources.coal * 2}
    • diff --git a/src/pages/login.astro b/src/pages/login.astro index 03a956b..6518faa 100644 --- a/src/pages/login.astro +++ b/src/pages/login.astro @@ -2,7 +2,7 @@ import Layout from '../layouts/Layout.astro'; import NavBar from '../components/NavBar.astro'; -import { getUserByNickOrEmail } from '../lib/users'; +import { getUserByNickOrEmail } from '../lib/db/users'; import { compare } from 'bcrypt'; diff --git a/src/pages/register.astro b/src/pages/register.astro index 167b0a7..72c95d3 100644 --- a/src/pages/register.astro +++ b/src/pages/register.astro @@ -2,7 +2,7 @@ import Layout from '../layouts/Layout.astro'; import NavBar from '../components/NavBar.astro'; -import { createUser } from '../lib/users'; +import { createUser } from '../lib/db/users'; import type User from '../types/User'; import bcrypt from 'bcrypt';