Merge branch 'release/1.0.1'

YukiOnishi1129 · Jul 12, 2024 · a9b98b2 · a9b98b2
2 parents 0362f65 + 693fdc0
commit a9b98b2
Show file tree

Hide file tree

Showing 20 changed files with 168 additions and 106 deletions.
diff --git a/web/client/src/app/(auth)/login/page.tsx b/web/client/src/app/(auth)/login/page.tsx
@@ -1,5 +1,13 @@
+import { Suspense } from "react";
+
 import { LoginTemplate } from "@/features/auth/components/LoginTemplate";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 export default function Login() {
-  return <LoginTemplate />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <LoginTemplate />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/article/[id]/page.tsx b/web/client/src/app/article/[id]/page.tsx
@@ -1,5 +1,9 @@
+import { Suspense } from "react";
+
 import { ArticleDetailTemplate } from "@/features/articles/components/Template";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type ArticleDetailPageProps = {
   params: {
     id: string;
@@ -10,5 +14,9 @@ export default async function ArticleDetailPage({
   params,
 }: ArticleDetailPageProps) {
   const { id } = params;
-  return <ArticleDetailTemplate id={id} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleDetailTemplate id={id} />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/article/search/page.tsx b/web/client/src/app/article/search/page.tsx
@@ -1,5 +1,13 @@
+import { Suspense } from "react";
+
 import { ArticleSearchTemplate } from "@/features/search/components/articles/Template";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 export default async function SearchArticlePage() {
-  return <ArticleSearchTemplate />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleSearchTemplate />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/article/search/result/page.tsx b/web/client/src/app/article/search/result/page.tsx
@@ -1,5 +1,9 @@
+import { Suspense } from "react";
+
 import { ArticleSearchResultTemplate } from "@/features/search/components/articles/Template";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 import { ArticleTabType } from "@/types/article";
 import { LanguageStatus } from "@/types/language";
 import { PlatformSiteType } from "@/types/platform";
@@ -40,12 +44,14 @@ export default async function ArticleSearchResultPage({
       : "unknown";
 
   return (
-    <ArticleSearchResultTemplate
-      languageStatus={languageStatus}
-      keyword={keyword}
-      platformSiteType={platformSiteType}
-      feedIdList={feedIdList}
-      tab={tab}
-    />
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleSearchResultTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        platformSiteType={platformSiteType}
+        feedIdList={feedIdList}
+        tab={tab}
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/bookmark/search/result/page.tsx b/web/client/src/app/bookmark/search/result/page.tsx
@@ -1,8 +1,11 @@
 import { redirect } from "next/navigation";
+import { Suspense } from "react";
 
 import { BookmarkSearchResultTemplate } from "@/features/search/components/bookmarks/Template";
 import { getUser } from "@/features/users/actions/user";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 import { LanguageStatus } from "@/types/language";
 import { PlatformSiteType } from "@/types/platform";
 
@@ -44,12 +47,14 @@ export default async function BookmarkSearchResultPage({
     platformIdList.push(searchParams["platformId"]);
 
   return (
-    <BookmarkSearchResultTemplate
-      user={user}
-      languageStatus={languageStatus}
-      keyword={keyword}
-      platformSiteType={platformSiteType}
-      platformIdList={platformIdList}
-    />
+    <Suspense fallback={<ScreenLoader />}>
+      <BookmarkSearchResultTemplate
+        user={user}
+        languageStatus={languageStatus}
+        keyword={keyword}
+        platformSiteType={platformSiteType}
+        platformIdList={platformIdList}
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/company/page.tsx b/web/client/src/app/company/page.tsx
@@ -37,15 +37,13 @@ export default async function CompanyPage({ searchParams }: PageProps) {
     feedIdList.push(searchParams["feedId"]);
 
   return (
-    <>
-      <Suspense fallback={<ScreenLoader />}>
-        <ArticleListTemplate
-          languageStatus={languageStatus}
-          keyword={keyword}
-          feedIdList={feedIdList}
-          tab={"company"}
-        />
-      </Suspense>
-    </>
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleListTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        feedIdList={feedIdList}
+        tab={"company"}
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/dashboard/company/page.tsx b/web/client/src/app/dashboard/company/page.tsx
@@ -37,15 +37,13 @@ export default async function DashboardSitePage({ searchParams }: PageProps) {
     feedIdList.push(searchParams["feedId"]);
 
   return (
-    <>
-      <Suspense fallback={<ScreenLoader />}>
-        <ArticleDashboardTemplate
-          languageStatus={languageStatus}
-          keyword={keyword}
-          feedIdList={feedIdList}
-          tab="company"
-        />
-      </Suspense>
-    </>
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleDashboardTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        feedIdList={feedIdList}
+        tab="company"
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/dashboard/site/page.tsx b/web/client/src/app/dashboard/site/page.tsx
@@ -37,15 +37,13 @@ export default async function DashboardSitePage({ searchParams }: PageProps) {
     feedIdList.push(searchParams["feedId"]);
 
   return (
-    <>
-      <Suspense fallback={<ScreenLoader />}>
-        <ArticleDashboardTemplate
-          languageStatus={languageStatus}
-          keyword={keyword}
-          feedIdList={feedIdList}
-          tab="site"
-        />
-      </Suspense>
-    </>
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleDashboardTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        feedIdList={feedIdList}
+        tab="site"
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/dashboard/summary/page.tsx b/web/client/src/app/dashboard/summary/page.tsx
@@ -39,15 +39,13 @@ export default async function DashboardSummaryPage({
     feedIdList.push(searchParams["feedId"]);
 
   return (
-    <>
-      <Suspense fallback={<ScreenLoader />}>
-        <ArticleDashboardTemplate
-          languageStatus={languageStatus}
-          keyword={keyword}
-          feedIdList={feedIdList}
-          tab="summary"
-        />
-      </Suspense>
-    </>
+    <Suspense fallback={<ScreenLoader />}>
+      <ArticleDashboardTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        feedIdList={feedIdList}
+        tab="summary"
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/dashboard/trend/page.tsx b/web/client/src/app/dashboard/trend/page.tsx
@@ -41,14 +41,12 @@ export default async function TrendDashboardPage({ searchParams }: PageProps) {
     typeof searchParams["tab"] === "string" ? searchParams["tab"] : "english";
 
   return (
-    <>
-      <Suspense fallback={<ScreenLoader />}>
-        <TrendDashboardTemplate
-          languageStatus={languageStatus}
-          keyword={keyword}
-          feedIdList={feedIdList}
-        />
-      </Suspense>
-    </>
+    <Suspense fallback={<ScreenLoader />}>
+      <TrendDashboardTemplate
+        languageStatus={languageStatus}
+        keyword={keyword}
+        feedIdList={feedIdList}
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/favorite-article-folder/[id]/page.tsx b/web/client/src/app/favorite-article-folder/[id]/page.tsx
@@ -1,8 +1,11 @@
 import { redirect } from "next/navigation";
+import { Suspense } from "react";
 
 import { FavoriteArticleFolderDetailTemplate } from "@/features/favoriteArticleFolders/components/Template";
 import { getUser } from "@/features/users/actions/user";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type FavoriteArticleFolderDetailPageProps = {
   params: {
     id: string;
@@ -24,10 +27,12 @@ export default async function FavoriteArticleFolderDetailPage({
       ? searchParams["keyword"]
       : undefined;
   return (
-    <FavoriteArticleFolderDetailTemplate
-      user={user}
-      id={id}
-      keyword={keyword}
-    />
+    <Suspense fallback={<ScreenLoader />}>
+      <FavoriteArticleFolderDetailTemplate
+        user={user}
+        id={id}
+        keyword={keyword}
+      />
+    </Suspense>
   );
 }
diff --git a/web/client/src/app/favorite-article-folder/page.tsx b/web/client/src/app/favorite-article-folder/page.tsx
@@ -1,8 +1,11 @@
 import { redirect } from "next/navigation";
+import { Suspense } from "react";
 
 import { FavoriteArticleFolderListTemplate } from "@/features/favoriteArticleFolders/components/Template";
 import { getUser } from "@/features/users/actions/user";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type PageProps = {
   params: { slug: string };
   searchParams: { [key: string]: string | string[] | undefined };
@@ -20,5 +23,9 @@ export default async function FavoriteArticleFolderPage({
       ? searchParams["keyword"]
       : undefined;
 
-  return <FavoriteArticleFolderListTemplate user={user} keyword={keyword} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <FavoriteArticleFolderListTemplate user={user} keyword={keyword} />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/feed/[id]/page.tsx b/web/client/src/app/feed/[id]/page.tsx
@@ -1,5 +1,9 @@
+import { Suspense } from "react";
+
 import { FeedDetailTemplate } from "@/features/feeds/components/Template";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type FeedDetailPageProps = {
   params: {
     id: string;
@@ -16,5 +20,9 @@ export default function FeedDetailPage({
     typeof searchParams["keyword"] === "string"
       ? searchParams["keyword"]
       : undefined;
-  return <FeedDetailTemplate id={id} keyword={keyword} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <FeedDetailTemplate id={id} keyword={keyword} />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/feed/page.tsx b/web/client/src/app/feed/page.tsx
@@ -1,5 +1,9 @@
+import { Suspense } from "react";
+
 import { FeedTemplate } from "@/features/feeds/components/Template";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type PageProps = {
   params: { slug: string };
   searchParams: { [key: string]: string | string[] | undefined };
@@ -10,5 +14,9 @@ export default function FeedListPage({ searchParams }: PageProps) {
     typeof searchParams["keyword"] === "string"
       ? searchParams["keyword"]
       : undefined;
-  return <FeedTemplate keyword={keyword} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <FeedTemplate keyword={keyword} />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/layout.tsx b/web/client/src/app/layout.tsx
@@ -13,7 +13,8 @@ const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
   title: "Check Picks",
-  description: "Check Picks is a collection of tech articles.",
+  description:
+    "Check Picks is a collection of the latest IT news. In particular, it has a good selection of news for software engineers. For example, React, Golang and AWS.",
 };
 
 export default function RootLayout({

diff --git a/web/client/src/app/my-feed-folder/[id]/page.tsx b/web/client/src/app/my-feed-folder/[id]/page.tsx
@@ -1,8 +1,11 @@
 import { redirect } from "next/navigation";
+import { Suspense } from "react";
 
 import { MyFeedFolderDetailTemplate } from "@/features/myFeedFolders/components/Template";
 import { getUser } from "@/features/users/actions/user";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type MyFeedFolderDetailPageProps = {
   params: {
     id: string;
@@ -23,5 +26,9 @@ export default async function MyFeedFolderDetailPage({
     typeof searchParams["keyword"] === "string"
       ? searchParams["keyword"]
       : undefined;
-  return <MyFeedFolderDetailTemplate user={user} id={id} keyword={keyword} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <MyFeedFolderDetailTemplate user={user} id={id} keyword={keyword} />
+    </Suspense>
+  );
 }
diff --git a/web/client/src/app/my-feed-folder/page.tsx b/web/client/src/app/my-feed-folder/page.tsx
@@ -1,8 +1,11 @@
 import { redirect } from "next/navigation";
+import { Suspense } from "react";
 
 import { MyFeedFolderListTemplate } from "@/features/myFeedFolders/components/Template";
 import { getUser } from "@/features/users/actions/user";
 
+import { ScreenLoader } from "@/components/layout/ScreenLoader";
+
 type PageProps = {
   params: { slug: string };
   searchParams: { [key: string]: string | string[] | undefined };
@@ -20,5 +23,9 @@ export default async function MyFeedFolderFolderListPage({
       ? searchParams["keyword"]
       : undefined;
 
-  return <MyFeedFolderListTemplate user={user} keyword={keyword} />;
+  return (
+    <Suspense fallback={<ScreenLoader />}>
+      <MyFeedFolderListTemplate user={user} keyword={keyword} />
+    </Suspense>
+  );
 }