Replaced separate Strapi env variables to a single URL one.

Author: moonstar-x

Dockerfile

@@ -18,9 +18,7 @@ COPY . .
 # Any NEXT_PUBLIC env variables must be added here for them to work.
 ENV NEXT_PUBLIC_URL=NEXT_PUBLIC_URL
 ENV NEXT_PUBLIC_DOWNLOADS_URL=NEXT_PUBLIC_DOWNLOADS_URL
-ENV NEXT_PUBLIC_STRAPI_PROTO=NEXT_PUBLIC_STRAPI_PROTO
-ENV NEXT_PUBLIC_STRAPI_HOST=NEXT_PUBLIC_STRAPI_HOST
-ENV NEXT_PUBLIC_STRAPI_PORT=NEXT_PUBLIC_STRAPI_PORT
+ENV NEXT_PUBLIC_STRAPI_URL=NEXT_PUBLIC_STRAPI_URL
 
 RUN npm run build
 

README.md

@@ -40,9 +40,7 @@ LOCAL_DOWNLOADS_URL=http://localhost:10000
 NEXT_REVALIDATE_TIME=600
 
 STRAPI_API_TOKEN=YOUR_TOKEN_HERE
-NEXT_PUBLIC_STRAPI_PROTO=http
-NEXT_PUBLIC_STRAPI_HOST=localhost
-NEXT_PUBLIC_STRAPI_PORT=1337
+NEXT_PUBLIC_STRAPI_URL=http://localhost:1337
 ```
 
 > Replace `YOUR_TOKEN_HERE` with a token generated on your Strapi instance created by following [web-cms](https://github.com/starpep-web/web-cms)'s README.
@@ -92,7 +90,7 @@ docker build -t local-starpep/web-frontend:latest .
 You can create a new container to try it out with the following command:
 
 ```bash
-docker run -it --rm -p 3000:3000 -e API_URL=http://localhost:4000 -e BIO_API_URL=http://localhost:8000 -e NEXT_PUBLIC_URL=http://localhost:3000 -e NEXT_PUBLIC_DOWNLOADS_URL=http://localhost:10000 -e LOCAL_DOWNLOADS_URL=http://localhost:10000 -e NEXT_REVALIDATE_TIME=600 -e STRAPI_API_TOKEN=YOUR_TOKEN_HERE -e NEXT_PUBLIC_STRAPI_PROTO=http -e NEXT_PUBLIC_STRAPI_HOST=localhost -e NEXT_PUBLIC_STRAPI_PORT=1337 local-starpep/web-frontend:latest
+docker run -it --rm -p 3000:3000 -e API_URL=http://localhost:4000 -e BIO_API_URL=http://localhost:8000 -e NEXT_PUBLIC_URL=http://localhost:3000 -e NEXT_PUBLIC_DOWNLOADS_URL=http://localhost:10000 -e LOCAL_DOWNLOADS_URL=http://localhost:10000 -e NEXT_REVALIDATE_TIME=600 -e STRAPI_API_TOKEN=YOUR_TOKEN_HERE -e NEXT_PUBLIC_STRAPI_URL=http://localhost:1337 local-starpep/web-frontend:latest
 docker run -it --rm -p 3000:3000 local-starpep/web-frontend:latest
 ```
 

graphql-codegen.ts

@@ -1,8 +1,7 @@
 import 'dotenv/config';
 import { CodegenConfig } from '@graphql-codegen/cli';
 
-const NEXT_PUBLIC_STRAPI_URL = `${process.env.NEXT_PUBLIC_STRAPI_PROTO}://${process.env.NEXT_PUBLIC_STRAPI_HOST}${process.env.NEXT_PUBLIC_STRAPI_PORT ? `:${process.env.NEXT_PUBLIC_STRAPI_PORT}` : ''}`;
-const GRAPHQL_URL = `${NEXT_PUBLIC_STRAPI_URL}/graphql`;
+const GRAPHQL_URL = `${process.env.NEXT_PUBLIC_STRAPI_URL}/graphql`;
 
 const config: CodegenConfig = {
   schema: GRAPHQL_URL,

src/global.d.ts

@@ -11,9 +11,7 @@ declare global {
       NEXT_REVALIDATE_TIME?: string
 
       STRAPI_API_TOKEN?: string
-      NEXT_PUBLIC_STRAPI_PROTO?: string
-      NEXT_PUBLIC_STRAPI_HOST?: string
-      NEXT_PUBLIC_STRAPI_PORT?: string
+      NEXT_PUBLIC_STRAPI_URL?: string
     }
   }
 }

src/lib/config/app.ts

@@ -8,8 +8,4 @@ export const LOCAL_DOWNLOADS_URL = process.env.LOCAL_DOWNLOADS_URL!;
 export const NEXT_REVALIDATE_TIME = process.env.NEXT_REVALIDATE_TIME ? parseInt(process.env.NEXT_REVALIDATE_TIME, 10) : 3600;
 
 export const STRAPI_API_TOKEN = process.env.STRAPI_API_TOKEN!;
-export const NEXT_PUBLIC_STRAPI_PROTO = process.env.NEXT_PUBLIC_STRAPI_PROTO!;
-export const NEXT_PUBLIC_STRAPI_HOST = process.env.NEXT_PUBLIC_STRAPI_HOST!;
-export const NEXT_PUBLIC_STRAPI_PORT = process.env.NEXT_PUBLIC_STRAPI_PORT ?? '';
-
-export const NEXT_PUBLIC_STRAPI_URL = `${NEXT_PUBLIC_STRAPI_PROTO}://${NEXT_PUBLIC_STRAPI_HOST}${NEXT_PUBLIC_STRAPI_PORT ? `:${NEXT_PUBLIC_STRAPI_PORT}` : ''}`;
+export const NEXT_PUBLIC_STRAPI_URL = process.env.NEXT_PUBLIC_STRAPI_URL!;