From d429384d22d4219e737c48096c3eab6adcef74d3 Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:08:12 +0100 Subject: [PATCH 1/2] client: fix APP_URL --- .../features/page/components/header/page-header-menu.tsx | 1 - apps/client/src/lib/config.ts | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/client/src/features/page/components/header/page-header-menu.tsx b/apps/client/src/features/page/components/header/page-header-menu.tsx index 5fdfa078..5de80b57 100644 --- a/apps/client/src/features/page/components/header/page-header-menu.tsx +++ b/apps/client/src/features/page/components/header/page-header-menu.tsx @@ -19,7 +19,6 @@ import { getAppUrl } from "@/lib/config.ts"; import { extractPageSlugId } from "@/lib"; import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts"; import { useDeletePageModal } from "@/features/page/hooks/use-delete-page-modal.tsx"; -import { boolean } from "zod"; interface PageHeaderMenuProps { readOnly?: boolean; diff --git a/apps/client/src/lib/config.ts b/apps/client/src/lib/config.ts index c7ff5448..33323b0b 100644 --- a/apps/client/src/lib/config.ts +++ b/apps/client/src/lib/config.ts @@ -7,13 +7,11 @@ declare global { export function getAppUrl(): string { let appUrl = window.CONFIG?.APP_URL || process.env.APP_URL; - if (!appUrl) { - appUrl = import.meta.env.DEV - ? "http://localhost:3000" - : window.location.protocol + "//" + window.location.host; + if (import.meta.env.DEV) { + return appUrl || "http://localhost:3000"; } - return appUrl; + return `${window.location.protocol}//${window.location.host}`; } export function getBackendUrl(): string { From eea4e62c2e8aef08b5a5008623c0848f0f26684f Mon Sep 17 00:00:00 2001 From: Philipinho <16838612+Philipinho@users.noreply.github.com> Date: Mon, 1 Jul 2024 10:09:28 +0100 Subject: [PATCH 2/2] v0.2.1 --- apps/client/package.json | 2 +- apps/server/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index 2451fc14..0b1232b8 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -1,7 +1,7 @@ { "name": "client", "private": true, - "version": "0.2.0", + "version": "0.2.1", "scripts": { "dev": "vite", "build": "tsc && vite build", diff --git a/apps/server/package.json b/apps/server/package.json index 2f89eed3..25064791 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -1,6 +1,6 @@ { "name": "server", - "version": "0.2.0", + "version": "0.2.1", "description": "", "author": "", "private": true, diff --git a/package.json b/package.json index c64a2ba4..ed3a8c56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "docmost", "homepage": "https://docmost.com", - "version": "0.2.0", + "version": "0.2.1", "private": true, "scripts": { "build": "nx run-many -t build",