0.8.3

.github/workflows/dev-mobile.yml

@@ -53,9 +53,6 @@ jobs:
         with:
           context: ./mobile
           push: true
-          build-args: |
-            VITE_API_BASE_URL=${{secrets.API_BASE_URL}}
-            BASE_URL=${{secrets.BASE_URL}}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=5scontrol/5scontrol_front_mobile:cache

.github/workflows/stage-mobile.yml

@@ -55,9 +55,6 @@ jobs:
         with:
           context: ./mobile
           push: true
-          build-args: |
-            VITE_API_BASE_URL=${{secrets.API_BASE_URL_STAGE}}
-            BASE_URL=${{secrets.BASE_URL}}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=5scontrol/5scontrol_front_mobile:stage-cache

.gitignore

@@ -12,6 +12,7 @@
 # production
 /build
 /mobile/dist
+/mobile/docker-compose.yml
 
 # misc
 .DS_Store

mobile/Dockerfile

@@ -3,15 +3,12 @@ WORKDIR /app
 COPY package*.json ./
 RUN npm ci
 COPY . .
-
-ARG BASE_URL
-ENV BASE_URL=${BASE_URL}
-
-ARG VITE_API_BASE_URL
-ENV VITE_API_BASE_URL=${VITE_API_BASE_URL}
-
 RUN npm run build
 
-FROM nginx:latest AS production
+FROM nginx:latest
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 COPY ./nginx/nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
+
+ENTRYPOINT ["/entrypoint.sh"]

mobile/entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -z "$VITE_API_BASE_URL" ]; then
+  echo "Error: VITE_API_BASE_URL is not set."
+  exit 1
+fi
+
+echo "Replacing VITE_API_BASE_URL with: $VITE_API_BASE_URL"
+
+find /usr/share/nginx/html -type f -exec sed -i "s|__VITE_API_BASE_URL__|$VITE_API_BASE_URL|g" {} \;
+
+nginx -g "daemon off;"

mobile/nginx/nginx.conf

@@ -1,7 +1,8 @@
-server { 
- listen 80;
- location / {
-   root /usr/share/nginx/html;
-   try_files $uri /index.html;
- }
+server {
+    listen 80;
+
+    location / {
+        root /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html;
+    }
 }

mobile/src/App.tsx

@@ -85,6 +85,7 @@ import { CollectionUpdateDynamic } from "./pages/directories-dynamic/CollectionU
 import OrderReport from "./pages/reports/orderReport/OrderReport";
 import TimespanCameras from "./pages/timespan/camera/TimespanCameras";
 import OrderProducts from "./pages/order/orderProducts/OrderProducts";
+import { API_BASE_PATH } from "./config";
 
 setupIonicReact();
 
@@ -126,7 +127,7 @@ function App() {
 
   return (
     <IonApp>
-      <IonReactRouter basename={import.meta.env.BASE_URL ?? "/"}>
+      <IonReactRouter basename={API_BASE_PATH ?? "/"}>
         <PermissionProvider role={role}>
           {cookies.token ? (
             <IonRouterOutlet>

mobile/src/api/algorithmRequest.ts

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { API_BASE_URL } from "../config";
 
 const API_ALGORITHM = "api/camera-algorithms/algorithms-detail/";
 const API_POSTALGORITHM = "api/camera-algorithms/create-process/";
@@ -7,7 +8,7 @@ const API_POSTOPERATIONID = "api/order/index_stanowisko/";
 const API_UPLOAD = "api/camera-algorithms/upload-algorithm/";
 
 export const getAveilableAlgorithms = (hostname, cookies) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_ALGORITHM}`, {
+  return axios.get(`${API_BASE_URL}${API_ALGORITHM}`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -17,7 +18,7 @@ export const getAveilableAlgorithms = (hostname, cookies) => {
 
 export const uploadAlgorithm = async (hostname, cookies, id) => {
   return axios.post(
-    `${import.meta.env.VITE_API_BASE_URL}${API_UPLOAD}${id}/`,
+    `${API_BASE_URL}${API_UPLOAD}${id}/`,
     {},
     {
       headers: {
@@ -31,7 +32,7 @@ export const uploadAlgorithm = async (hostname, cookies, id) => {
 
 export const postAlgorithnDependences = async (hostname, cookies, response) => {
   return axios.post(
-    `${import.meta.env.VITE_API_BASE_URL}${API_POSTALGORITHM}`,
+    `${API_BASE_URL}${API_POSTALGORITHM}`,
     response,
     {
       headers: {
@@ -44,7 +45,7 @@ export const postAlgorithnDependences = async (hostname, cookies, response) => {
 };
 
 export const getProcess = (hostname, cookies) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_GETPROCESS}`, {
+  return axios.get(`${API_BASE_URL}${API_GETPROCESS}`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -53,7 +54,7 @@ export const getProcess = (hostname, cookies) => {
 };
 
 export const getProcessByCamera = (hostname, cameraIp, cookies) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_GETPROCESS}${cameraIp}/`, {
+  return axios.get(`${API_BASE_URL}${API_GETPROCESS}${cameraIp}/`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -62,7 +63,7 @@ export const getProcessByCamera = (hostname, cameraIp, cookies) => {
 };
 
 export const getOperationID = (hostname, cookies) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_POSTOPERATIONID}`, {
+  return axios.get(`${API_BASE_URL}${API_POSTOPERATIONID}`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -71,7 +72,7 @@ export const getOperationID = (hostname, cookies) => {
 };
 
 export const postUploadAlgorithm = async (hostname, cookies, body) => {
-  return axios.post(`${import.meta.env.VITE_API_BASE_URL}${API_ALGORITHM}`, body, {
+  return axios.post(`${API_BASE_URL}${API_ALGORITHM}`, body, {
     headers: {
       "Content-Type": "application/json",
       Authorization: cookies,
@@ -81,7 +82,7 @@ export const postUploadAlgorithm = async (hostname, cookies, body) => {
 };
 
 export const deleteAlgorithmAPI = (hostname, cookies, id) => {
-  return axios.delete(`${import.meta.env.VITE_API_BASE_URL}${API_ALGORITHM}${id}/`, {
+  return axios.delete(`${API_BASE_URL}${API_ALGORITHM}${id}/`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -91,7 +92,7 @@ export const deleteAlgorithmAPI = (hostname, cookies, id) => {
 
 export const putAlgorithmAPI = (cookies, id, body) => {
   return axios.put(
-    `${import.meta.env.VITE_API_BASE_URL}${API_ALGORITHM}${id}/`,
+    `${API_BASE_URL}${API_ALGORITHM}${id}/`,
     body,
     {
       headers: {

mobile/src/api/authorization.ts

@@ -1,18 +1,19 @@
 import axios from "axios";
+import { API_BASE_URL } from "../config";
 
 const API_AUTH = "api/auth/jwt/create/";
 const API_VERIFYTOKEN = "api/auth/jwt/verify/";
 
 export const authorizationRequest = (email: string, password: string) => {
-    return axios.post(`${import.meta.env.VITE_API_BASE_URL}${API_AUTH}`, {
+    return axios.post(`${API_BASE_URL}${API_AUTH}`, {
       username: email,
       password: password,
     });
   };
 
   export const isVerifyToken = (cookies: string) => {
     cookies = cookies?.split(" ")[1];
-    return axios.post(`${import.meta.env.VITE_API_BASE_URL}${API_VERIFYTOKEN}`, {
+    return axios.post(`${API_BASE_URL}${API_VERIFYTOKEN}`, {
       token: cookies,
       "ngrok-skip-browser-warning": "true",
     });

mobile/src/api/cameraRequest.ts

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { API_BASE_URL } from "../config";
 
 const API_CAMERASELECT = "api/camera-algorithms/camera/";
 const API_CAMERACREATE = "api/cameras/create-camera/";
@@ -11,7 +12,7 @@ const API_ALGORITHMZONES = "api/camera-algorithms/zones-algorithms/";
 const API_VIDEO = "api/onvif/is_video_available/";
 
 export const getSelectedCameras = (hostname, cookies) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_CAMERASELECT}`, {
+  return axios.get(`${API_BASE_URL}${API_CAMERASELECT}`, {
     headers: {
       "Content-Type": "application/json",
       Authorization: cookies,
@@ -22,7 +23,7 @@ export const getSelectedCameras = (hostname, cookies) => {
 
 export const postCamera = (hostname, IPCamera, username, password, cookies) => {
   return axios.post(
-    `${import.meta.env.VITE_API_BASE_URL}${API_CAMERACREATE}`,
+    `${API_BASE_URL}${API_CAMERACREATE}`,
     {
       ip: IPCamera,
       username: username,
@@ -40,7 +41,7 @@ export const postCamera = (hostname, IPCamera, username, password, cookies) => {
 
 export const deleteCameraAPI = (hostname, cookies, IPCamera) => {
   return axios.delete(
-    `${import.meta.env.VITE_API_BASE_URL}${API_CAMERADELETE}${IPCamera}/`,
+    `${API_BASE_URL}${API_CAMERADELETE}${IPCamera}/`,
     {
       headers: {
         Authorization: cookies,
@@ -51,15 +52,15 @@ export const deleteCameraAPI = (hostname, cookies, IPCamera) => {
 };
 
 export const findCamera = (hostname) => {
-  return axios.get(import.meta.env.VITE_API_BASE_URL + API_CAMERAFIND, {
+  return axios.get(API_BASE_URL + API_CAMERAFIND, {
     headers: {
       "ngrok-skip-browser-warning": "true",
     },
   });
 };
 
 export const checkCamera = (hostname, cameraIP, username, password) => {
-  return fetch(`${import.meta.env.VITE_API_BASE_URL}${API_CAMERACHECK}`, {
+  return fetch(`${API_BASE_URL}${API_CAMERACHECK}`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -75,7 +76,7 @@ export const checkCamera = (hostname, cameraIP, username, password) => {
 
 export const getCameraZones = (hostname, cookies, camera) => {
   return axios.get(
-    `${import.meta.env.VITE_API_BASE_URL}${API_CAMERAZONES}?camera=${camera}`,
+    `${API_BASE_URL}${API_CAMERAZONES}?camera=${camera}`,
     {
       headers: {
         "Content-Type": "application/json",
@@ -87,7 +88,7 @@ export const getCameraZones = (hostname, cookies, camera) => {
 };
 
 export const postCameraZones = (hostname, cookies, body) => {
-  return axios.post(`${import.meta.env.VITE_API_BASE_URL}${API_ZONES}`, body, {
+  return axios.post(`${API_BASE_URL}${API_ZONES}`, body, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -97,7 +98,7 @@ export const postCameraZones = (hostname, cookies, body) => {
 
 export const patchCameraZones = (hostname, cookies, response, id) => {
   return axios.put(
-    `${import.meta.env.VITE_API_BASE_URL}${API_ZONES}${id}/`,
+    `${API_BASE_URL}${API_ZONES}${id}/`,
     response,
     {
       headers: {
@@ -109,7 +110,7 @@ export const patchCameraZones = (hostname, cookies, response, id) => {
 };
 
 export const deleteCameraZones = (hostname, cookies, id) => {
-  return axios.delete(`${import.meta.env.VITE_API_BASE_URL}${API_ZONES}${id}/`, {
+  return axios.delete(`${API_BASE_URL}${API_ZONES}${id}/`, {
     headers: {
       Authorization: cookies,
       "ngrok-skip-browser-warning": "true",
@@ -119,7 +120,7 @@ export const deleteCameraZones = (hostname, cookies, id) => {
 
 export const getAlgorithmZones = (hostname, cookies, camera) => {
   return axios.get(
-    `${import.meta.env.VITE_API_BASE_URL}${API_ALGORITHMZONES}?camera=${camera}`,
+    `${API_BASE_URL}${API_ALGORITHMZONES}?camera=${camera}`,
     {
       headers: {
         "Content-Type": "application/json",
@@ -131,15 +132,15 @@ export const getAlgorithmZones = (hostname, cookies, camera) => {
 };
 
 export const getVideo = (hostname, body) => {
-  return axios.post(`${import.meta.env.VITE_API_BASE_URL}${API_VIDEO}`, body, {
+  return axios.post(`${API_BASE_URL}${API_VIDEO}`, body, {
     headers: {
       "ngrok-skip-browser-warning": "true",
     },
   });
 };
 
 export const getSelectedZone = (hostname, cookies, id) => {
-  return axios.get(`${import.meta.env.VITE_API_BASE_URL}${API_ZONES}${id}/`, {
+  return axios.get(`${API_BASE_URL}${API_ZONES}${id}/`, {
     headers: {
       "Content-Type": "application/json",
       Authorization: cookies,

mobile/src/api/connections.ts

@@ -1,6 +1,7 @@
 import axios from "axios";
+import { API_BASE_URL } from "../config";
 
-const API_BASE_URL: string = import.meta.env.VITE_API_BASE_URL;
+const BASE_URL: string = API_BASE_URL;
 const API_STATUSDATA = "api/connector/status/";
 const API_CONNECTIONS = "api/connector/connections/";
 const GET_CONNECTIONS = "api/order/get-connections/";
@@ -12,7 +13,7 @@ const axiosConfig = (cookies: string) => ({
   },
 });
 
-const constructUrl = (endpoint: string) => `${API_BASE_URL}${endpoint}`;
+const constructUrl = (endpoint: string) => `${BASE_URL}${endpoint}`;
 
 export const getStatusData = (hostname: string, cookies: string) => {
   return axios.get(constructUrl(API_STATUSDATA), axiosConfig(cookies));

mobile/src/api/directory/directory.ts

@@ -1,6 +1,7 @@
 import axios from "axios";
+import { API_BASE_URL } from "../../config";
 
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
+const BASE_URL = API_BASE_URL;
 const API_DIRECTORY = "api/erp-reference/references/";
 const API_STATIC_DIRECTORY = "api/erp-reference/references/static/";
 
@@ -11,7 +12,7 @@ const axiosConfig = (cookies: string) => ({
   },
 });
 
-const constructUrl = (endpoint: string) => `${API_BASE_URL}${endpoint}`;
+const constructUrl = (endpoint: string) => `${BASE_URL}${endpoint}`;
 
 export const getAllDirectories = (cookies: string) => {
   return axios.get(constructUrl(API_DIRECTORY), axiosConfig(cookies));

mobile/src/api/directory/directoryCategories.ts

@@ -1,6 +1,7 @@
 import axios from "axios";
+import { API_BASE_URL } from "../../config";
 
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
+const BASE_URL = API_BASE_URL;
 const API_DIRECTORY = "api/erp-reference/reference-items/";
 const REFERENCE = 'reference/';
 
@@ -11,7 +12,7 @@ const axiosConfig = (cookies: string) => ({
   },
 });
 
-const constructUrl = (endpoint: string) => `${API_BASE_URL}${endpoint}`;
+const constructUrl = (endpoint: string) => `${BASE_URL}${endpoint}`;
 
 export const createDirectoryCategory = (name: string, referenceId: number, cookies: string) => {
   return axios.post(

mobile/src/api/employees.ts

@@ -1,6 +1,7 @@
 import axios from "axios";
+import { API_BASE_URL } from "../config";
 
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
+const BASE_URL = API_BASE_URL;
 const API_EMPLOYEE = "api/erp-reference/employees/";
 
 const axiosConfig = (cookies: string) => ({
@@ -10,7 +11,7 @@ const axiosConfig = (cookies: string) => ({
   },
 });
 
-const constructUrl = (endpoint: string) => `${API_BASE_URL}${endpoint}`;
+const constructUrl = (endpoint: string) => `${BASE_URL}${endpoint}`;
 
 export const getAllEmployees = (cookies: string) => {
   return axios.get(constructUrl(API_EMPLOYEE), axiosConfig(cookies));