ti/hereconnect
1
0
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

base url
Main daploy / deploy (push) Successful in 46s
Details

Browse Source
This commit is contained in:
Vasilii Mikhailovskii
2024-11-26 21:32:26 +02:00
parent aac8a5ee69
commit b22748d8ac
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deploy.yaml
+1
View File
@@ -22,6 +22,7 @@ jobs:
node-version: '22' node-version: '22'
- name: Clean install dependencies and build - name: Clean install dependencies and build
run: | run: |
echo BASE_URL=$BASE_URL
npm ci npm ci
npm run build-only --workspace=apps/frontend -- --emptyOutDir --base $BASE_URL --outDir /www/hereconnect.condev.ru/build-${{env.GITHUB_SHA}}/ 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 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
apps/frontend/src/api/qrCode.ts
+3 -1
View File
@@ -13,12 +13,14 @@ export const createQrCodeDocument = async (
>, >,
) => { ) => {
const uri = Math.abs(Date.now() - EPOHE).toString(36) 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 = { const qrCodeDoc: QRCodeDocument = {
_id: `qr_code:${uri}`, _id: `qr_code:${uri}`,
type: 'qr_code', type: 'qr_code',
uri, uri,
url: `${import.meta.env.BASE_URL}/read/${uri}`, url,
user_uuid: getUserUuid(), user_uuid: getUserUuid(),
browser_uuid: getBrowserUuid(), browser_uuid: getBrowserUuid(),
created_at: new Date().toISOString(), created_at: new Date().toISOString(),