digitalgreenorg · ugeshdg · Mar 26, 2024 · Mar 27, 2024 · Apr 17, 2024 · Apr 17, 2024
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,6 @@ yarn-error.log*
 Jenkinsfile
 
 package-lock.json
-.env.production
+.env.production
+
+/envs
diff --git a/Dockerfile b/Dockerfile
@@ -9,11 +9,7 @@ RUN npm run build
 
 # copy static files and run nginx server
 FROM nginx:alpine
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build-image /app/build /usr/share/nginx/html
-COPY ./public.crt /etc/nginx/cert/public.crt
-COPY ./private.key /etc/nginx/cert/private.key
 EXPOSE 80
-EXPOSE 443
 CMD ["nginx", "-g", "daemon off;"]
 
diff --git a/env_frontend.sh b/env_frontend.sh
@@ -1,5 +1,5 @@
 # Set up endpoint for env retrieval
-echo "Window.ENV_VARS = {" > /usr/share/nginx/html/env_config.js
+echo "window.ENV_VARS = {" > /usr/share/nginx/html/env_config.js
 
 # Collect enviroment variables for react
 eval enviroment_variables="$(env | grep REACT_APP.*=)"

diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "caniuse-lite": "^1.0.30001444",
     "chart.js": "^3.7.0",
     "country-state-city": "^3.1.2",
+    "cross-env": "^7.0.3",
     "date-fns": "^2.30.0",
     "dotenv": "^16.3.1",
     "echarts": "5.1.2",
@@ -77,8 +78,8 @@
     "validator": "^13.7.0"
   },
   "scripts": {
-    "start": "env-cmd -f .env.production react-scripts --max-old-space-size=6144 start",
-    "build": "env-cmd -f .env.production react-scripts --max-old-space-size=6144 build",
+    "start": "NODE_OPTIONS=--max-old-space-size=6144 react-scripts start",
+    "build": "NODE_OPTIONS=--max-old-space-size=6144 react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "coverage": "react-scripts test --coverage --watchAll"
@@ -101,6 +102,8 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^5.16.5",
     "axios-mock-adapter": "^1.21.5",
+    "babel-jest": "^24.9.0",
+    "jest": "^24.9.0",
     "jest-svg-transformer": "^1.0.0",
     "msw": "^1.2.2"
   },

diff --git a/public/env_config.js b/public/env_config.js
@@ -1,11 +1,6 @@
-Window.ENV_VARS = {
-  //   REACT_APP_API_BASE_URL: "",
-  //   REACT_APP_GOOGLE_CLIENT_ID: "",
-  //   REACT_APP_BASE_URL: "",
-  //   REACT_APP_CONNECTOR_HOSTING: "",
-  //   REACT_APP_CONNECTOR_HOST_IP: "",
-
+window.ENV_VARS = {
   REACT_APP_BASEURL: "",
   REACT_APP_BASEURL_without_slash: "",
   REACT_APP_BASEURL_without_slash_view_data: "",
+  REACT_APP_LOGIN_WITH_PASSWORD: ""
 };
diff --git a/public/index.html b/public/index.html
@@ -4,13 +4,12 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Explore Vistaar's premier Agricultural Data Sharing Platform, powered by FarmStack. Collaborate, analyze, and innovate in agriculture.
-      Join the future of Indians agriculture with our Data Sharing Platform, supported by FarmStack. Access, share, and transform agri data today.
-      FarmStack's Vistaar Agricultural Data Sharing Platform - the hub for sharing, discovering, and leveraging agricultural insights and knowledge.
-      Discover the power of data collaboration in Indian agriculture. Join FarmStack's Data Sharing Platform to drive growth and sustainability.
-      Get involved in India's agriculture revolution. FarmStack's Data Sharing Platform connects stakeholders for data-driven farming success."
+    <meta name="description" content="FarmStack : Powered by Digital Green" />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="192x192"
+      href="https://digitalgreen.org/wp-content/themes/digital-green/images/favicons/android-chrome-192x192.png"
     />
     <!--
       manifest.json provides metadata used when your web app is installed on a
@@ -40,7 +39,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Vistaar Agricultural Data Sharing Platform</title>
+    <title>FarmStack : Powered by Digital Green</title>
   </head>
 
   <body>

diff --git a/src/App.js b/src/App.js
@@ -111,6 +111,18 @@ function App() {
       });
   };
   useEffect(() => {
+    // TODO: to be removed
+    console.log(
+      "🚀 ~ verifyUserDataOfLocal ~ UrlConstant.base_url:",
+      UrlConstant.base_url,
+      window?.ENV_VARS?.base_url,
+      process.env.base_url
+    );
+    console.log(
+      window?.ENV_VARS?.REACT_APP_LOGIN_WITH_PASSWORD ||
+        process.env.REACT_APP_LOGIN_WITH_PASSWORD,
+      "REACT_APP_LOGIN_WITH_PASSWORD"
+    );
     verifyUserDataOfLocal();
     getAdminData();
   }, []);