chore(mono): 🚧 Update frontend/v2 with base changes of main branch

.github/workflows/api.yml

@@ -10,12 +10,12 @@ jobs:
     outputs:
       has_changes: ${{ steps.check_for_changes.outputs.has_changes }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 3
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '22.14.0'
+          node-version: 22
       - name: Install turbo
         run: npm install -g turbo@2.4.4 && npm install -g turbo-ignore
       - name: Check for changes
@@ -29,6 +29,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install turbo
         run: npm install -g turbo@2.4.4
       - name: Login to Docker

.github/workflows/dashboard.yml

@@ -42,6 +42,7 @@ jobs:
           echo NEXT_PUBLIC_API_URL="https://api.buildtheearth.net/api/v1" >> apps/dashboard/.env
           echo NEXT_PUBLIC_SMYLER_API_URL="https://smybteapi.buildtheearth.net" >> apps/dashboard/.env
           echo NEXT_PUBLIC_FRONTEND_URL="https://buildtheearth.net" >> apps/dashboard/.env
+          # echo DATABASE_URL="${{ secrets.DATABASE_URL }}" >> apps/dashboard/.env
       - name: Build the Docker image
         run: docker build . --file apps/dashboard/Dockerfile --tag ghcr.io/buildtheearth/dashboard-website:$(git rev-parse --short HEAD) --tag ghcr.io/buildtheearth/dashboard-website:latest
       - name: Docker push tag

.vscode/settings.json

@@ -29,6 +29,10 @@
 		"frontend/seo",
 		"api/applications",
 		"api/claims",
-		"frontend/legal"
+		"frontend/legal",
+		"frontend/gallery",
+		"dash/editor",
+		"db",
+		"dash/responsive"
 	]
 }

apps/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:21-alpine AS base
+FROM node:22-alpine AS base
 
 FROM base AS builder
 RUN apk update
@@ -18,6 +18,9 @@ WORKDIR /app
 
 # Install dependencies
 COPY --from=builder /app/out/json/ .
+# Enable corepack to use the correct Yarn version
+RUN corepack enable
+RUN corepack prepare yarn@4.9.1 --activate
 RUN yarn install
 
 # Build the project

apps/api/src/util/package.ts

@@ -1 +1,2 @@
-export const LIB_VERSION = "1.1.0";export const LIB_LICENSE = undefined;
+export const LIB_VERSION = '1.1.0';
+export const LIB_LICENSE = undefined;

apps/dashboard/.env.example

@@ -1,26 +1,44 @@
 #
 # Keycloak
 #
-NEXT_PUBLIC_KEYCLOAK_URL="https://yourkeycloak.net/realms/yourrealm"
-NEXT_PUBLIC_KEYCLOAK_ID="yourclient"
-KEYCLOAK_SECRET="topsecret"
+NEXT_PUBLIC_KEYCLOAK_URL="https://.../realms/..."
+NEXT_PUBLIC_KEYCLOAK_ID="..."
+KEYCLOAK_SECRET="..."
+KEYCLOAK_ADMIN_CLIENT_ID="..."
+KEYCLOAK_ADMIN_CLIENT_SECRET="..."
 
 #
-# NextAuth
+# Auth
 #
-NEXTAUTH_URL="http://localhost:3000"
-NEXTAUTH_SECRET="secondtopsecret"
+NEXTAUTH_URL="http://localhost:3001"
+NEXTAUTH_SECRET="..."
+INTERNAL_API_KEY="..."
 
 #
-# BuildTheEarth
+# APIs
 #
-NEXT_PUBLIC_API_URL="https://api.yourserver.net/api/v1"
-NEXT_PUBLIC_SMYLER_API_URL="https://smybteapi.yourserver.net"
-NEXT_PUBLIC_FRONTEND_URL="https://yourserver.net"
-FRONTEND_KEY="thirdtopsecret"
+NEXT_PUBLIC_API_URL="https://.../api/v1"
+NEXT_PUBLIC_SMYLER_API_URL="https://..."
 
+# 
+# Main Website
 #
-# Other Confirguration
+NEXT_PUBLIC_FRONTEND_URL="https://..."
+FRONTEND_KEY="..."
+
+#
+# Mapbox
+#
+NEXT_PUBLIC_MAPBOX_TOKEN="..."
+
+#
+# Database
+#
+DATABASE_URL="postgresql://user:password@server:5432/database?pool_timeout=0"
+
+#
+# DISCORD
 #
 REPORTS_WEBHOOK="https://discord.com/api/webhooks/..."
-NEXT_PUBLIC_MAPBOX_TOKEN="fourthtopsecret"
+DISCORD_BOT_URL="https://..."
+DISCORD_BOT_SECRET="..."

apps/dashboard/Dockerfile

@@ -1,8 +1,8 @@
-FROM node:21-alpine AS base
+FROM node:22-alpine AS base
+RUN corepack enable
 
 FROM base AS builder
-RUN apk update
-RUN apk add --no-cache libc6-compat
+RUN apk update && apk add --no-cache libc6-compat openssl
 WORKDIR /app
 
 # Run turbo (will prune the lockfile to only include target dependencies)
@@ -12,20 +12,21 @@ RUN turbo prune dashboard --docker
 
 # Add lockfile and package.json's of isolated subworkspace
 FROM base AS installer
-RUN apk update
-RUN apk add --no-cache libc6-compat
+RUN apk update && apk add --no-cache libc6-compat openssl 
+# This is only for prisma v5 because it only looks in /lib for openssl libaries
+RUN ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3 
 WORKDIR /app
 
 # First install the dependencies (as they change less often)
 COPY --from=builder /app/out/json/ .
+# RUN ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3
 RUN yarn install
 
 # Build the project
 COPY --from=builder /app/out/full/ .
 COPY --from=builder /app/apps/dashboard/.env ./apps/dashboard/.env
 
 ENV NEXT_TELEMETRY_DISABLED 1
-
 RUN yarn turbo run build --filter=dashboard...
 
 FROM base AS runner
@@ -35,8 +36,8 @@ ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1
 
 # Create a runner user
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
+RUN addgroup --system --gid 1001 nodejs && \
+    adduser --system --uid 1001 nextjs
 USER nextjs
 
 # Reduce image size

apps/dashboard/README.md

@@ -22,16 +22,22 @@ See the global Readme file.
 
 # Envoriment Variables
 
-| Variable                   | Example Value                             | Description                                                       |
-| -------------------------- | ----------------------------------------- | ----------------------------------------------------------------- |
-| NEXT_PUBLIC_KEYCLOAK_URL   | https://yourkeycloak.net/realms/yourrealm | The Keycloak SSO URL, including the realm                         |
-| NEXT_PUBLIC_KEYCLOAK_ID    | yourclient                                | A client ID for your Keycloak Installation                        |
-| KEYCLOAK_SECRET            | topsecret                                 | The client secret of your client                                  |
-| NEXTAUTH_URL               | http://localhost:3000                     | The URL NextAuth should use for redirections back to your website |
-| NEXTAUTH_SECRET            | secondtopsecret                           | A secret used by NextAuth to encrypt session information          |
-| NEXT_PUBLIC_API_URL        | https://api.yourserver.net/api/v1         | The URL of your deployed or local BuildTheEarth API               |
-| NEXT_PUBLIC_SMYLER_API_URL | https://smybteapi.yourserver.net          | The URL of your deployed or local SmyBTE API                      |
-| NEXT_PUBLIC_MAPBOX_TOKEN   | fourthtopsecret                           | Your personal mapbox studio token                                 |
-| NEXT_PUBLIC_FRONTEND_URL   | https://yourserver.net                    | The URL to your local or deployed BuildTheEarth Website           |
-| FRONTEND_KEY               | thirdtopsecret                            | The Key used to Authenticate against the BuildTheEarth Website    |
-| REPORTS_WEBHOOK            | https://discord.com/api/webhooks/...      | A discord webhook to send reports to                              |
+| Variable                     | Example Value                                                  | Description                                                        |
+| ---------------------------- | -------------------------------------------------------------- | ------------------------------------------------------------------ |
+| NEXT_PUBLIC_KEYCLOAK_URL     | https://yourkeycloak.net/realms/yourrealm                      | The Keycloak SSO URL, including the realm                          |
+| NEXT_PUBLIC_KEYCLOAK_ID      | yourclient                                                     | A client ID for your Keycloak Installation                         |
+| KEYCLOAK_SECRET              | topsecret                                                      | The client secret of your client                                   |
+| KEYCLOAK_ADMIN_CLIENT_ID     | yourclient                                                     | A client ID for your Keycloak Installation (Admin users client)    |
+| KEYCLOAK_ADMIN_CLIENT_SECRET | topsecret                                                      | The client secret of your admin client                             |
+| NEXTAUTH_URL                 | http://localhost:3000                                          | The URL NextAuth should use for redirections back to your website  |
+| NEXTAUTH_SECRET              | secondtopsecret                                                | A secret used by NextAuth to encrypt session information           |
+| INTERNAL_API_KEY             | internalsecret                                                 | A secret used by the website to send custom api requests to itself |
+| NEXT_PUBLIC_API_URL          | https://api.yourserver.net/api/v1                              | The URL of your deployed or local BuildTheEarth API                |
+| NEXT_PUBLIC_SMYLER_API_URL   | https://smybteapi.yourserver.net                               | The URL of your deployed or local SmyBTE API                       |
+| NEXT_PUBLIC_FRONTEND_URL     | https://yourserver.net                                         | The URL to your local or deployed BuildTheEarth Website            |
+| FRONTEND_KEY                 | thirdtopsecret                                                 | The Key used to Authenticate against the BuildTheEarth Website     |
+| NEXT_PUBLIC_MAPBOX_TOKEN     | fourthtopsecret                                                | Your personal mapbox studio token                                  |
+| DATABASE_URL                 | postgresql://user:password@server:5432/database?pool_timeout=0 | Your Database connection string                                    |
+| REPORTS_WEBHOOK              | https://discord.com/api/webhooks/...                           | A discord webhook to send reports to                               |
+| DISCORD_BOT_URL              | https://bot.yourserver.net/...                                 | The URL to your local or delpolyed BuildTheEarth Main Bot          |
+| DISCORD_BOT_SECRET           | fifthtopsecret                                                 | The secret key to your Main Bot instance                           |

apps/dashboard/next.config.ts

@@ -19,7 +19,20 @@ const nextConfig: NextConfig = {
 	poweredByHeader: false,
 	outputFileTracingRoot: path.join(__dirname, '../../'),
 	images: {
-		domains: ['cdn.buildtheearth.net'],
+		remotePatterns: [
+			{
+				protocol: 'https',
+				hostname: 'cdn.buildtheearth.net',
+				port: '',
+				pathname: '/uploads/**',
+			},
+			{
+				protocol: 'https',
+				hostname: 'cdn.buildtheearth.net',
+				port: '',
+				pathname: '/static/**',
+			},
+		],
 	},
 };
 

apps/dashboard/package.json

@@ -14,18 +14,19 @@
 	},
 	"dependencies": {
 		"@bte-germany/terraconvert": "^1.1.2",
-		"@mantine/charts": "^7.17.4",
-		"@mantine/code-highlight": "^7.17.4",
-		"@mantine/core": "^7.17.4",
-		"@mantine/dates": "^7.17.4",
-		"@mantine/form": "^7.17.4",
-		"@mantine/hooks": "^7.17.4",
-		"@mantine/modals": "^7.17.4",
-		"@mantine/notifications": "^7.17.4",
-		"@mantine/nprogress": "^7.17.4",
-		"@mantine/spotlight": "^7.17.4",
-		"@mantine/tiptap": "^7.17.4",
-		"@mapbox/mapbox-gl-draw": "^1.4.3",
+		"@keycloak/keycloak-admin-client": "^26.2.0",
+		"@mantine/charts": "^8.1.2",
+		"@mantine/code-highlight": "^8.1.2",
+		"@mantine/core": "^8.1.2",
+		"@mantine/dates": "^8.1.2",
+		"@mantine/form": "^8.1.2",
+		"@mantine/hooks": "^8.1.2",
+		"@mantine/modals": "^8.1.2",
+		"@mantine/notifications": "^8.1.2",
+		"@mantine/nprogress": "^8.1.2",
+		"@mantine/spotlight": "^8.1.2",
+		"@mantine/tiptap": "^8.1.2",
+		"@mapbox/mapbox-gl-draw": "^1.5.0",
 		"@repo/db": "*",
 		"@tabler/icons-react": "^3.9.0",
 		"@tiptap/core": "^2.11.7",
@@ -39,27 +40,32 @@
 		"@tiptap/pm": "^2.11.7",
 		"@tiptap/react": "^2.11.7",
 		"@tiptap/starter-kit": "^2.11.7",
-		"@types/mapbox__mapbox-gl-draw": "1.4.4",
+		"@turf/helpers": "^7.2.0",
+		"@turf/turf": "^7.2.0",
+		"axios": "^1.9.0",
 		"clsx": "^2.1.1",
 		"dayjs": "^1.11.11",
 		"mantine-contextmenu": "^7.11.0",
 		"mantine-datatable": "^7.12.4",
 		"mapbox-gl": "2.13.0",
-		"mapbox-gl-draw-snap-mode": "^0.2.0",
+		"mapbox-gl-draw-snap-mode": "^0.4.0",
 		"mapbox-gl-style-switcher": "^1.0.11",
 		"moment": "^2.30.1",
 		"moment-timezone": "^0.5.45",
-		"next": "15.3.0",
+		"next": "^15.3.4",
 		"next-auth": "^4.24.7",
 		"next-transpile-modules": "^10.0.1",
 		"react": "19.1.0",
 		"react-dom": "19.1.0",
 		"recharts": "^2.13.3",
-		"swr": "^2.2.5"
+		"swr": "^2.2.5",
+		"zustand": "^5.0.4"
 	},
 	"devDependencies": {
 		"@repo/prettier-config": "*",
 		"@repo/typescript-config": "*",
+		"@types/mapbox-gl": "^3.4.1",
+		"@types/mapbox__mapbox-gl-draw": "^1.4.8",
 		"@types/node": "^20",
 		"@types/react": "19.1.1",
 		"@types/react-dom": "19.1.2",

apps/dashboard/src/actions/buildTeams.ts

@@ -45,7 +45,7 @@ export const adminTransferTeam = async (
 				select: { id: true },
 			});
 			const transaction = await prisma.$transaction(
-				members.map((m) =>
+				members.map((m: { id: any }) =>
 					prisma.user.update({ where: { id: m.id }, data: { joinedBuildTeams: { connect: { id: destinationId } } } }),
 				),
 			);