let's try this again

.gitea/kubernetes/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: scoresaber-reloaded-container
-          image: git.fascinated.cc/fascinated/scoresaber-reloaded:latest
+          image: git.fascinated.cc/fascinated/scoresaber-reloaded-frontend:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 3000

.gitea/workflows/deploy-backend.yml

@@ -0,0 +1,58 @@
+name: "Deploy Backend"
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+          registry: git.fascinated.cc
+
+      - name: Build Image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./backend/Dockerfile
+          push: true
+          tags: |
+            git.fascinated.cc/fascinated/scoresaber-reloaded-backend:${{ github.sha }}
+            git.fascinated.cc/fascinated/scoresaber-reloaded-backend:latest
+          build-args: |
+            GIT_REV=${{ gitea.sha }}
+            SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
+
+      - name: Install kubectl
+        uses: azure/setup-kubectl@v4
+        id: install
+
+      - name: Setup Kubernetes Context
+        uses: azure/k8s-set-context@v4
+        with:
+          kubeconfig: ${{ secrets.KUBECONFIG }}
+
+#      - name: Deploy to Kubernetes
+#        uses: Azure/k8s-deploy@v5
+#        with:
+#          action: deploy
+#          namespace: public-services
+#          manifests: |
+#            .gitea/kubernetes/sealed-secrets.yaml
+#            .gitea/kubernetes/deployment.yaml
+#            .gitea/kubernetes/service.yaml
+#            .gitea/kubernetes/ingress.yaml
+#          images: |
+#            git.fascinated.cc/fascinated/scoresaber-reloaded-backend:${{ github.sha }}

.gitea/workflows/deploy-frontend.yml

@@ -1,4 +1,4 @@
-name: "Deploy"
+name: "Deploy Frontend"
 
 on:
   push:
@@ -26,10 +26,11 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
+          file: ./frontend/Dockerfile
           push: true
           tags: |
-            git.fascinated.cc/fascinated/scoresaber-reloaded:${{ github.sha }}
+            git.fascinated.cc/fascinated/scoresaber-reloaded-frontend:${{ github.sha }}
-            git.fascinated.cc/fascinated/scoresaber-reloaded:latest
+            git.fascinated.cc/fascinated/scoresaber-reloaded-frontend:latest
           build-args: |
             GIT_REV=${{ gitea.sha }}
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -54,4 +55,4 @@ jobs:
             .gitea/kubernetes/service.yaml
             .gitea/kubernetes/ingress.yaml
           images: |
-            git.fascinated.cc/fascinated/scoresaber-reloaded:${{ github.sha }}
+            git.fascinated.cc/fascinated/scoresaber-reloaded-frontend:${{ github.sha }}

.gitignore

@@ -1,41 +1,79 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+logs
-
+*.log
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-.yarn/install-state.gz
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-
+lerna-debug.log*
-# local env files
+.pnpm-debug.log*
-.env*.local
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
+pids
-# vercel
+*.pid
-.vercel
+*.seed
-
+*.pid.lock
-# typescript
+lib-cov
+coverage
+*.lcov
+.nyc_output
+.grunt
+bower_components
+.lock-wscript
+build/Release
+node_modules/
+jspm_packages/
+web_modules/
 *.tsbuildinfo
+.npm
+.eslintcache
+.stylelintcache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+.node_repl_history
+*.tgz
+.yarn-integrity
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+.cache
+.parcel-cache
+.next
+out
+.nuxt
+dist
+.cache/
+.vuepress/dist
+.temp
+.docusaurus
+.serverless/
+.fusebox/
+.dynamodb/
+.tern-port
+.vscode-test
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+.DS_*
+**/*.backup.*
+**/*.back.*
+node_modules
+*.sublime*
+psd
+thumb
+sketch
+/node_modules
+/.pnp
+.pnp.js
+/coverage
+/.next/
+/out/
+/build
+.DS_Store
+*.pem
+.env*.local
+.vercel
 next-env.d.ts
-
-.idea
-
-# Sentry Config File
-.env.sentry-build-plugin

Dockerfile

@@ -1,65 +0,0 @@
-FROM fascinated/docker-images:nodejs_20_with_pnpm AS base
-
-# Install dependencies and build tools for canvas
-FROM base AS deps
-RUN apk add --no-cache python3 make g++ gcc pkgconfig pixman cairo-dev libjpeg-turbo-dev pango-dev giflib-dev
-WORKDIR /app
-COPY package.json* pnpm-lock.yaml* ./
-RUN pnpm install --frozen-lockfile --quiet
-
-# Build from source
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-
-# Install runtime dependencies
-RUN apk add --no-cache cairo pango libjpeg-turbo giflib
-
-ENV NEXT_TELEMETRY_DISABLED=1
-
-# Add the commit hash
-ARG GIT_REV
-ENV GIT_REV=${GIT_REV}
-
-# Add the sentry auth token
-ARG SENTRY_AUTH_TOKEN
-ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
-
-# Build the app
-RUN pnpm run build
-
-# Final stage to run the app
-FROM base AS runner
-WORKDIR /app
-
-# Install runtime dependencies
-RUN apk add --no-cache cairo pango libjpeg-turbo giflib
-
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-
-# Add the commit hash
-ARG GIT_REV
-ENV GIT_REV=${GIT_REV}
-
-# Copy the built app from the builder stage
-COPY --from=builder --chown=nextjs:nodejs /app/node_modules ./node_modules
-COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
-COPY --from=builder --chown=nextjs:nodejs /app/public ./public
-COPY --from=builder --chown=nextjs:nodejs /app/package.json ./package.json
-COPY --from=builder --chown=nextjs:nodejs /app/next.config.mjs ./next.config.mjs
-
-USER nextjs
-
-EXPOSE 3000
-ENV HOSTNAME="0.0.0.0"
-ENV PORT=3000
-
-CMD ["pnpm", "start"]

backend/Dockerfile

@@ -0,0 +1,16 @@
+FROM fascinated/docker-images:nodejs_20_with_pnpm AS base
+
+# Install dependencies and build the app
+FROM base AS builder
+WORKDIR /app
+COPY package.json* pnpm-lock.yaml* ./
+RUN pnpm install --frozen-lockfile --quiet
+COPY . .
+RUN pnpm run build
+
+# Final stage to run the app
+FROM base AS runner
+WORKDIR /app
+COPY --from=builder /app/dist ./dist
+EXPOSE 3000
+CMD ["pnpm", "start"]

backend/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "backend",
+  "version": "1.0.0",
+  "author": "fascinated7",
+  "license": "MIT",
+  "private": true,
+  "main": "src/index.ts",
+  "scripts": {
+    "dev": "concurrently -k \"tsup --watch\" \"nodemon dist/index.js\"",
+    "build": "tsup",
+    "start": "node dist/index.js"
+  },
+  "devDependencies": {
+    "concurrently": "^9.0.1",
+    "nodemon": "^2.0.20",
+    "tsup": "^8.3.0",
+    "typescript": "^5"
+  }
+}

backend/src/index.ts

@@ -0,0 +1 @@
+console.log("meow!!!");

backend/tsconfig.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": ["src"],
+  "exclude": ["node_modules"]
+}

backend/tsup.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from "tsup";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["esm", "cjs"],
+  splitting: false,
+  dts: true,
+  clean: true,
+  outDir: "./dist",
+});

package.json

@@ -1,66 +1,11 @@
 {
   "name": "scoresaber-reloadedv3",
-  "version": "0.1.0",
+  "version": "1.0.0",
-  "private": true,
   "scripts": {
-    "dev": "next dev --turbo",
+    "dev": "pnpm run -r dev",
-    "build": "next build",
+    "dev:website": "pnpm --filter website dev",
-    "start": "next start",
+    "dev:backend": "pnpm --filter backend dev"
-    "lint": "next lint"
   },
-  "dependencies": {
+  "author": "fascinated7",
-    "@formkit/tempo": "^0.1.2",
+  "license": "MIT"
-    "@heroicons/react": "^2.1.5",
-    "@hookform/resolvers": "^3.9.0",
-    "@radix-ui/react-avatar": "^1.1.0",
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-label": "^2.1.0",
-    "@radix-ui/react-scroll-area": "^1.1.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@radix-ui/react-toast": "^1.2.1",
-    "@radix-ui/react-tooltip": "^1.1.2",
-    "@sentry/nextjs": "8",
-    "@tanstack/react-query": "^5.55.4",
-    "@trigger.dev/nextjs": "^3.0.8",
-    "@trigger.dev/react": "^3.0.8",
-    "@trigger.dev/sdk": "^3.0.8",
-    "@uidotdev/usehooks": "^2.4.1",
-    "canvas": "3.0.0-rc2",
-    "chart.js": "^4.4.4",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "comlink": "^4.4.1",
-    "dexie": "^4.0.8",
-    "dexie-react-hooks": "^1.1.7",
-    "extract-colors": "^4.0.8",
-    "framer-motion": "^11.5.4",
-    "js-cookie": "^3.0.5",
-    "ky": "^1.7.2",
-    "lucide-react": "^0.447.0",
-    "mongoose": "^8.7.0",
-    "next": "15.0.0-rc.0",
-    "next-build-id": "^3.0.0",
-    "next-themes": "^0.3.0",
-    "react": "19.0.0-rc-3edc000d-20240926",
-    "react-chartjs-2": "^5.2.0",
-    "react-dom": "19.0.0-rc-3edc000d-20240926",
-    "react-hook-form": "^7.53.0",
-    "tailwind-merge": "^2.5.2",
-    "tailwindcss-animate": "^1.0.7",
-    "zod": "^3.23.8"
-  },
-  "devDependencies": {
-    "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.14",
-    "postcss": "^8",
-    "tailwindcss": "^3.4.1",
-    "typescript": "^5"
-  },
-  "trigger.dev": {
-    "endpointId": "scoresaber-reloaded-KB0Z"
-  }
 }

pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  - "website"
+  - "backend"

website/.gitignore

@@ -0,0 +1,41 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+.idea
+
+# Sentry Config File
+.env.sentry-build-plugin

website/Dockerfile

@@ -0,0 +1,65 @@
+# Base image with Node.js 20 and pnpm
+FROM fascinated/docker-images:nodejs_20_with_pnpm AS base
+
+# Install build tools for canvas (Python, GCC, etc.)
+FROM base AS deps
+RUN apk add --no-cache python3 make g++ gcc pkgconfig pixman cairo-dev libjpeg-turbo-dev pango-dev giflib-dev
+WORKDIR /app
+
+# Copy frontend package and lock files only
+COPY ./frontend/package.json* ./frontend/pnpm-lock.yaml* ./
+RUN pnpm install --frozen-lockfile --quiet
+
+# Build stage
+FROM base AS builder
+WORKDIR /app
+
+# Copy node_modules from deps stage
+COPY --from=deps /app/node_modules ./node_modules
+
+# Copy all necessary files from both ./frontend and ./
+# This ensures you have access to both frontend code and shared types in root
+COPY ./frontend ./frontend
+
+# Install runtime dependencies
+RUN apk add --no-cache cairo pango libjpeg-turbo giflib
+
+# Build the frontend app
+WORKDIR /app/frontend
+RUN pnpm run build
+
+# Final stage for running the app
+FROM base AS runner
+WORKDIR /app
+
+# Install runtime dependencies
+RUN apk add --no-cache cairo pango libjpeg-turbo giflib
+
+# Set environment variables for production
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
+
+# Create system user and group for running the app
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+# Ensure necessary directories exist and are writable
+RUN mkdir /app/frontend/.next
+RUN chown nextjs:nodejs /app/frontend/.next
+
+# Copy built files from the builder stage
+COPY --from=builder --chown=nextjs:nodejs /app/frontend/node_modules ./frontend/node_modules
+COPY --from=builder --chown=nextjs:nodejs /app/frontend/.next ./frontend/.next
+COPY --from=builder --chown=nextjs:nodejs /app/frontend/public ./frontend/public
+COPY --from=builder --chown=nextjs:nodejs /app/frontend/package.json ./frontend/package.json
+COPY --from=builder --chown=nextjs:nodejs /app/frontend/next.config.mjs ./frontend/next.config.mjs
+
+# Switch to non-root user
+USER nextjs
+
+# Expose the app port and start it
+EXPOSE 3000
+ENV HOSTNAME="0.0.0.0"
+ENV PORT=3000
+
+CMD ["pnpm", "start"]

website/next.config.mjs

@@ -9,9 +9,6 @@ const __dirname = path.dirname(__filename); // get the name of the directory
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    webpackMemoryOptimizations: true,
-  },
   images: {
     remotePatterns: [
       {

website/package.json

@@ -0,0 +1,66 @@
+{
+  "name": "website",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --turbo",
+    "build": "next build",
+    "start": "next start",
+    "lint": "next lint"
+  },
+  "dependencies": {
+    "@formkit/tempo": "^0.1.2",
+    "@heroicons/react": "^2.1.5",
+    "@hookform/resolvers": "^3.9.0",
+    "@radix-ui/react-avatar": "^1.1.0",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-label": "^2.1.0",
+    "@radix-ui/react-scroll-area": "^1.1.0",
+    "@radix-ui/react-slot": "^1.1.0",
+    "@radix-ui/react-toast": "^1.2.1",
+    "@radix-ui/react-tooltip": "^1.1.2",
+    "@sentry/nextjs": "8",
+    "@tanstack/react-query": "^5.55.4",
+    "@trigger.dev/nextjs": "^3.0.8",
+    "@trigger.dev/react": "^3.0.8",
+    "@trigger.dev/sdk": "^3.0.8",
+    "@uidotdev/usehooks": "^2.4.1",
+    "canvas": "3.0.0-rc2",
+    "chart.js": "^4.4.4",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.1",
+    "comlink": "^4.4.1",
+    "dexie": "^4.0.8",
+    "dexie-react-hooks": "^1.1.7",
+    "extract-colors": "^4.0.8",
+    "framer-motion": "^11.5.4",
+    "js-cookie": "^3.0.5",
+    "ky": "^1.7.2",
+    "lucide-react": "^0.447.0",
+    "mongoose": "^8.7.0",
+    "next": "15.0.0-rc.0",
+    "next-build-id": "^3.0.0",
+    "next-themes": "^0.3.0",
+    "react": "19.0.0-rc-3edc000d-20240926",
+    "react-chartjs-2": "^5.2.0",
+    "react-dom": "19.0.0-rc-3edc000d-20240926",
+    "react-hook-form": "^7.53.0",
+    "tailwind-merge": "^2.5.2",
+    "tailwindcss-animate": "^1.0.7",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "@types/js-cookie": "^3.0.6",
+    "@types/node": "^20",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
+    "eslint": "^8",
+    "eslint-config-next": "14.2.14",
+    "postcss": "^8",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5"
+  },
+  "trigger.dev": {
+    "endpointId": "scoresaber-reloaded-KB0Z"
+  }
+}