From 7455ecea706662f15cfa9a91852a9b8d24804176 Mon Sep 17 00:00:00 2001 From: Satyam Date: Thu, 14 Mar 2024 13:18:03 +0530 Subject: [PATCH 1/4] chore: change environment variables --- .env | 3 +- process-env.d.ts | 1 + .../common/Navbar/navbar.constants.ts | 12 ++--- src/constants/urls.ts | 52 ++++++++++++++++++- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 75b3434..84b9e38 100644 --- a/.env +++ b/.env @@ -5,4 +5,5 @@ NEXT_PUBLIC_STATUS_SITE='https://staging-status.realdevsquad.com' NEXT_PUBLIC_MEMBERS_SITE='https://staging-members.realdevsquad.com' NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' NEXT_PUBLIC_WWW_SITE='https://staging-www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' \ No newline at end of file +NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' +# NEXT_PUBLIC_APP_ENV='production' \ No newline at end of file diff --git a/process-env.d.ts b/process-env.d.ts index 8ed51b1..ff3a44b 100644 --- a/process-env.d.ts +++ b/process-env.d.ts @@ -6,5 +6,6 @@ declare namespace NodeJS { NEXT_PUBLIC_WELCOME_SITE: string; NEXT_PUBLIC_WWW_SITE: string; NEXT_PUBLIC_MY_SITE: string; + NEXT_PUBLIC_APP_ENV: "development" | "production" | "test" | "development"; } } diff --git a/src/components/common/Navbar/navbar.constants.ts b/src/components/common/Navbar/navbar.constants.ts index 70ebaf6..faa0c81 100644 --- a/src/components/common/Navbar/navbar.constants.ts +++ b/src/components/common/Navbar/navbar.constants.ts @@ -1,28 +1,28 @@ -import { RDS_BACKEND_URL } from "@/constants/urls"; +import { RDS_BACKEND_URL, URLS } from "@/constants/urls"; import { NavbarLink } from "./navbar.types"; // ?v2=true so that we get rds-session-v2 cookie from RDS backend -export const SIGNIN_URL = `${RDS_BACKEND_URL}/auth/github/login?redirectURL=${process.env.NEXT_PUBLIC_SKILL_TREE_SITE}?v2=true`; +export const SIGNIN_URL = `${RDS_BACKEND_URL}/auth/github/login?redirectURL=${URLS.SKILL_TREE_SITE}?v2=true`; export const NAVBAR_LINKS: NavbarLink[] = [ { id: "welcome-site", name: "Welcome", - link: process.env.NEXT_PUBLIC_WELCOME_SITE, + link: URLS.WELCOME_SITE, }, { id: "events-site", name: "Events", - link: `${process.env.NEXT_PUBLIC_WWW_SITE}/events`, + link: `${URLS.WWW_SITE}/events`, }, { id: "members-site", name: "Members", - link: process.env.NEXT_PUBLIC_MEMBERS_SITE, + link: URLS.MEMBERS_SITE, }, { id: "status-site", name: "Status", - link: process.env.NEXT_PUBLIC_STATUS_SITE, + link: URLS.STATUS_SITE, }, ]; diff --git a/src/constants/urls.ts b/src/constants/urls.ts index 5a7ddf6..8b48c5d 100644 --- a/src/constants/urls.ts +++ b/src/constants/urls.ts @@ -1,2 +1,50 @@ -export const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_BASE_URL; -export const RDS_BACKEND_URL = process.env.NEXT_PUBLIC_RDS_BACKEND_URL; +type Urls = { + [key: string]: { + BACKEND_BASE_URL: string; + RDS_BACKEND_URL: string; + SKILL_TREE_SITE: string; + STATUS_SITE: string; + MEMBERS_SITE: string; + WELCOME_SITE: string; + WWW_SITE: string; + MY_SITE: string; + }; +}; + +export const URLS_MAP: Urls = { + production: { + BACKEND_BASE_URL: "https://skilltree-api.realdevsquad.com/v1", + RDS_BACKEND_URL: "https://api.realdevsquad.com", + SKILL_TREE_SITE: "https:/skilltree.realdevsquad.com", + STATUS_SITE: "https://status.realdevsquad.com", + MEMBERS_SITE: "https://members.realdevsquad.com", + WELCOME_SITE: "https://welcome.realdevsquad.com", + WWW_SITE: "https://www.realdevsquad.com", + MY_SITE: "https://my.realdevsquad.com", + }, + staging: { + BACKEND_BASE_URL: "https://staging-skilltree-api.realdevsquad.com/v1", + RDS_BACKEND_URL: "https://staging-api.realdevsquad.com", + SKILL_TREE_SITE: "https://staging-skilltree.realdevsquad.com", + STATUS_SITE: "https://staging-status.realdevsquad.com", + MEMBERS_SITE: "https://staging-members.realdevsquad.com", + WELCOME_SITE: "https://welcome.realdevsquad.com", + WWW_SITE: "https://staging-www.realdevsquad.com", + MY_SITE: "https://staging-my.realdevsquad.com", + }, + development: { + BACKEND_BASE_URL: "https://staging-skilltree-api.realdevsquad.com/v1", + RDS_BACKEND_URL: "https://staging-api.realdevsquad.com", + SKILL_TREE_SITE: "https://staging-skilltree.realdevsquad.com", + STATUS_SITE: "https://staging-status.realdevsquad.com", + MEMBERS_SITE: "https://staging-members.realdevsquad.com", + WELCOME_SITE: "https://welcome.realdevsquad.com", + WWW_SITE: "https://staging-www.realdevsquad.com", + MY_SITE: "https://staging-my.realdevsquad.com", + }, +}; + +export const URLS = { ...URLS_MAP[process.env.NEXT_PUBLIC_APP_ENV] }; + +export const BASE_URL: string = URLS.BACKEND_BASE_URL; +export const RDS_BACKEND_URL: string = URLS.RDS_BACKEND_URL; From 94c5365def8bb060efc02659cd1437fa9c3e89f0 Mon Sep 17 00:00:00 2001 From: Satyam Date: Thu, 14 Mar 2024 20:42:40 +0530 Subject: [PATCH 2/4] chore: remove unnecessary env files --- .env | 3 +-- env/.env.development | 8 -------- env/.env.production | 10 ---------- env/.env.staging | 8 -------- env/.env.test | 8 -------- 5 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 env/.env.development delete mode 100644 env/.env.production delete mode 100644 env/.env.staging delete mode 100644 env/.env.test diff --git a/.env b/.env index 84b9e38..75b3434 100644 --- a/.env +++ b/.env @@ -5,5 +5,4 @@ NEXT_PUBLIC_STATUS_SITE='https://staging-status.realdevsquad.com' NEXT_PUBLIC_MEMBERS_SITE='https://staging-members.realdevsquad.com' NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' NEXT_PUBLIC_WWW_SITE='https://staging-www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' -# NEXT_PUBLIC_APP_ENV='production' \ No newline at end of file +NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' \ No newline at end of file diff --git a/env/.env.development b/env/.env.development deleted file mode 100644 index 75b3434..0000000 --- a/env/.env.development +++ /dev/null @@ -1,8 +0,0 @@ -NEXT_PUBLIC_BACKEND_BASE_URL = 'https://staging-skilltree-api.realdevsquad.com/v1' -NEXT_PUBLIC_RDS_BACKEND_URL='https://staging-api.realdevsquad.com' -NEXT_PUBLIC_SKILL_TREE_SITE='https://staging-skilltree.realdevsquad.com' -NEXT_PUBLIC_STATUS_SITE='https://staging-status.realdevsquad.com' -NEXT_PUBLIC_MEMBERS_SITE='https://staging-members.realdevsquad.com' -NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' -NEXT_PUBLIC_WWW_SITE='https://staging-www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' \ No newline at end of file diff --git a/env/.env.production b/env/.env.production deleted file mode 100644 index 20e752e..0000000 --- a/env/.env.production +++ /dev/null @@ -1,10 +0,0 @@ -NEXT_PUBLIC_BACKEND_BASE_URL = 'https://skilltree-api.realdevsquad.com/v1' -NEXT_PUBLIC_RDS_BACKEND_URL='https://api.realdevsquad.com' -NEXT_PUBLIC_SKILL_TREE_SITE='https:/skilltree.realdevsquad.com' -NEXT_PUBLIC_STATUS_SITE='https://status.realdevsquad.com' -NEXT_PUBLIC_MEMBERS_SITE='https://members.realdevsquad.com' -NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' -NEXT_PUBLIC_WWW_SITE='https://www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://my.realdevsquad.com' - - diff --git a/env/.env.staging b/env/.env.staging deleted file mode 100644 index cd2c360..0000000 --- a/env/.env.staging +++ /dev/null @@ -1,8 +0,0 @@ -NEXT_PUBLIC_BACKEND_BASE_URL = 'https://staging-skilltree-api.realdevsquad.com/v1' -NEXT_PUBLIC_RDS_BACKEND_URL='https://staging-api.realdevsquad.com' -NEXT_PUBLIC_SKILL_TREE_SITE='https:/staging-skilltree.realdevsquad.com' -NEXT_PUBLIC_STATUS_SITE='https://staging-status.realdevsquad.com' -NEXT_PUBLIC_MEMBERS_SITE='https://staging-members.realdevsquad.com' -NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' -NEXT_PUBLIC_WWW_SITE='https://staging-www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' \ No newline at end of file diff --git a/env/.env.test b/env/.env.test deleted file mode 100644 index cd2c360..0000000 --- a/env/.env.test +++ /dev/null @@ -1,8 +0,0 @@ -NEXT_PUBLIC_BACKEND_BASE_URL = 'https://staging-skilltree-api.realdevsquad.com/v1' -NEXT_PUBLIC_RDS_BACKEND_URL='https://staging-api.realdevsquad.com' -NEXT_PUBLIC_SKILL_TREE_SITE='https:/staging-skilltree.realdevsquad.com' -NEXT_PUBLIC_STATUS_SITE='https://staging-status.realdevsquad.com' -NEXT_PUBLIC_MEMBERS_SITE='https://staging-members.realdevsquad.com' -NEXT_PUBLIC_WELCOME_SITE='https://welcome.realdevsquad.com' -NEXT_PUBLIC_WWW_SITE='https://staging-www.realdevsquad.com' -NEXT_PUBLIC_MY_SITE='https://staging-my.realdevsquad.com' \ No newline at end of file From ba8fb3a57cbd042c60b087685441a36fb0af49a0 Mon Sep 17 00:00:00 2001 From: Satyam Date: Thu, 14 Mar 2024 22:29:01 +0530 Subject: [PATCH 3/4] chore: fix base url in endorsement handler --- __mocks__/handlers/endorsements.handler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__mocks__/handlers/endorsements.handler.js b/__mocks__/handlers/endorsements.handler.js index 5e35cac..0af4efc 100644 --- a/__mocks__/handlers/endorsements.handler.js +++ b/__mocks__/handlers/endorsements.handler.js @@ -3,7 +3,7 @@ import { BASE_URL } from "@/constants/urls"; import endorsementDetails from "../db/endorsementDetails.json"; export const endorsementsHandler = [ - rest.get(`${BASE_URL.dev}/endorsements`, (req, res, ctx) => { + rest.get(`${BASE_URL}/endorsements`, (req, res, ctx) => { return res(ctx.status(200), ctx.json(endorsementDetails)); }), ]; From 4f312d71ca6574ce3cbf831684c122d918db16a4 Mon Sep 17 00:00:00 2001 From: Satyam Bajpai Date: Mon, 18 Mar 2024 12:29:02 +0530 Subject: [PATCH 4/4] fix: types of APP_ENV variable --- process-env.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process-env.d.ts b/process-env.d.ts index ff3a44b..0d9e55a 100644 --- a/process-env.d.ts +++ b/process-env.d.ts @@ -6,6 +6,6 @@ declare namespace NodeJS { NEXT_PUBLIC_WELCOME_SITE: string; NEXT_PUBLIC_WWW_SITE: string; NEXT_PUBLIC_MY_SITE: string; - NEXT_PUBLIC_APP_ENV: "development" | "production" | "test" | "development"; + NEXT_PUBLIC_APP_ENV: "staging" | "production" | "test" | "development"; } }