Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into raktima-opensignlabs-patch-11

Author: raktima-opensignlabs

.env.local_dev

@@ -7,7 +7,7 @@ PUBLIC_URL=http://localhost:3000
 # Set it to true if you want to generate the Sourcemap for debugging
 GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
-REACT_APP_SERVERURL=http://localhost:8080/app
+# REACT_APP_SERVERURL=http://localhost:8080/app
 # A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
 REACT_APP_APPID=opensign
 
@@ -46,7 +46,7 @@ USE_LOCAL=true
 MAILGUN_API_KEY=
 MAILGUN_DOMAIN=mail.yourdomain.com
 [email protected]
-SMTP_ENABLE=
+SMTP_ENABLE=true
 SMTP_HOST=smtp.yourhost.com
 SMTP_PORT=443
 [email protected]

.github/workflows/Docker.yml

@@ -2,7 +2,7 @@ name: ci
 on:
   push:
     branches:
-      - 'staging'
+      - 'main'
 
 jobs:
   docker:

Caddyfile

@@ -0,0 +1,7 @@
+{$HOST_URL} {
+    reverse_proxy client:3000
+    handle_path /app/* {
+        reverse_proxy server:8080
+            rewrite * /app{uri}
+    }
+}

Makefile

@@ -1,8 +1,10 @@
 build:
+	@echo "Building with HOST_URL=${HOST_URL}"
 	cp .env.local_dev .env
 	cd apps/OpenSign && cp ../../.env.local_dev .env && npm install && npm run build
-	docker compose up --build --force-recreate
+	HOST_URL=${HOST_URL} docker compose up --build --force-recreate
 
 run:
+	@echo "Building with HOST_URL=${HOST_URL}"
 	cp .env.local_dev .env
-	docker compose up -d
+	docker compose up -d

apps/OpenSign/package-lock.json

@@ -4,12 +4,12 @@
   "private": true,
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.8.6",
+    "@lottiefiles/dotlottie-react": "^0.8.7",
     "@pdf-lib/fontkit": "^1.1.1",
     "@radix-ui/themes": "^3.1.1",
     "@react-pdf/renderer": "^3.4.4",
     "@reduxjs/toolkit": "^2.2.7",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "file-saver": "^2.0.5",
     "i18next": "^23.12.2",
     "i18next-browser-languagedetector": "^8.0.0",
@@ -33,10 +33,10 @@
     "react-dom": "^18.2.0",
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
-    "react-i18next": "^15.0.0",
+    "react-i18next": "^15.0.1",
     "react-konva": "^18.2.10",
     "react-pdf": "^9.1.0",
-    "react-quill": "^2.0.0",
+    "react-quill-new": "^3.2.2",
     "react-redux": "^9.1.2",
     "react-rnd": "^10.4.11",
     "react-router-dom": "^6.26.0",
@@ -114,7 +114,7 @@
     "postcss": "^8.4.41",
     "prettier": "^3.3.3",
     "pretty-quick": "^4.0.0",
-    "tailwindcss": "^3.4.7",
+    "tailwindcss": "^3.4.9",
     "terser-webpack-plugin": "^5.3.10",
     "webpack-cli": "^5.1.4"
   },