From 23e3493a3f787696fba264bab893a846ef315fb3 Mon Sep 17 00:00:00 2001
From: Ardeman <are.theman@gmail.com>
Date: Fri, 28 Feb 2025 11:49:51 +0800
Subject: [PATCH] feat: restructure routing and layouts for admin and news
 sections, update cookie paths

---
 app/components/ui/carousel.tsx                |  2 +-
 app/configs/meta.ts                           |  2 +-
 app/layouts/admin/navbar.tsx                  |  2 +-
 app/layouts/news/footer-newsletter.tsx        |  4 +-
 app/layouts/news/form-login.tsx               |  2 +-
 app/layouts/news/header-top.tsx               |  8 ++--
 app/layouts/news/menu.ts                      | 40 +++++++++----------
 app/libs/cookie.server.ts                     |  2 +-
 app/libs/logout-header.server.ts              |  2 +-
 app/root.tsx                                  | 11 -----
 ...min._index.tsx => _admin.admin._index.tsx} |  0
 ....login.tsx => _admin.admin.auth.login.tsx} |  0
 ....tsx => _admin.admin.dashboard._index.tsx} |  0
 ....tsx => _admin.admin.dashboard.admins.tsx} |  0
 ..._admin.admin.dashboard.advertisements.tsx} |  0
 ...sx => _admin.admin.dashboard.contents.tsx} |  0
 ...sx => _admin.admin.dashboard.settings.tsx} |  0
 ...x => _admin.admin.dashboard.site-data.tsx} |  0
 ... _admin.admin.dashboard.subscriptions.tsx} |  0
 ...shboard.tsx => _admin.admin.dashboard.tsx} |  0
 ...s.tsx => _admin.admin.dashboard.users.tsx} |  0
 .../{_layout.admin.tsx => _admin.admin.tsx}   |  0
 app/routes/_layout._index.tsx                 |  8 ++--
 ...y.$name.tsx => _layout.category.$name.tsx} |  0
 ...ail.$slug.tsx => _layout.detail.$slug.tsx} |  0
 app/routes/_layout.news._index.tsx            |  7 ----
 app/routes/{_layout.news.tsx => _layout.tsx}  |  2 +-
 ...actions.news.login.ts => actions.login.ts} | 26 +++++++-----
 ...tions.news.logout.ts => actions.logout.ts} |  0
 vite.config.ts                                |  1 -
 30 files changed, 55 insertions(+), 64 deletions(-)
 rename app/routes/{_layout.admin._index.tsx => _admin.admin._index.tsx} (100%)
 rename app/routes/{_layout.admin.auth.login.tsx => _admin.admin.auth.login.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard._index.tsx => _admin.admin.dashboard._index.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.admins.tsx => _admin.admin.dashboard.admins.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.advertisements.tsx => _admin.admin.dashboard.advertisements.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.contents.tsx => _admin.admin.dashboard.contents.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.settings.tsx => _admin.admin.dashboard.settings.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.site-data.tsx => _admin.admin.dashboard.site-data.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.subscriptions.tsx => _admin.admin.dashboard.subscriptions.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.tsx => _admin.admin.dashboard.tsx} (100%)
 rename app/routes/{_layout.admin.dashboard.users.tsx => _admin.admin.dashboard.users.tsx} (100%)
 rename app/routes/{_layout.admin.tsx => _admin.admin.tsx} (100%)
 rename app/routes/{_layout.news.category.$name.tsx => _layout.category.$name.tsx} (100%)
 rename app/routes/{_layout.news.detail.$slug.tsx => _layout.detail.$slug.tsx} (100%)
 delete mode 100644 app/routes/_layout.news._index.tsx
 rename app/routes/{_layout.news.tsx => _layout.tsx} (91%)
 rename app/routes/{actions.news.login.ts => actions.login.ts} (76%)
 rename app/routes/{actions.news.logout.ts => actions.logout.ts} (100%)

diff --git a/app/components/ui/carousel.tsx b/app/components/ui/carousel.tsx
index a1d26ba..6fe2f3b 100644
--- a/app/components/ui/carousel.tsx
+++ b/app/components/ui/carousel.tsx
@@ -136,7 +136,7 @@ export const Carousel = (properties: TNews) => {
                         },
                         to: '',
                       }
-                    : { as: Link, to: `/news/detail/${slug}` })}
+                    : { as: Link, to: `/detail/${slug}` })}
                   className={twMerge('', type === 'hero' ? '' : 'mb-5')}
                 >
                   View More
diff --git a/app/configs/meta.ts b/app/configs/meta.ts
index 2f6bd55..73dc552 100644
--- a/app/configs/meta.ts
+++ b/app/configs/meta.ts
@@ -14,7 +14,7 @@ type TMetaTitleConfig = {
 
 export const META_TITLE_CONFIG: TMetaTitleConfig = [
   {
-    path: '/news',
+    path: '/',
     title: 'Home',
   },
   {
diff --git a/app/layouts/admin/navbar.tsx b/app/layouts/admin/navbar.tsx
index b0295ed..366faa7 100644
--- a/app/layouts/admin/navbar.tsx
+++ b/app/layouts/admin/navbar.tsx
@@ -11,7 +11,7 @@ export const Navbar = () => {
   return (
     <div className="flex h-20 items-center justify-between border-b border-[#ECECEC] bg-white px-10 py-5">
       <Link
-        to="/news"
+        to="/"
         className="h-full"
       >
         <img
diff --git a/app/layouts/news/footer-newsletter.tsx b/app/layouts/news/footer-newsletter.tsx
index f83db44..bf88d9a 100644
--- a/app/layouts/news/footer-newsletter.tsx
+++ b/app/layouts/news/footer-newsletter.tsx
@@ -9,7 +9,7 @@ export const FooterNewsletter = () => {
       <div className="col-span-2 hidden gap-y-6 sm:grid">
         <div className="h-[75px] bg-white p-3">
           <Link
-            to="/news"
+            to="/"
             className="h-full"
           >
             <img
@@ -44,7 +44,7 @@ export const FooterNewsletter = () => {
       <div className="block sm:hidden">
         <div className="h-[60px] bg-white p-3">
           <Link
-            to="/news"
+            to="/"
             className="h-full"
           >
             <img
diff --git a/app/layouts/news/form-login.tsx b/app/layouts/news/form-login.tsx
index 48c4039..86135fd 100644
--- a/app/layouts/news/form-login.tsx
+++ b/app/layouts/news/form-login.tsx
@@ -67,7 +67,7 @@ export const FormLogin = (properties: TProperties) => {
             method="post"
             onSubmit={handleSubmit}
             className="space-y-4"
-            action="/actions/news/login"
+            action="/actions/login"
           >
             <Input
               id="email"
diff --git a/app/layouts/news/header-top.tsx b/app/layouts/news/header-top.tsx
index cb5507e..aac8b4e 100644
--- a/app/layouts/news/header-top.tsx
+++ b/app/layouts/news/header-top.tsx
@@ -3,17 +3,17 @@ import { Link, useFetcher, useRouteLoaderData } from 'react-router'
 import { Button } from '~/components/ui/button'
 import { APP } from '~/configs/meta'
 import { useNewsContext } from '~/contexts/news'
-import type { loader } from '~/routes/_layout.news'
+import type { loader } from '~/routes/_layout'
 
 export const HeaderTop = () => {
   const { setIsLoginOpen } = useNewsContext()
-  const loaderData = useRouteLoaderData<typeof loader>('routes/_layout.news')
+  const loaderData = useRouteLoaderData<typeof loader>('routes/_layout')
   const fetcher = useFetcher()
 
   return (
     <div className="flex h-[60px] items-center justify-between bg-white px-5 align-middle sm:h-[100px] sm:gap-[15px] sm:px-[50px] sm:py-[20px]">
       <Link
-        to="/news"
+        to="/"
         className="mt-2 h-full py-2"
       >
         <img
@@ -32,7 +32,7 @@ export const HeaderTop = () => {
         {loaderData?.userToken ? (
           <fetcher.Form
             method="POST"
-            action="/actions/news/logout"
+            action="/actions/logout"
           >
             <Button
               variant="newsSecondary"
diff --git a/app/layouts/news/menu.ts b/app/layouts/news/menu.ts
index 0c41da0..0d02f18 100644
--- a/app/layouts/news/menu.ts
+++ b/app/layouts/news/menu.ts
@@ -21,31 +21,31 @@ type TFooterMenu = {
 export const MENU: TMenu[] = [
   {
     title: 'Spotlight',
-    url: '/news/category/spotlight',
+    url: '/category/spotlight',
   },
   {
     title: 'Berita',
-    url: '/news/category/berita',
+    url: '/category/berita',
   },
   {
     title: 'Kasus',
-    url: '/news/category/kasus',
+    url: '/category/kasus',
   },
   {
     title: 'Kajian',
-    url: '/news/category/kajian',
+    url: '/category/kajian',
   },
   {
     title: 'Lifestyle',
-    url: '/news/category/lifestyle',
+    url: '/category/lifestyle',
   },
   {
     title: 'Event',
-    url: '/news/category/event',
+    url: '/category/event',
   },
   {
     title: 'Travel',
-    url: '/news/category/travel',
+    url: '/category/travel',
   },
 ]
 
@@ -55,23 +55,23 @@ export const FOOTER_MENU: TFooterMenu[] = [
     items: [
       {
         title: 'Popular',
-        url: '/news/list?sort=popular',
+        url: '/list?sort=popular',
       },
       {
         title: 'Trending',
-        url: '/news/list?sort=trending',
+        url: '/list?sort=trending',
       },
       {
         title: 'Contact',
-        url: '/news/contact',
+        url: '/contact',
       },
       {
         title: 'Support/Help',
-        url: '/news/support',
+        url: '/support',
       },
       {
         title: 'Rquest Topic',
-        url: '/news/request-topic',
+        url: '/request-topic',
       },
     ],
   },
@@ -80,23 +80,23 @@ export const FOOTER_MENU: TFooterMenu[] = [
     items: [
       {
         title: 'FAQs',
-        url: '/news/faq',
+        url: '/faq',
       },
       {
         title: 'Terms and Condition',
-        url: '/news/terms-condition',
+        url: '/terms-condition',
       },
       {
         title: 'Support',
-        url: '/news/support',
+        url: '/support',
       },
       {
         title: 'Link Nine',
-        url: '/news',
+        url: '/',
       },
       {
         title: 'Link Ten',
-        url: '/news',
+        url: '/',
       },
     ],
   },
@@ -130,14 +130,14 @@ export const FOOTER_MENU: TFooterMenu[] = [
 export const COPYRIGHT_MENU: TMenu[] = [
   {
     title: 'Privacy Policy',
-    url: '/news/privacy-policy',
+    url: '/privacy-policy',
   },
   {
     title: 'Terms of Service',
-    url: '/news/terms-of-service',
+    url: '/terms-of-service',
   },
   {
     title: 'Cookies Settings',
-    url: '/news/cookies-settings',
+    url: '/cookies-settings',
   },
 ]
diff --git a/app/libs/cookie.server.ts b/app/libs/cookie.server.ts
index 7d73eb4..afe71e4 100644
--- a/app/libs/cookie.server.ts
+++ b/app/libs/cookie.server.ts
@@ -7,7 +7,7 @@ export const userTokenCookieConfig = createCookie(USER_COOKIES.token, {
   sameSite: 'lax',
   secure: process.env.NODE_ENV === 'production',
   secrets: [process.env.VITE_SALT_KEY || 'default-secret'],
-  path: '/news',
+  path: '/',
 })
 
 export const adminTokenCookieConfig = createCookie(ADMIN_COOKIES.token, {
diff --git a/app/libs/logout-header.server.ts b/app/libs/logout-header.server.ts
index 548e920..91bbb55 100644
--- a/app/libs/logout-header.server.ts
+++ b/app/libs/logout-header.server.ts
@@ -4,7 +4,7 @@ export const setUserLogoutHeaders = () => {
   const responseHeaders = new Headers()
   responseHeaders.append(
     'Set-Cookie',
-    `${USER_COOKIES.token}=; Path=/news; HttpOnly; SameSite=Strict; Max-Age=0`,
+    `${USER_COOKIES.token}=; Path=/; HttpOnly; SameSite=Strict; Max-Age=0`,
   )
 
   return responseHeaders
diff --git a/app/root.tsx b/app/root.tsx
index 8f5a320..8bee112 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -6,7 +6,6 @@ import {
   Outlet,
   Scripts,
   ScrollRestoration,
-  type ShouldRevalidateFunctionArgs,
 } from 'react-router'
 
 import type { Route } from './+types/root'
@@ -37,16 +36,6 @@ export const meta = ({ location }: Route.MetaArgs) => {
   ]
 }
 
-export const shouldRevalidate = ({
-  actionResult,
-  defaultShouldRevalidate,
-}: ShouldRevalidateFunctionArgs) => {
-  if (actionResult?.success) {
-    return true
-  }
-  return defaultShouldRevalidate
-}
-
 export const Layout = ({ children }: { children: ReactNode }) => {
   return (
     <html lang="en">
diff --git a/app/routes/_layout.admin._index.tsx b/app/routes/_admin.admin._index.tsx
similarity index 100%
rename from app/routes/_layout.admin._index.tsx
rename to app/routes/_admin.admin._index.tsx
diff --git a/app/routes/_layout.admin.auth.login.tsx b/app/routes/_admin.admin.auth.login.tsx
similarity index 100%
rename from app/routes/_layout.admin.auth.login.tsx
rename to app/routes/_admin.admin.auth.login.tsx
diff --git a/app/routes/_layout.admin.dashboard._index.tsx b/app/routes/_admin.admin.dashboard._index.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard._index.tsx
rename to app/routes/_admin.admin.dashboard._index.tsx
diff --git a/app/routes/_layout.admin.dashboard.admins.tsx b/app/routes/_admin.admin.dashboard.admins.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.admins.tsx
rename to app/routes/_admin.admin.dashboard.admins.tsx
diff --git a/app/routes/_layout.admin.dashboard.advertisements.tsx b/app/routes/_admin.admin.dashboard.advertisements.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.advertisements.tsx
rename to app/routes/_admin.admin.dashboard.advertisements.tsx
diff --git a/app/routes/_layout.admin.dashboard.contents.tsx b/app/routes/_admin.admin.dashboard.contents.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.contents.tsx
rename to app/routes/_admin.admin.dashboard.contents.tsx
diff --git a/app/routes/_layout.admin.dashboard.settings.tsx b/app/routes/_admin.admin.dashboard.settings.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.settings.tsx
rename to app/routes/_admin.admin.dashboard.settings.tsx
diff --git a/app/routes/_layout.admin.dashboard.site-data.tsx b/app/routes/_admin.admin.dashboard.site-data.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.site-data.tsx
rename to app/routes/_admin.admin.dashboard.site-data.tsx
diff --git a/app/routes/_layout.admin.dashboard.subscriptions.tsx b/app/routes/_admin.admin.dashboard.subscriptions.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.subscriptions.tsx
rename to app/routes/_admin.admin.dashboard.subscriptions.tsx
diff --git a/app/routes/_layout.admin.dashboard.tsx b/app/routes/_admin.admin.dashboard.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.tsx
rename to app/routes/_admin.admin.dashboard.tsx
diff --git a/app/routes/_layout.admin.dashboard.users.tsx b/app/routes/_admin.admin.dashboard.users.tsx
similarity index 100%
rename from app/routes/_layout.admin.dashboard.users.tsx
rename to app/routes/_admin.admin.dashboard.users.tsx
diff --git a/app/routes/_layout.admin.tsx b/app/routes/_admin.admin.tsx
similarity index 100%
rename from app/routes/_layout.admin.tsx
rename to app/routes/_admin.admin.tsx
diff --git a/app/routes/_layout._index.tsx b/app/routes/_layout._index.tsx
index 267d0e9..0038b88 100644
--- a/app/routes/_layout._index.tsx
+++ b/app/routes/_layout._index.tsx
@@ -1,5 +1,7 @@
-import { redirect } from 'react-router'
+import { NewsPage } from '~/pages/news'
 
-export async function loader() {
-  return redirect('/news')
+const NewsIndexLayout = () => {
+  return <NewsPage />
 }
+
+export default NewsIndexLayout
diff --git a/app/routes/_layout.news.category.$name.tsx b/app/routes/_layout.category.$name.tsx
similarity index 100%
rename from app/routes/_layout.news.category.$name.tsx
rename to app/routes/_layout.category.$name.tsx
diff --git a/app/routes/_layout.news.detail.$slug.tsx b/app/routes/_layout.detail.$slug.tsx
similarity index 100%
rename from app/routes/_layout.news.detail.$slug.tsx
rename to app/routes/_layout.detail.$slug.tsx
diff --git a/app/routes/_layout.news._index.tsx b/app/routes/_layout.news._index.tsx
deleted file mode 100644
index 0038b88..0000000
--- a/app/routes/_layout.news._index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { NewsPage } from '~/pages/news'
-
-const NewsIndexLayout = () => {
-  return <NewsPage />
-}
-
-export default NewsIndexLayout
diff --git a/app/routes/_layout.news.tsx b/app/routes/_layout.tsx
similarity index 91%
rename from app/routes/_layout.news.tsx
rename to app/routes/_layout.tsx
index f25a003..dc43b19 100644
--- a/app/routes/_layout.news.tsx
+++ b/app/routes/_layout.tsx
@@ -4,7 +4,7 @@ import { NewsProvider } from '~/contexts/news'
 import { NewsDefaultLayout } from '~/layouts/news/default'
 import { handleCookie } from '~/libs/cookies'
 
-import type { Route } from './+types/_layout.news'
+import type { Route } from './+types/_layout'
 
 export const loader = async ({ request }: Route.LoaderArgs) => {
   const { userToken } = await handleCookie(request)
diff --git a/app/routes/actions.news.login.ts b/app/routes/actions.login.ts
similarity index 76%
rename from app/routes/actions.news.login.ts
rename to app/routes/actions.login.ts
index 12ee85e..af9961b 100644
--- a/app/routes/actions.news.login.ts
+++ b/app/routes/actions.login.ts
@@ -7,7 +7,7 @@ import { newsLoginRequest } from '~/apis/news/login'
 import { loginSchema, type TLoginSchema } from '~/layouts/news/form-login'
 import { generateTokenCookie } from '~/utils/token'
 
-import type { Route } from './+types/actions.news.login'
+import type { Route } from './+types/actions.login'
 
 export const action = async ({ request }: Route.ActionArgs) => {
   try {
@@ -46,14 +46,22 @@ export const action = async ({ request }: Route.ActionArgs) => {
     )
   } catch (error) {
     if (error instanceof XiorError) {
-      return data({
-        success: false,
-        message: error?.response?.data?.error?.message || error.message,
-      })
+      return data(
+        {
+          success: false,
+          message: error?.response?.data?.error?.message || error.message,
+        },
+        {
+          status: error?.response?.status || 500,
+        },
+      )
     }
-    return data({
-      success: false,
-      message: 'Internal server error',
-    })
+    return data(
+      {
+        success: false,
+        message: 'Internal server error',
+      },
+      { status: 500 },
+    )
   }
 }
diff --git a/app/routes/actions.news.logout.ts b/app/routes/actions.logout.ts
similarity index 100%
rename from app/routes/actions.news.logout.ts
rename to app/routes/actions.logout.ts
diff --git a/vite.config.ts b/vite.config.ts
index 02286ee..6a1f133 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,6 +7,5 @@ export default defineConfig({
   plugins: [tailwindcss(), reactRouter(), tsconfigPaths()],
   build: {
     cssMinify: true,
-    ssr: false,
   },
 })