diff --git a/packages/client/src/components/wiki/create/index.tsx b/packages/client/src/components/wiki/create/index.tsx
index c794428b..d66d8a66 100644
--- a/packages/client/src/components/wiki/create/index.tsx
+++ b/packages/client/src/components/wiki/create/index.tsx
@@ -2,6 +2,7 @@ import { Form, Modal } from '@douyinfe/semi-ui';
import { FormApi } from '@douyinfe/semi-ui/lib/es/form';
import type { IWiki } from '@think/domains';
import { ICreateWiki, useOwnWikis } from 'data/wiki';
+import { useRouterQuery } from 'hooks/use-router-query';
import Router from 'next/router';
import { Dispatch, SetStateAction, useRef } from 'react';
@@ -12,18 +13,21 @@ interface IProps {
export const WikiCreator: React.FC = ({ visible, toggleVisible }) => {
const $form = useRef();
- const { createWiki } = useOwnWikis();
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { createWiki } = useOwnWikis(organizationId);
const handleOk = () => {
$form.current.validate().then((values) => {
createWiki(values as ICreateWiki).then((res) => {
toggleVisible(false);
Router.push({
- pathname: `/wiki/${(res as unknown as IWiki).id}`,
+ pathname: `/app/org/[organizationId]/wiki/[wikiId]`,
+ query: { organizationId: res.organizationId, wikiId: res.id },
});
});
});
};
+
const handleCancel = () => {
toggleVisible(false);
};
diff --git a/packages/client/src/components/wiki/delete/index.tsx b/packages/client/src/components/wiki/delete/index.tsx
index a24b001b..a1c189f8 100644
--- a/packages/client/src/components/wiki/delete/index.tsx
+++ b/packages/client/src/components/wiki/delete/index.tsx
@@ -1,6 +1,7 @@
import { IconDelete } from '@douyinfe/semi-icons';
import { Modal, Space, Typography } from '@douyinfe/semi-ui';
import { useOwnWikis } from 'data/wiki';
+import { useRouterQuery } from 'hooks/use-router-query';
import Router from 'next/router';
import React, { useCallback } from 'react';
@@ -11,8 +12,9 @@ interface IProps {
const { Text } = Typography;
-export const WorkspaceDeletor: React.FC = ({ wikiId, onDelete, children }) => {
- const { deletWiki } = useOwnWikis();
+export const WikiDeletor: React.FC = ({ wikiId, onDelete, children }) => {
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { deletWiki } = useOwnWikis(organizationId);
const deleteAction = useCallback(() => {
Modal.error({
@@ -23,7 +25,8 @@ export const WorkspaceDeletor: React.FC = ({ wikiId, onDelete, children
onDelete
? onDelete()
: Router.push({
- pathname: `/wiki`,
+ pathname: `/app/org/[organizationId]`,
+ query: { organizationId },
});
});
},
@@ -32,7 +35,7 @@ export const WorkspaceDeletor: React.FC = ({ wikiId, onDelete, children
},
style: { maxWidth: '96vw' },
});
- }, [wikiId, deletWiki, onDelete]);
+ }, [organizationId, wikiId, deletWiki, onDelete]);
return (
diff --git a/packages/client/src/components/wiki/pin-card/index.tsx b/packages/client/src/components/wiki/pin-card/index.tsx
index bb65bd8a..588842f6 100644
--- a/packages/client/src/components/wiki/pin-card/index.tsx
+++ b/packages/client/src/components/wiki/pin-card/index.tsx
@@ -12,7 +12,12 @@ const { Text, Paragraph } = Typography;
export const WikiPinCard: React.FC<{ wiki: IWiki }> = ({ wiki }) => {
return (
);
};
diff --git a/packages/client/src/components/wiki/setting/users/add.tsx b/packages/client/src/components/wiki/setting/users/add.tsx
deleted file mode 100644
index ae502663..00000000
--- a/packages/client/src/components/wiki/setting/users/add.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Banner, Button, Input, Modal, Select, Space, Typography } from '@douyinfe/semi-ui';
-import { WIKI_USER_ROLES, WikiUserRole } from '@think/domains';
-import { IWikiUserOpeateData } from 'data/wiki';
-import React, { useCallback, useState } from 'react';
-
-interface IProps {
- visible: boolean;
- toggleVisible: (arg) => void;
- onOk: (arg: IWikiUserOpeateData) => any;
-}
-
-const { Paragraph } = Typography;
-
-export const AddUser: React.FC = ({ visible, toggleVisible, onOk }) => {
- const [userRole, setUserRole] = useState(WikiUserRole.normal);
- const [userName, setUserName] = useState('');
- const handleOk = useCallback(() => {
- onOk({ userName, userRole } as unknown as IWikiUserOpeateData).then(() => {
- setUserRole(WikiUserRole.normal);
- setUserName('');
- toggleVisible(false);
- });
- }, [onOk, userName, userRole, toggleVisible]);
-
- return (
- toggleVisible(false)}
- maskClosable={false}
- style={{ maxWidth: '96vw' }}
- footer={null}
- >
-
- );
-};
diff --git a/packages/client/src/components/wiki/setting/users/edit.tsx b/packages/client/src/components/wiki/setting/users/edit.tsx
deleted file mode 100644
index f68f98ab..00000000
--- a/packages/client/src/components/wiki/setting/users/edit.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Banner, Button, Modal, Select } from '@douyinfe/semi-ui';
-import { WIKI_USER_ROLES, WikiUserRole } from '@think/domains';
-import React, { useCallback, useState } from 'react';
-
-interface IProps {
- visible: boolean;
- toggleVisible: (arg) => void;
- onOk: (arg: WikiUserRole) => any;
-}
-
-export const EditUser: React.FC = ({ visible, toggleVisible, onOk }) => {
- const [userRole, setUserRole] = useState(WikiUserRole.normal);
- const handleOk = useCallback(() => {
- onOk(userRole).then(() => {
- setUserRole(WikiUserRole.normal);
- toggleVisible(false);
- });
- }, [onOk, userRole, toggleVisible]);
-
- return (
- toggleVisible(false)}
- maskClosable={false}
- style={{ maxWidth: '96vw' }}
- footer={null}
- >
-
- );
-};
diff --git a/packages/client/src/components/wiki/setting/users/index.tsx b/packages/client/src/components/wiki/setting/users/index.tsx
index 98f43f6e..ded43f0c 100644
--- a/packages/client/src/components/wiki/setting/users/index.tsx
+++ b/packages/client/src/components/wiki/setting/users/index.tsx
@@ -1,88 +1,17 @@
-import { IconDelete, IconEdit } from '@douyinfe/semi-icons';
-import { Button, Popconfirm, Table } from '@douyinfe/semi-ui';
-import { getWikiUserRoleText } from '@think/domains';
-import { DataRender } from 'components/data-render';
-import { LocaleTime } from 'components/locale-time';
+import { Members } from 'components/members';
import { useWikiMembers } from 'data/wiki';
-import { useToggle } from 'hooks/use-toggle';
-import React, { useState } from 'react';
-
-import { AddUser } from './add';
-import { EditUser } from './edit';
-import { Placeholder } from './placeholder';
+import React from 'react';
interface IProps {
wikiId: string;
}
-const { Column } = Table;
-
export const Users: React.FC = ({ wikiId }) => {
- const [visible, toggleVisible] = useToggle(false);
- const [editVisible, toggleEditVisible] = useToggle(false);
- const [currentUser, setCurrentUser] = useState(null);
- const { users, loading, error, addUser, updateUser, deleteUser } = useWikiMembers(wikiId);
-
- const editUser = (user) => {
- setCurrentUser(user);
- toggleEditVisible(true);
- };
-
- const handleEdit = (userRole) => {
- return updateUser({ userName: currentUser.userName, userRole }).then(() => {
- setCurrentUser(null);
- });
- };
-
return (
- <>
- }) => React.ReactNode;
onChange?: () => void;
}
-export const WikiStar: React.FC = ({ wikiId, render, onChange }) => {
- const { data, toggle } = useWikiStarToggle(wikiId);
+export const WikiStar: React.FC = ({ organizationId, wikiId, render, onChange }) => {
+ const { data, toggle } = useWikiStarToggle(organizationId, wikiId);
const text = data ? '取消收藏' : '收藏知识库';
return (
diff --git a/packages/client/src/components/wiki/tocs/index.tsx b/packages/client/src/components/wiki/tocs/index.tsx
index 37734846..55512a08 100644
--- a/packages/client/src/components/wiki/tocs/index.tsx
+++ b/packages/client/src/components/wiki/tocs/index.tsx
@@ -1,10 +1,11 @@
import { IconPlus, IconSmallTriangleDown } from '@douyinfe/semi-icons';
import { Avatar, Button, Dropdown, Skeleton, Typography } from '@douyinfe/semi-ui';
+import { IDocument } from '@think/domains';
import cls from 'classnames';
import { DataRender } from 'components/data-render';
import { IconOverview, IconSetting } from 'components/icons';
import { findParents } from 'components/wiki/tocs/utils';
-import { useStarWikis, useWikiStarDocuments } from 'data/star';
+import { useStarDocumentsInWiki, useStarWikisInOrganization } from 'data/star';
import { useWikiDetail, useWikiTocs } from 'data/wiki';
import { triggerCreateDocument } from 'event';
import Link from 'next/link';
@@ -18,7 +19,7 @@ interface IProps {
wikiId: string;
documentId?: string;
docAsLink?: string;
- getDocLink?: (arg: string) => string;
+ getDocLink?: (arg: IDocument) => string;
}
const { Text } = Typography;
@@ -26,18 +27,18 @@ const { Text } = Typography;
export const WikiTocs: React.FC = ({
wikiId,
documentId = null,
- docAsLink = '/wiki/[wikiId]/document/[documentId]',
- getDocLink = (documentId) => `/wiki/${wikiId}/document/${documentId}`,
+ docAsLink = '/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]',
+ getDocLink = (document) => `/app/org/${document.organizationId}/wiki/${document.wikiId}/doc/${document.id}`,
}) => {
const { pathname, query } = useRouter();
const { data: wiki, loading: wikiLoading, error: wikiError } = useWikiDetail(wikiId);
const { data: tocs, loading: tocsLoading, error: tocsError } = useWikiTocs(wikiId);
- const { data: starWikis } = useStarWikis();
+ const { data: starWikis } = useStarWikisInOrganization(query.organizationId);
const {
data: starDocuments,
loading: starDocumentsLoading,
error: starDocumentsError,
- } = useWikiStarDocuments(wikiId);
+ } = useStarDocumentsInWiki(query.organizationId, wikiId);
const [parentIds, setParentIds] = useState>([]);
const otherStarWikis = useMemo(() => (starWikis || []).filter((wiki) => wiki.id !== wikiId), [starWikis, wikiId]);
@@ -86,8 +87,8 @@ export const WikiTocs: React.FC = ({
= ({
- {userRole === WikiUserRole.admin ? (
-
-
-
-
-
-
-
- {userRole === WikiUserRole.admin ? (
-
-
-
-
-
- )}
- />
-
-
-
-
@@ -235,11 +237,16 @@ export const WikiTocs: React.FC = ({
}
error={wikiError}
normalContent={() => (
-
@@ -130,7 +145,10 @@ const WikiContent = () => {
+
+
+ );
+};
+
+export default Page;
diff --git a/packages/client/src/pages/star/index.module.scss b/packages/client/src/pages/app/org/[organizationId]/index.module.scss
similarity index 100%
rename from packages/client/src/pages/star/index.module.scss
rename to packages/client/src/pages/app/org/[organizationId]/index.module.scss
diff --git a/packages/client/src/pages/app/org/[organizationId]/index.tsx b/packages/client/src/pages/app/org/[organizationId]/index.tsx
new file mode 100644
index 00000000..2e1739d3
--- /dev/null
+++ b/packages/client/src/pages/app/org/[organizationId]/index.tsx
@@ -0,0 +1,200 @@
+import { Avatar, Button, List, Table, Typography } from '@douyinfe/semi-ui';
+import { DocumentApiDefinition, IDocument, IOrganization, StarApiDefinition } from '@think/domains';
+import { DataRender } from 'components/data-render';
+import { DocumentActions } from 'components/document/actions';
+import { Empty } from 'components/empty';
+import { LocaleTime } from 'components/locale-time';
+import { Seo } from 'components/seo';
+import { WikiCreator } from 'components/wiki/create';
+import { WikiPinCard, WikiPinCardPlaceholder } from 'components/wiki/pin-card';
+import { getRecentVisitedDocuments, useRecentDocuments } from 'data/document';
+import { getStarWikisInOrganization, useStarWikisInOrganization } from 'data/star';
+import { useRouterQuery } from 'hooks/use-router-query';
+import { useToggle } from 'hooks/use-toggle';
+import { AppSingleColumnLayout } from 'layouts/app-single-column';
+import type { NextPage } from 'next';
+import Link from 'next/link';
+import React, { useEffect, useMemo } from 'react';
+import { serverPrefetcher } from 'services/server-prefetcher';
+
+import styles from './index.module.scss';
+
+const { Title } = Typography;
+const { Column } = Table;
+
+const grid = {
+ gutter: 16,
+ xs: 24,
+ sm: 12,
+ md: 12,
+ lg: 8,
+ xl: 8,
+};
+
+const RecentDocs = () => {
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { data, error, loading, refresh } = useRecentDocuments(organizationId);
+
+ const columns = useMemo(
+ () => [
+ {
+ return (
+
+ {document.title}
+
+ );
+ }}
+ />,
+ {
+ return (
+
+
+ {createUser.name.slice(0, 1)}
+
+ {createUser.name}
+
+ );
+ }}
+ />,
+ (
+
+ 最近访问
+
+
+ {columns}
+
+ }
+ error={error}
+ normalContent={() =>
+ data && data.length ? (
+
+ {columns}
+
+ ) : (
+
+
+ );
+};
+
+Page.getInitialProps = async (ctx) => {
+ const { organizationId } = ctx.query;
+
+ const props = await serverPrefetcher(ctx, [
+ {
+ url: StarApiDefinition.getStarWikisInOrganization.client(organizationId),
+ action: (cookie) => getStarWikisInOrganization(organizationId, cookie),
+ },
+ {
+ url: DocumentApiDefinition.recent.client(organizationId),
+ action: (cookie) => getRecentVisitedDocuments(organizationId, cookie),
+ },
+ ]);
+ return { ...props, organizationId } as any;
+};
+
+export default Page;
diff --git a/packages/client/src/pages/app/org/[organizationId]/setting/index.tsx b/packages/client/src/pages/app/org/[organizationId]/setting/index.tsx
new file mode 100644
index 00000000..8050caab
--- /dev/null
+++ b/packages/client/src/pages/app/org/[organizationId]/setting/index.tsx
@@ -0,0 +1,51 @@
+import { Typography } from '@douyinfe/semi-ui';
+import { IOrganization } from '@think/domains';
+import { OrganizationSetting } from 'components/organization/setting';
+import { AppSingleColumnLayout } from 'layouts/app-single-column';
+import { NextPage } from 'next';
+import Router, { useRouter } from 'next/router';
+import React, { useCallback } from 'react';
+
+interface IProps {
+ organizationId: IOrganization['id'];
+}
+
+const { Title } = Typography;
+
+const Page: NextPage = ({ organizationId }) => {
+ const { query = {} } = useRouter();
+ const { tab = 'base' } = query as {
+ tab?: string;
+ };
+
+ const navigate = useCallback(
+ (tab = 'base') => {
+ console.log(tab);
+ Router.push({
+ pathname: `/app/org/[organizationId]/setting`,
+ query: { organizationId, tab },
+ });
+ },
+ [organizationId]
+ );
+
+ return (
+
+
+ );
+};
+
+Page.getInitialProps = async (ctx) => {
+ const { organizationId } = ctx.query;
+ return { organizationId } as IProps;
+};
+
+export default Page;
diff --git a/packages/client/src/pages/wiki/index.module.scss b/packages/client/src/pages/app/org/[organizationId]/star/index.module.scss
similarity index 100%
rename from packages/client/src/pages/wiki/index.module.scss
rename to packages/client/src/pages/app/org/[organizationId]/star/index.module.scss
diff --git a/packages/client/src/pages/star/index.tsx b/packages/client/src/pages/app/org/[organizationId]/star/index.tsx
similarity index 72%
rename from packages/client/src/pages/star/index.tsx
rename to packages/client/src/pages/app/org/[organizationId]/star/index.tsx
index 0cfef3e8..a6586cc8 100644
--- a/packages/client/src/pages/star/index.tsx
+++ b/packages/client/src/pages/app/org/[organizationId]/star/index.tsx
@@ -5,8 +5,14 @@ import { DocumentCard, DocumentCardPlaceholder } from 'components/document/card'
import { Empty } from 'components/empty';
import { Seo } from 'components/seo';
import { WikiCard, WikiCardPlaceholder } from 'components/wiki/card';
-import { getStarDocuments, getStarWikis, useStarDocuments, useStarWikis } from 'data/star';
-import { SingleColumnLayout } from 'layouts/single-column';
+import {
+ getStarDocumentsInOrganization,
+ getStarWikisInOrganization,
+ useStarDocumentsInOrganization,
+ useStarWikisInOrganization,
+} from 'data/star';
+import { useRouterQuery } from 'hooks/use-router-query';
+import { AppSingleColumnLayout } from 'layouts/app-single-column';
import type { NextPage } from 'next';
import React from 'react';
import { serverPrefetcher } from 'services/server-prefetcher';
@@ -25,7 +31,8 @@ const grid = {
};
const StarDocs = () => {
- const { data: docs, loading, error } = useStarDocuments();
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { data: docs, loading, error } = useStarDocumentsInOrganization(organizationId);
return (
{
};
const StarWikis = () => {
- const { data, loading, error } = useStarWikis();
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { data, loading, error } = useStarWikisInOrganization(organizationId);
return (
{
const Page: NextPage = () => {
return (
-
+
+
);
};
Page.getInitialProps = async (ctx) => {
+ const { organizationId } = ctx.query;
+
const props = await serverPrefetcher(ctx, [
- { url: StarApiDefinition.wikis.client(), action: (cookie) => getStarWikis(cookie) },
- { url: StarApiDefinition.documents.client(), action: (cookie) => getStarDocuments(cookie) },
+ {
+ url: StarApiDefinition.getStarWikisInOrganization.client(organizationId),
+ action: (cookie) => getStarWikisInOrganization(organizationId, cookie),
+ },
+ {
+ url: StarApiDefinition.getStarDocumentsInOrganization.client(organizationId),
+ action: (cookie) => getStarDocumentsInOrganization(organizationId, cookie),
+ },
]);
return props;
};
diff --git a/packages/client/src/pages/wiki/[wikiId]/document/[documentId]/edit/index.tsx b/packages/client/src/pages/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]/edit/index.tsx
similarity index 100%
rename from packages/client/src/pages/wiki/[wikiId]/document/[documentId]/edit/index.tsx
rename to packages/client/src/pages/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]/edit/index.tsx
diff --git a/packages/client/src/pages/wiki/[wikiId]/document/[documentId]/index.tsx b/packages/client/src/pages/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]/index.tsx
similarity index 92%
rename from packages/client/src/pages/wiki/[wikiId]/document/[documentId]/index.tsx
rename to packages/client/src/pages/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]/index.tsx
index 80453c5a..478e473f 100644
--- a/packages/client/src/pages/wiki/[wikiId]/document/[documentId]/index.tsx
+++ b/packages/client/src/pages/app/org/[organizationId]/wiki/[wikiId]/doc/[documentId]/index.tsx
@@ -3,7 +3,7 @@ import { DocumentReader } from 'components/document/reader';
import { WikiTocs } from 'components/wiki/tocs';
import { getDocumentDetail } from 'data/document';
import { getWikiTocs } from 'data/wiki';
-import { DoubleColumnLayout } from 'layouts/double-column';
+import { AppDoubleColumnLayout } from 'layouts/app-double-column';
import { NextPage } from 'next';
import React from 'react';
import { serverPrefetcher } from 'services/server-prefetcher';
@@ -15,7 +15,7 @@ interface IProps {
const Page: NextPage = ({ wikiId, documentId }) => {
return (
- = ({ wikiId }) => {
const { data: wiki, loading, error } = useWikiDetail(wikiId);
return (
- = ({ wikiId }) => {
(tab = 'base') => {
return () => {
Router.push({
- pathname: `/wiki/${wikiId}/setting`,
- query: { tab },
+ pathname: `/app/org/[organizationId]/wiki/[wikiId]/setting`,
+ query: { organizationId: query.organizationId, wikiId, tab },
});
};
},
- [wikiId]
+ [query, wikiId]
);
return (
- {
- return (
-
- {document.title}
-
- );
- }}
- />,
- {
- return (
-
-
- {createUser.name.slice(0, 1)}
-
- {createUser.name}
-
- );
- }}
- />,
- (
-
- 最近访问
-
-
- {columns}
-
- }
- error={error}
- normalContent={() =>
- data && data.length ? (
-
- {columns}
-
- ) : (
-
+
diff --git a/packages/client/src/components/wiki/tocs/public.tsx b/packages/client/src/components/wiki/tocs/public.tsx
index 986cc40e..5ea059da 100644
--- a/packages/client/src/components/wiki/tocs/public.tsx
+++ b/packages/client/src/components/wiki/tocs/public.tsx
@@ -1,5 +1,6 @@
import { IconPlus } from '@douyinfe/semi-icons';
import { Avatar, Skeleton, Space, Typography } from '@douyinfe/semi-ui';
+import { IDocument } from '@think/domains';
import { DataRender } from 'components/data-render';
import { IconOverview } from 'components/icons';
import { LogoImage, LogoText } from 'components/logo';
@@ -17,7 +18,7 @@ interface IProps {
wikiId: string;
documentId?: string;
docAsLink?: string;
- getDocLink?: (arg: string) => string;
+ getDocLink?: (arg: IDocument) => string;
pageTitle: string;
}
@@ -28,7 +29,7 @@ export const WikiPublicTocs: React.FC = ({
wikiId,
documentId = null,
docAsLink = '/share/wiki/[wikiId]/document/[documentId]',
- getDocLink = (documentId) => `/share/wiki/${wikiId}/document/${documentId}`,
+ getDocLink = (document) => `/share/wiki/${document.wikiId}/document/${document.id}`,
}) => {
const { pathname } = useRouter();
const { data: wiki, loading: wikiLoading, error: wikiError } = usePublicWikiDetail(wikiId);
diff --git a/packages/client/src/components/wiki/tocs/tree.tsx b/packages/client/src/components/wiki/tocs/tree.tsx
index a93492f4..dbc2b72b 100644
--- a/packages/client/src/components/wiki/tocs/tree.tsx
+++ b/packages/client/src/components/wiki/tocs/tree.tsx
@@ -16,6 +16,7 @@ const Actions = ({ node }) => {
(
diff --git a/packages/client/src/layouts/router-header/wiki.tsx b/packages/client/src/layouts/app-router-header/wiki.tsx
similarity index 82%
rename from packages/client/src/layouts/router-header/wiki.tsx
rename to packages/client/src/layouts/app-router-header/wiki.tsx
index 431538a8..d0002c1a 100644
--- a/packages/client/src/layouts/router-header/wiki.tsx
+++ b/packages/client/src/layouts/app-router-header/wiki.tsx
@@ -3,7 +3,7 @@ import { Avatar, Dropdown, Modal, Space, Typography } from '@douyinfe/semi-ui';
import { DataRender } from 'components/data-render';
import { Empty } from 'components/empty';
import { WikiStar } from 'components/wiki/star';
-import { useStarWikis } from 'data/star';
+import { useStarWikisInOrganization } from 'data/star';
import { useWikiDetail } from 'data/wiki';
import Link from 'next/link';
import { useRouter } from 'next/router';
@@ -16,7 +16,12 @@ const { Text } = Typography;
const WikiContent = () => {
const { query } = useRouter();
- const { data: starWikis, loading, error, refresh: refreshStarWikis } = useStarWikis();
+ const {
+ data: starWikis,
+ loading,
+ error,
+ refresh: refreshStarWikis,
+ } = useStarWikisInOrganization(query.organizationId);
const { data: currentWiki } = useWikiDetail(query.wikiId);
return (
@@ -31,8 +36,9 @@ const WikiContent = () => {
-
{
-
@@ -84,8 +94,9 @@ const WikiContent = () => {
{
-
+ (
+ <>
+
+
+
+ )}
+ />
+
+
+
+ 组织列表
+
+
+
+
+ (
+
+
+
+ 快捷访问
+
+ <>
+
+
+ - (
+
- (
+
+
+
+
+ 组织设置
+
+
+
@@ -111,14 +119,22 @@ const Page: NextPage = () => {
@@ -56,4 +56,5 @@ Page.getInitialProps = async (ctx) => {
]);
return { ...res, wikiId } as IProps;
};
+
export default Page;
diff --git a/packages/client/src/pages/app/org/[organizationId]/wiki/index.module.scss b/packages/client/src/pages/app/org/[organizationId]/wiki/index.module.scss
new file mode 100644
index 00000000..4708e1b0
--- /dev/null
+++ b/packages/client/src/pages/app/org/[organizationId]/wiki/index.module.scss
@@ -0,0 +1,12 @@
+.wikiItemWrap {
+ padding: 12px 16px !important;
+ margin: 8px 2px;
+ cursor: pointer;
+ background-color: var(--semi-color-bg-2);
+ border: 1px solid var(--semi-color-border) !important;
+}
+
+.titleWrap {
+ display: flex;
+ justify-content: space-between;
+}
diff --git a/packages/client/src/pages/wiki/index.tsx b/packages/client/src/pages/app/org/[organizationId]/wiki/index.tsx
similarity index 76%
rename from packages/client/src/pages/wiki/index.tsx
rename to packages/client/src/pages/app/org/[organizationId]/wiki/index.tsx
index 30bca788..a831ab63 100644
--- a/packages/client/src/pages/wiki/index.tsx
+++ b/packages/client/src/pages/app/org/[organizationId]/wiki/index.tsx
@@ -6,8 +6,9 @@ import { Seo } from 'components/seo';
import { WikiCard, WikiCardPlaceholder } from 'components/wiki/card';
import { WikiCreator } from 'components/wiki-creator';
import { getAllWikis, getJoinWikis, getOwnWikis, useAllWikis, useJoinWikis, useOwnWikis } from 'data/wiki';
+import { useRouterQuery } from 'hooks/use-router-query';
import { CreateWikiIllustration } from 'illustrations/create-wiki';
-import { SingleColumnLayout } from 'layouts/single-column';
+import { AppSingleColumnLayout } from 'layouts/app-single-column';
import type { NextPage } from 'next';
import React from 'react';
import { serverPrefetcher } from 'services/server-prefetcher';
@@ -24,7 +25,8 @@ const grid = {
const { Title } = Typography;
const Wikis = ({ hook }) => {
- const { data, loading, error } = hook();
+ const { organizationId } = useRouterQuery<{ organizationId: string }>();
+ const { data, loading, error } = hook(organizationId);
return (
{
const Page: NextPage = () => {
return (
-
+
@@ -77,15 +79,17 @@ const Page: NextPage = () => {
</TabPane>
</Tabs>
</div>
- </SingleColumnLayout>
+ </AppSingleColumnLayout>
);
};
Page.getInitialProps = async (ctx) => {
+ const { orgId: organizationId } = ctx.query;
+
const props = await serverPrefetcher(ctx, [
- { url: WikiApiDefinition.getAllWikis.client(), action: (cookie) => getAllWikis(cookie) },
- { url: WikiApiDefinition.getJoinWikis.client(), action: (cookie) => getJoinWikis(cookie) },
- { url: WikiApiDefinition.getOwnWikis.client(), action: (cookie) => getOwnWikis(cookie) },
+ { url: WikiApiDefinition.getAllWikis.client(organizationId), action: (cookie) => getAllWikis(cookie) },
+ { url: WikiApiDefinition.getJoinWikis.client(organizationId), action: (cookie) => getJoinWikis(cookie) },
+ { url: WikiApiDefinition.getOwnWikis.client(organizationId), action: (cookie) => getOwnWikis(cookie) },
]);
return props;
};
diff --git a/packages/client/src/pages/app/org/create/index.module.scss b/packages/client/src/pages/app/org/create/index.module.scss
new file mode 100644
index 00000000..c58f36b3
--- /dev/null
+++ b/packages/client/src/pages/app/org/create/index.module.scss
@@ -0,0 +1,9 @@
+.cover {
+ margin-right: 12px;
+}
+
+@media (max-width: 768px) {
+ .cover {
+ width: 100%;
+ }
+}
diff --git a/packages/client/src/pages/app/org/create/index.tsx b/packages/client/src/pages/app/org/create/index.tsx
new file mode 100644
index 00000000..5bf8ab59
--- /dev/null
+++ b/packages/client/src/pages/app/org/create/index.tsx
@@ -0,0 +1,119 @@
+import { Avatar, Button, Form, Typography } from '@douyinfe/semi-ui';
+import { FormApi } from '@douyinfe/semi-ui/lib/es/form';
+import { ORGANIZATION_LOGOS } from '@think/constants';
+import { ImageUploader } from 'components/image-uploader';
+import { useCreateOrganization } from 'data/organization';
+import { useToggle } from 'hooks/use-toggle';
+import { SingleColumnLayout } from 'layouts/single-column';
+import Router from 'next/router';
+import { useCallback, useRef, useState } from 'react';
+
+import styles from './index.module.scss';
+
+const images = [
+ {
+ key: 'placeholers',
+ title: '图库',
+ images: ORGANIZATION_LOGOS,
+ },
+];
+
+const { Title } = Typography;
+
+const Page: React.FC = () => {
+ const $form = useRef<FormApi>();
+ const [changed, toggleChanged] = useToggle(false);
+ const [currentCover, setCurrentCover] = useState('');
+ const { create, loading } = useCreateOrganization();
+
+ const setCover = useCallback((url) => {
+ $form.current.setValue('logo', url);
+ setCurrentCover(url);
+ }, []);
+
+ const onFormChange = useCallback(() => {
+ toggleChanged(true);
+ }, [toggleChanged]);
+
+ const onSubmit = useCallback(() => {
+ $form.current.validate().then((values) => {
+ create(values).then((res) => {
+ Router.push({
+ pathname: `/app/org/[organizationId]`,
+ query: { organizationId: res.id },
+ });
+ });
+ });
+ }, [create]);
+
+ return (
+ <SingleColumnLayout>
+ <div className="container">
+ <div>
+ <Title heading={3} style={{ margin: '8px 0' }}>
+ 新建组织
+
+
+
+
+
+ );
+};
+
+export default Page;
diff --git a/packages/client/src/pages/find/index.tsx b/packages/client/src/pages/find/index.tsx
index 73ec3ef9..14d21ccc 100644
--- a/packages/client/src/pages/find/index.tsx
+++ b/packages/client/src/pages/find/index.tsx
@@ -75,7 +75,7 @@ const Page: NextPage = () => {
Page.getInitialProps = async (ctx) => {
const props = await serverPrefetcher(ctx, [
- { url: [WikiApiDefinition.getAllWikis.client(), 1], action: (cookie) => getAllPublicWikis(1, cookie) },
+ { url: [WikiApiDefinition.getPublicWikis.client(), 1], action: (cookie) => getAllPublicWikis(1, cookie) },
]);
return props;
};
diff --git a/packages/client/src/pages/index.module.scss b/packages/client/src/pages/index.module.scss
index 4708e1b0..ba021ccd 100644
--- a/packages/client/src/pages/index.module.scss
+++ b/packages/client/src/pages/index.module.scss
@@ -1,12 +1,26 @@
-.wikiItemWrap {
- padding: 12px 16px !important;
- margin: 8px 2px;
- cursor: pointer;
- background-color: var(--semi-color-bg-2);
- border: 1px solid var(--semi-color-border) !important;
+.wrap {
+ z-index: 1;
+ display: flex;
+ width: 100%;
+ padding: 10vh 32px 48px;
+ align-items: center;
+ flex-direction: row;
+
+ .hero {
+ max-width: 53%;
+ min-width: 53%;
+ margin-left: 48px;
+ }
}
-.titleWrap {
- display: flex;
- justify-content: space-between;
+@media (max-width: 768px) {
+ .wrap {
+ flex-direction: column;
+
+ .hero {
+ max-width: 100%;
+ min-width: 100%;
+ margin-left: 0;
+ }
+ }
}
diff --git a/packages/client/src/pages/index.tsx b/packages/client/src/pages/index.tsx
index 5b809cfe..e894fc07 100644
--- a/packages/client/src/pages/index.tsx
+++ b/packages/client/src/pages/index.tsx
@@ -1,184 +1,61 @@
-import { Avatar, Button, List, Table, Typography } from '@douyinfe/semi-ui';
-import { DocumentApiDefinition, IDocument, StarApiDefinition } from '@think/domains';
-import { DataRender } from 'components/data-render';
-import { DocumentActions } from 'components/document/actions';
-import { Empty } from 'components/empty';
-import { LocaleTime } from 'components/locale-time';
+import { Button, Typography } from '@douyinfe/semi-ui';
import { Seo } from 'components/seo';
-import { WikiCreator } from 'components/wiki/create';
-import { WikiPinCard, WikiPinCardPlaceholder } from 'components/wiki/pin-card';
-import { getRecentVisitedDocuments, useRecentDocuments } from 'data/document';
-import { getStarWikis, useStarWikis } from 'data/star';
-import { useToggle } from 'hooks/use-toggle';
+import { toLogin, useUser } from 'data/user';
+import { TeamWorkIllustration } from 'illustrations/team-work';
import { SingleColumnLayout } from 'layouts/single-column';
import type { NextPage } from 'next';
-import Link from 'next/link';
-import React, { useEffect, useMemo } from 'react';
-import { serverPrefetcher } from 'services/server-prefetcher';
+import Router from 'next/router';
+import React, { useCallback } from 'react';
import styles from './index.module.scss';
-const { Title } = Typography;
-const { Column } = Table;
-
-const grid = {
- gutter: 16,
- xs: 24,
- sm: 12,
- md: 12,
- lg: 8,
- xl: 8,
-};
-
-const RecentDocs = () => {
- const { data, error, loading, refresh } = useRecentDocuments();
-
- const columns = useMemo(
- () => [
-
-
-
+ {systemConfig && systemConfig.enableEmailVerify ? (
+
+
+ ) : null}
-
- 快捷访问
-
- <>
-
- (
-
);
};
-Page.getInitialProps = async (ctx) => {
- const props = await serverPrefetcher(ctx, [
- { url: StarApiDefinition.wikis.client(), action: (cookie) => getStarWikis(cookie) },
- { url: DocumentApiDefinition.recent.client(), action: (cookie) => getRecentVisitedDocuments(cookie) },
- ]);
- return props;
-};
-
export default Page;
diff --git a/packages/client/src/pages/register/index.tsx b/packages/client/src/pages/register/index.tsx
index e414e526..37ae2b92 100644
--- a/packages/client/src/pages/register/index.tsx
+++ b/packages/client/src/pages/register/index.tsx
@@ -2,7 +2,7 @@ import { Button, Col, Form, Layout, Modal, Row, Space, Toast, Typography } from
import { Author } from 'components/author';
import { LogoImage, LogoText } from 'components/logo';
import { Seo } from 'components/seo';
-import { useRegister, useVerifyCode } from 'data/user';
+import { useRegister, useSystemPublicConfig, useVerifyCode } from 'data/user';
import { isEmail } from 'helpers/validator';
import { useInterval } from 'hooks/use-interval';
import { useRouterQuery } from 'hooks/use-router-query';
@@ -24,6 +24,7 @@ const Page = () => {
const [hasSendVerifyCode, toggleHasSendVerifyCode] = useToggle(false);
const [countDown, setCountDown] = useState(0);
const { register, loading } = useRegister();
+ const { data: systemConfig } = useSystemPublicConfig();
const { sendVerifyCode, loading: sendVerifyCodeLoading } = useVerifyCode();
const onFormChange = useCallback((formState) => {
@@ -133,22 +134,29 @@ const Page = () => {
]}
/>
-
+
-
+
+
+
+
+ 云策文档
+
+ 云策文档是一款开源知识管理工具。通过独立的知识库空间，结构化地组织在线协作文档，实现知识的积累与沉淀，促进知识的复用与流通。
+
+
+
+
+
+
+
+
- (
-
- (
-