Skip to content

Commit

Permalink
chore: fix eslint & update CODEOWNERS & update document homepage (#625)
Browse files Browse the repository at this point in the history
  • Loading branch information
jikkai committed Dec 4, 2023
1 parent cb09fc0 commit 4294c93
Show file tree
Hide file tree
Showing 9 changed files with 284 additions and 412 deletions.
5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Build
dist
lib
local
.turbo
.docusaurus
typedoc


# Coverage
coverage-report/
Expand Down
51 changes: 26 additions & 25 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,40 @@ packages/core @DR-Univer @wzhudev
packages/core/src/services/resource-manager @Gggpound
packages/core/src/services/permission @Gggpound

# rendering
packages/base-render @DR-Univer @wzhudev

# business cores
packages/base-docs @DR-Univer @Jocs
packages/base-sheets @wzhudev @DR-Univer
packages/base-slides @wzhudev @DR-Univer @jikkai
packages/base-sheets/src/services/numfmt @Gggpound
packages/base-sheets/src/services/ref-range @Gggpound
# engine
packages/engine-render @DR-Univer @wzhudev
packages/engine-formula @DR-Univer
packages/engine-numfmt @Gggpound

# ui
packages/base-ui @jikkai @wzhudev @Jocs
packages/base-ui/src/services/clipboard @yuhongz
packages/ui @jikkai @wzhudev @Jocs
packages/ui/src/services/clipboard @yuhongz
packages/design @jikkai @wzhudev

# docs
packages/ui-plugin-docs @jikkai @Jocs
packages/docs @DR-Univer @Jocs
packages/docs-ui @jikkai @Jocs

# sheets
packages/ui-plugin-sheets @jikkai @wzhudev
packages/ui-plugin-sheets/src/controllers/clipboard @yuhongz
packages/ui-plugin-sheets/src/controllers/editor @Jocs
packages/ui-plugin-sheets/src/services/clipboard @yuhongz
packages/ui-plugin-sheets/src/services/editor @Jocs
packages/ui-plugin-sheets/src/services/editor-bridge.service.ts @Jocs
packages/sheets-plugin-numfmt @Gggpound

packages/sheets @wzhudev @DR-Univer
packages/sheets-ui @jikkai @wzhudev
packages/sheets-ui/src/controllers/clipboard @yuhongz
packages/sheets-ui/src/controllers/editor @Jocs
packages/sheets-ui/src/services/clipboard @yuhongz
packages/sheets-ui/src/services/editor @Jocs
packages/sheets-ui/src/services/editor-bridge.service.ts @Jocs
packages/sheets-numfmt @Gggpound
packages/sheets-formula @DR-Univer @Dushusir
packages/sheets/src/services/numfmt @Gggpound
packages/sheets/src/services/ref-range @Gggpound

# slides
packages/ui-plugin-slides @jikkai @wzhudev
packages/slides @wzhudev @DR-Univer @jikkai
packages/slides-ui @jikkai @wzhudev

# formula
packages/base-formula-engine @DR-Univer
packages/base-numfmt-engine @Gggpound
packages/sheets-plugin-formula @DR-Univer
packages/sheets-plugin-formula-ui @DR-Univer @Dushusir
packages/formula @DR-Univer

# network
packages/rpc @wzhudev
packages/network @wzhudev
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,6 @@
"Xingkai",
"Xinwei"
],
"vsicons.presets.angular": false
"vsicons.presets.angular": false,
"eslint.codeActionsOnSave.mode": "problems"
}
2 changes: 1 addition & 1 deletion apps/docs/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { themes as prismThemes } from 'prism-react-renderer';

const config: Config = {
title: 'Univer',
tagline: 'A website for Univerjs',
tagline: 'An open source collaborative solution.',
favicon: 'img/favicon.ico',

// Set the production url of your site here
Expand Down
15 changes: 8 additions & 7 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@
"typecheck": "tsc"
},
"dependencies": {
"@univerjs/core": "workspace:*",
"@docusaurus/core": "3.0.0",
"@docusaurus/preset-classic": "3.0.0",
"@docusaurus/core": "3.0.1",
"@docusaurus/preset-classic": "3.0.1",
"@mdx-js/react": "^3.0.0",
"@univerjs/core": "workspace:*",
"@univerjs/icons": "^0.1.14",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.0.0",
"@docusaurus/plugin-content-docs": "^3.0.0",
"@docusaurus/tsconfig": "3.0.0",
"@docusaurus/types": "3.0.0",
"@docusaurus/module-type-aliases": "3.0.1",
"@docusaurus/plugin-content-docs": "^3.0.1",
"@docusaurus/tsconfig": "3.0.1",
"@docusaurus/types": "3.0.1",
"typescript": "^5.3.2"
},
"browserslist": {
Expand Down
8 changes: 4 additions & 4 deletions apps/docs/src/css/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@

/* You can override the default Infima variables here. */
:root {
--ifm-color-primary: #2e8555;
/* --ifm-color-primary: #2e8555;
--ifm-color-primary-dark: #29784c;
--ifm-color-primary-darker: #277148;
--ifm-color-primary-darkest: #205d3b;
--ifm-color-primary-light: #33925d;
--ifm-color-primary-lighter: #359962;
--ifm-color-primary-lightest: #3cad6e;
--ifm-code-font-size: 95%;
--docusaurus-highlighted-code-line-bg: rgb(0 0 0 / 10%);
--docusaurus-highlighted-code-line-bg: rgb(0 0 0 / 10%); */
}

/* For readability concerns, you should choose a lighter palette in dark mode. */
[data-theme='dark'] {
--ifm-color-primary: #25c2a0;
/* --ifm-color-primary: #25c2a0;
--ifm-color-primary-dark: #21af90;
--ifm-color-primary-darker: #1fa588;
--ifm-color-primary-darkest: #1a8870;
--ifm-color-primary-light: #29d5b0;
--ifm-color-primary-lighter: #32d8b4;
--ifm-color-primary-lightest: #4fddbf;
--docusaurus-highlighted-code-line-bg: rgb(0 0 0 / 30%);
--docusaurus-highlighted-code-line-bg: rgb(0 0 0 / 30%); */
}
35 changes: 19 additions & 16 deletions apps/docs/src/pages/index.module.css
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
/**
* CSS files with the .module.css suffix will be treated as CSS modules
* and scoped locally.
*/
.header {
margin-top: 6rem;
margin-bottom: 8rem;
}

.heroBanner {
position: relative;
overflow: hidden;
padding: 4rem 0;
text-align: center;
.h1 {
font-size: 40px;
font-weight: 500;
color: var(--ifm-heading-color);
}

@media screen and (width <=996px) {
.heroBanner {
padding: 2rem;
}
.h2 {
font-size: 32px;
font-weight: normal;
color: var(--ifm-hero-text-color);
}

.buttons {
display: flex;
.btn {
display: inline-flex;
gap: 4px;
align-items: center;
justify-content: center;
}

.icon {
font-size: 20px;
}
57 changes: 42 additions & 15 deletions apps/docs/src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,57 @@
import { useHistory } from '@docusaurus/router';
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import Heading from '@theme/Heading';
import Layout from '@theme/Layout';
import { DiscordSingle24, GithubSingle24 } from '@univerjs/icons';
import clsx from 'clsx';

import styles from './index.module.css';

function HomepageHeader() {
export default function Home() {
const { siteConfig } = useDocusaurusContext();
const history = useHistory();

function handleRedirect(external: boolean, url: string) {
if (external) {
window.open(url, '_blank');
} else {
history.push(url);
}
}

return (
<header className={clsx('hero hero--primary', styles.heroBanner)}>
<div className="container">
<Heading as="h1" className="hero__title">
<Layout>
<header className={clsx('container', styles.header)}>
<Heading as="h1" className={styles.h1}>
{siteConfig.title}
</Heading>
<p className="hero__subtitle">{siteConfig.tagline}</p>
</div>
</header>
);
}

export default function Home(): JSX.Element {
const { siteConfig } = useDocusaurusContext();
return (
<Layout>
<HomepageHeader />
<main>main area, Hello {siteConfig.title}</main>
<Heading as="h2" className={styles.h2}>
{siteConfig.tagline}
</Heading>

<section>
<button
className="button button--primary margin-right--sm"
onClick={() => handleRedirect(false, '/docs/tutorial/intro')}
>
Get Started
</button>
<button
className={clsx('button button--outline button--secondary margin-right--sm', styles.btn)}
onClick={() => handleRedirect(true, 'https://discord.gg/z3NKNT6D2f')}
>
<DiscordSingle24 className={styles.icon} />
Discord
</button>
<button
className={clsx('button button--outline button--secondary', styles.btn)}
onClick={() => handleRedirect(true, 'https://github.com/dream-num/univer')}
>
<GithubSingle24 className={styles.icon} />
</button>
</section>
</header>
</Layout>
);
}
Loading

0 comments on commit 4294c93

Please sign in to comment.