Compare commits

...
Sign in to create a new pull request.

12 commits

Author SHA1 Message Date
f8a7121e34 Add apps/frontend/public/test.txt
Some checks failed
/ build (push) Failing after 6m3s
2024-12-11 17:48:56 +00:00
ac31b9eb6a fix: include public
Some checks failed
/ build (push) Failing after 1m12s
2024-11-23 01:13:45 -05:00
c6a874f14d fix: correct invalid docker file path
Some checks failed
/ build (push) Failing after 1m11s
2024-11-23 01:08:04 -05:00
63df8ff113 fix: use proper file
Some checks failed
/ build (push) Failing after 9s
2024-11-23 01:07:34 -05:00
994a94f9e3 feat: begin new ui
Some checks failed
/ build (push) Failing after 10s
fix: attempt to build using local docker file
2024-11-23 01:06:37 -05:00
Trenten Vollmer
0f3e9e5363 fix: only copy frontend app
Some checks failed
/ build (push) Failing after 23s
2024-11-22 23:33:29 -05:00
Trenten Vollmer
1f13ed1b78 fix: try using docker files prebuilt for repos instead of single file
Some checks failed
/ build (push) Failing after 25s
2024-11-22 23:31:14 -05:00
Trenten Vollmer
02604e9238 fix: try docker 2
Some checks failed
/ build (push) Failing after 2m1s
2024-11-22 23:22:33 -05:00
Trenten Vollmer
d41ed386ad fix: dockerfile
Some checks failed
/ build (push) Failing after 1m23s
2024-11-22 23:19:58 -05:00
Trenten Vollmer
3cc8008163 fix: dockerfile
Some checks failed
/ build (push) Failing after 1m19s
2024-11-22 23:17:50 -05:00
59d7d862d5 Merge branch 'main' of git.kakio.us:kakious/waterwolf-auth
All checks were successful
/ build (push) Successful in 6m31s
2024-11-22 21:25:22 -05:00
97c1a160ad feat: docker image building 2024-11-22 21:25:20 -05:00
24 changed files with 950 additions and 157 deletions

View file

@ -0,0 +1,39 @@
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 }}

25
Dockerfile Normal file
View file

@ -0,0 +1,25 @@
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"]

View file

@ -1,5 +1,5 @@
{
"name": "waterwolf-oauth-core",
"name": "backend",
"version": "0.0.1",
"description": "",
"author": "",

View file

@ -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 --frozen-lockfile; \
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --no-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

View file

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View file

@ -0,0 +1,35 @@
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>
);
}

View file

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

View file

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

View file

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

View file

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

View file

@ -0,0 +1,17 @@
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>
);
}

View file

@ -1,8 +1,32 @@
/** @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;

View file

@ -9,19 +9,34 @@
"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",
"next": "14.2.15"
"recharts": "2"
},
"devDependencies": {
"typescript": "^5",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"postcss": "^8",
"tailwindcss": "^3.4.1",
"eslint": "^8",
"eslint-config-next": "14.2.15"
"eslint-config-next": "14.2.15",
"postcss": "^8.4.47",
"postcss-preset-mantine": "^1.17.0",
"postcss-simple-vars": "^7.0.1",
"tailwindcss": "^3.4.1",
"typescript": "^5"
},
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
"files": [".next", "public"],
"packageManager": "pnpm@9.5.0+sha512.140036830124618d624a2187b50d04289d5a087f326c9edfc0ccd733d76c4f52c3a313d4fc148794a2a9d81553016004e6742e8cf850670268a7387fc220c903"
}

View file

@ -2,6 +2,16 @@
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',
},
},
},
};

View file

View file

@ -1,35 +0,0 @@
import type { Metadata } from "next";
import localFont from "next/font/local";
import "./globals.css";
const geistSans = localFont({
src: "./fonts/GeistVF.woff",
variable: "--font-geist-sans",
weight: "100 900",
});
const geistMono = localFont({
src: "./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>
);
}

View file

@ -1,101 +0,0 @@
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>
);
}

View file

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

View file

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

739
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff

View file

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