diff --git a/pkg/models/posts.go b/pkg/models/posts.go index 1132ec3..852f7fa 100644 --- a/pkg/models/posts.go +++ b/pkg/models/posts.go @@ -14,6 +14,8 @@ type Post struct { DislikedAccounts []PostDislike `json:"disliked_accounts"` RepostTo *Post `json:"repost_to" gorm:"foreignKey:RepostID"` ReplyTo *Post `json:"reply_to" gorm:"foreignKey:ReplyID"` + PinnedAt *time.Time `json:"pinned_at"` + EditedAt *time.Time `json:"edited_at"` PublishedAt time.Time `json:"published_at"` RepostID *uint `json:"repost_id"` ReplyID *uint `json:"reply_id"` diff --git a/pkg/server/posts_api.go b/pkg/server/posts_api.go index 0e6f4d6..adcd0d9 100644 --- a/pkg/server/posts_api.go +++ b/pkg/server/posts_api.go @@ -13,16 +13,22 @@ import ( func listPost(c *fiber.Ctx) error { take := c.QueryInt("take", 0) offset := c.QueryInt("offset", 0) + authorId := c.QueryInt("authorId", 0) + + tx := database.C.Where(&models.Post{RealmID: nil}).Order("created_at desc") + + if authorId > 0 { + tx = tx.Where(&models.Post{AuthorID: uint(authorId)}) + } var count int64 - if err := database.C. - Where(&models.Post{RealmID: nil}). + if err := tx. Model(&models.Post{}). Count(&count).Error; err != nil { return fiber.NewError(fiber.StatusInternalServerError, err.Error()) } - posts, err := services.ListPost(take, offset) + posts, err := services.ListPost(tx, take, offset) if err != nil { return fiber.NewError(fiber.StatusBadRequest, err.Error()) } diff --git a/pkg/server/startup.go b/pkg/server/startup.go index fa3f3c3..1df69c7 100644 --- a/pkg/server/startup.go +++ b/pkg/server/startup.go @@ -57,7 +57,8 @@ func NewServer() { api := A.Group("/api").Name("API") { api.Get("/users/me", auth, getUserinfo) - api.Get("/users/:accountId/follow", auth, doFollowAccount) + api.Get("/users/:accountId", getOthersInfo) + api.Post("/users/:accountId/follow", auth, doFollowAccount) api.Get("/auth", doLogin) api.Get("/auth/callback", doPostLogin) diff --git a/pkg/server/users_api.go b/pkg/server/users_api.go index 2cb26d1..f285f3d 100644 --- a/pkg/server/users_api.go +++ b/pkg/server/users_api.go @@ -20,6 +20,19 @@ func getUserinfo(c *fiber.Ctx) error { return c.JSON(data) } +func getOthersInfo(c *fiber.Ctx) error { + accountId, _ := c.ParamsInt("accountId", 0) + + var data models.Account + if err := database.C. + Where(&models.Account{BaseModel: models.BaseModel{ID: uint(accountId)}}). + First(&data).Error; err != nil { + return fiber.NewError(fiber.StatusInternalServerError, err.Error()) + } + + return c.JSON(data) +} + func doFollowAccount(c *fiber.Ctx) error { user := c.Locals("principal").(models.Account) id, _ := c.ParamsInt("accountId", 0) diff --git a/pkg/services/posts.go b/pkg/services/posts.go index a483c9e..a4b4265 100644 --- a/pkg/services/posts.go +++ b/pkg/services/posts.go @@ -10,13 +10,11 @@ import ( "gorm.io/gorm" ) -func ListPost(take int, offset int) ([]*models.Post, error) { +func ListPost(tx *gorm.DB, take int, offset int) ([]*models.Post, error) { var posts []*models.Post - if err := database.C. - Where(&models.Post{RealmID: nil}). + if err := tx. Limit(take). Offset(offset). - Order("created_at desc"). Preload("Author"). Find(&posts).Error; err != nil { return posts, err diff --git a/pkg/view/src/components/NameCard.module.css b/pkg/view/src/components/NameCard.module.css new file mode 100644 index 0000000..932298a --- /dev/null +++ b/pkg/view/src/components/NameCard.module.css @@ -0,0 +1,3 @@ +.description { + color: var(--fallback-bc, oklch(var(--bc)/.8)); +} \ No newline at end of file diff --git a/pkg/view/src/components/NameCard.tsx b/pkg/view/src/components/NameCard.tsx new file mode 100644 index 0000000..bc9fdfa --- /dev/null +++ b/pkg/view/src/components/NameCard.tsx @@ -0,0 +1,58 @@ +import { createSignal } from "solid-js"; + +import styles from "./NameCard.module.css"; + +export default function NameCard(props: { accountId: number, onError: (messasge: string | null) => void }) { + const [info, setInfo] = createSignal(null); + + const [_, setLoading] = createSignal(true); + + async function readInfo() { + setLoading(true); + const res = await fetch(`/api/users/${props.accountId}`); + if (res.status !== 200) { + props.onError(await res.text()); + } else { + setInfo(await res.json()); + props.onError(null); + } + setLoading(false); + } + + readInfo(); + + return ( +
+ + +
+
+ avatar +
+
+ +
+
+ +
+
+ +
+

{info()?.name}

+

{info()?.description}

+
+

+ + Joined at {new Date(info()?.created_at).toLocaleString()} +

+
+
+
+ ); +} \ No newline at end of file diff --git a/pkg/view/src/components/PostItem.tsx b/pkg/view/src/components/PostItem.tsx index 8bb8be6..f8deff6 100644 --- a/pkg/view/src/components/PostItem.tsx +++ b/pkg/view/src/components/PostItem.tsx @@ -24,22 +24,24 @@ export default function PostItem(props: { post: any, onError: (message: string | return (
-
-
-
- {props.post.author.name.substring(0, 1)}}> - avatar - + +
+
+
+ {props.post.author.name.substring(0, 1)}}> + avatar + +
+
+
+
+

{props.post.author.name}

+

{props.post.author.description}

+
-
-
-

{props.post.author.name}

-

{props.post.author.description}

-
-
-
+

{props.post.title}

@@ -48,7 +50,7 @@ export default function PostItem(props: { post: any, onError: (message: string |
-
+
+
+
-
-
diff --git a/pkg/view/src/components/PostList.tsx b/pkg/view/src/components/PostList.tsx index b59d5e0..43163b0 100644 --- a/pkg/view/src/components/PostList.tsx +++ b/pkg/view/src/components/PostList.tsx @@ -1,33 +1,24 @@ import { createMemo, createSignal, For, Show } from "solid-js"; import styles from "./PostList.module.css"; - -import PostPublish from "./PostPublish.tsx"; import PostItem from "./PostItem.tsx"; -export default function PostList(props: { onError: (message: string | null) => void }) { +export default function PostList(props: { + info: { data: any[], count: number } | null, + onUpdate: (pn: number) => Promise, + onError: (message: string | null) => void +}) { const [loading, setLoading] = createSignal(true); - const [posts, setPosts] = createSignal([]); - const [postCount, setPostCount] = createSignal(0); + const posts = createMemo(() => props.info?.data) + const postCount = createMemo(() => props.info?.count ?? 0) const [page, setPage] = createSignal(1); const pageCount = createMemo(() => Math.ceil(postCount() / 10)); async function readPosts() { setLoading(true); - const res = await fetch("/api/posts?" + new URLSearchParams({ - take: (10).toString(), - offset: ((page() - 1) * 10).toString() - })); - if (res.status !== 200) { - props.onError(await res.text()); - } else { - const data = await res.json(); - setPosts(data["data"]); - setPostCount(data["count"]); - props.onError(null); - } + await props.onUpdate(page()); setLoading(false); } @@ -42,8 +33,6 @@ export default function PostList(props: { onError: (message: string | null) => v return (
- readPosts()} onError={props.onError} /> -
{item => readPosts()} onError={props.onError} />} diff --git a/pkg/view/src/index.tsx b/pkg/view/src/index.tsx index f45259b..dae49ec 100644 --- a/pkg/view/src/index.tsx +++ b/pkg/view/src/index.tsx @@ -20,7 +20,10 @@ render(() => ( - import("./pages/feed.tsx"))} /> + import("./pages/feed.tsx"))}> + import("./pages/global.tsx"))} /> + import("./pages/account.tsx"))} /> + import("./pages/auth/callout.tsx"))} /> import("./pages/auth/callback.tsx"))} /> diff --git a/pkg/view/src/pages/account.tsx b/pkg/view/src/pages/account.tsx new file mode 100644 index 0000000..1782284 --- /dev/null +++ b/pkg/view/src/pages/account.tsx @@ -0,0 +1,50 @@ +import { createSignal, Show } from "solid-js"; +import { useParams } from "@solidjs/router"; + +import PostList from "../components/PostList.tsx"; +import NameCard from "../components/NameCard.tsx"; + +export default function DashboardPage() { + const [error, setError] = createSignal(null); + + const [page, setPage] = createSignal(0); + const [info, setInfo] = createSignal(null); + + const params = useParams(); + + async function readPosts(pn?: number) { + if (pn) setPage(pn); + const res = await fetch("/api/posts?" + new URLSearchParams({ + take: (10).toString(), + offset: ((page() - 1) * 10).toString(), + authorId: params["accountId"] + })); + if (res.status !== 200) { + setError(await res.text()); + } else { + setError(null); + setInfo(await res.json()); + } + } + + return ( + <> +
+ + + +
+ + + + + + ); +} \ No newline at end of file diff --git a/pkg/view/src/pages/feed.tsx b/pkg/view/src/pages/feed.tsx index 11557ba..ad588b6 100644 --- a/pkg/view/src/pages/feed.tsx +++ b/pkg/view/src/pages/feed.tsx @@ -1,33 +1,12 @@ -import { createEffect, createSignal, For, Show } from "solid-js"; - import styles from "./feed.module.css"; -import PostList from "../components/PostList.tsx"; - -export default function DashboardPage() { - const [error, setError] = createSignal(null); - +export default function DashboardPage(props: any) { return (
- -
- - - -
- - - + {props.children}
diff --git a/pkg/view/src/pages/global.tsx b/pkg/view/src/pages/global.tsx new file mode 100644 index 0000000..a2e2776 --- /dev/null +++ b/pkg/view/src/pages/global.tsx @@ -0,0 +1,46 @@ +import { createSignal, Show } from "solid-js"; + +import PostList from "../components/PostList.tsx"; +import PostPublish from "../components/PostPublish.tsx"; + +export default function DashboardPage() { + const [error, setError] = createSignal(null); + + const [page, setPage] = createSignal(0); + const [info, setInfo] = createSignal(null); + + async function readPosts(pn?: number) { + if (pn) setPage(pn); + const res = await fetch("/api/posts?" + new URLSearchParams({ + take: (10).toString(), + offset: ((page() - 1) * 10).toString() + })); + if (res.status !== 200) { + setError(await res.text()); + } else { + setError(null); + setInfo(await res.json()); + } + } + + return ( + <> +
+ + + +
+ + readPosts()} onError={setError} /> + + + + ); +} \ No newline at end of file