-
- {page.title || "Untitled"}
-
+
+ {page.title ? (
+
+ {page.title}
+
+ ) : (
+
+ {page.summary?.content}
+
+ )}
{getPageVisibility(page).toLowerCase()}
diff --git a/src/components/site/SiteHome.tsx b/src/components/site/SiteHome.tsx
index dab6c7d7..0352faf7 100644
--- a/src/components/site/SiteHome.tsx
+++ b/src/components/site/SiteHome.tsx
@@ -63,8 +63,6 @@ export const SiteHome: React.FC<{
className="object-cover rounded w-24 h-24"
alt="cover"
layout="fill"
- width={96}
- height={96}
src={post.cover}
>
diff --git a/src/components/ui/EditorToolbar.tsx b/src/components/ui/EditorToolbar.tsx
index d15bb454..877238b7 100644
--- a/src/components/ui/EditorToolbar.tsx
+++ b/src/components/ui/EditorToolbar.tsx
@@ -7,9 +7,6 @@ import { Tooltip } from "./Tooltip"
export interface EditorToolbarProps {
view: EditorView | null
toolbars: ICommand[]
- modeToolbars: ICommand[]
- previewVisible: boolean
- setPreviewVisible: Dispatch
>
}
enum ToolbarMode {
@@ -17,36 +14,21 @@ enum ToolbarMode {
Preview,
}
-export const EditorToolbar: FC = ({
- view,
- toolbars,
- modeToolbars,
- previewVisible,
- setPreviewVisible,
-}) => {
+export const EditorToolbar: FC = ({ view, toolbars }) => {
const renderToolbar =
(mode: ToolbarMode) =>
// eslint-disable-next-line react/display-name
({ name, icon, label, execute }: ICommand) => {
- const isPreviewModeCommand = mode === ToolbarMode.Preview
- const active = isPreviewModeCommand && previewVisible
- const disabled = !isPreviewModeCommand && previewVisible
return (
)
}
diff --git a/src/components/ui/Image.tsx b/src/components/ui/Image.tsx
index c4bcd841..7ae09115 100644
--- a/src/components/ui/Image.tsx
+++ b/src/components/ui/Image.tsx
@@ -14,33 +14,43 @@ export const Image: React.FC<
> = ({ layout, className, alt, src, width, height, ...props }) => {
src = toIPFS(src)
const [paddingTop, setPaddingTop] = React.useState("0")
+ const [autoWidth, setAutoWidth] = React.useState(0)
const autoSize = !width && !height && !layout
return (
- {
- if (autoSize) {
- const { naturalWidth, naturalHeight } = target as HTMLImageElement
- setPaddingTop(`calc(100% / (${naturalWidth} / ${naturalHeight})`)
- }
- }}
- />
+
+ {
+ if (autoSize) {
+ const { naturalWidth, naturalHeight } = target as HTMLImageElement
+ setPaddingTop(`calc(100% / (${naturalWidth} / ${naturalHeight})`)
+ setAutoWidth(naturalWidth)
+ }
+ }}
+ />
+
)
}
diff --git a/src/editor/Preview.tsx b/src/editor/Preview.tsx
deleted file mode 100644
index 404d406f..00000000
--- a/src/editor/Preview.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ICommand } from "."
-
-export const Preview: ICommand = {
- name: "preview",
- label: "Toggle Preview",
- icon: "i-bi:eye",
- execute: (_, options) => {
- options?.setPreviewVisible?.((visible) => !visible)
- },
-}
diff --git a/src/editor/index.tsx b/src/editor/index.tsx
index d8b82bc9..25fb4a1f 100644
--- a/src/editor/index.tsx
+++ b/src/editor/index.tsx
@@ -11,7 +11,6 @@ import { Italic } from "./Italic"
import { Link } from "./Link"
import { ListOrdered } from "./ListOrdered"
import { ListUnordered } from "./ListUnordered"
-import { Preview } from "./Preview"
import { Quote } from "./Quote"
import { Strikethrough } from "./Strikethrough"
import { Underline } from "./Underline"
@@ -131,5 +130,3 @@ export const toolbars: ICommand[] = [
Image,
UploadImage,
]
-
-export const modeToolbars: ICommand[] = [Preview]
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 34abe7d1..0254f0a3 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -25,6 +25,7 @@ export enum PageVisibilityEnum {
Published = "published",
Scheduled = "scheduled",
Draft = "draft",
+ Crossbell = "crossbell",
}
export type PostOnSiteHome = {
diff --git a/src/models/page.model.ts b/src/models/page.model.ts
index 762ac4d6..d524a868 100644
--- a/src/models/page.model.ts
+++ b/src/models/page.model.ts
@@ -31,6 +31,7 @@ export async function createOrUpdatePage(input: {
/** Only needed when creating page */
isPost?: boolean
externalUrl?: string
+ applications?: string[]
}) {
if (!input.published) {
return await unidata.notes.set(
@@ -78,7 +79,10 @@ export async function createOrUpdatePage(input: {
.map((tag) => tag.trim())
.filter((tag) => tag) || []),
],
- applications: ["xlog"],
+ applications: [
+ "xlog",
+ ...(input.applications?.filter((app) => app !== "xlog") || []),
+ ],
...(input.slug && {
attributes: [
{
@@ -176,6 +180,7 @@ export async function getPagesBySite(input: {
}
const visibility = input.visibility || PageVisibilityEnum.All
+ const crossbell = visibility === PageVisibilityEnum.Crossbell
const options = {
source: "Crossbell Note",
@@ -183,8 +188,8 @@ export async function getPagesBySite(input: {
platform: "Crossbell",
limit: input.take || 1000,
filter: {
- tags: [...(input.tags || []), input.type],
- applications: ["xlog"],
+ tags: [...(input.tags || []), ...(crossbell ? [] : [input.type])],
+ applications: [...(crossbell ? [] : ["xlog"])],
},
cursor: "",
}
@@ -206,12 +211,14 @@ export async function getPagesBySite(input: {
cursor = res.cursor
} while (cursor)
- const local = getLocalPages({
- site: input.site,
- isPost: input.type === "post",
- })
- pages.list = pages.list.concat(local)
- pages.total += local.length
+ if (!crossbell) {
+ const local = getLocalPages({
+ site: input.site,
+ isPost: input.type === "post",
+ })
+ pages.list = pages.list.concat(local)
+ pages.total += local.length
+ }
if (pages?.list) {
switch (visibility) {
@@ -229,6 +236,11 @@ export async function getPagesBySite(input: {
(page) => +new Date(page.date_published) > +new Date(),
)
break
+ case PageVisibilityEnum.Crossbell:
+ pages.list = pages.list.filter(
+ (page) => !page.applications?.includes("xlog"),
+ )
+ break
}
pages.list = pages.list
.filter(
diff --git a/src/pages/dashboard/[subdomain]/editor.tsx b/src/pages/dashboard/[subdomain]/editor.tsx
index 7c08aac7..9666aeb5 100644
--- a/src/pages/dashboard/[subdomain]/editor.tsx
+++ b/src/pages/dashboard/[subdomain]/editor.tsx
@@ -4,7 +4,7 @@ import dayjs from "dayjs"
import { useRouter } from "next/router"
import { ChangeEvent, useCallback, useEffect, useMemo, useState } from "react"
import toast from "react-hot-toast"
-import { modeToolbars, toolbars } from "~/editor"
+import { toolbars } from "~/editor"
import { DashboardLayout } from "~/components/dashboard/DashboardLayout"
import { DashboardMain } from "~/components/dashboard/DashboardMain"
import { PublishButton } from "~/components/dashboard/PublishButton"
@@ -23,6 +23,7 @@ import { getStorage, setStorage, delStorage } from "~/lib/storage"
import { nanoid } from "nanoid"
import { useQueryClient } from "@tanstack/react-query"
import { PageContent } from "~/components/common/PageContent"
+import pinyin from "pinyin"
const getInputDatetimeValue = (date: Date | string) => {
const str = dayjs(date).format()
@@ -75,13 +76,24 @@ export default function SubdomainEditor() {
content: "",
})
const [content, setContent] = useState("")
-
- const [previewVisible, setPreviewVisible] = useState(false)
+ const [defaultSlug, setDefaultSlug] = useState("")
type Values = typeof values
const updateValue = useCallback(
(key: K, value: Values[K]) => {
+ if (key === "title") {
+ setDefaultSlug(
+ pinyin(value as string, {
+ style: pinyin.STYLE_NORMAL,
+ compact: true,
+ })?.[0]
+ ?.map((word) => word.trim())
+ ?.filter((word) => word)
+ ?.join("-")
+ ?.replace(/\s+/g, "-") || "",
+ )
+ }
const newValues = { ...values, [key]: value }
if (draftKey) {
setStorage(draftKey, {
@@ -101,15 +113,17 @@ export default function SubdomainEditor() {
const savePage = (published: boolean) => {
createOrUpdatePage.mutate({
...values,
+ slug: values.slug || defaultSlug,
siteId: subdomain,
...(visibility === PageVisibilityEnum.Draft ? {} : { pageId: pageId }),
isPost: isPost,
published,
externalUrl:
- values.slug &&
+ (values.slug || defaultSlug) &&
`${getSiteLink({ subdomain, domain: site.data?.custom_domain })}/${
- values.slug
+ values.slug || defaultSlug
}`,
+ applications: page.data?.applications,
})
}
@@ -210,13 +224,7 @@ export default function SubdomainEditor() {