Skip to content

Commit 83166dd

Browse files
Remove in-place editing from campaign details page (#676)
* pass in `NEXT_PUBLIC_APP_URL` at build time * rename to `NEXT_PUBLIC_API_BASE_URL` * remove in-place editing on campaign details page
1 parent 9aa8cdc commit 83166dd

12 files changed

Lines changed: 63 additions & 1021 deletions

File tree

.github/workflows/docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ jobs:
106106
platforms: linux/amd64
107107
file: frontend-nextjs/Dockerfile
108108
push: true
109+
build-args: |
110+
NEXT_PUBLIC_APP_URL=${{ vars.NEXT_PUBLIC_APP_URL }}
111+
NEXT_PUBLIC_API_BASE_URL=${{ vars.NEXT_PUBLIC_API_BASE_URL }}
109112
tags: |
110113
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-frontend:${{ github.sha }}
111114
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-frontend:latest

.github/workflows/frontend-nextjs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ jobs:
3535
env:
3636
NEXT_PUBLIC_APP_URL: http://localhost:3000
3737
NEXT_OAUTH_CALLBACK_URL: http://localhost:8080/auth/google
38-
NEXT_API_BASE_URL: https://localhost:8080
38+
NEXT_PUBLIC_API_BASE_URL: https://localhost:8080

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
env_file:
5050
- ./frontend-nextjs/.env
5151
environment:
52-
NEXT_API_BASE_URL: ${NEXT_API_BASE_URL:-http://backend:8080}
52+
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL:-http://backend:8080}
5353
NODE_ENV: production
5454
ports:
5555
- "${FRONTEND_PORT:-3000}:3000"

frontend-nextjs/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ RUN bun add lightningcss-linux-arm64-gnu@1.30.2
2020
RUN bun add @tailwindcss/oxide-linux-arm64-gnu@4.1.18
2121

2222
COPY . .
23+
24+
ARG NEXT_PUBLIC_APP_ROOT_URL
25+
ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL
26+
ARG NEXT_PUBLIC_API_BASE_URL
27+
ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
28+
2329
RUN bun run build
2430

2531
# runner

frontend-nextjs/src/app/[lang]/dashboard/organisation/[orgId]/campaigns/[campaignId]/campaign-dates.tsx

Lines changed: 0 additions & 166 deletions
This file was deleted.

0 commit comments

Comments
 (0)