From 00db5f45f631f95b9776e104b63d563893bc8807 Mon Sep 17 00:00:00 2001
From: mwlt68 <mwltgr@gmail.com>
Date: Sun, 12 Mar 2023 23:42:18 +0300
Subject: [PATCH] Enviroments add

---
 .env.development                           |  1 +
 .env.production                            |  1 +
 package-lock.json                          | 40 ++++++++++++++++++++++
 package.json                               |  9 ++---
 src/services/api-service/ApiBaseService.ts |  4 +--
 5 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 .env.development
 create mode 100644 .env.production

diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..affbb35
--- /dev/null
+++ b/.env.development
@@ -0,0 +1 @@
+REACT_APP_API_URL=https://localhost:7175
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..8d81c91
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+REACT_APP_API_URL=test
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 878dbfe..db502c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "@types/react": "^18.0.26",
         "@types/react-dom": "^18.0.10",
         "axios": "^1.2.1",
+        "env-cmd": "^10.1.0",
         "eslint-plugin-react-hooks": "^4.6.0",
         "localforage": "^1.10.0",
         "lottie-react": "^2.3.1",
@@ -7115,6 +7116,29 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/env-cmd": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-10.1.0.tgz",
+      "integrity": "sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==",
+      "dependencies": {
+        "commander": "^4.0.0",
+        "cross-spawn": "^7.0.0"
+      },
+      "bin": {
+        "env-cmd": "bin/env-cmd.js"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/env-cmd/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -22506,6 +22530,22 @@
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
     },
+    "env-cmd": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-10.1.0.tgz",
+      "integrity": "sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA==",
+      "requires": {
+        "commander": "^4.0.0",
+        "cross-spawn": "^7.0.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        }
+      }
+    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
diff --git a/package.json b/package.json
index 978dfa3..6418a9d 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.10",
     "axios": "^1.2.1",
+    "env-cmd": "^10.1.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "localforage": "^1.10.0",
     "lottie-react": "^2.3.1",
@@ -30,10 +31,10 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "start:prod": "env-cmd -f .env.production react-scripts start",
+    "start:dev": "env-cmd -f .env.development react-scripts start",
+    "build:prod": "env-cmd -f .env.production react-scripts build",
+    "build:dev": "env-cmd -f .env.development react-scripts build"
   },
   "eslintConfig": {
     "extends": [
diff --git a/src/services/api-service/ApiBaseService.ts b/src/services/api-service/ApiBaseService.ts
index d47d979..fa16df3 100644
--- a/src/services/api-service/ApiBaseService.ts
+++ b/src/services/api-service/ApiBaseService.ts
@@ -14,7 +14,7 @@ import { AuthManager } from "../../utils/helpers/AuthManager";
 
 export abstract class ApiBaseService {
 
-  static readonly BaseUrl: string = "https://localhost:7175";
+  static BaseUrl: string |undefined = process.env.REACT_APP_API_URL;
   static isBusy: boolean = false;
 
   static async sendRequestBase<ResponseModel>(
@@ -27,7 +27,7 @@ export abstract class ApiBaseService {
   ) {
     this.isBusy = true;
     let isUnauthorized: boolean = false;
-
+    debugger
     var response = await axios
       .request({
         baseURL: this.BaseUrl,