From 8e5148b3fbf051aea1a30330605f36b5e1f548d7 Mon Sep 17 00:00:00 2001 From: VividTruthKeeper Date: Fri, 30 Sep 2022 14:25:41 +0500 Subject: [PATCH] structural changes --- src/pages/Post.tsx | 24 +++-------- src/pages/Posts.tsx | 100 +++++++++++++++++++++---------------------- src/types/links.ts | 2 +- src/types/posts.ts | 10 ++--- src/types/sources.ts | 2 +- 5 files changed, 64 insertions(+), 74 deletions(-) diff --git a/src/pages/Post.tsx b/src/pages/Post.tsx index 1f93def..289bb4b 100644 --- a/src/pages/Post.tsx +++ b/src/pages/Post.tsx @@ -33,7 +33,6 @@ const Post = () => { } } }, [posts]); - console.log(postData ? parseDate(postData.publish_date)[0] : ""); return (
@@ -56,29 +55,20 @@ const Post = () => {
-
-

ID

- -

Category

-

Title

- Summary +
{ parseDate(History.new_published_at)[1] }`} - {`${parseDate(History.createdAt)[0]}, ${ - parseDate(History.createdAt)[1] + {`${parseDate(History.created_at)[0]}, ${ + parseDate(History.created_at)[1] }`} {`${parseDate(History.updatedAt)[0]}, ${ parseDate(History.updatedAt)[1] diff --git a/src/pages/Posts.tsx b/src/pages/Posts.tsx index 28fcef1..24bff9f 100644 --- a/src/pages/Posts.tsx +++ b/src/pages/Posts.tsx @@ -38,8 +38,8 @@ interface filtersType { fil_link: filterType; fil_publish_date: filterType; fil_summary: filterType; - fil_createdAt: filterType; - fil_updatedAt: filterType; + fil_created_atAt: filterType; + fil_updated_atAt: filterType; } const Posts = () => { @@ -59,9 +59,9 @@ const Posts = () => { title: "asc", link: "asc", date: "asc", - published: "asc", - created: "asc", - updated: "asc", + publish_date: "asc", + created_at: "asc", + updated_at: "asc", }); const [filters, setFilters] = useState({ @@ -81,12 +81,12 @@ const Posts = () => { name: "fil_summary", value: "", }, - fil_createdAt: { - name: "fil_createdAt", + fil_created_atAt: { + name: "fil_created_atAt", value: "", }, - fil_updatedAt: { - name: "fil_updatedAt", + fil_updated_atAt: { + name: "fil_updated_atAt", value: "", }, }); @@ -199,12 +199,12 @@ const Posts = () => { name: "fil_summary", value: "", }, - fil_createdAt: { - name: "fil_createdAt", + fil_created_atAt: { + name: "fil_created_atAt", value: "", }, - fil_updatedAt: { - name: "fil_updatedAt", + fil_updated_atAt: { + name: "fil_updated_atAt", value: "", }, }); @@ -285,20 +285,20 @@ const Posts = () => { Link { - setSort("published"); - if (params.published !== "asc") - setParams({ ...params, published: "asc" }); - else setParams({ ...params, published: "desc" }); + setSort("publish_date"); + if (params.publish_date !== "asc") + setParams({ ...params, publish_date: "asc" }); + else setParams({ ...params, publish_date: "desc" }); }} > - {sort === "published" && params.published === "asc" ? ( + {sort === "publish_date" && params.publish_date === "asc" ? ( ) : null} - {sort === "published" && params.published === "desc" ? ( + {sort === "publish_date" && params.publish_date === "desc" ? ( @@ -306,20 +306,20 @@ const Posts = () => { Published { - setSort("created"); - if (params.created !== "asc") - setParams({ ...params, created: "asc" }); - else setParams({ ...params, created: "desc" }); + setSort("created_at"); + if (params.created_at !== "asc") + setParams({ ...params, created_at: "asc" }); + else setParams({ ...params, created_at: "desc" }); }} > - {sort === "created" && params.created === "asc" ? ( + {sort === "created_at" && params.created_at === "asc" ? ( ) : null} - {sort === "created" && params.created === "desc" ? ( + {sort === "created_at" && params.created_at === "desc" ? ( @@ -327,20 +327,20 @@ const Posts = () => { Created { - setSort("updated"); - if (params.updated !== "asc") - setParams({ ...params, updated: "asc" }); - else setParams({ ...params, updated: "desc" }); + setSort("updated_at"); + if (params.updated_at !== "asc") + setParams({ ...params, updated_at: "asc" }); + else setParams({ ...params, updated_at: "desc" }); }} > - {sort === "updated" && params.updated === "asc" ? ( + {sort === "updated_at" && params.updated_at === "asc" ? ( ) : null} - {sort === "updated" && params.updated === "desc" ? ( + {sort === "updated_at" && params.updated_at === "desc" ? ( @@ -388,8 +388,8 @@ const Posts = () => { ) => { @@ -405,15 +405,15 @@ const Posts = () => { ) => { setFilters({ ...filters, - fil_createdAt: { - ...filters.fil_createdAt, + fil_created_atAt: { + ...filters.fil_created_atAt, value: e.target.value, }, }); @@ -422,15 +422,15 @@ const Posts = () => { ) => setFilters({ ...filters, - fil_updatedAt: { - ...filters.fil_updatedAt, + fil_updated_atAt: { + ...filters.fil_updated_atAt, value: e.target.value, }, }) @@ -467,11 +467,11 @@ const Posts = () => { {`${parseDate(post.publish_date)[0]}, ${ parseDate(post.publish_date)[1] }`} - {`${parseDate(post.createdAt)[0]}, ${ - parseDate(post.createdAt)[1] + {`${parseDate(post.created_at)[0]}, ${ + parseDate(post.created_at)[1] }`} - {`${parseDate(post.updatedAt)[0]}, ${ - parseDate(post.updatedAt)[1] + {`${parseDate(post.created_at)[0]}, ${ + parseDate(post.created_at)[1] }`} diff --git a/src/types/links.ts b/src/types/links.ts index 3fbb60e..bb9df73 100644 --- a/src/types/links.ts +++ b/src/types/links.ts @@ -2,6 +2,6 @@ export interface LinksAll { id: number; name: string; source: string; - createdAt: Date; + created_at: Date; updatedAt: Date; } diff --git a/src/types/posts.ts b/src/types/posts.ts index 2c51539..233ad4c 100644 --- a/src/types/posts.ts +++ b/src/types/posts.ts @@ -2,7 +2,7 @@ export interface HistoryList { old_published_at: Date; new_published_at: Date; PostID: number; - createdAt: Date; + created_at: Date; updatedAt: Date; } export interface PostType { @@ -12,7 +12,7 @@ export interface PostType { link: string; publish_date: Date; summary: string; - createdAt: Date; + created_at: Date; updatedAt: Date; HistoryList: HistoryList[]; } @@ -22,7 +22,7 @@ export interface paramsType { title: "asc" | "desc"; link: "asc" | "desc"; date: "asc" | "desc"; - published: "asc" | "desc"; - created: "asc" | "desc"; - updated: "asc" | "desc"; + publish_date: "asc" | "desc"; + created_at: "asc" | "desc"; + updated_at: "asc" | "desc"; } diff --git a/src/types/sources.ts b/src/types/sources.ts index aa8f1bb..7ef5725 100644 --- a/src/types/sources.ts +++ b/src/types/sources.ts @@ -2,7 +2,7 @@ export interface SourceType { id: number; name: string; source: string; - createdAt: Date; + created_at: Date; updatedAt: Date; }