feat: adding .env

arunavabasucom · Dec 24, 2023 · c01dafe · c01dafe
1 parent 9c9713f
commit c01dafe
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 122 deletions.
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -13,6 +13,7 @@
 
 # misc
 .DS_Store
+.env
 .env.local
 .env.development.local
 .env.test.local
@@ -22,5 +23,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# RADIS App logo type declaration
-!./src/.radis.d.ts
+#  type declaration
+!*.d.ts
diff --git a/frontend/src/components/Form.tsx b/frontend/src/components/Form.tsx
@@ -136,135 +136,134 @@ export const Form: React.FunctionComponent<FormProps> = ({
     setLoading(true);
     setError(undefined);
 
-    import(/* webpackIgnore: true */ "./config.js").then(async (module) => {
-      if (endpoint === "calculate-spectrum") {
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        ReactGA.event({
-          category: "calculate",
-          action: "click_calculate",
-          label: "calculate_spectrum",
-        });
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        setProgress(30);
+    const apiEndpoint = import.meta.env.VITE_API_ENDPOINT;
+    if (endpoint === "calculate-spectrum") {
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      ReactGA.event({
+        category: "calculate",
+        action: "click_calculate",
+        label: "calculate_spectrum",
+      });
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      setProgress(30);
 
-        const rawResponse = await axios({
-          url: module.apiEndpoint + `calculate-spectrum`,
-          method: "POST",
-          data: data,
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
-        if (
-          rawResponse.data.data === undefined &&
-          rawResponse.data.error === undefined
-        ) {
-          handleBadResponse("Bad response from backend!");
+      const rawResponse = await axios({
+        url: apiEndpoint + `calculate-spectrum`,
+        method: "POST",
+        data: data,
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
+      if (
+        rawResponse.data.data === undefined &&
+        rawResponse.data.error === undefined
+      ) {
+        handleBadResponse("Bad response from backend!");
+        setDisableDownloadButton(true);
+      } else {
+        const response = await rawResponse.data;
+        if (response.error) {
+          handleBadResponse(response.error);
           setDisableDownloadButton(true);
         } else {
-          const response = await rawResponse.data;
-          if (response.error) {
-            handleBadResponse(response.error);
-            setDisableDownloadButton(true);
-          } else {
-            setSpectra([
-              ...(appendSpectrum ? spectra : []),
-              {
-                species: data.species.map((s) => ({ ...s })),
-                database: data.database,
-                tgas: data.tgas,
-                trot: data.trot,
-                tvib: data.tvib,
-                pressure: data.pressure,
-                pressure_units: data.pressure_units,
-                wavelength_units: data.wavelength_units,
-                ...response.data,
-              },
-            ]);
-            setDisableAddToPlotButton(false);
-            setPlotSettings({
-              mode: data.mode,
-              units: data.mode.startsWith("absorbance")
-                ? "-ln(I/I0)"
-                : response.data.units,
-            });
-            setDisableDownloadButton(false);
-          }
+          setSpectra([
+            ...(appendSpectrum ? spectra : []),
+            {
+              species: data.species.map((s) => ({ ...s })),
+              database: data.database,
+              tgas: data.tgas,
+              trot: data.trot,
+              tvib: data.tvib,
+              pressure: data.pressure,
+              pressure_units: data.pressure_units,
+              wavelength_units: data.wavelength_units,
+              ...response.data,
+            },
+          ]);
+          setDisableAddToPlotButton(false);
+          setPlotSettings({
+            mode: data.mode,
+            units: data.mode.startsWith("absorbance")
+              ? "-ln(I/I0)"
+              : response.data.units,
+          });
+          setDisableDownloadButton(false);
         }
-
-        setProgress(100);
-        setLoading(false);
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        ReactGA.event({
-          category: "calculate",
-          action: "click_calculate_successful",
-          label: "calculate_spectrum_successful",
-        });
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
       }
 
-      if (endpoint === "download-spectrum" || endpoint === "download-txt") {
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        ReactGA.event({
-          category: "file_download",
-          action: "click_download",
-          label: "download_spectrum_file",
-        });
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        setProgress(30);
-        setLoading(false);
-        let serverFullUrl: string;
-        if (endpoint === "download-spectrum") {
-          serverFullUrl = module.apiEndpoint + `download-spectrum`;
-        } else {
-          serverFullUrl = module.apiEndpoint + `download-txt`;
-        }
-        const rawResponse = await axios({
-          url: serverFullUrl,
-          method: "POST",
-          responseType: "blob",
-          data: data,
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
+      setProgress(100);
+      setLoading(false);
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      ReactGA.event({
+        category: "calculate",
+        action: "click_calculate_successful",
+        label: "calculate_spectrum_successful",
+      });
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+    }
 
-        const url = window.URL.createObjectURL(new Blob([rawResponse.data]));
-        const link = document.createElement("a");
-        link.href = url;
-        if (endpoint === "download-spectrum") {
-          link.setAttribute(
-            "download",
-            `${data.database}_${molecules}_${data.min_wavenumber_range}_${data.max_wavenumber_range}cm-1_${data.tgas}K_${data.pressure}atm.spec`
-          );
-        }
-        if (endpoint === "download-txt") {
-          link.setAttribute(
-            "download",
-            `${data.database}_${molecules}_${data.min_wavenumber_range}_${data.max_wavenumber_range}cm-1_${data.tgas}K_${data.pressure}atm.csv`
-          );
-        }
+    if (endpoint === "download-spectrum" || endpoint === "download-txt") {
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      ReactGA.event({
+        category: "file_download",
+        action: "click_download",
+        label: "download_spectrum_file",
+      });
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      setProgress(30);
+      setLoading(false);
+      let serverFullUrl: string;
+      if (endpoint === "download-spectrum") {
+        serverFullUrl = apiEndpoint + `download-spectrum`;
+      } else {
+        serverFullUrl = apiEndpoint + `download-txt`;
+      }
+      const rawResponse = await axios({
+        url: serverFullUrl,
+        method: "POST",
+        responseType: "blob",
+        data: data,
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
 
-        document.body.appendChild(link);
-        link.click();
-        setDisableDownloadButton(false);
-        const response = await rawResponse.data;
-        if (response.error) {
-          handleBadResponse(response.error);
-        } else {
-          setDisableDownloadButton(false);
-        }
+      const url = window.URL.createObjectURL(new Blob([rawResponse.data]));
+      const link = document.createElement("a");
+      link.href = url;
+      if (endpoint === "download-spectrum") {
+        link.setAttribute(
+          "download",
+          `${data.database}_${molecules}_${data.min_wavenumber_range}_${data.max_wavenumber_range}cm-1_${data.tgas}K_${data.pressure}atm.spec`
+        );
+      }
+      if (endpoint === "download-txt") {
+        link.setAttribute(
+          "download",
+          `${data.database}_${molecules}_${data.min_wavenumber_range}_${data.max_wavenumber_range}cm-1_${data.tgas}K_${data.pressure}atm.csv`
+        );
+      }
+
+      document.body.appendChild(link);
+      link.click();
+      setDisableDownloadButton(false);
+      const response = await rawResponse.data;
+      if (response.error) {
+        handleBadResponse(response.error);
+      } else {
         setDisableDownloadButton(false);
-        setProgress(100);
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
-        ReactGA.event({
-          category: "file_download",
-          action: "click_download_successful",
-          label: "download_spectrum_file_successful",
-        });
-        /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
       }
-    });
+      setDisableDownloadButton(false);
+      setProgress(100);
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+      ReactGA.event({
+        category: "file_download",
+        action: "click_download_successful",
+        label: "download_spectrum_file_successful",
+      });
+      /*#########GOOGLE_ANALYTICS_EVENT_TRACKING###############*/
+    }
   };
 
   useEffect(() => {

diff --git a/frontend/src/env.d.ts b/frontend/src/env.d.ts
@@ -0,0 +1,9 @@
+// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_API_ENDPOINT: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -4,7 +4,8 @@
     "lib": [
       "dom",
       "dom.iterable",
-      "esnext"
+      "esnext",
+      "WebWorker"
     ],
     "allowJs": true,
     "skipLibCheck": true,