Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: use the editor to render the sharing page #82

Merged
merged 4 commits into from
Jul 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 9 additions & 124 deletions components/container/post-container.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import { FC, useMemo } from 'react'
// TODO: Maybe can custom
import 'highlight.js/styles/zenburn.css'
import { useEditorTheme } from 'components/editor/theme'
import classNames from 'classnames'
import useI18n from 'libs/web/hooks/use-i18n'
import UIState from 'libs/web/state/ui'
import InnerHTML from 'dangerously-set-html-content'
import { NoteModel } from 'libs/shared/note'
import pupa from 'pupa'
import MainEditor from 'components/editor/main-editor'

const MAX_WIDTH = 900

export const PostContainer: FC<{
post?: string
small?: boolean
note?: NoteModel
}> = ({ post = '', small = false, note }) => {
const { t } = useI18n()
const editorTheme = useEditorTheme()
}> = ({ small = false, note }) => {
const {
settings: {
settings: { injection },
Expand All @@ -29,134 +26,22 @@ export const PostContainer: FC<{
})
}, [injection, note])

const articleClassName = useMemo(
() =>
classNames('prose mx-auto pb-10 prose-sm px-4 md:px-0', {
'md:prose-2xl': !small,
}),
[small]
)
const className = 'pt-10 px-6 m-auto max-w-full w-[900px]'

return (
<>
<article className={articleClassName}>
<header>
<h1 className="pt-10">{note?.title ?? t('Untitled')}</h1>
</header>
<main
dangerouslySetInnerHTML={{
__html: post,
}}
></main>
<style jsx>{`
.prose :glboal(img) {
margin: auto;
}

.prose :glboal([title='left-50']) {
float: left;
width: 50%;
margin-right: 2em;
margin-bottom: 1em;
clear: initial;
}

.prose :glboal([title='right-50']) {
float: right;
width: 50%;
margin-left: 2em;
margin-bottom: 1em;
clear: initial;
}

.prose :glboal(figcaption) {
text-align: center;
}

.prose :global(.task-list-item) {
padding-left: 0;
}

.prose :global(.task-list-item::before) {
content: none;
}

.prose :global(.task-list-item label) {
margin-left: 6px;
}

.prose :global(.notice) {
display: flex;
align-items: center;
background: ${editorTheme.noticeInfoBackground};
color: ${editorTheme.noticeInfoText};
border-radius: 4px;
padding: 8px 16px;
margin: 8px 0;
}

.prose :global(.notice *) {
margin: 0;
color: currentColor;
}

.prose :global(.notice .icon) {
width: 1.5em;
height: 1.5em;
align-self: flex-start;
margin-right: 4px;
position: relative;
top: 1px;
}

.prose :global(.notice svg) {
width: 100%;
height: 100%;
}

.prose :global(.notice .content) {
flex-grow: 1;
}

.prose :global(.notice a) {
color: ${editorTheme.noticeInfoText};
}
.prose :global(.notice a:not(.heading-name)) {
text-decoration: underline;
}

.prose :global(.notice-tip) {
background: ${editorTheme.noticeTipBackground};
color: ${editorTheme.noticeTipText};
}

.prose :global(.notice-tip a) {
color: ${editorTheme.noticeTipText};
}
.prose :global(.notice-warning) {
background: ${editorTheme.noticeWarningBackground};
color: ${editorTheme.noticeWarningText};
}

.prose: global(.notice-warning a) {
color: ${editorTheme.noticeWarningText};
}

.prose :global(table *) {
margin: 0;
}
`}</style>
</article>
<MainEditor small={small} note={note} className={className} readOnly />
{small ? null : (
<>
{injection ? (
<InnerHTML
id="snippet-injection"
className={articleClassName}
className={className}
style={{ width: MAX_WIDTH }}
html={injectionHTML}
/>
) : null}
<footer className="text-gray-300 text-center my-20 text-sm">
<footer className="pb-10 text-gray-300 text-center my-20 text-sm">
Built with{' '}
<a
href="https://cinwell.com/notea/"
Expand Down
4 changes: 2 additions & 2 deletions components/editor/edit-title.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useRouter } from 'next/router'
import { FC, useCallback, KeyboardEvent, useRef, useMemo } from 'react'
import EditorState from 'libs/web/state/editor'

const EditTitle: FC = () => {
const EditTitle: FC<{ readOnly?: boolean }> = ({ readOnly }) => {
const { editorEl, onNoteChange, note } = EditorState.useContainer()
const router = useRouter()
const inputRef = useRef<HTMLTextAreaElement>(null)
Expand All @@ -29,13 +29,13 @@ const EditTitle: FC = () => {
)

const autoFocus = useMemo(() => has(router.query, 'new'), [router.query])

const { t } = useI18n()

return (
<h1 className="text-3xl mb-8">
<TextareaAutosize
ref={inputRef}
readOnly={readOnly}
className="outline-none w-full resize-none block bg-transparent"
placeholder={t('New Page')}
defaultValue={note?.title}
Expand Down
7 changes: 5 additions & 2 deletions components/editor/editor.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, useCallback, useEffect, useMemo, useState } from 'react'
import { use100vh } from 'react-div-100vh'
import MarkdownEditor from 'rich-markdown-editor'
import MarkdownEditor, { Props } from 'rich-markdown-editor'
import { useEditorTheme } from './theme'
import useMounted from 'libs/web/hooks/use-mounted'
import useI18n from 'libs/web/hooks/use-i18n'
Expand All @@ -9,7 +9,9 @@ import extensions from './extensions'
import EditorState from 'libs/web/state/editor'
import { useToast } from 'libs/web/hooks/use-toast'

const Editor: FC = () => {
export type EditorProps = Pick<Props, 'readOnly'>

const Editor: FC<EditorProps> = ({ readOnly }) => {
const {
onSearchLink,
onCreateLink,
Expand Down Expand Up @@ -106,6 +108,7 @@ const Editor: FC = () => {
return (
<>
<MarkdownEditor
readOnly={readOnly}
id={note?.id}
ref={editorEl}
value={mounted ? note?.content : ''}
Expand Down
27 changes: 20 additions & 7 deletions components/editor/main-editor.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
import EditTitle from './edit-title'
import Editor from './editor'
import Editor, { EditorProps } from './editor'
import Backlinks from './backlinks'
import EditorState from 'libs/web/state/editor'
import { FC } from 'react'
import { NoteModel } from 'libs/shared/note'

const MainEditor = () => {
const MainEditor: FC<
EditorProps & {
note?: NoteModel
small?: boolean
className?: string
}
> = ({
className = 'pt-40 px-6 m-auto h-full max-w-prose',
note,
small,
...props
}) => {
return (
<EditorState.Provider>
<article className="pt-40 px-6 m-auto h-full max-w-prose" dir="auto">
<EditTitle />
<Editor />
<Backlinks />
<EditorState.Provider initialState={note}>
<article className={className}>
<EditTitle readOnly={props.readOnly} />
<Editor {...props} />
{!small && <Backlinks />}
</article>
</EditorState.Provider>
)
Expand Down
16 changes: 2 additions & 14 deletions components/portal/preview-modal.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
import React, {
FC,
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from 'react'
import React, { FC, useCallback, useEffect, useRef, useState } from 'react'
import { Paper, Popper, Fade } from '@material-ui/core'
import PortalState from 'libs/web/state/portal'
import { useRouter } from 'next/router'
import { NoteCacheItem } from 'libs/web/cache'
import useNoteAPI from 'libs/web/api/note'
import { PostContainer } from 'components/container/post-container'
import { renderMarkdown } from 'libs/shared/markdown/render'
import IconButton from 'components/icon-button'
import HotkeyTooltip from 'components/hotkey-tooltip'
import useI18n from 'libs/web/hooks/use-i18n'
Expand Down Expand Up @@ -81,10 +73,6 @@ const PreviewModal: FC = () => {
}
}, [note?.id, router])

const post = useMemo(() => {
return renderMarkdown(note?.content ?? '')
}, [note?.content])

useEffect(() => {
setAnchor(null)
close()
Expand Down Expand Up @@ -123,7 +111,7 @@ const PreviewModal: FC = () => {
</HotkeyTooltip>
</div>
<div className="overflow-y-scroll h-full p-4">
<PostContainer small post={post} note={note}></PostContainer>
<PostContainer small note={note}></PostContainer>
</div>
</Paper>
</Fade>
Expand Down
1 change: 0 additions & 1 deletion libs/server/connect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export interface ServerProps {
tree?: TreeModel
ua?: UserAgentType
disablePassword: boolean
post: string
}

export type ApiRequest = NextApiRequest & {
Expand Down
19 changes: 0 additions & 19 deletions libs/server/middlewares/post.ts

This file was deleted.

35 changes: 0 additions & 35 deletions libs/shared/markdown/notice-plugin.tsx

This file was deleted.

Loading