From 4c35560f6cdd773a5ccfefb5f79b22cc5d2034c5 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 19 Oct 2024 04:48:07 -0600 Subject: [PATCH] Chore: format --- astro.config.ts | 6 +++--- database_assets/com.nebula.retro/retro.css | 4 ++-- server/marketplace.ts | 24 ++++++++++++---------- server/server.ts | 6 +++--- src/components/Header.astro | 2 +- src/pages/[lang]/catalog/[...page].astro | 2 +- tailwind.config.mjs | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/astro.config.ts b/astro.config.ts index ae7e71d..ae3cf9b 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -22,10 +22,10 @@ export default defineConfig({ default: version }), MARKETPLACE_ENABLED: envField.boolean({ - context: 'client', - access: 'public', + context: "client", + access: "public", optional: true, - default: parsedDoc.marketplace.enabled + default: parsedDoc.marketplace.enabled }) } } diff --git a/database_assets/com.nebula.retro/retro.css b/database_assets/com.nebula.retro/retro.css index 7a74080..0b11042 100644 --- a/database_assets/com.nebula.retro/retro.css +++ b/database_assets/com.nebula.retro/retro.css @@ -15,10 +15,10 @@ --dropdown-option-hover-color: #000000; --tab-color: #000000; --border-color: #3cb371; - --font-family: 'terminal'; + --font-family: "terminal"; } @font-face { font-family: terminal; - src: url('./terminal.ttf'); + src: url("./terminal.ttf"); } diff --git a/server/marketplace.ts b/server/marketplace.ts index 539d9f5..cfc0c9d 100644 --- a/server/marketplace.ts +++ b/server/marketplace.ts @@ -1,10 +1,10 @@ -import { Sequelize, Model, InferAttributes, InferCreationAttributes, DataTypes } from "sequelize"; -import { parsedDoc } from "./config.js"; -import { FastifyInstance, FastifyRequest } from "fastify"; -import { fileURLToPath } from "node:url"; -import { pipeline } from "node:stream/promises"; import { createWriteStream } from "node:fs"; -import { access, mkdir, constants } from "node:fs/promises"; +import { constants, access, mkdir } from "node:fs/promises"; +import { pipeline } from "node:stream/promises"; +import { fileURLToPath } from "node:url"; +import { FastifyInstance, FastifyRequest } from "fastify"; +import { DataTypes, InferAttributes, InferCreationAttributes, Model, Sequelize } from "sequelize"; +import { parsedDoc } from "./config.js"; const db = new Sequelize(parsedDoc.db.name, parsedDoc.db.username, parsedDoc.db.password, { host: parsedDoc.db.postgres ? `${parsedDoc.postgres.domain}` : "localhost", @@ -169,9 +169,9 @@ function marketplaceAPI(app: FastifyInstance) { ) ); } catch (error) { - return reply - .status(500) - .send({ status: `File couldn't be uploaded! (Package most likely doesn't exist)` }); + return reply.status(500).send({ + status: `File couldn't be uploaded! (Package most likely doesn't exist)` + }); } return reply.status(verify.status).send({ status: "File uploaded successfully!" }); } @@ -214,10 +214,12 @@ function marketplaceAPI(app: FastifyInstance) { return reply.status(500).send({ status: "Package already exists!" }); } catch (err) { await mkdir(`${assets}/${body.package_name}/`); - return reply.status(verify.status).send({ status: "Package created successfully!" }); + return reply + .status(verify.status) + .send({ status: "Package created successfully!" }); } } }); } -export { marketplaceAPI, db, catalogAssets, Catalog, CatalogModel } +export { marketplaceAPI, db, catalogAssets, Catalog, CatalogModel }; diff --git a/server/server.ts b/server/server.ts index 1c7d2cf..290eb47 100644 --- a/server/server.ts +++ b/server/server.ts @@ -3,10 +3,10 @@ import { constants, access, mkdir } from "node:fs/promises"; import { pipeline } from "node:stream/promises"; import { fileURLToPath } from "node:url"; import fastifyCompress from "@fastify/compress"; +import fastifyHelmet from "@fastify/helmet"; import fastifyMiddie from "@fastify/middie"; import fastifyMultipart from "@fastify/multipart"; import fastifyStatic from "@fastify/static"; -import fastifyHelmet from "@fastify/helmet"; import chalk from "chalk"; import Fastify, { FastifyReply, FastifyRequest } from "fastify"; import gradient from "gradient-string"; @@ -15,8 +15,8 @@ import { DataTypes, InferAttributes, InferCreationAttributes, Model, Sequelize } import { handler as ssrHandler } from "../dist/server/entry.mjs"; import { parsedDoc } from "./config.js"; import { setupDB } from "./dbSetup.js"; +import { catalogAssets, marketplaceAPI } from "./marketplace.js"; import { serverFactory } from "./serverFactory.js"; -import { marketplaceAPI, catalogAssets } from "./marketplace.js"; const app = Fastify({ logger: parsedDoc.server.server.logging, @@ -39,7 +39,7 @@ await app.register(fastifyHelmet, { }); await app.register(fastifyStatic, { - root: fileURLToPath(new URL("../dist/client", import.meta.url)), + root: fileURLToPath(new URL("../dist/client", import.meta.url)) }); //Our marketplace API. Not middleware as I don't want to deal with that LOL. Just a function that passes our app to it. diff --git a/src/components/Header.astro b/src/components/Header.astro index 8cdc7bb..dd0d130 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,10 +1,10 @@ --- +import { MARKETPLACE_ENABLED } from "astro:env/client"; import { Icon } from "astro-icon/components"; import { getLangFromUrl, useTranslations } from "../i18n/utils"; import { isMobileNavOpen } from "../store.js"; import HeaderButton from "./HeaderButton.astro"; import Logo from "./Logo.astro"; -import { MARKETPLACE_ENABLED } from "astro:env/client"; const lang = getLangFromUrl(Astro.url); const t = useTranslations(lang); --- diff --git a/src/pages/[lang]/catalog/[...page].astro b/src/pages/[lang]/catalog/[...page].astro index 0a4654a..c3f99bc 100644 --- a/src/pages/[lang]/catalog/[...page].astro +++ b/src/pages/[lang]/catalog/[...page].astro @@ -1,8 +1,8 @@ --- import CatalogCard from "@components/catalog/CatalogCard.svelte"; import Layout from "@layouts/Layout.astro"; -import Pagnation from "./pagnation.astro"; import { getLangFromUrl, useTranslations } from "../../../i18n/utils"; +import Pagnation from "./pagnation.astro"; const lang = getLangFromUrl(Astro.url); const t = useTranslations(lang); diff --git a/tailwind.config.mjs b/tailwind.config.mjs index b168946..44fd4b8 100644 --- a/tailwind.config.mjs +++ b/tailwind.config.mjs @@ -16,7 +16,7 @@ export default { "border-color": "var(--border-color)" }, fontFamily: { - roboto: 'var(--font-family), Roboto' + roboto: "var(--font-family), Roboto" }, extend: {} },