fix: Fixed mono font

.forgejo/workflows/release.yml

@@ -1,39 +0,0 @@
-on: [push]
-jobs:
-  build:
-    runs-on: docker
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to git.kakio.us
-        uses: docker/login-action@v3.3.0
-        with:
-          registry: git.kakio.us
-          username: kakious
-          password: ${{ secrets.REPO_PUSH  }}
-
-      - name: Build and push frontend
-        uses: docker/build-push-action@v2
-        with:
-          context: ./apps/frontend/
-          file: ./apps/frontend/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            git.kakio.us/kakious/authcore-frontend:latest
-            git.kakio.us/kakious/authcore-frontend:${{ github.sha }}
-
-      - name: Build and push backend
-        uses: docker/build-push-action@v2
-        with:
-          context: ./apps/backend/
-          file: ./apps/backend/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            git.kakio.us/kakious/authcore-backend:latest
-            git.kakio.us/kakious/authcore-backend:${{ github.sha }}

Dockerfile

@@ -1,25 +0,0 @@
-FROM node:22-alpine AS base
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
-
-
-FROM base AS deps
-# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat
-COPY . /usr/src/app
-WORKDIR /usr/src/app
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
-
-FROM base AS builder-frontend
-COPY --from=deps /usr/src/app /usr/src/app
-RUN pnpm deploy --target frontend 
-
-
-FROM node:22-alpine AS frontend
-WORKDIR /app
-COPY --from=base-build /prod/frontend/.next ./.next
-COPY --from=base-build /usr/src/app/apps/frontend/public ./.next/standalone/public
-ENV NODE_ENV=production
-EXPOSE 3000
-CMD ["node", ".next/standalone/server.js"]

apps/backend/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "backend",
+  "name": "waterwolf-oauth-core",
   "version": "0.0.1",
   "description": "",
   "author": "",
@@ -114,4 +114,4 @@
     "testEnvironment": "node"
   },
   "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
-}
+}

apps/backend/src/auth/controllers/auth.controller.ts

@@ -1,10 +1,12 @@
-import { Body, Controller, Get, Post, Query, Req, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { Body, Controller, Get, Post, Query, Render, Req, Res, UseGuards } from '@nestjs/common';
+import { ApiExcludeEndpoint, ApiResponse, ApiTags } from '@nestjs/swagger';
 
 import { AuthService } from '../services/auth.service';
 import { ForgotPasswordDto } from '../dto/forgotPassword.dto';
 import { CreateUserDto } from '../dto/register.dto';
 import { LoginUserDto } from '../dto/loginUser.dto';
+import { CurrentUser } from '../decorators/user.decorator';
+import { ViewLoginGuard } from '../guard/viewLogin.guard';
 import { Response, Request } from 'express';
 import { LoginResponse } from '../dto/loginResponse.dto';
 
@@ -46,18 +48,34 @@ export class AuthController {
     return await this.authService.sendVerificationEmail(body.email);
   }
 
+  // ==== Render pages ==== //
+
   @Get('verify-email')
-  public async verifyEmail(@Query('code') code: string): Promise<any> {
+  @UseGuards(ViewLoginGuard)
+  @ApiExcludeEndpoint()
+  public async verifyEmail(@Res() response: Response, @Query('code') code: string): Promise<any> {
     if (!code) {
-      return { error: true, message: 'Invalid Verification Code' };
+      return response.render('base/error', {
+        error_header: 'Invalid Verification Code',
+        error_message:
+          'The verification code provided is invalid. Please try sending your verification email again.',
+        button_name: 'Go Back to Login',
+        button_link: '/api/v1/auth/login',
+      });
     }
 
     try {
       await this.authService.markEmailVerified(code);
-
-      return { error: false, message: 'Email Verified' };
     } catch (e) {
-      return { error: true, message: 'Invalid Verification Code' };
+      return response.render('base/error', {
+        error_header: 'Invalid Verification Code',
+        error_message:
+          'The verification code provided is invalid. Please try sending your verification email again.',
+        button_name: 'Go Back to Login',
+        button_link: 'api/v1/auth/login',
+      });
     }
+
+    response.redirect('/auth/login');
   }
 }

apps/backend/src/main.ts

@@ -14,7 +14,14 @@ async function bootstrap() {
   app.disable('x-powered-by');
 
   app.setGlobalPrefix('api', {
-    exclude: [{ path: 'oidc/:splat*', method: RequestMethod.ALL }],
+    exclude: [
+      { path: 'auth/login', method: RequestMethod.GET },
+      { path: '', method: RequestMethod.GET },
+      { path: 'auth/login/totp', method: RequestMethod.GET },
+      { path: 'auth/forgot-password', method: RequestMethod.GET },
+      { path: ':oidc*', method: RequestMethod.ALL },
+      { path: ':interaction*', method: RequestMethod.ALL },
+    ],
   });
 
   app.enableVersioning({

apps/frontend/Dockerfile

@@ -14,7 +14,7 @@ COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
 RUN \
   if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
   elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --no-frozen-lockfile; \
+  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
   else echo "Lockfile not found." && exit 1; \
   fi
 
@@ -31,7 +31,7 @@ COPY --from=deps /app/node_modules ./node_modules
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line in case you want to disable telemetry during the build.
-ENV NEXT_TELEMETRY_DISABLED=1
+# ENV NEXT_TELEMETRY_DISABLED=1
 
 RUN \
   if [ -f yarn.lock ]; then yarn run build; \
@@ -46,7 +46,7 @@ WORKDIR /app
 
 ENV NODE_ENV=production
 # Uncomment the following line in case you want to disable telemetry during runtime.
-ENV NEXT_TELEMETRY_DISABLED=1
+# ENV NEXT_TELEMETRY_DISABLED=1
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs

apps/frontend/app/(main)/layout.tsx

@@ -1,35 +0,0 @@
-import type { Metadata } from 'next';
-import './globals.css';
-import '@mantine/core/styles.css';
-import {
-  createTheme,
-  ColorSchemeScript,
-  MantineProvider,
-  // localStorageColorSchemeManager,
-} from '@mantine/core';
-
-export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
-};
-
-const theme = createTheme({});
-
-export default async function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <html lang="en">
-      <head>
-        <ColorSchemeScript defaultColorScheme="dark" />
-      </head>
-      <body>
-        <MantineProvider theme={theme} defaultColorScheme="dark">
-          {children}
-        </MantineProvider>
-      </body>
-    </html>
-  );
-}

apps/frontend/app/(main)/login/layout.tsx

@@ -1,9 +0,0 @@
-import { Center } from '@mantine/core';
-
-export default async function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return <Center h={'100vh'}>{children}</Center>;
-}

apps/frontend/app/(main)/login/page.tsx

@@ -1,5 +0,0 @@
-import LoginCard from './../../../components/auth/login/LoginCard';
-
-export default async function Login() {
-  return <LoginCard />;
-}

apps/frontend/app/(main)/providers.tsx

@@ -1,9 +0,0 @@
-'use client';
-
-export default function Providers({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return <>{children}</>;
-}

apps/frontend/components/auth/login/LoginCard.module.css

@@ -1,2 +0,0 @@
-.card {
-}

apps/frontend/components/auth/login/LoginCard.tsx

@@ -1,17 +0,0 @@
-import { Button, Card, Checkbox, Stack, TextInput } from '@mantine/core';
-import classes from './LoginCard.module.css';
-
-export default function LoginCard() {
-  return (
-    <Card shadow="sm" padding="lg" className={classes.card}>
-      <Stack gap={20}>
-        <TextInput label="Email" placeholder="Your email" />
-        <TextInput label="Password" placeholder="Your password" type="password" />
-        <Checkbox label="Remember me" variant="outline"></Checkbox>
-        <Button type="submit" variant="gradient" gradient={{ from: 'blue', to: 'purple', deg: 45 }}>
-          Login
-        </Button>
-      </Stack>
-    </Card>
-  );
-}

apps/frontend/next.config.mjs

@@ -1,32 +1,8 @@
 /** @type {import('next').NextConfig} */
-
 const nextConfig = {
   typescript: {
     tsconfigPath: './tsconfig.next.json',
   },
-  experimental: {
-    optimizePackageImports: [
-      '@mantine/core',
-      '@mantine/hooks',
-      '@mantine/dates',
-      '@mantine/form',
-      '@mantine/modals',
-      '@mantine/notifications',
-      '@mantine/nprogress',
-      '@mantine/dropzone',
-      '@mantine/charts',
-    ],
-  },
-  output: 'standalone',
-  async redirects() {
-    return [
-      {
-        source: '/',
-        destination: '/login',
-        permanent: true,
-      },
-    ];
-  },
 };
 
 export default nextConfig;

apps/frontend/package.json

@@ -9,34 +9,19 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@mantine/charts": "^7.14.1",
-    "@mantine/core": "^7.14.1",
-    "@mantine/dates": "^7.14.1",
-    "@mantine/dropzone": "^7.14.1",
-    "@mantine/form": "^7.14.1",
-    "@mantine/hooks": "^7.14.1",
-    "@mantine/modals": "^7.14.1",
-    "@mantine/notifications": "^7.14.1",
-    "@mantine/nprogress": "^7.14.1",
-    "dayjs": "^1.11.13",
-    "frontend": "link:",
-    "next": "14.2.15",
     "react": "^18",
     "react-dom": "^18",
-    "recharts": "2"
+    "next": "14.2.15"
   },
   "devDependencies": {
+    "typescript": "^5",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.15",
-    "postcss": "^8.4.47",
-    "postcss-preset-mantine": "^1.17.0",
-    "postcss-simple-vars": "^7.0.1",
+    "postcss": "^8",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5"
+    "eslint": "^8",
+    "eslint-config-next": "14.2.15"
   },
-  "files": [".next", "public"],
-  "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
+   "packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
 }

apps/frontend/postcss.config.mjs

@@ -2,16 +2,6 @@
 const config = {
   plugins: {
     tailwindcss: {},
-    'postcss-preset-mantine': {},
-    'postcss-simple-vars': {
-      variables: {
-        'mantine-breakpoint-xs': '36em',
-        'mantine-breakpoint-sm': '48em',
-        'mantine-breakpoint-md': '62em',
-        'mantine-breakpoint-lg': '75em',
-        'mantine-breakpoint-xl': '88em',
-      },
-    },
   },
 };
 

apps/frontend/src/app/layout.tsx

@@ -0,0 +1,35 @@
+import type { Metadata } from "next";
+import localFont from "next/font/local";
+import "./globals.css";
+
+const geistSans = localFont({
+  src: "../../public/fonts/GeistVF.woff",
+  variable: "--font-geist-sans",
+  weight: "100 900",
+});
+const geistMono = localFont({
+  src: "../../public/fonts/GeistMonoVF.woff",
+  variable: "--font-geist-mono",
+  weight: "100 900",
+});
+
+export const metadata: Metadata = {
+  title: "Create Next App",
+  description: "Generated by create next app",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <body
+        className={`${geistSans.variable} ${geistMono.variable} antialiased`}
+      >
+        {children}
+      </body>
+    </html>
+  );
+}

apps/frontend/src/app/page.tsx

@@ -0,0 +1,101 @@
+import Image from "next/image";
+
+export default function Home() {
+  return (
+    <div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20 font-[family-name:var(--font-geist-sans)]">
+      <main className="flex flex-col gap-8 row-start-2 items-center sm:items-start">
+        <Image
+          className="dark:invert"
+          src="https://nextjs.org/icons/next.svg"
+          alt="Next.js logo"
+          width={180}
+          height={38}
+          priority
+        />
+        <ol className="list-inside list-decimal text-sm text-center sm:text-left font-[family-name:var(--font-geist-mono)]">
+          <li className="mb-2">
+            Get started by editing{" "}
+            <code className="bg-black/[.05] dark:bg-white/[.06] px-1 py-0.5 rounded font-semibold">
+              src/app/page.tsx
+            </code>
+            .
+          </li>
+          <li>Save and see your changes instantly.</li>
+        </ol>
+
+        <div className="flex gap-4 items-center flex-col sm:flex-row">
+          <a
+            className="rounded-full border border-solid border-transparent transition-colors flex items-center justify-center bg-foreground text-background gap-2 hover:bg-[#383838] dark:hover:bg-[#ccc] text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5"
+            href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            <Image
+              className="dark:invert"
+              src="https://nextjs.org/icons/vercel.svg"
+              alt="Vercel logomark"
+              width={20}
+              height={20}
+            />
+            Deploy now
+          </a>
+          <a
+            className="rounded-full border border-solid border-black/[.08] dark:border-white/[.145] transition-colors flex items-center justify-center hover:bg-[#f2f2f2] dark:hover:bg-[#1a1a1a] hover:border-transparent text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5 sm:min-w-44"
+            href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Read our docs
+          </a>
+        </div>
+      </main>
+      <footer className="row-start-3 flex gap-6 flex-wrap items-center justify-center">
+        <a
+          className="flex items-center gap-2 hover:underline hover:underline-offset-4"
+          href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <Image
+            aria-hidden
+            src="https://nextjs.org/icons/file.svg"
+            alt="File icon"
+            width={16}
+            height={16}
+          />
+          Learn
+        </a>
+        <a
+          className="flex items-center gap-2 hover:underline hover:underline-offset-4"
+          href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <Image
+            aria-hidden
+            src="https://nextjs.org/icons/window.svg"
+            alt="Window icon"
+            width={16}
+            height={16}
+          />
+          Examples
+        </a>
+        <a
+          className="flex items-center gap-2 hover:underline hover:underline-offset-4"
+          href="https://nextjs.org?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <Image
+            aria-hidden
+            src="https://nextjs.org/icons/globe.svg"
+            alt="Globe icon"
+            width={16}
+            height={16}
+          />
+          Go to nextjs.org →
+        </a>
+      </footer>
+    </div>
+  );
+}

apps/frontend/tailwind.config.ts

@@ -1,16 +1,16 @@
-import type { Config } from 'tailwindcss';
+import type { Config } from "tailwindcss";
 
 const config: Config = {
   content: [
-    './pages/**/*.{js,ts,jsx,tsx,mdx}',
-    './components/**/*.{js,ts,jsx,tsx,mdx}',
-    './app/**/*.{js,ts,jsx,tsx,mdx}',
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
   ],
   theme: {
     extend: {
       colors: {
-        background: 'var(--background)',
-        foreground: 'var(--foreground)',
+        background: "var(--background)",
+        foreground: "var(--foreground)",
       },
     },
   },

apps/frontend/tsconfig.json

@@ -23,7 +23,10 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "paths": {
+      "@/*": ["./app/*"]
+    }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
   "exclude": ["node_modules"]

apps/frontend/tsconfig.next.json

@@ -20,7 +20,10 @@
       {
         "name": "next"
       }
-    ]
+    ],
+    "paths": {
+      "@/*": ["./app/*"]
+    }
   },
   "include": [
     "next-env.d.ts",

configs/nginx-dev.conf

@@ -27,8 +27,6 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3001/api/; # Local back end
             proxy_redirect default;
-
-            proxy_set_header Host $host;
         }
 
         #OIDC Provider
@@ -36,9 +34,6 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3001/oidc/; # Local back end
             proxy_redirect default;
-
-            #Needed for Host File
-            proxy_set_header Host $host;
         }
 
         #Frontend Next.js App
@@ -46,14 +41,6 @@ http {
             resolver 127.0.0.11 valid=30s; # Docker DNS
             proxy_pass http://host.docker.internal:3000/; # Local back end
             proxy_redirect default;
-            # Change the host header to the original host
-
-            proxy_set_header Host $host;
-
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $host;
         }
     }
 }

package.json

@@ -4,10 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "dev": "pnpm run --parallel dev",
-    "build": "pnpm run --parallel build",
-    "build-frontend": "pnpm run --filter=frontend build",
-    "build-backend": "pnpm run --filter=backend build"
+    "dev": "pnpm run --parallel dev"
   },
   "keywords": [],
   "author": "",

tsconfig.json

@@ -11,7 +11,8 @@
     "forceConsistentCasingInFileNames": true,
     "noFallthroughCasesInSwitch": true,
     "paths": {
-      "@server/*": ["./apps/backend/src/*"]
+      "@server/*": ["./apps/backend/src/*"],
+      "@web/*": ["./apps/frontend/*"]
     }
   }
 }