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

---
 .gitea/workflows/deploy.yaml           | 3 +--
 apps/frontend/src/api/qrCode.ts        | 3 +--
 apps/frontend/src/router/index.ts      | 2 +-
 apps/frontend/src/views/DonateView.vue | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index abc2d02..9acc2b7 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -22,7 +22,6 @@ jobs:
           node-version: '22'
       - name: Clean install dependencies and build
         run: |
-          echo BASE_URL=${{env.BASE_URL}}
           npm ci
-          npm run build-only --workspace=apps/frontend -- --emptyOutDir  --base ${{env.BASE_URL}} --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}/
+          npm run build-only --workspace=apps/frontend -- --emptyOutDir --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 eb0bec1..de9f77e 100644
--- a/apps/frontend/src/api/qrCode.ts
+++ b/apps/frontend/src/api/qrCode.ts
@@ -13,8 +13,7 @@ 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 url = new URL(`/read/${uri}`, location.origin).toString()
 
   const qrCodeDoc: QRCodeDocument = {
     _id: `qr_code:${uri}`,
diff --git a/apps/frontend/src/router/index.ts b/apps/frontend/src/router/index.ts
index c7a55e1..26ae13c 100644
--- a/apps/frontend/src/router/index.ts
+++ b/apps/frontend/src/router/index.ts
@@ -91,7 +91,7 @@ const routes = [
 ]
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHistory(),
   routes,
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
diff --git a/apps/frontend/src/views/DonateView.vue b/apps/frontend/src/views/DonateView.vue
index e897359..27036ed 100644
--- a/apps/frontend/src/views/DonateView.vue
+++ b/apps/frontend/src/views/DonateView.vue
@@ -81,7 +81,7 @@
 // const success = ref(false)
 
 // Конфигурация для шаринга
-const siteUrl = encodeURIComponent(import.meta.env.BASE_URL)
+const siteUrl = encodeURIComponent(location.origin)
 const shareText = encodeURIComponent('Попробуйте НаСвязи — удобный способ связаться через QR-код!')
 // const shareImage = encodeURIComponent(
 //   'https://hereconnect.condev.ru/images/qr-code-logo-200x200.jpg',