js/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost synced 2025-03-28 21:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge d7ccc81eda805601b6a15bdee90f848cab610b78 into a74d3feae425063e559d9d185cdbf2af1fa61885

Browse Source
This commit is contained in:
Handa Kengo 2025-03-27 12:26:56 -04:00 committed by GitHub
commit e64aef55f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 78 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -5,6 +5,8 @@ PORT=3000
# minimum of 32 characters. Generate one with: openssl rand -hex 32
APP_SECRET=REPLACE_WITH_LONG_SECRET
APP_MAME=Docmost
JWT_TOKEN_EXPIRES_IN=30d
DATABASE_URL="postgresql://postgres:password@localhost:5432/docmost?schema=public"

47
apps/client/src/components/layouts/global/app-header.tsx
View File

@ -4,6 +4,7 @@ import React from "react";
import TopMenu from "@/components/layouts/global/top-menu.tsx";
import { Link } from "react-router-dom";
import APP_ROUTE from "@/lib/app-route.ts";
import { getAppName } from '@/lib/config';
import { useAtom } from "jotai";
import {
desktopSidebarAtom,
@ -18,22 +19,23 @@ import { isCloud } from "@/lib/config.ts";
const links = [{ link: APP_ROUTE.HOME, label: "Home" }];
export function AppHeader() {
const { t } = useTranslation();
const [mobileOpened] = useAtom(mobileSidebarAtom);
const toggleMobile = useToggleSidebar(mobileSidebarAtom);
const { t } = useTranslation();
const [mobileOpened] = useAtom(mobileSidebarAtom);
const toggleMobile = useToggleSidebar(mobileSidebarAtom);
const [desktopOpened] = useAtom(desktopSidebarAtom);
const toggleDesktop = useToggleSidebar(desktopSidebarAtom);
const { isTrial, trialDaysLeft } = useTrial();
const isHomeRoute = location.pathname.startsWith("/home");
const isHomeRoute = location.pathname.startsWith('/home');
const items = links.map((link) => (
<Link key={link.label} to={link.link} className={classes.link}>
{t(link.label)}
</Link>
));
const items = links.map((link) => (
<Link key={link.label} to={link.link} className={classes.link}>
{t(link.label)}
</Link>
));
const app_name = getAppName();
return (
<>
<Group h="100%" px="md" justify="space-between" wrap={"nowrap"}>
@ -50,17 +52,11 @@ export function AppHeader() {
/>
</Tooltip>
<Tooltip label={t("Sidebar toggle")}>
<SidebarToggle
aria-label={t("Sidebar toggle")}
opened={desktopOpened}
onClick={toggleDesktop}
visibleFrom="sm"
size="sm"
/>
</Tooltip>
</>
)}
<Tooltip label={t('Sidebar toggle')}>
<SidebarToggle aria-label={t('Sidebar toggle')} opened={desktopOpened} onClick={toggleDesktop} visibleFrom="sm" size="sm" />
</Tooltip>
</>
)}
<Text
size="lg"
@ -69,14 +65,13 @@ export function AppHeader() {
component={Link}
to="/home"
>
Docmost
{app_name}
</Text>
<Group ml={50} gap={5} className={classes.links} visibleFrom="sm">
{items}
</Group>
</Group>
<Group ml={50} gap={5} className={classes.links} visibleFrom="sm">
{items}
</Group>
</Group>
<Group px={"xl"} wrap="nowrap">
{isCloud() && isTrial && trialDaysLeft !== 0 && (
<Badge

52
apps/client/src/components/ui/error-404.tsx
View File

@ -1,28 +1,32 @@
import { Title, Text, Button, Container, Group } from "@mantine/core";
import classes from "./error-404.module.css";
import { Link } from "react-router-dom";
import { Helmet } from "react-helmet-async";
import { useTranslation } from "react-i18next";
import { Title, Text, Button, Container, Group } from '@mantine/core';
import classes from './error-404.module.css';
import { Link } from 'react-router-dom';
import { Helmet } from 'react-helmet-async';
import { useTranslation } from 'react-i18next';
import { getAppName } from '@/lib/config';
export function Error404() {
const { t } = useTranslation();
const { t } = useTranslation();
const app_name = getAppName();
return (
<>
<Helmet>
<title>{t("404 page not found")} - Docmost</title>
</Helmet>
<Container className={classes.root}>
<Title className={classes.title}>{t("404 page not found")}</Title>
<Text c="dimmed" size="lg" ta="center" className={classes.description}>
{t("Sorry, we can't find the page you are looking for.")}
</Text>
<Group justify="center">
<Button component={Link} to={"/home"} variant="subtle" size="md">
{t("Take me back to homepage")}
</Button>
</Group>
</Container>
</>
);
return (
<>
<Helmet>
<title>
{t('404 page not found')} - {app_name}
</title>
</Helmet>
<Container className={classes.root}>
<Title className={classes.title}>{t('404 page not found')}</Title>
<Text c="dimmed" size="lg" ta="center" className={classes.description}>
{t("Sorry, we can't find the page you are looking for.")}
</Text>
<Group justify="center">
<Button component={Link} to={'/home'} variant="subtle" size="md">
{t('Take me back to homepage')}
</Button>
</Group>
</Container>
</>
);
}

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

@ -2,17 +2,17 @@ import bytes from "bytes";
import { castToBoolean } from "@/lib/utils.tsx";
declare global {
interface Window {
CONFIG?: Record<string, string>;
}
interface Window {
CONFIG?: Record<string, string>;
}
}
export function getAppName(): string {
return "Docmost";
return getConfigValue('APP_NAME', 'Docmost');
}
export function getAppUrl(): string {
return `${window.location.protocol}//${window.location.host}`;
return `${window.location.protocol}//${window.location.host}`;
}
export function getServerAppUrl(): string {
@ -20,7 +20,7 @@ export function getServerAppUrl(): string {
}
export function getBackendUrl(): string {
return getAppUrl() + "/api";
return getAppUrl() + '/api';
}
export function getCollaborationUrl(): string {
@ -42,14 +42,14 @@ export function isCloud(): boolean {
}
export function getAvatarUrl(avatarUrl: string) {
if (!avatarUrl) return null;
if (avatarUrl?.startsWith("http")) return avatarUrl;
if (!avatarUrl) return null;
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) {
@ -66,17 +66,15 @@ export function getFileUrl(src: string) {
}
export function getFileUploadSizeLimit() {
const limit = getConfigValue("FILE_UPLOAD_SIZE_LIMIT", "50mb");
return bytes(limit);
const limit = getConfigValue('FILE_UPLOAD_SIZE_LIMIT', '50mb');
return bytes(limit);
}
export function getDrawioUrl() {
return getConfigValue("DRAWIO_URL", "https://embed.diagrams.net");
return getConfigValue('DRAWIO_URL', 'https://embed.diagrams.net');
}
function getConfigValue(key: string, defaultValue: string = undefined): string {
const rawValue = import.meta.env.DEV
? process?.env?.[key]
: window?.CONFIG?.[key];
return rawValue ?? defaultValue;
const rawValue = import.meta.env.DEV ? process?.env?.[key] : window?.CONFIG?.[key];
return rawValue ?? defaultValue;
}

7
apps/server/src/core/workspace/services/workspace-invitation.service.ts
View File

@ -267,7 +267,7 @@ export class WorkspaceInvitationService {
await this.mailService.sendToQueue({
to: invitedByUser.email,
subject: `${newUser.name} has accepted your Docmost invite`,
subject: `${newUser.name} has accepted your ${this.environmentService.getAppName()} invite`,
template: emailTemplate,
});
}
@ -352,14 +352,15 @@ export class WorkspaceInvitationService {
inviteToken,
hostname,
});
const appName = this.environmentService.getAppName();
const emailTemplate = InvitationEmail({
appName,
inviteLink,
});
await this.mailService.sendToQueue({
to: inviteeEmail,
subject: `${invitedByName} invited you to Docmost`,
subject: `${invitedByName} invited you to ${this.environmentService.getAppName()}`,
template: emailTemplate,
});
}

4
apps/server/src/integrations/environment/environment.service.ts
View File

@ -40,6 +40,10 @@ export class EnvironmentService {
return this.configService.get<string>('APP_SECRET');
}
getAppName(): string {
return this.configService.get<string>('APP_NAME', 'Docmost');
}
getDatabaseURL(): string {
return this.configService.get<string>('DATABASE_URL');
}

6
apps/server/src/integrations/transactional/emails/invitation-email.tsx
View File

@ -2,17 +2,19 @@ import { Section, Text, Button } from '@react-email/components';
import * as React from 'react';
import { button, content, paragraph } from '../css/styles';
import { MailBody } from '../partials/partials';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
interface Props {
appName: string;
inviteLink: string;
}
export const InvitationEmail = ({ inviteLink }: Props) => {
export const InvitationEmail = ({ appName, inviteLink }: Props) => {
return (
<MailBody>
<Section style={content}>
<Text style={paragraph}>Hi there,</Text>
<Text style={paragraph}>You have been invited to Docmost.</Text>
<Text style={paragraph}>You have been invited to {appName}.</Text>
<Text style={paragraph}>
Please click the button below to accept this invitation.
</Text>