From b5eb50e27f62d7a28e8fec09423620e6e30e5fac Mon Sep 17 00:00:00 2001
From: sriram veeraghanta <veeraghanta.sriram@gmail.com>
Date: Mon, 2 Dec 2024 12:22:06 +0530
Subject: [PATCH] fix: merge conflicts

---
 packages/constants/endpoints.ts         | 17 -----------------
 packages/constants/src/endpoints.ts     |  4 ++++
 packages/constants/{ => src}/payment.ts |  0
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 packages/constants/endpoints.ts
 rename packages/constants/{ => src}/payment.ts (100%)

diff --git a/packages/constants/endpoints.ts b/packages/constants/endpoints.ts
deleted file mode 100644
index 3c15fd1118..0000000000
--- a/packages/constants/endpoints.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL || "";
-// PI Base Url
-export const PI_BASE_URL = process.env.NEXT_PUBLIC_PI_BASE_URL || "";
-// God Mode Admin App Base Url
-export const ADMIN_BASE_URL = process.env.NEXT_PUBLIC_ADMIN_BASE_URL || "";
-export const ADMIN_BASE_PATH = process.env.NEXT_PUBLIC_ADMIN_BASE_PATH || "";
-export const GOD_MODE_URL = encodeURI(`${ADMIN_BASE_URL}${ADMIN_BASE_PATH}/`);
-// Publish App Base Url
-export const SPACE_BASE_URL = process.env.NEXT_PUBLIC_SPACE_BASE_URL || "";
-export const SPACE_BASE_PATH = process.env.NEXT_PUBLIC_SPACE_BASE_PATH || "";
-// Live App Base Url
-export const LIVE_BASE_URL = process.env.NEXT_PUBLIC_LIVE_BASE_URL || "";
-export const LIVE_BASE_PATH = process.env.NEXT_PUBLIC_LIVE_BASE_PATH || "";
-export const LIVE_URL = `${LIVE_BASE_URL}${LIVE_BASE_PATH}`;
-// Silo Base Url
-export const SILO_BASE_URL = process.env.NEXT_PUBLIC_SILO_BASE_URL || "";
-export const SILO_BASE_PATH = process.env.NEXT_PUBLIC_SILO_BASE_PATH || "";
diff --git a/packages/constants/src/endpoints.ts b/packages/constants/src/endpoints.ts
index 751ee20dd3..2e55eb418d 100644
--- a/packages/constants/src/endpoints.ts
+++ b/packages/constants/src/endpoints.ts
@@ -13,3 +13,7 @@ export const SITES_URL = encodeURI(`${SPACE_BASE_URL}${SPACE_BASE_PATH}/`);
 export const LIVE_BASE_URL = process.env.NEXT_PUBLIC_LIVE_BASE_URL || "";
 export const LIVE_BASE_PATH = process.env.NEXT_PUBLIC_LIVE_BASE_PATH || "";
 export const LIVE_URL = encodeURI(`${LIVE_BASE_URL}${LIVE_BASE_PATH}/`);
+// Silo Base Url
+export const SILO_BASE_URL = process.env.NEXT_PUBLIC_SILO_BASE_URL || "";
+export const SILO_BASE_PATH = process.env.NEXT_PUBLIC_SILO_BASE_PATH || "";
+export const SILO_URL = encodeURI(`${SILO_BASE_URL}${SILO_BASE_PATH}/`);
diff --git a/packages/constants/payment.ts b/packages/constants/src/payment.ts
similarity index 100%
rename from packages/constants/payment.ts
rename to packages/constants/src/payment.ts