Merge pull request #56 from AplinkosMinisterija/web_repozitorijose_su…

…keisti_adresus sukeisti adresai
AplinkosMinisterija · Mar 27, 2024 · e5f5bb2 · e5f5bb2
2 parents 0473b42 + 52b44b1
commit e5f5bb2
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.env.example b/.env.example
@@ -1 +1,6 @@
-VITE_PROXY_URL=https://dev.internalapi.biip.lt/zuvinimasnew/api
+VITE_PROXY_URL=https://zuvinimas.biip.lt/api
+VITE_MAPS_HOST=https://maps.biip.lt
+VITE_SENTRY_DSN=
+VITE_ENVIRONMENT=
+
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,8 +29,6 @@ jobs:
         run: yarn run build --mode development
         env:
           NODE_ENV: development
-          VITE_MAPS_HOST: https://dev.maps.biip.lt
-          VITE_ZUVINIMAS_API_BASE_URL: https://dev.zuvinimas.biip.lt/api
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/.github/workflows/deploy-development.yml b/.github/workflows/deploy-development.yml
@@ -18,4 +18,4 @@ jobs:
       build-args: |
         NODE_ENV=development
         VITE_SENTRY_DSN=https://0385edf7f78f4ad4a511abae516ae3e8@sentry.biip.lt/7
-        VITE_MAPS_HOST=https://dev.maps.biip.lt
+        VITE_MAPS_HOST=https://dev-maps.biip.lt
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -19,4 +19,4 @@ jobs:
       build-args: |
         NODE_ENV=production
         VITE_SENTRY_DSN=https://0385edf7f78f4ad4a511abae516ae3e8@sentry.biip.lt/7
-        VITE_MAPS_HOST=https://staging.maps.biip.lt
+        VITE_MAPS_HOST=https://staging-maps.biip.lt
diff --git a/Dockerfile b/Dockerfile
@@ -17,9 +17,10 @@ ARG VITE_ENVIRONMENT=${ENVIRONMENT}
 ARG VITE_VERSION=${VERSION}
 
 # Set env variables
-ARG VITE_MAPS_HOST=
-ARG VITE_SENTRY_DSN=
 ARG NODE_ENV=production
+ARG VITE_SENTRY_DSN=
+ARG VITE_MAPS_HOST=
+
 
 # Build and cleanup
 RUN yarn build

diff --git a/src/utils/api.ts b/src/utils/api.ts
@@ -7,7 +7,6 @@ import Cookies from 'universal-cookie';
 import { Resources } from './constants';
 
 const cookies = new Cookies();
-const env = import.meta.env;
 
 interface GetAll {
   resource?: string;
@@ -79,11 +78,9 @@ interface Create {
 
 class Api {
   private AuthApiAxios: AxiosInstance;
-  private readonly apiBaseUrl: string;
+  private readonly proxy: string = '/api';
 
   constructor() {
-    this.apiBaseUrl = env.VITE_ZUVINIMAS_API_BASE_URL ?? '/api';
-
     this.AuthApiAxios = Axios.create();
     this.AuthApiAxios.interceptors.request.use(
       (config) => {
@@ -93,7 +90,7 @@ class Api {
           config.headers!.Authorization = 'Bearer ' + token;
           if (isFinite(parseInt(profileId))) config.headers!['X-Profile'] = profileId;
         }
-        config.url = this.apiBaseUrl + config.url;
+        config.url = this.proxy + config.url;
         return config;
       },
       (error) => {
@@ -418,7 +415,7 @@ class Api {
     const profileId = cookies.get('profileId');
 
     const response = await fetch(
-      `${this.apiBaseUrl}/${Resources.EXCEL}?filter=${JSON.stringify(filter)}`,
+      `${this.proxy}/${Resources.EXCEL}?filter=${JSON.stringify(filter)}`,
       {
         headers: {
           'Content-Type': 'application/json',

diff --git a/src/utils/texts.ts b/src/utils/texts.ts
@@ -127,7 +127,7 @@ export const toasts = {
   profileUpdated: 'Profilis atnaujintas',
 };
 
-const mapsHost = import.meta.env.VITE_MAPS_HOST || 'https://dev.maps.biip.lt';
+const mapsHost = import.meta.env.VITE_MAPS_HOST;
 export const Url = {
   DRAW: `${mapsHost}/zuvinimas/draw`,
   FISH_STOCKING: `${mapsHost}/zuvinimas`,

diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
@@ -2,7 +2,6 @@
 
 interface ImportMetaEnv {
   readonly NODE_ENV: 'development' | 'production';
-  readonly VITE_ZUVINIMAS_API_BASE_URL?: string;
   readonly VITE_SENTRY_DSN?: string;
   readonly VITE_ENVIRONMENT?: string;
   readonly VITE_MAPS_HOST?: string;