From b22748d8acb27dd13520079383c003f659365cc3 Mon Sep 17 00:00:00 2001
From: Vasilii Mikhailovskii <ti.webdev@ya.ru>
Date: Tue, 26 Nov 2024 21:32:26 +0200
Subject: [PATCH] base url

---
 .gitea/workflows/deploy.yaml    | 1 +
 apps/frontend/src/api/qrCode.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 9381d84..5b63cd8 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -22,6 +22,7 @@ jobs:
           node-version: '22'
       - name: Clean install dependencies and build
         run: |
+          echo BASE_URL=$BASE_URL
           npm ci
           npm run build-only --workspace=apps/frontend -- --emptyOutDir  --base $BASE_URL --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}/
           mv /www/hereconnect.condev.ru/current /www/hereconnect.condev.ru/old && mv /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}} /www/hereconnect.condev.ru/current && rm -rf /www/hereconnect.condev.ru/old
diff --git a/apps/frontend/src/api/qrCode.ts b/apps/frontend/src/api/qrCode.ts
index 05a0116..eb0bec1 100644
--- a/apps/frontend/src/api/qrCode.ts
+++ b/apps/frontend/src/api/qrCode.ts
@@ -13,12 +13,14 @@ export const createQrCodeDocument = async (
   >,
 ) => {
   const uri = Math.abs(Date.now() - EPOHE).toString(36)
+  const urlBasePrefix = `${import.meta.env.BASE_URL}`.replace(/\/+$/, '')
+  const url = new URL(`${urlBasePrefix}/read/${uri}`, location.origin).toString()
 
   const qrCodeDoc: QRCodeDocument = {
     _id: `qr_code:${uri}`,
     type: 'qr_code',
     uri,
-    url: `${import.meta.env.BASE_URL}/read/${uri}`,
+    url,
     user_uuid: getUserUuid(),
     browser_uuid: getBrowserUuid(),
     created_at: new Date().toISOString(),