diff --git a/apps/frontend/.env b/apps/frontend/.env index 7a96bd1..ac73ac1 100644 --- a/apps/frontend/.env +++ b/apps/frontend/.env @@ -1,2 +1,2 @@ -VITE_API_URL=https://hereconnect.condev.ru/api +VITE_API_URL=/api VITE_READ_BASE_URL=https://r.condev.ru diff --git a/apps/frontend/.env.development b/apps/frontend/.env.development index 7b622b3..0ec8864 100644 --- a/apps/frontend/.env.development +++ b/apps/frontend/.env.development @@ -1,2 +1,3 @@ VITE_MANIFEST_NAME=НаСвязи-dev VITE_MANIFEST_SHORT_NAME=НаСвязи-dev +VITE_PROXY_API_URL=https://hereconnect.condev.ru/api diff --git a/apps/frontend/.gitignore b/apps/frontend/.gitignore index c1f5067..e800227 100644 --- a/apps/frontend/.gitignore +++ b/apps/frontend/.gitignore @@ -12,7 +12,7 @@ node_modules dist dist-ssr coverage -.env.local +.env.development.local /cypress/videos/ /cypress/screenshots/ diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 883e0d2..134815d 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -12,12 +12,14 @@ "test:e2e": "playwright test", "build-only": "vite build", "type-check": "vue-tsc --build --force", - "lint": "eslint . --fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "format": "prettier --write src/", "vite-bundle-visualizer": "npx vite-bundle-visualizer" }, "dependencies": { "@f3ve/vue-markdown-it": "^0.2.3", + "@hereconnect/constants": "workspace:^", "@hereconnect/types": "^1.0.0", "@primevue/forms": "^4.2.1", "@primevue/themes": "^4.2.1", diff --git a/apps/frontend/src/api/dbs.ts b/apps/frontend/src/api/dbs.ts index 335b86d..f095dd2 100644 --- a/apps/frontend/src/api/dbs.ts +++ b/apps/frontend/src/api/dbs.ts @@ -12,7 +12,9 @@ import type { import { DB_NAMES } from '@/constants/dbNames' export const getRemoteDb = (dbName: DB_NAMES) => - new PouchDB(`${import.meta.env.VITE_API_URL}/${dbName}`, { skip_setup: true }) + new PouchDB(new URL(`${import.meta.env.VITE_API_URL}/${dbName}`, location.origin).toString(), { + skip_setup: true, + }) export const getLocalDb = (dbName: DB_NAMES) => new PouchDB(dbName) diff --git a/apps/frontend/src/api/qrCode.ts b/apps/frontend/src/api/qrCode.ts index 9164517..104460d 100644 --- a/apps/frontend/src/api/qrCode.ts +++ b/apps/frontend/src/api/qrCode.ts @@ -1,18 +1,17 @@ import type { QRCodeDocument } from '@hereconnect/types' +import { EPOCH } from '@hereconnect/constants' import { qrCodeDbLocal, qrCodeDbRemote } from '@/api/dbs' import { getUserUuid } from '@/utils/getUserUuid' import { getBrowserUuid } from '@/utils/getBrowserUuid' import { isNotFoundError } from '@/api/PouchDB' -const EPOHE = 1731661630981 - export const createQrCodeDocument = async ( qrCodeDocPartial: Pick< QRCodeDocument, 'name' | 'placement' | 'actions' | 'predefinedMessages' | 'messageDeliveryMethod' >, ) => { - const uri = Math.abs(Date.now() - EPOHE).toString(36) + const uri = Math.abs(Date.now() - EPOCH).toString(36) const url = new URL( `${import.meta.env.VITE_READ_BASE_URL || '/read'}/${uri}`, location.origin, diff --git a/apps/frontend/src/components/chat/ChatMessages.vue b/apps/frontend/src/components/chat/ChatMessages.vue index 35fe4c3..4008039 100644 --- a/apps/frontend/src/components/chat/ChatMessages.vue +++ b/apps/frontend/src/components/chat/ChatMessages.vue @@ -33,7 +33,7 @@