refactor: Move clientDb to context c.get('db')

Author: aXenDeveloper

.github/workflows/test.yml

@@ -59,6 +59,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Build scripts
+        run: pnpm run build:scripts
+
       - name: Run script to bump version & copy files
         run: pnpm run release
         id: version-bump

apps/web/drizzle.config.ts

@@ -1,16 +1,13 @@
-import { POSTGRES_ENVS } from '@/database/client';
 import { defineConfig } from 'drizzle-kit';
 
-const { url, ...rest } = POSTGRES_ENVS;
+import { POSTGRES_URL } from './src/vitnode.api.config';
 
 export default defineConfig({
   out: './src/database/migrations/',
   // schema: ['./src/plugins/**/database/schema/*'],
   schema: ['./src/database/schema/*'],
   dialect: 'postgresql',
-  dbCredentials: process.env.POSTGRES_URL
-    ? {
-        url,
-      }
-    : rest,
+  dbCredentials: {
+    url: POSTGRES_URL,
+  },
 });

apps/web/src/app/[locale]/(main)/(plugins)/(vitnode-blog)/blog/page.tsx

@@ -1,6 +1,7 @@
+import { Link } from '@vitnode/core/lib/navigation';
+
 import { Test } from '@vitnode/blog/views/test';
 import { TestClient } from '@vitnode/blog/views/test/client';
-import { Link } from '@vitnode/core/lib/navigation';
 
 export default function Page() {
   return (

apps/web/src/app/[locale]/(main)/(plugins)/(vitnode-core)/login/page.tsx

@@ -1,8 +1,9 @@
 import type { Metadata } from 'next/dist/types';
 
-import { SignInView } from '@vitnode/core/views/auth/sign-in/sign-in-view';
 import { getTranslations } from 'next-intl/server';
 
+import { SignInView } from '@vitnode/core/views/auth/sign-in/sign-in-view';
+
 export const generateMetadata = async ({
   locale,
 }: {

apps/web/src/app/[locale]/(main)/(plugins)/(vitnode-core)/register/page.tsx

@@ -1,8 +1,9 @@
 import type { Metadata } from 'next/dist/types';
 
-import { SignUpView } from '@vitnode/core/views/auth/sign-up/sign-up-view';
 import { getTranslations } from 'next-intl/server';
 
+import { SignUpView } from '@vitnode/core/views/auth/sign-up/sign-up-view';
+
 export const generateMetadata = async ({
   locale,
 }: {

apps/web/src/app/[locale]/admin/(auth)/(plugins)/(vitnode-core)/core/page.tsx

@@ -0,0 +1,5 @@
+import { DashboardAdminView } from '@vitnode/core/views/admin/views/core/dashboard/dashboard-admin-view';
+
+export default function Page() {
+  return <DashboardAdminView />;
+}

apps/web/src/database/client.ts

@@ -4,9 +4,25 @@ import { DiscordSSOApiPlugin } from '@vitnode/core/api/plugins/sso/discord';
 import { FacebookSSOApiPlugin } from '@vitnode/core/api/plugins/sso/facebook';
 import { GoogleSSOApiPlugin } from '@vitnode/core/api/plugins/sso/google';
 import { buildApiConfig } from '@vitnode/core/vitnode.config';
+import { drizzle } from 'drizzle-orm/postgres-js';
+
+// import * as dotenv from 'dotenv';
+// import { drizzle } from 'drizzle-orm/postgres-js';
+// import { join } from 'path';
+
+// dotenv.config({
+//   path: join(process.cwd(), '..', '..', '.env'),
+// });
+
+export const POSTGRES_URL =
+  process.env.POSTGRES_URL ?? 'postgresql://root:root@localhost:5432/vitnode';
 
 export const vitNodeApiConfig = buildApiConfig({
   plugins: [blogApiPlugin()],
+  dbProvider: drizzle({
+    connection: POSTGRES_URL,
+    casing: 'camelCase',
+  }),
   emailProvider: NodemailerEmailPlugin({
     from: process.env.NODE_MAILER_FROM,
     host: process.env.NODE_MAILER_HOST,

apps/web/src/vitnode.api.config.ts

@@ -0,0 +1,38 @@
+# (VitNode) Create App
+
+This package is a CLI tool to create a new VitNode app quickly.
+
+Script based on [Create Next App](https://nextjs.org/).
+
+<p align="center">
+  <br>
+  <a href="https://vitnode.com/" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/VitNode/vitnode/canary/assets/logo/vitnode_logo_dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/VitNode/vitnode/canary/assets/logo/vitnode_logo_light.svg">
+      <img alt="VitNode Logo" src="https://raw.githubusercontent.com/VitNode/vitnode/canary/assets/logo/vitnode_logo_light.svg" width="400">
+    </picture>
+  </a>
+  <br>
+  <br>
+</p>
+
+## Usage
+
+```bash
+npx create-vitnode-app@latest
+```
+
+or
+
+```bash
+pnpm create vitnode-app@latest
+```
+
+## Options
+
+| Option              | Description                                                |
+| ------------------- | ---------------------------------------------------------- |
+| `--package-manager` | Specify the package manager to use. Support `npm`, `pnpm`. |
+| `--eslint`          | Initialize with eslint config.                             |
+| `--skip-install`    | Skip installing packages after initializing the project.   |

packages/create-vitnode-app/README.md

@@ -1,17 +1,31 @@
 /* eslint-disable no-console */
 
-import { dbClient } from '@/database/client.js';
 import { core_admin_permissions } from '@/database/schema/admins.js';
 import {
   core_languages,
   core_languages_words,
 } from '@/database/schema/languages.js';
 import { core_moderators_permissions } from '@/database/schema/moderators.js';
 import { core_roles } from '@/database/schema/roles.js';
+import * as dotenv from 'dotenv';
 import { count } from 'drizzle-orm';
+import { drizzle } from 'drizzle-orm/postgres-js';
+import { join } from 'path';
 
 import { runInteractiveShellCommand } from './run-interactive-shell-command.js';
 
+dotenv.config({
+  path: join(process.cwd(), '..', '..', '.env'),
+});
+
+console.log(join(process.cwd(), '..', '..', '.env'));
+
+const dbClient = drizzle({
+  connection:
+    process.env.POSTGRES_URL ?? 'postgresql://root:root@localhost:5432/vitnode',
+  casing: 'camelCase',
+});
+
 export const generateDatabaseMigrations = async () => {
   try {
     await runInteractiveShellCommand('npm', ['run', 'drizzle-kit', 'up']);