Ryan/docmost-ryan
1
0
Fork 0
mirror of https://github.com/Shadowfita/docmost.git synced 2025-11-15 17:21:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Shadowfita/docmost

Browse Source
This commit is contained in:
Ryan Palmer
2024-09-04 13:07:20 +10:00
parent 502b9fdab8 78d5390e40
commit bd15401e7f
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/package.json
View File

@ -1,7 +1,7 @@
{
"name": "client",
"private": true,
"version": "0.3.0",
"version": "0.3.1",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",

26
apps/client/src/lib/config.ts
View File

@ -7,23 +7,27 @@ declare global {
export function getAppUrl(): string {
//let appUrl = window.CONFIG?.APP_URL || process.env.APP_URL;
// if (import.meta.env.DEV) {
// return appUrl || "http://localhost:3000";
// if (import.meta.env.DEV) {
// return appUrl || "http://localhost:3000";
//}
return `${window.location.protocol}//${window.location.host}`;
}
export function getBackendUrl(): string {
return getAppUrl() + "/api";
return getAppUrl() + '/api';
}
export function getCollaborationUrl(): string {
const COLLAB_PATH = "/collab";
const url = process.env.APP_URL || getAppUrl();
const COLLAB_PATH = '/collab';
const wsProtocol = url.startsWith("https") ? "wss" : "ws";
return `${wsProtocol}://${url.split("://")[1]}${COLLAB_PATH}`;
let url = getAppUrl();
if (import.meta.env.DEV) {
url = process.env.APP_URL;
}
const wsProtocol = url.startsWith('https') ? 'wss' : 'ws';
return `${wsProtocol}://${url.split('://')[1]}${COLLAB_PATH}`;
}
export function getAvatarUrl(avatarUrl: string) {
@ -31,17 +35,17 @@ export function getAvatarUrl(avatarUrl: string) {
return null;
}
if (avatarUrl?.startsWith("http")) {
if (avatarUrl?.startsWith('http')) {
return avatarUrl;
}
return getBackendUrl() + "/attachments/img/avatar/" + avatarUrl;
return getBackendUrl() + '/attachments/img/avatar/' + avatarUrl;
}
export function getSpaceUrl(spaceSlug: string) {
return "/s/" + spaceSlug;
return '/s/' + spaceSlug;
}
export function getFileUrl(src: string) {
return src?.startsWith("/files/") ? getBackendUrl() + src : src;
return src?.startsWith('/files/') ? getBackendUrl() + src : src;
}

2
apps/server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "server",
"version": "0.3.0",
"version": "0.3.1",
"description": "",
"author": "",
"private": true,

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "docmost",
"homepage": "https://docmost.com",
"version": "0.3.0",
"version": "0.3.1",
"private": true,
"scripts": {
"build": "nx run-many -t build",