diff --git a/layouts/page-container1.tsx b/layouts/page-container1.tsx
index 218af42d..c3151703 100644
--- a/layouts/page-container1.tsx
+++ b/layouts/page-container1.tsx
@@ -43,7 +43,7 @@ function PageContainer1(props: PageContainerProps) {
-
+
{children}
diff --git a/pages/[username]/[post_id].tsx b/pages/[username]/[post_id].tsx
index 93b9acd9..58ec9d52 100644
--- a/pages/[username]/[post_id].tsx
+++ b/pages/[username]/[post_id].tsx
@@ -12,14 +12,18 @@ import React, { useEffect, useState } from "react"
import { Story } from "src/types/story"
import { requestApi } from "utils/axios/request"
import StorySidebar from "components/story/story-sidebar"
+import Series from "components/story/series"
+import Card from "components/card"
const PostPage = () => {
const router = useRouter()
const id = router.query.post_id
const [post, setPost]: [Story, any] = useState(null)
+ const [series,setSeries] = useState([])
useEffect(() => {
if (id) {
getData()
+ getSeries()
}
}, [id])
@@ -37,6 +41,10 @@ const PostPage = () => {
setPost(res.data)
}
+ const getSeries = async () => {
+ const res = await requestApi.get(`/story/series/byPostID/${id}`)
+ setSeries(res.data)
+ }
return (
<>
@@ -60,6 +68,7 @@ const PostPage = () => {
{post.rawTags.map(tag => )}
+ {series.length > 0 && }
diff --git a/pages/bookmarks.tsx b/pages/bookmarks.tsx
index 2c687a70..87c074ae 100644
--- a/pages/bookmarks.tsx
+++ b/pages/bookmarks.tsx
@@ -95,7 +95,7 @@ import Empty from "components/empty"
-
+ {
{
tags.map(t =>
filterPostsByTag(t)}>
@@ -103,8 +103,8 @@ import Empty from "components/empty"
{t.title}
)
}
-
-
+ }
+ {tags.length > 0&& }
{posts.length !== 0
?
diff --git a/pages/editor/series.tsx b/pages/editor/series.tsx
index e3f72cef..3944edab 100644
--- a/pages/editor/series.tsx
+++ b/pages/editor/series.tsx
@@ -19,11 +19,12 @@ import { IDType } from "src/types/id"
import PostSelect from "components/story/post-select"
import { cloneDeep, find, remove } from "lodash"
import userCustomTheme from "theme/user-custom"
+import Tags from "components/tags/tags"
var validator = require('validator');
const newSeries: Story = { title: '', brief: '', cover: '', type: IDType.Series }
const PostsPage = () => {
- const [currentSeries, setCurrentSeries] = useState(null)
+ const [currentSeries, setCurrentSeries]:[Story,any] = useState(null)
const [series, setSeries] = useState([])
const [posts, setPosts] = useState([])
const [seriesPosts, setSeriesPosts] = useState([])
@@ -186,6 +187,15 @@ const PostsPage = () => {
)}
+
+ {({ field, form }) => (
+
+ 标签
+ currentSeries.tags = ids}/>
+
+ )}
+
+
{({ field, form }) => (
diff --git a/pages/series/[id].tsx b/pages/series/[id].tsx
index 60e358b7..01644bae 100644
--- a/pages/series/[id].tsx
+++ b/pages/series/[id].tsx
@@ -1,7 +1,7 @@
-import { Box, Divider, Heading, HStack, Image} from "@chakra-ui/react"
+import { Box, Divider, Heading, HStack, Image, Tag, Text, VStack } from "@chakra-ui/react"
import Comments from "components/comments/comments"
import { MarkdownRender } from "components/markdown-editor/render"
-import { StoryAuthor } from "components/story/story-author"
+import { StoryAuthor } from "components/story/story-author"
import TagTextCard from "components/story/tag-text-card"
import SEO from "components/seo"
import siteConfig from "configs/site-config"
@@ -12,66 +12,81 @@ import React, { useEffect, useState } from "react"
import { Story } from "src/types/story"
import { requestApi } from "utils/axios/request"
import StorySidebar from "components/story/story-sidebar"
+import Stroies from "components/story/stories"
+import Card from "components/card"
const PostPage = () => {
- const router = useRouter()
- const id = router.query.id
- const [post, setPost]: [Story, any] = useState(null)
- useEffect(() => {
- if (id) {
- getData()
- }
- }, [id])
+ const router = useRouter()
+ const id = router.query.id
+ const [series, setSeries]: [Story, any] = useState(null)
+ const [posts, setPosts]: [Story[], any] = useState([])
+ useEffect(() => {
+ if (id) {
+ getSeries()
+ getSeriesPost()
+ }
+ }, [id])
- useEffect(() => {
- if (router && router.asPath.indexOf("#comments") > -1) {
- setTimeout(() => {
- location.href = "#comments"
- }, 100)
- }
- }, [router])
+ useEffect(() => {
+ if (router && router.asPath.indexOf("#comments") > -1) {
+ setTimeout(() => {
+ location.href = "#comments"
+ }, 100)
+ }
+ }, [router])
- const getData = async () => {
- const res = await requestApi.get(`/story/post/${id}`)
- setPost(res.data)
- }
+ const getSeries = async () => {
+ const res = await requestApi.get(`/story/post/${id}`)
+ setSeries(res.data)
+ }
+ const getSeriesPost = async () => {
+ const res = await requestApi.get(`/story/series/posts/${id}`)
+ setPosts(res.data)
+ }
- return (
- <>
-
- {post && } mt="2rem">
+ return (
<>
-
-
-
-
- {post.title}
+
+ {series && } mt="2rem">
+ <>
+
+
+
+
+
+ SERIES
+ {series.title}
+ {series.brief}
+ {series.rawTags.map(tag => )}
+
+ {series.cover && }
+
+
-
-
-
+
+
+ Articles in this series
+
-
-
- {post.rawTags.map(tag => )}
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+ }
-
- }
-
- )
+ )
}
export default PostPage
diff --git a/server/internal/api/story.go b/server/internal/api/story.go
index d2ca8b11..4a2c143e 100644
--- a/server/internal/api/story.go
+++ b/server/internal/api/story.go
@@ -40,8 +40,8 @@ func DeletePost(c *gin.Context) {
return
}
- user := user.CurrentUser(c)
- if !models.IsStoryCreator(user.ID, id) {
+ u := user.CurrentUser(c)
+ if !models.IsStoryCreator(u.ID, id) {
c.JSON(http.StatusForbidden, common.RespError(e.NoPermission))
return
}
@@ -57,16 +57,16 @@ func DeletePost(c *gin.Context) {
func GetStory(c *gin.Context) {
id := c.Param("id")
- user := user.CurrentUser(c)
+ u := user.CurrentUser(c)
ar, err := story.GetStory(id, "")
if err != nil {
c.JSON(err.Status, common.RespError(err.Message))
return
}
- if user != nil {
- ar.Liked = interaction.GetLiked(ar.ID, user.ID)
- ar.Bookmarked, _ = story.Bookmarked(user.ID, ar.ID)
+ if u != nil {
+ ar.Liked = interaction.GetLiked(ar.ID, u.ID)
+ ar.Bookmarked, _ = story.Bookmarked(u.ID, ar.ID)
}
c.JSON(http.StatusOK, common.RespSuccess(ar))
@@ -85,9 +85,9 @@ func GenStoryID(c *gin.Context) {
func Bookmark(c *gin.Context) {
storyID := c.Param("storyID")
- user := user.CurrentUser(c)
+ u := user.CurrentUser(c)
- err := story.Bookmark(user.ID, storyID)
+ err := story.Bookmark(u.ID, storyID)
if err != nil {
c.JSON(err.Status, common.RespError(err.Message))
return
@@ -137,6 +137,18 @@ func GetSeriesPost(c *gin.Context) {
c.JSON(http.StatusOK, common.RespSuccess(posts))
}
+func GetSeriesPosts(c *gin.Context) {
+ id := c.Param("id")
+ u := user.CurrentUser(c)
+ posts, err := story.GetSeriesPosts(u, id)
+ if err != nil {
+ c.JSON(err.Status, common.RespError(err.Message))
+ return
+ }
+
+ c.JSON(http.StatusOK, common.RespSuccess(posts))
+}
+
func DeleteSeriesPost(c *gin.Context) {
id := c.Param("id")
if id == "" {
@@ -144,8 +156,8 @@ func DeleteSeriesPost(c *gin.Context) {
return
}
- user := user.CurrentUser(c)
- if !models.IsStoryCreator(user.ID, id) {
+ u := user.CurrentUser(c)
+ if !models.IsStoryCreator(u.ID, id) {
c.JSON(http.StatusForbidden, common.RespError(e.NoPermission))
return
}
@@ -159,3 +171,29 @@ func DeleteSeriesPost(c *gin.Context) {
c.JSON(http.StatusOK, common.RespSuccess(nil))
}
+
+func GetPostSeries(c *gin.Context) {
+ postID := c.Param("id")
+ series, err := story.GetPostSeries(postID)
+ if err != nil {
+ c.JSON(err.Status, common.RespError(err.Message))
+ return
+ }
+
+ c.JSON(http.StatusOK, common.RespSuccess(series))
+}
+
+func GetSeries(c *gin.Context) {
+ ids := make([]string, 0)
+ c.Bind(&ids)
+
+ u := user.CurrentUser(c)
+
+ series, err := story.GetSeries(u, ids)
+ if err != nil {
+ c.JSON(err.Status, common.RespError(err.Message))
+ return
+ }
+
+ c.JSON(http.StatusOK, common.RespSuccess(series))
+}
diff --git a/server/internal/server.go b/server/internal/server.go
index f63265c4..c29f1b2e 100644
--- a/server/internal/server.go
+++ b/server/internal/server.go
@@ -54,9 +54,12 @@ func (s *Server) Start() error {
r.GET("/story/posts/drafts", IsLogin(), api.GetEditorDrafts)
r.GET("/story/posts/home/:filter", api.GetHomePosts)
r.POST("/story", IsLogin(), api.SubmitStory)
+ r.POST("/story/series", api.GetSeries)
r.POST("/story/series/post/:id", IsLogin(), api.SubmitSeriesPost)
r.GET("/story/series/post/:id", api.GetSeriesPost)
- r.DELETE("/story/series/post/:id", api.DeleteSeriesPost)
+ r.GET("/story/series/posts/:id", api.GetSeriesPosts)
+ r.GET("/story/series/byPostID/:id", api.GetPostSeries)
+ r.DELETE("/story/series/post/:id", IsLogin(), api.DeleteSeriesPost)
r.POST("/story/post/draft", IsLogin(), api.SubmitPostDraft)
r.DELETE("/story/post/:id", IsLogin(), api.DeletePost)
r.POST("/story/bookmark/:storyID", IsLogin(), api.Bookmark)
diff --git a/server/internal/story/posts.go b/server/internal/story/posts.go
index 6770489f..b6a5445b 100644
--- a/server/internal/story/posts.go
+++ b/server/internal/story/posts.go
@@ -14,9 +14,11 @@ import (
"github.com/imdotdev/im.dev/server/pkg/models"
)
+const PostQueryPrefix = "select id,type,slug,title,url,cover,brief,creator,created,updated from story "
+
func HomePosts(user *models.User, filter string) (models.Stories, *e.Error) {
- rows, err := db.Conn.Query("select id,type,slug,title,url,cover,brief,creator,created,updated from story where status=?", models.StatusPublished)
+ rows, err := db.Conn.Query(PostQueryPrefix+"where status=?", models.StatusPublished)
if err != nil && err != sql.ErrNoRows {
logger.Warn("get user posts error", "error", err)
return nil, e.New(http.StatusInternalServerError, e.Internal)
@@ -32,9 +34,9 @@ func UserPosts(tp string, user *models.User, uid string) (models.Stories, *e.Err
var rows *sql.Rows
var err error
if tp == models.IDTypeUndefined {
- rows, err = db.Conn.Query("select id,type,slug,title,url,cover,brief,creator,created,updated from story where creator=? and status=?", uid, models.StatusPublished)
+ rows, err = db.Conn.Query(PostQueryPrefix+"where creator=? and status=?", uid, models.StatusPublished)
} else {
- rows, err = db.Conn.Query("select id,type,slug,title,url,cover,brief,creator,created,updated from story where creator=? and type=? and status=?", uid, tp, models.StatusPublished)
+ rows, err = db.Conn.Query(PostQueryPrefix+"where creator=? and type=? and status=?", uid, tp, models.StatusPublished)
}
if err != nil && err != sql.ErrNoRows {
@@ -49,7 +51,7 @@ func UserPosts(tp string, user *models.User, uid string) (models.Stories, *e.Err
}
func UserDrafts(user *models.User, uid string) (models.Stories, *e.Error) {
- rows, err := db.Conn.Query("select id,type,slug,title,url,cover,brief,creator,created,updated from story where creator=? and status=?", uid, models.StatusDraft)
+ rows, err := db.Conn.Query(PostQueryPrefix+"where creator=? and status=?", uid, models.StatusDraft)
if err != nil && err != sql.ErrNoRows {
logger.Warn("get user drafts error", "error", err)
return nil, e.New(http.StatusInternalServerError, e.Internal)
@@ -71,7 +73,7 @@ func TagPosts(user *models.User, tagID string) (models.Stories, *e.Error) {
ids := strings.Join(postIDs, "','")
- q := fmt.Sprintf("select id,type,slug,title,url,cover,brief,creator,created,updated from story where id in ('%s') and status='%d'", ids, models.StatusPublished)
+ q := fmt.Sprintf(PostQueryPrefix+"where id in ('%s') and status='%d'", ids, models.StatusPublished)
rows, err := db.Conn.Query(q)
if err != nil && err != sql.ErrNoRows {
logger.Warn("get user posts error", "error", err)
@@ -101,7 +103,7 @@ func BookmarkPosts(user *models.User, filter string) (models.Stories, *e.Error)
ids := strings.Join(postIDs, "','")
- q := fmt.Sprintf("select id,type,slug,title,url,cover,brief,creator,created,updated from story where id in ('%s')", ids)
+ q := fmt.Sprintf(PostQueryPrefix+"where id in ('%s')", ids)
rows, err = db.Conn.Query(q)
if err != nil && err != sql.ErrNoRows {
logger.Warn("get user posts error", "error", err)
@@ -150,10 +152,11 @@ func GetPosts(user *models.User, rows *sql.Rows) models.Stories {
}
ar.Likes = interaction.GetLikes(ar.ID)
- _, rawTags, err := tags.GetTargetTags(ar.ID)
+ tags, rawTags, err := tags.GetTargetTags(ar.ID)
if err != nil {
logger.Warn("get tags error", "error", err)
}
+ ar.Tags = tags
ar.RawTags = rawTags
posts = append(posts, ar)
diff --git a/server/internal/story/series.go b/server/internal/story/series.go
index d413c3c8..dcfc15dc 100644
--- a/server/internal/story/series.go
+++ b/server/internal/story/series.go
@@ -1,7 +1,11 @@
package story
import (
+ "database/sql"
+ "fmt"
"net/http"
+ "sort"
+ "strings"
"github.com/imdotdev/im.dev/server/pkg/db"
"github.com/imdotdev/im.dev/server/pkg/e"
@@ -46,6 +50,50 @@ func GetSeriesPost(seriesID string) ([]*models.SeriesPost, *e.Error) {
return posts, nil
}
+func GetSeriesPosts(user *models.User, seriesID string) ([]*models.Story, *e.Error) {
+ rows, err := db.Conn.Query("SELECT post_id,priority FROM series_post WHERE series_id=?", seriesID)
+ if err != nil {
+ logger.Warn("select series post error", "error", err)
+ return nil, e.New(http.StatusInternalServerError, e.Internal)
+ }
+
+ seriesPosts := make(models.SeriesPosts, 0)
+ seriesPostsMap := make(map[string]*models.SeriesPost)
+ postIDs := make([]string, 0)
+
+ for rows.Next() {
+ post := &models.SeriesPost{}
+ err := rows.Scan(&post.PostID, &post.Priority)
+ if err != nil {
+ logger.Warn("scan series post error", "error", err)
+ continue
+ }
+ seriesPosts = append(seriesPosts, post)
+ seriesPostsMap[post.PostID] = post
+ postIDs = append(postIDs, post.PostID)
+ }
+
+ ids := strings.Join(postIDs, "','")
+
+ q := fmt.Sprintf(PostQueryPrefix+"where id in ('%s')", ids)
+ rows, err = db.Conn.Query(q)
+ if err != nil && err != sql.ErrNoRows {
+ logger.Warn("get user posts error", "error", err)
+ return nil, e.New(http.StatusInternalServerError, e.Internal)
+ }
+
+ posts := GetPosts(user, rows)
+ for _, post := range posts {
+ p, ok := seriesPostsMap[post.ID]
+ if ok {
+ post.Priority = p.Priority
+ }
+ }
+
+ sort.Sort(models.PriorityStories(posts))
+ return posts, nil
+}
+
func DeleteSeriesPost(id string) *e.Error {
_, err := db.Conn.Exec("DELETE FROM series_post WHERE series_id=?", id)
if err != nil {
@@ -54,3 +102,34 @@ func DeleteSeriesPost(id string) *e.Error {
return nil
}
+
+func GetPostSeries(postID string) ([]string, *e.Error) {
+ series := make([]string, 0)
+ rows, err := db.Conn.Query("SELECT series_id FROM series_post WHERE post_id=?", postID)
+ if err != nil {
+ logger.Warn("get post series error", "error", err)
+ return nil, e.New(http.StatusInternalServerError, e.Internal)
+ }
+
+ for rows.Next() {
+ var id string
+ rows.Scan(&id)
+ series = append(series, id)
+ }
+
+ return series, nil
+}
+
+func GetSeries(user *models.User, seriesIds []string) ([]*models.Story, *e.Error) {
+ ids := strings.Join(seriesIds, "','")
+ q := fmt.Sprintf(PostQueryPrefix+"where id in ('%s')", ids)
+ rows, err := db.Conn.Query(q)
+ if err != nil && err != sql.ErrNoRows {
+ logger.Warn("get user posts error", "error", err)
+ return nil, e.New(http.StatusInternalServerError, e.Internal)
+ }
+
+ series := GetPosts(user, rows)
+
+ return series, nil
+}
diff --git a/server/pkg/models/story.go b/server/pkg/models/story.go
index 07747f27..014b277c 100644
--- a/server/pkg/models/story.go
+++ b/server/pkg/models/story.go
@@ -34,6 +34,8 @@ type Story struct {
Status int `json:"status"`
Created time.Time `json:"created"`
Updated time.Time `json:"updated"`
+
+ Priority int `json:"-"`
}
type Stories []*Story
@@ -52,11 +54,27 @@ func (s FavorStories) Less(i, j int) bool {
return s[i].Likes > s[j].Likes
}
+type PriorityStories []*Story
+
+func (s PriorityStories) Len() int { return len(s) }
+func (s PriorityStories) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s PriorityStories) Less(i, j int) bool {
+ return s[i].Priority < s[j].Priority
+}
+
type SeriesPost struct {
PostID string `json:"id"`
Priority int `json:"priority"`
}
+type SeriesPosts []*SeriesPost
+
+func (s SeriesPosts) Len() int { return len(s) }
+func (s SeriesPosts) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s SeriesPosts) Less(i, j int) bool {
+ return s[i].Priority < s[j].Priority
+}
+
func IsStoryCreator(userID string, storyID string) bool {
var nid string
err := db.Conn.QueryRow("SELECT creator FROM story WHERE id=?", storyID).Scan(&nid)
diff --git a/src/components/story/series.tsx b/src/components/story/series.tsx
new file mode 100644
index 00000000..c7f063ff
--- /dev/null
+++ b/src/components/story/series.tsx
@@ -0,0 +1,117 @@
+import React, { useEffect, useState } from "react"
+import { Box, Flex, Heading, HStack, Image, Select, StackDivider, Tag, Text, useColorModeValue, VStack } from "@chakra-ui/react"
+import { requestApi } from "utils/axios/request"
+import userCustomTheme from "theme/user-custom"
+import { Story } from "src/types/story"
+import { find } from "lodash"
+import { getStoryUrl } from "utils/story"
+import Link from "next/link"
+
+interface Props {
+ postID: string
+ series: string[]
+}
+
+export const Series = (props: Props) => {
+ const [showAll,setShowAll] = useState(false)
+ const [currentSeries, setCurrentSeries]: [Story, any] = useState(null)
+ const [series, setSeries]: [Story[], any] = useState([])
+ const [posts, setPosts]: [Story[], any] = useState([])
+
+ const borderColor = useColorModeValue(userCustomTheme.borderColor.light, userCustomTheme.borderColor.dark)
+
+ useEffect(() => {
+ getSeries()
+ }, [])
+
+
+ const getSeries = async () => {
+ const res = await requestApi.post(`/story/series`, props.series)
+ setSeries(res.data)
+ if (res.data.length > 0) {
+ setCurrentSeries(res.data[0])
+ getSeriesPosts(res.data[0].id)
+ }
+ }
+
+ const getSeriesPosts = async (id) => {
+ const res = await requestApi.get(`/story/series/posts/${id}`)
+ if (res.data.length > 4) {
+ setShowAll(false)
+ } else {
+ setShowAll(true)
+ }
+ setPosts(res.data)
+ }
+
+ const onSereisChange = e => {
+ const s = find(series, s => s.id === e.currentTarget.value)
+ setCurrentSeries(s)
+ getSeriesPosts(s.id)
+ }
+
+ const postInHidden = () => {
+ for (let i=0;i= 2) {
+ return true
+ }
+ return false
+ }
+ }
+
+ return false
+ }
+
+ if (posts.length > 0) {
+ return (
+ } alignItems="left">
+
+ ARTICLE SERIES
+ {}
+
+ {
+ posts.map((post, i) => {
+ if (showAll) {
+ return
+ } else {
+ if (i < 2) {
+ return
+ }
+ }
+ })
+ }
+ {
+ (!showAll && posts.length > 2) && setShowAll(true)}>
+ ··
+ Show all {posts.length-2} posts
+
+ }
+
+ )
+ } else {
+ return null
+ }
+}
+
+export default Series
+
+function PostCard({ i, post, postID }) {
+ return
+
+ {i + 1}
+
+
+ {post.title}
+ {post.brief.substring(0, 100)}
+
+
+
+
+ {post.cover && }
+
+}
\ No newline at end of file
diff --git a/src/components/story/simple-story-card.tsx b/src/components/story/simple-story-card.tsx
index 471bf18f..b09eaa65 100644
--- a/src/components/story/simple-story-card.tsx
+++ b/src/components/story/simple-story-card.tsx
@@ -5,6 +5,8 @@ import Link from "next/link"
import { FaHeart, FaRegComment, FaRegHeart } from "react-icons/fa"
import Bookmark from "./bookmark"
import { getCommentsUrl, getStoryUrl } from "utils/story"
+import Like from "components/interaction/like"
+import { getSvgIcon } from "components/svg-icon"
interface Props {
story: Story
@@ -18,28 +20,22 @@ export const SimpleStoryCard = (props: Props) => {
const Layout = isLargeScreen ? HStack : VStack
return (
- {story.title}
+ {story.title}
{story.creator.nickname}
- {story.liked ?
-
- :
- }
- {story.likes}
+
-
+ {getSvgIcon("comments", "1rem")}
{story.comments}
-
-
-
+
)
diff --git a/src/components/story/story-card.tsx b/src/components/story/story-card.tsx
index 77c6c5bf..3a547de9 100644
--- a/src/components/story/story-card.tsx
+++ b/src/components/story/story-card.tsx
@@ -1,7 +1,7 @@
import React from "react"
-import { Box, Heading, HStack, Image, Text, useMediaQuery, VStack } from "@chakra-ui/react"
+import { Box, Heading, HStack, Image, Tag, Text, useMediaQuery, VStack } from "@chakra-ui/react"
import { Story } from "src/types/story"
-import StoryAuthor from "./story-author"
+import StoryAuthor from "./story-author"
import Link from "next/link"
import Like from "../interaction/like"
import Bookmark from "./bookmark"
@@ -23,27 +23,29 @@ export const StoryCard = (props: Props) => {
const { story, type = "classic" } = props
const [isLargeScreen] = useMediaQuery("(min-width: 768px)")
const Layout = isLargeScreen ? HStack : VStack
-
+
return (
-
-
+
+
+
+ {story.type === IDType.Series && SERIES}
{type !== "classic" && {story.rawTags.map(t => #{t.name})}}
+ highlightClassName="highlight-search-match"
+ textToHighlight={story.brief}
+ searchWords={[props.highlight]}
+ />
{story.cover && type === "classic" && }
diff --git a/theme.ts b/theme.ts
index 66f4d39c..61ea3a00 100644
--- a/theme.ts
+++ b/theme.ts
@@ -24,6 +24,9 @@ const customTheme = extendTheme({
styles: {
global: (props) => {
return ({
+ p: {
+ wordBreak: 'break-word'
+ },
'.hover-bg:hover': {
background: mode(userCustomTheme.hoverBg.light,userCustomTheme.hoverBg.dark )(props),
borderRadius: '6px'
diff --git a/theme/markdown-render.ts b/theme/markdown-render.ts
index df55f71b..aa75da73 100644
--- a/theme/markdown-render.ts
+++ b/theme/markdown-render.ts
@@ -5,6 +5,7 @@ export default function markdownRender(props) {
console.log(props)
return {
'.markdown-render': {
+ wordBreak: 'break-word',
'.hljs' : {
padding: '1rem',
borderRadius: '8px'