From 21fd9ef41618d1eec8187da4d56792ac67552fe6 Mon Sep 17 00:00:00 2001
From: Sohit Kumar <79898903+sohitkumar@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:52:39 +0530
Subject: [PATCH 1/6] (add) : window.env_vars

---
 src/App.js                                    |  2 +-
 src/common/constants/UrlConstants.js          |  6 ++---
 src/common/utils/utils.js                     |  4 ++--
 .../src/common/sections/second/Section.js     | 22 +++++++++----------
 src/features/routes.js                        |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/App.js b/src/App.js
index 8a8664d5..4d0a74ec 100755
--- a/src/App.js
+++ b/src/App.js
@@ -9,7 +9,7 @@ import featureRoutes from "features/routes";
 import { Helmet } from "react-helmet";
 import { getMetaData } from "common/utils/MetaData";
 const MainComponent = lazy(() => Promise.resolve({ default: featureRoutes }));
-const instance = process.env.REACT_APP_INSTANCE;
+const instance = window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
 
 function App() {
   const { title, description, faviconImage } = getMetaData(instance);
diff --git a/src/common/constants/UrlConstants.js b/src/common/constants/UrlConstants.js
index 9b145005..d715dcfe 100644
--- a/src/common/constants/UrlConstants.js
+++ b/src/common/constants/UrlConstants.js
@@ -1,11 +1,11 @@
 const UrlConstant = {
   base_url:
-    Window?.ENV_VARS?.REACT_APP_BASEURL || process.env.REACT_APP_BASEURL,
+    window?.ENV_VARS?.REACT_APP_BASEURL || process.env.REACT_APP_BASEURL,
   base_url_without_slash:
-    Window?.ENV_VARS?.REACT_APP_BASEURL_without_slash ||
+    window?.ENV_VARS?.REACT_APP_BASEURL_without_slash ||
     process.env.REACT_APP_BASEURL_without_slash,
   view_data_connector:
-    Window?.ENV_VARS?.REACT_APP_BASEURL_without_slash_view_data ||
+    window?.ENV_VARS?.REACT_APP_BASEURL_without_slash_view_data ||
     process.env.REACT_APP_BASEURL_without_slash_view_data,
 
   login: "accounts/login/",
diff --git a/src/common/utils/utils.js b/src/common/utils/utils.js
index 672ebd48..b872f136 100644
--- a/src/common/utils/utils.js
+++ b/src/common/utils/utils.js
@@ -472,12 +472,12 @@ export function findType() {
 
 export function checkProjectFor(name) {
   console.log(
-    Window?.ENV_VARS?.REACT_APP_PROJECT_FOR,
+    window?.ENV_VARS?.REACT_APP_PROJECT_FOR,
     process.env.REACT_APP_PROJECT_FOR,
     name
   );
   if (
-    (Window?.ENV_VARS?.REACT_APP_PROJECT_FOR ||
+    (window?.ENV_VARS?.REACT_APP_PROJECT_FOR === name ||
       process.env.REACT_APP_PROJECT_FOR) === name
   ) {
     return true;
diff --git a/src/features/default/src/common/sections/second/Section.js b/src/features/default/src/common/sections/second/Section.js
index 80756597..e6143a86 100644
--- a/src/features/default/src/common/sections/second/Section.js
+++ b/src/features/default/src/common/sections/second/Section.js
@@ -37,11 +37,11 @@ const Section = () => {
         <Box>
           <img
            src={
-            process.env.REACT_APP_INSTANCE === "EADP"
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP"
               ? eadp_micro1
-              : process.env.REACT_APP_INSTANCE === "KADP"
+              : window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP"
               ? eadp_micro1
-              : process.env.REACT_APP_INSTANCE === "ETH_MOA"
+              : window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
               ? ethmoasec
               : micro1
           }
@@ -75,11 +75,11 @@ const Section = () => {
               marginRight: mobile || tablet || miniLaptop ? "" : "28px",
             }}
           >
-            {process.env.REACT_APP_INSTANCE === "EADP" ||
-            process.env.REACT_APP_INSTANCE === "KADP" || 
-            process.env.REACT_APP_INSTANCE === "ETH_MOA"
+            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP" || 
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
               ? "With Data sharing great things will happen"
-              : process.env.REACT_APP_INSTANCE === "VISTAAR"
+              : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" || process.env.REACT_APP_INSTANCE === "VISTAAR"
               ? "With Content distribution great things will happen"
               : "With Content distribution great things will happen"}
 
@@ -113,14 +113,14 @@ const Section = () => {
             } ${GlobalStyles.highlighted_text_in_home}`}
           >
             <b style={{ fontWeight: "bold" }}></b>
-            {process.env.REACT_APP_INSTANCE === "EADP" ||
-            process.env.REACT_APP_INSTANCE === "KADP" ||
-             process.env.REACT_APP_INSTANCE === "ETH_MOA"
+            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
               ? `We enable seamless data sharing, breaks down silos, 
               and builds trust among organisations.  
               The platform consolidates fragmented data, standardises data, and aids in 
               better data categorization, enhancing its usability and value.`
-              : process.env.REACT_APP_INSTANCE === "VISTAAR"
+              : (window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" || process.env.REACT_APP_INSTANCE === "VISTAAR")
               ? `We enable seamless content upload of all formats, and builds unified
             approach. The platforms integrate all data or content across all
             states and departments and effectively delivers to front line
diff --git a/src/features/routes.js b/src/features/routes.js
index 46c1291d..96816a7f 100644
--- a/src/features/routes.js
+++ b/src/features/routes.js
@@ -3,7 +3,7 @@ try {
   featureRoutes = require(`./default/src/routes/index`).default;
 } catch (error) {
   console.warn(
-    `Failed to load routes for ${process.env.REACT_APP_INSTANCE}`,
+    `Failed to load routes for ${window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE}`,
     error
   );
   featureRoutes = () => <div>Feature set not supported or not found</div>;

From 1a91c47b4d5b311c6e3541f8607644c4e83120f6 Mon Sep 17 00:00:00 2001
From: sohitkumar <sohit6100@gmail.com>
Date: Tue, 1 Oct 2024 14:07:00 +0530
Subject: [PATCH 2/6] (add) : env_vars

---
 src/App.js                                    |  5 +-
 .../ParticipantForm/ParticipantFormNew.js     |  3 +-
 .../src/Components/Datasets_New/AddDataSet.js |  3 +-
 .../src/Components/Datasets_New/DataSets.js   |  3 +-
 src/features/default/src/Layout/Datahub.js    | 25 ++++++----
 .../default/src/Layout/GuestRoutes.js         | 12 +++--
 .../src/Views/Dashboard/DashboardNew.js       | 11 +++--
 .../src/Views/GuestUser/GuestUserHomeNew.js   | 16 ++++---
 .../ParticipantAndCoStewardDetailsNew.js      |  3 +-
 .../src/common/sections/second/Section.js     | 47 ++++++++++++-------
 .../src/common/sections/third/Section.js      | 12 +++--
 src/features/routes.js                        |  4 +-
 12 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/src/App.js b/src/App.js
index 4d0a74ec..54b128d7 100755
--- a/src/App.js
+++ b/src/App.js
@@ -9,10 +9,13 @@ import featureRoutes from "features/routes";
 import { Helmet } from "react-helmet";
 import { getMetaData } from "common/utils/MetaData";
 const MainComponent = lazy(() => Promise.resolve({ default: featureRoutes }));
-const instance = window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
+const instance =
+  window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
 
 function App() {
   const { title, description, faviconImage } = getMetaData(instance);
+  console.log(window?.ENV_VARS);
+  console.log(process.env);
   return (
     <React.Fragment>
       <Helmet>
diff --git a/src/features/default/src/Components/Card/ParticipantForm/ParticipantFormNew.js b/src/features/default/src/Components/Card/ParticipantForm/ParticipantFormNew.js
index 6701af29..daab23b8 100644
--- a/src/features/default/src/Components/Card/ParticipantForm/ParticipantFormNew.js
+++ b/src/features/default/src/Components/Card/ParticipantForm/ParticipantFormNew.js
@@ -36,7 +36,8 @@ import MuiPhoneNumber from "material-ui-phone-number";
 import { isPhoneValid } from "../../NewOnboarding/utils";
 import { getCountryData, getDefaultCountryCode } from "common/utils/utils";
 const ParticipantFormNew = (props) => {
-  const instance = process.env.REACT_APP_INSTANCE;
+  const instance =
+    window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
   const { callToast, callLoader } = useContext(FarmStackContext);
 
   const { title, isEditModeOn, userType } = props;
diff --git a/src/features/default/src/Components/Datasets_New/AddDataSet.js b/src/features/default/src/Components/Datasets_New/AddDataSet.js
index 2eff690b..670c636e 100644
--- a/src/features/default/src/Components/Datasets_New/AddDataSet.js
+++ b/src/features/default/src/Components/Datasets_New/AddDataSet.js
@@ -53,7 +53,8 @@ function TabPanel(props) {
 }
 
 const AddDataSet = (props) => {
-  const instance = process.env.REACT_APP_INSTANCE;
+  const instance =
+    window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
   const history = useHistory();
   const { callLoader, callToast } = useContext(FarmStackContext);
   const theme = useTheme();
diff --git a/src/features/default/src/Components/Datasets_New/DataSets.js b/src/features/default/src/Components/Datasets_New/DataSets.js
index 9dfbd195..c7a68e19 100644
--- a/src/features/default/src/Components/Datasets_New/DataSets.js
+++ b/src/features/default/src/Components/Datasets_New/DataSets.js
@@ -60,7 +60,8 @@ const cardSx = {
 };
 const DataSets = (props) => {
   const { user, breadcrumbFromRoute } = props;
-  const instance = process.env.REACT_APP_INSTANCE;
+  const instance =
+    window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
 
   const { callLoader, callToast } = useContext(FarmStackContext);
   const history = useHistory();
diff --git a/src/features/default/src/Layout/Datahub.js b/src/features/default/src/Layout/Datahub.js
index 95fd923c..748b2b40 100644
--- a/src/features/default/src/Layout/Datahub.js
+++ b/src/features/default/src/Layout/Datahub.js
@@ -211,9 +211,10 @@ function Datahub(props) {
           {globalConfig?.navBar === "DEFAULT" ? (
             <DefaultNavbar loginType={"admin"} />
           ) : null}
-          {(globalConfig?.navBar === "EADP" || globalConfig?.navBar === "ETH_MOA") && (
-  <EadpNavbar loginType={"admin"} />
-)}
+          {(globalConfig?.navBar === "EADP" ||
+            globalConfig?.navBar === "ETH_MOA") && (
+            <EadpNavbar loginType={"admin"} />
+          )}
           {globalConfig?.navBar === "VISTAAR" && (
             <VistaarNavbar loginType={"admin"} />
           )}
@@ -242,7 +243,8 @@ function Datahub(props) {
                   component={ParticipantsAndCoStewardDetailsNew}
                 />
               )}
-              {process.env.REACT_APP_INSTANCE !== "KADP" &&
+              {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+                process.env.REACT_APP_INSTANCE !== "KADP") &&
                 isCoStewardsEnabled && (
                   <Route
                     exact
@@ -257,7 +259,8 @@ function Datahub(props) {
                   component={EditParticipantsNew}
                 />
               )}
-              {process.env.REACT_APP_INSTANCE !== "KADP" &&
+              {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+                process.env.REACT_APP_INSTANCE !== "KADP") &&
                 isCoStewardsEnabled && (
                   <Route
                     exact
@@ -272,7 +275,8 @@ function Datahub(props) {
                   component={ParticipantApproveNew}
                 />
               )}
-              {process.env.REACT_APP_INSTANCE !== "KADP" &&
+              {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+                process.env.REACT_APP_INSTANCE !== "KADP") &&
                 isCoStewardsEnabled && (
                   <Route
                     exact
@@ -465,7 +469,8 @@ function Datahub(props) {
                   component={ParticipantsAndCoStewardNew}
                 />
               )}
-              {process.env.REACT_APP_INSTANCE !== "KADP" &&
+              {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+                process.env.REACT_APP_INSTANCE !== "KADP") &&
                 isCoStewardsEnabled && (
                   <Route
                     exact
@@ -604,9 +609,9 @@ function Datahub(props) {
           {globalConfig?.footer === "DEFAULT" && (
             <DefaultFooter loginType={"admin"} />
           )}
-          {(globalConfig?.footer === "EADP" || globalConfig?.footer === "ETH_MOA") && !footerMatch && (
-            <EadpFooter loginType={"admin"} />
-          )}
+          {(globalConfig?.footer === "EADP" ||
+            globalConfig?.footer === "ETH_MOA") &&
+            !footerMatch && <EadpFooter loginType={"admin"} />}
           {globalConfig?.footer === "KADP" && (
             <KadpFooter loginType={"admin"} />
           )}
diff --git a/src/features/default/src/Layout/GuestRoutes.js b/src/features/default/src/Layout/GuestRoutes.js
index 7d760a30..74c7bd7e 100644
--- a/src/features/default/src/Layout/GuestRoutes.js
+++ b/src/features/default/src/Layout/GuestRoutes.js
@@ -138,7 +138,8 @@ const GuestRoutes = () => {
           }
         />
       ) : null}
-      {(globalConfig?.navBar === "EADP" || globalConfig?.navBar === "ETH_MOA") && (
+      {(globalConfig?.navBar === "EADP" ||
+        globalConfig?.navBar === "ETH_MOA") && (
         <EadpNavbar
           loginType={
             isLoggedInUserAdmin() || (isLoggedInUserCoSteward() && isVerified)
@@ -196,14 +197,16 @@ const GuestRoutes = () => {
             path="/home/participants/view/:id"
             component={GuestUserParticipantsDetails}
           />
-          {process.env.REACT_APP_INSTANCE !== "KADP" && (
+          {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+            process.env.REACT_APP_INSTANCE !== "KADP") && (
             <Route
               exact
               path="/home/costeward"
               component={GuestUserCoStewardNew}
             />
           )}
-          {process.env.REACT_APP_INSTANCE !== "KADP" && (
+          {(window?.ENV_VARS?.REACT_APP_INSTANCE !== "KADP" ||
+            process.env.REACT_APP_INSTANCE !== "KADP") && (
             <Route
               exact
               path="/home/costeward/view/:id"
@@ -255,7 +258,8 @@ const GuestRoutes = () => {
           }
         />
       )}
-      {(globalConfig?.footer === "EADP" || globalConfig?.footer === "ETH_MOA") && (
+      {(globalConfig?.footer === "EADP" ||
+        globalConfig?.footer === "ETH_MOA") && (
         <EadpFooter
           loginType={
             isLoggedInUserAdmin() || (isLoggedInUserCoSteward() && isVerified)
diff --git a/src/features/default/src/Views/Dashboard/DashboardNew.js b/src/features/default/src/Views/Dashboard/DashboardNew.js
index ef5d836c..492f2614 100644
--- a/src/features/default/src/Views/Dashboard/DashboardNew.js
+++ b/src/features/default/src/Views/Dashboard/DashboardNew.js
@@ -258,10 +258,10 @@ function DashboardNew() {
     } else if (item === "da_registry_dashboard") {
       path =
         isLoggedInUserAdmin() || isLoggedInUserCoSteward()
-        ? `/datahub/dashboards/da_registry_dashboard`
-        : isLoggedInUserParticipant()
-        ? `/participant/dashboards/da_registry_dashboard`
-        : "/home";
+          ? `/datahub/dashboards/da_registry_dashboard`
+          : isLoggedInUserParticipant()
+          ? `/participant/dashboards/da_registry_dashboard`
+          : "/home";
     } else {
       path =
         isLoggedInUserAdmin() || isLoggedInUserCoSteward()
@@ -302,7 +302,8 @@ function DashboardNew() {
             Track and optimize network activities effortlessly. Gain valuable
             insights for efficient operations.
           </div>
-          {process.env.REACT_APP_INSTANCE === "ETH_MOA" && (
+          {(window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+            process.env.REACT_APP_INSTANCE === "ETH_MOA") && (
             <Button
               variant="contained"
               sx={{ marginTop: "25px" }}
diff --git a/src/features/default/src/Views/GuestUser/GuestUserHomeNew.js b/src/features/default/src/Views/GuestUser/GuestUserHomeNew.js
index 65039cdc..5315c4b1 100644
--- a/src/features/default/src/Views/GuestUser/GuestUserHomeNew.js
+++ b/src/features/default/src/Views/GuestUser/GuestUserHomeNew.js
@@ -24,8 +24,8 @@ import DefaultFirstSection from "../../common/sections/first/default/FirstSectio
 import EadpFirstSection from "../../common/sections/first/eadp/FirstSection";
 import KadpFirstSection from "../../common/sections/first/kadp/FirstSection";
 import VistaarFirstSection from "../../common/sections/first/vistaar/FirstSection";
-import ETHMoAFirstSection from "../../common/sections/first/ethmoa/FirstSection"
-import ETHfourth_image from "../../../../../features/default/src/Assets/Img/ethmoa/MoA_3.jpg"
+import ETHMoAFirstSection from "../../common/sections/first/ethmoa/FirstSection";
+import ETHfourth_image from "../../../../../features/default/src/Assets/Img/ethmoa/MoA_3.jpg";
 
 import globalConfig from "globalConfig";
 import SecondSection from "../../common/sections/second/Section";
@@ -268,13 +268,17 @@ const GuestUserHome = () => {
                 largeDesktop ? LocalStyle.image_for_big : LocalStyle.image
               }
               src={
+                window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" ||
                 process.env.REACT_APP_INSTANCE === "EADP"
                   ? micro_4
-                  : process.env.REACT_APP_INSTANCE === "KADP"
+                  : window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" ||
+                    process.env.REACT_APP_INSTANCE === "KADP"
                   ? fourth_home
-                  : process.env.REACT_APP_INSTANCE === "VISTAAR"
-                  ? micro3 
-                  : process.env.REACT_APP_INSTANCE === "ETH_MOA"
+                  : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" ||
+                    process.env.REACT_APP_INSTANCE === "VISTAAR"
+                  ? micro3
+                  : window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+                    process.env.REACT_APP_INSTANCE === "ETH_MOA"
                   ? ETHfourth_image
                   : micro3
               }
diff --git a/src/features/default/src/Views/ParticipantCoSteward/ParticipantAndCoStewardDetailsNew.js b/src/features/default/src/Views/ParticipantCoSteward/ParticipantAndCoStewardDetailsNew.js
index 25cd9604..950b6441 100644
--- a/src/features/default/src/Views/ParticipantCoSteward/ParticipantAndCoStewardDetailsNew.js
+++ b/src/features/default/src/Views/ParticipantCoSteward/ParticipantAndCoStewardDetailsNew.js
@@ -39,7 +39,8 @@ const ParticipantAndCoStewardDetailsNew = (props) => {
     breadcrumbFromRoute,
     isCostewardsParticipant,
   } = props;
-  const instance = process.env.REACT_APP_INSTANCE;
+  const instance =
+    window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE;
   const { callLoader, callToast } = useContext(FarmStackContext);
   const theme = useTheme();
   const mobile = useMediaQuery(theme.breakpoints.down("sm"));
diff --git a/src/features/default/src/common/sections/second/Section.js b/src/features/default/src/common/sections/second/Section.js
index e6143a86..94b212b8 100644
--- a/src/features/default/src/common/sections/second/Section.js
+++ b/src/features/default/src/common/sections/second/Section.js
@@ -10,7 +10,7 @@ import {
 } from "@mui/material";
 import micro1 from "../../../Assets/Img/micro1.jpeg";
 import eadp_micro1 from "../../../Assets/Img/eadp/micro_1.jpg";
-import ethmoasec from "../../../Assets/Img/ethmoa/MoA_1.jpg"
+import ethmoasec from "../../../Assets/Img/ethmoa/MoA_1.jpg";
 import { useHistory } from "react-router-dom";
 const Section = () => {
   const history = useHistory();
@@ -36,15 +36,18 @@ const Section = () => {
       >
         <Box>
           <img
-           src={
-            window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP"
-              ? eadp_micro1
-              : window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP"
-              ? eadp_micro1
-              : window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
-              ? ethmoasec
-              : micro1
-          }
+            src={
+              window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" ||
+              process.env.REACT_APP_INSTANCE === "EADP"
+                ? eadp_micro1
+                : window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" ||
+                  process.env.REACT_APP_INSTANCE === "KADP"
+                ? eadp_micro1
+                : window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+                  process.env.REACT_APP_INSTANCE === "ETH_MOA"
+                ? ethmoasec
+                : micro1
+            }
             width={mobile ? "152px" : "none"}
             height={"250px"}
             loading="lazy"
@@ -75,11 +78,15 @@ const Section = () => {
               marginRight: mobile || tablet || miniLaptop ? "" : "28px",
             }}
           >
-            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP" ||
-            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP" || 
-            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
+            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" ||
+            process.env.REACT_APP_INSTANCE === "EADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" ||
+            process.env.REACT_APP_INSTANCE === "KADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+            process.env.REACT_APP_INSTANCE === "ETH_MOA"
               ? "With Data sharing great things will happen"
-              : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" || process.env.REACT_APP_INSTANCE === "VISTAAR"
+              : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" ||
+                process.env.REACT_APP_INSTANCE === "VISTAAR"
               ? "With Content distribution great things will happen"
               : "With Content distribution great things will happen"}
 
@@ -113,14 +120,18 @@ const Section = () => {
             } ${GlobalStyles.highlighted_text_in_home}`}
           >
             <b style={{ fontWeight: "bold" }}></b>
-            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" || process.env.REACT_APP_INSTANCE === "EADP" ||
-            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" || process.env.REACT_APP_INSTANCE === "KADP" ||
-            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" || process.env.REACT_APP_INSTANCE === "ETH_MOA"
+            {window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" ||
+            process.env.REACT_APP_INSTANCE === "EADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" ||
+            process.env.REACT_APP_INSTANCE === "KADP" ||
+            window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+            process.env.REACT_APP_INSTANCE === "ETH_MOA"
               ? `We enable seamless data sharing, breaks down silos, 
               and builds trust among organisations.  
               The platform consolidates fragmented data, standardises data, and aids in 
               better data categorization, enhancing its usability and value.`
-              : (window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" || process.env.REACT_APP_INSTANCE === "VISTAAR")
+              : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" ||
+                process.env.REACT_APP_INSTANCE === "VISTAAR"
               ? `We enable seamless content upload of all formats, and builds unified
             approach. The platforms integrate all data or content across all
             states and departments and effectively delivers to front line
diff --git a/src/features/default/src/common/sections/third/Section.js b/src/features/default/src/common/sections/third/Section.js
index 9e52914b..82d93486 100644
--- a/src/features/default/src/common/sections/third/Section.js
+++ b/src/features/default/src/common/sections/third/Section.js
@@ -12,7 +12,7 @@ import microsite_point4 from "../../../Assets/Img/microsite_point4.svg";
 import microsite_point3 from "../../../Assets/Img/microsite_point3.svg";
 import microsite_point2 from "../../../Assets/Img/microsite_point2.svg";
 import microsite_point1 from "../../../Assets/Img/microsite_point1.svg";
-import ethmoasectionthird from "../../../Assets/Img/ethmoa/MoA_2.jpg"
+import ethmoasectionthird from "../../../Assets/Img/ethmoa/MoA_2.jpg";
 const Section = () => {
   const history = useHistory();
   const theme = useTheme();
@@ -116,13 +116,17 @@ const Section = () => {
                 : LocalStyle.micrositeLogo
             }
             src={
+              window?.ENV_VARS?.REACT_APP_INSTANCE === "EADP" ||
               process.env.REACT_APP_INSTANCE === "EADP"
                 ? micro_2
-                : process.env.REACT_APP_INSTANCE === "KADP"
+                : window?.ENV_VARS?.REACT_APP_INSTANCE === "KADP" ||
+                  process.env.REACT_APP_INSTANCE === "KADP"
                 ? micro2first_home
-                : process.env.REACT_APP_INSTANCE === "VISTAAR"
+                : window?.ENV_VARS?.REACT_APP_INSTANCE === "VISTAAR" ||
+                  process.env.REACT_APP_INSTANCE === "VISTAAR"
                 ? micro2
-                : process.env.REACT_APP_INSTANCE === "ETH_MOA"
+                : window?.ENV_VARS?.REACT_APP_INSTANCE === "ETH_MOA" ||
+                  process.env.REACT_APP_INSTANCE === "ETH_MOA"
                 ? ethmoasectionthird
                 : micro2
             }
diff --git a/src/features/routes.js b/src/features/routes.js
index 96816a7f..6715f2d1 100644
--- a/src/features/routes.js
+++ b/src/features/routes.js
@@ -3,7 +3,9 @@ try {
   featureRoutes = require(`./default/src/routes/index`).default;
 } catch (error) {
   console.warn(
-    `Failed to load routes for ${window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE}`,
+    `Failed to load routes for ${
+      window?.ENV_VARS?.REACT_APP_INSTANCE || process.env.REACT_APP_INSTANCE
+    }`,
     error
   );
   featureRoutes = () => <div>Feature set not supported or not found</div>;

From cc95d34ac64ff80feee586fcba4ce8c0d4db94d7 Mon Sep 17 00:00:00 2001
From: sohitkumar <sohit6100@gmail.com>
Date: Tue, 1 Oct 2024 14:10:32 +0530
Subject: [PATCH 3/6] modify : dockerfile for dev-ata

---
 Dockerfile | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 51aa602b..4b8101b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,35 @@
-FROM node:20-alpine as builder
+#FROM node:20-alpine as builder
 
-WORKDIR /app
+#WORKDIR /app
 
-COPY package.json package-lock.json* ./
+#COPY package.json package-lock.json* ./
 
 # Install build dependencies for native modules and project dependencies
-RUN apk add --no-cache make gcc g++ python3 && \
-    npm i -f && \
-    npm cache clean --force
+#RUN apk add --no-cache make gcc g++ python3 && \
+#    npm i -f && \
+#    npm cache clean --force
+
+#COPY . .
+
+#EXPOSE 3000
+
+#CMD ["npm", "run", "start"]
+
 
+FROM node:20 as build-image
+WORKDIR /app
+COPY package*.json ./
+RUN export NODE_OPTIONS=--max-old-space-size=4096
+RUN npm install --force
 COPY . .
 
-EXPOSE 3000
+RUN npm run build
+
+# copy static files and run nginx server
+FROM nginx:alpine
+
+COPY --from=build-image /app/build /usr/share/nginx/html
+
+EXPOSE 80
 
-CMD ["npm", "run", "start"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file

From 66ecc6e0e94685cccad9a0ea1ad6461be6f73edb Mon Sep 17 00:00:00 2001
From: sohitkumar <sohit6100@gmail.com>
Date: Tue, 1 Oct 2024 14:36:53 +0530
Subject: [PATCH 4/6] (add) : env file check

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7d350b24..b8d5efa9 100755
--- a/package.json
+++ b/package.json
@@ -58,8 +58,8 @@
     "validator": "^13.7.0"
   },
   "scripts": {
-    "start": "cross-env NODE_OPTIONS=--max-old-space-size=6144 react-scripts start",
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=6144 react-scripts build",
+    "start": "env-cmd -f .env cross-env NODE_OPTIONS=--max-old-space-size=6144 react-scripts start",
+    "build": "env-cmd -f .env cross-env NODE_OPTIONS=--max-old-space-size=6144 react-scripts build",
     "start:default": "cross-env REACT_APP_INSTANCE=DEFAULT REACT_APP_BASEURL=https://dev.platform.farmer.chat/be/ REACT_APP_BASEURL_without_slash=https://dev.platform.farmer.chat/be NODE_OPTIONS=--max-old-space-size=6144 react-scripts start",
     "test": "react-scripts test",
     "eject": "react-scripts eject",

From 5de91366822abce44d45ef275ab10c1bad30b463 Mon Sep 17 00:00:00 2001
From: sohitkumar <sohit6100@gmail.com>
Date: Tue, 1 Oct 2024 17:38:40 +0530
Subject: [PATCH 5/6] (add) : icon name correction

---
 .../src/Components/DatasetCard/DatasetCard.js  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/features/default/src/Components/DatasetCard/DatasetCard.js b/src/features/default/src/Components/DatasetCard/DatasetCard.js
index 8a856d69..2434a889 100644
--- a/src/features/default/src/Components/DatasetCard/DatasetCard.js
+++ b/src/features/default/src/Components/DatasetCard/DatasetCard.js
@@ -1,7 +1,7 @@
-import location from '../../Assets/Img/location.svg';
-import category from '../../Assets/Img/category.svg';
-import apartment from '../../Assets/Img/apartment.svg';
-import globe_img from '../../Assets/Img/globe_img.svg';
+import location from "../../Assets/Img/location.svg";
+import category_icon from "../../Assets/Img/category.svg";
+import apartment from "../../Assets/Img/apartment.svg";
+import globe_img from "../../Assets/Img/globe_img.svg";
 import { Card, Typography, useMediaQuery, useTheme } from "@mui/material";
 import React from "react";
 import LocalStyle from "./DatasetCard.module.css";
@@ -26,7 +26,7 @@ const DatasetCart = (props) => {
       className={mobile ? LocalStyle.cardContainerSm : LocalStyle.cardContainer}
     >
       <div className="published">
-        <img  src={globe_img}  />
+        <img src={globe_img} />
         <span className="published_text">
           Published on:{" "}
           {publishDate?.split("T")[0]
@@ -36,16 +36,14 @@ const DatasetCart = (props) => {
       </div>
       <div className="d_content_title">{title}</div>
       <div className={"organisation"}>
-        {orgnisationName && (
-          <img  src={apartment}  />
-        )}
+        {orgnisationName && <img src={apartment} />}
         {orgnisationName && (
           <span className="organisation_text">{orgnisationName}</span>
         )}
       </div>
       <div className="d_content_text">
         <div className="category">
-          <img  src={category}  alt="category" />
+          <img src={category_icon} alt="category" />
           <span className="category_text">
             {Object.keys(category).length
               ? category?.length > 1
@@ -55,7 +53,7 @@ const DatasetCart = (props) => {
           </span>
         </div>
         <div className="location">
-          <img  src={location}  alt="location" />
+          <img src={location} alt="location" />
           <span className="location_text">
             {geography?.country?.name
               ? geography?.country?.name

From f759653406da0d29cf4e0af3d7818ff7511d7c22 Mon Sep 17 00:00:00 2001
From: sohit-dg <128470277+sohit-dg@users.noreply.github.com>
Date: Sun, 6 Oct 2024 16:22:50 +0530
Subject: [PATCH 6/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb3d3f21..a253a8ac 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Overview
+## Overview :
 • The agricultural sector is a diverse ecosystem involving numerous organizations. • These organizations collaborate with farmers to implement a wide array of  projects. 
 • Key players include government and non-government entities, NGOs, not-for profit organizations, researchers, and for-profit companies. 
 • During project implementation, valuable data is collected that could improve  agricultural practices and outcomes for farmers.