fix:article create edit

.env

@@ -0,0 +1 @@
+NEXT_PUBLIC_MAPS_API_KEY=AIzaSyCOkxoeKykE60L_nM4VS1JYJqBmqy2GA0Q

.gitlab-ci.yml

@@ -7,6 +7,7 @@ build-dev:
   when: on_success
   only:
     - main
+    - dev-restructure
   image: docker:stable
   services:
     - name: docker:dind
@@ -22,8 +23,9 @@ auto-deploy:
   when: on_success
   only:
     - main
+    - dev-restructure
   image: curlimages/curl:latest
   services:
     - docker:dind
   script:
-    - curl --user cekmedsos:$JENKINS_PWD http://103.82.242.92:8080/job/autodeploy-humas/build?token=autodeployhumas
+    - curl --user admin:$JENKINS_PWD http://38.47.180.165:8080/job/autodeploy-humas/build?token=autodeployhumas

Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /usr/src/app
 COPY package*.json /usr/src/app/
 
 # RUN npm install --force
-RUN npm install -g npm@latest
+# RUN npm install -g npm@latest
 RUN npm install
 
 # Copying source files

app/(admin)/admin/article/create/page.tsx

@@ -1,10 +1,12 @@
-import FormArticle from '@/components/form/form-article'
+import CreateArticleForm from "@/components/form/article/create-article-form";
-import { Card } from '@nextui-org/react'
+import FormArticle from "@/components/form/form-article";
+import { Card } from "@nextui-org/react";
 
 export default function CreateArticle() {
   return (
-        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+    <div className="h-[96vh] bg-transparent p-8 !bg-slate-100 dark:!bg-black overflow-y-auto">
-            <FormArticle />
+      {/* <FormArticle /> */}
-        </Card>
+      <CreateArticleForm />
-    )
+    </div>
+  );
 }

app/(admin)/admin/article/detail/[id]/page.tsx

@@ -1,10 +1,10 @@
-import FormDetailArticle from '@/components/form/form-detail-article'
+import EditArticleForm from "@/components/form/article/edit-article-form";
-import { Card } from '@nextui-org/react'
 
 export default function DetailArticlePage() {
   return (
-        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+    <div className="h-[96vh] bg-transparent p-8 !bg-slate-100 dark:!bg-black overflow-y-auto">
-            <FormDetailArticle />
+      {/* <FormDetailArticle /> */}
-        </Card>
+      <EditArticleForm isDetail={true} />
-    )
+    </div>
+  );
 }

app/(admin)/admin/article/edit/[id]/page.tsx

@@ -1,10 +1,9 @@
-import FormUpdateArticle from '@/components/form/form-edit-article'
+import EditArticleForm from "@/components/form/article/edit-article-form";
-import { Card } from '@nextui-org/react'
 
 export default function UpdateArticlePage() {
   return (
-        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+    <div className="h-[96vh] bg-transparent p-8 !bg-slate-100 dark:!bg-black overflow-y-auto">
-            <FormUpdateArticle />
+      <EditArticleForm isDetail={false} />
-        </Card>
+    </div>
-    )
+  );
 }

app/(admin)/admin/article/generate/edit/[id]/page.tsx

@@ -0,0 +1,27 @@
+"use client";
+import EditGeneratedArticleChecker from "@/components/form/article/edit-generated-article-checker-form";
+import EditGeneratedArticleContent from "@/components/form/article/edit-generated-article-content-form";
+import { Card } from "@nextui-org/react";
+import { Tab, Tabs } from "@nextui-org/react";
+
+import { useParams } from "next/navigation";
+
+export default function EditGeneratedArticlePage() {
+  const params = useParams();
+  const id = String(params.id);
+
+  return (
+    <Card className="rounded-md border bg-transparent p-6 overflow-auto">
+      <div className="flex flex-col gap-2">
+        <Tabs aria-label="Options">
+          <Tab key="content" title="Content">
+            <EditGeneratedArticleContent id={id} />
+          </Tab>
+          <Tab key="checker" title="Checker">
+            <EditGeneratedArticleChecker id={id} />
+          </Tab>
+        </Tabs>
+      </div>
+    </Card>
+  );
+}

app/(admin)/admin/article/generate/page.tsx

@@ -0,0 +1,10 @@
+import GenerateArticleForm from "@/components/form/article/generate-article-form";
+import { Card } from "@nextui-org/react";
+
+export default function GenerateArticle() {
+  return (
+    <Card className="rounded-md border bg-transparent">
+      <GenerateArticleForm />
+    </Card>
+  );
+}

app/(admin)/admin/article/page.tsx

@@ -1,23 +1,48 @@
-"use client"
+"use client";
 import { AddIcon } from "@/components/icons";
 import ArticleTable from "@/components/table/article-table";
+import generatedArticleIds from "@/store/generated-article-store";
 import { Button, Card } from "@nextui-org/react";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 
 export default function BasicPage() {
+  const router = useRouter();
+  const setGeneratedArticleIdStore = generatedArticleIds(
+    (state) => state.setArticleIds
+  );
+  const goGenerate = () => {
+    setGeneratedArticleIdStore({
+      singleArticle: [],
+      bulkArticle: [],
+      rewriteArticle: [],
+    });
+    router.push("/admin/article/generate");
+  };
+
   return (
-        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
+    <div className="overflow-x-hidden overflow-y-scroll">
-            <div className="px-4">
+      <div className="px-2 md:px-4 w-full">
-                <Card className="rounded-md my-5 pl-5 py-2">
+        <div className="rounded-md my-5 px-5 py-2 bg-white dark:bg-[#18181b] flex flex-row gap-3">
           <Link href="/admin/article/create">
-                        <Button size="md" color="primary" className="w-min">
+            <Button size="md" className="bg-[#F07C00] text-white">
-                            <AddIcon />New Article
+              New Article
+              <AddIcon />
             </Button>
           </Link>
-                </Card>
+          {/* <Button
-                <Card className="rounded-md my-5">
+            size="md"
+            color="primary"
+            className="bg-[#F07C00] text-white"
+            onPress={goGenerate}
+          >
+            <AddIcon />
+            Generate Article
+          </Button> */}
+        </div>
+        <div className="bg-white dark:bg-[#18181b] rounded-xl p-2">
           <ArticleTable />
-                </Card>
+        </div>
       </div>
     </div>
   );

app/(admin)/admin/dashboard/page.tsx

@@ -2,10 +2,10 @@ import DashboardContainer from "@/components/main/dashboard/dashboard-container"
 
 export default function AdminPage() {
   return (
-        <div className="flex h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
+    <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid">
       <div className="px-4">
         <DashboardContainer />
       </div>
     </div>
-    )
+  );
 }

app/(admin)/admin/master-category/page.tsx

@@ -0,0 +1,4 @@
+"use client";
+export default function MasterCategory() {
+  return <div>master category</div>;
+}

app/(admin)/admin/master-role/create/page.tsx

@@ -1,10 +1,10 @@
-import FormMasterUserRole from '@/components/form/form-master-user-role'
+import FormMasterUserRole from "@/components/form/form-master-user-role";
-import { Card } from '@nextui-org/react'
+import { Card } from "@nextui-org/react";
 
 export default function CreateMasterUserRolePage() {
   return (
-        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+    <Card className="h-[96vh] rounded-md border bg-transparent">
       <FormMasterUserRole />
     </Card>
-    )
+  );
 }

app/(admin)/admin/master-role/page.tsx

@@ -1,4 +1,4 @@
-"use client"
+"use client";
 import { AddIcon } from "@/components/icons";
 import MasterRoleTable from "@/components/table/master-role-table";
 import { Button, Card } from "@nextui-org/react";
@@ -6,12 +6,17 @@ import Link from "next/link";
 
 export default function MasterRolePage() {
   return (
-        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
+    <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2">
       <div className="px-4">
         <Card className="rounded-md my-5 pl-5 py-2">
           <Link href="/admin/master-role/create">
-                        <Button size="md" color="primary" className="w-min">
+            <Button
-                            <AddIcon />New Role
+              size="md"
+              color="primary"
+              className="bg-[#F07C00] text-white"
+            >
+              <AddIcon />
+              New Role
             </Button>
           </Link>
         </Card>

app/(admin)/admin/master-user/create/page.tsx

@@ -1,10 +1,10 @@
-import FormMasterUser from '@/components/form/form-master-user'
+import FormMasterUser from "@/components/form/form-master-user";
-import { Card } from '@nextui-org/react'
+import { Card } from "@nextui-org/react";
 
 export default function CreateMasterUserPage() {
   return (
-        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+    <Card className="h-[96vh] rounded-md border bg-transparent">
       <FormMasterUser />
     </Card>
-    )
+  );
 }

app/(admin)/admin/master-user/page.tsx

@@ -1,4 +1,4 @@
-"use client"
+"use client";
 import { AddIcon } from "@/components/icons";
 import MasterUserTable from "@/components/table/master-user-table";
 import { Button, Card } from "@nextui-org/react";
@@ -6,12 +6,17 @@ import Link from "next/link";
 
 export default function MasterUserPage() {
   return (
-        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
+    <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2">
       <div className="px-4">
         <Card className="rounded-md my-5 pl-5 py-2">
           <Link href="/admin/master-user/create">
-                        <Button size="md" color="primary" className="w-min">
+            <Button
-                            <AddIcon />New User
+              size="md"
+              color="primary"
+              className="bg-[#F07C00] text-white"
+            >
+              <AddIcon />
+              New User
             </Button>
           </Link>
         </Card>

app/(admin)/admin/static-page/create/page.tsx

@@ -0,0 +1,10 @@
+import StaticPageBuilder from "@/components/main/static-page/static-page-main";
+import { Card } from "@nextui-org/react";
+
+export default function StaticPageGenerator() {
+  return (
+    <Card className="rounded-md border bg-transparent p-4 overflow-auto">
+      <StaticPageBuilder />
+    </Card>
+  );
+}

app/(admin)/admin/static-page/edit/[id]/page.tsx

@@ -0,0 +1,10 @@
+import StaticPageBuilderEdit from "@/components/form/static-page/static-page-edit-form";
+import { Card } from "@nextui-org/react";
+
+export default function StaticPageEdit() {
+  return (
+    <Card className="rounded-md border bg-transparent p-4 overflow-auto">
+      <StaticPageBuilderEdit />
+    </Card>
+  );
+}

app/(admin)/admin/static-page/page.tsx

@@ -0,0 +1,28 @@
+import { AddIcon } from "@/components/icons";
+import StaticPageTable from "@/components/table/static-page-table";
+import { Button, Card } from "@nextui-org/react";
+import Link from "next/link";
+
+export default function StaticPageGeneratorList() {
+  return (
+    <div className="overflow-x-hidden overflow-y-scroll rounded-lg border-2">
+      <div className="px-2 md:px-4 w-full">
+        <div className="rounded-md mt-4 px-5 py-2 bg-white dark:bg-[#18181b] flex flex-row gap-3">
+          <Link href="/admin/static-page/create">
+            <Button
+              size="md"
+              color="primary"
+              className="bg-[#F07C00] text-white"
+            >
+              <AddIcon />
+              Create Page
+            </Button>
+          </Link>
+        </div>
+        <div className="bg-white dark:bg-[#18181b] rounded-xl p-2">
+          <StaticPageTable />
+        </div>
+      </div>
+    </div>
+  );
+}

app/auth/layout.tsx

@@ -1,13 +1,9 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function AuthLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <> {children}</>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/auth/page.tsx

@@ -1,8 +1,28 @@
-import Login from '@/components/form/login'
+"use client"
-import React from 'react'
+
+import Login from "@/components/form/login";
+import QudoLogin from "@/components/form/qudo-login";
+import Cookies from "js-cookie";
+import React, { useEffect, useState } from "react";
 
 export default function AuthPage() {
+
+  const isAuthenticated = Cookies.get("is_authenticated") || "false";
+
+  console.log("isAuthenticated : ", isAuthenticated);
+  
+  const [hasMounted, setHasMounted] = useState(false);
+
+  useEffect(() => {
+    setHasMounted(true);
+  }, []);
+
+  // Render
+  if (!hasMounted) return null;
+
   return (
-        <Login />
+    isAuthenticated == "true" ?
-    )
+    <Login /> : 
+    <QudoLogin />
+  );
 }

app/docs/layout.tsx

@@ -1,15 +1,11 @@
-'use client'
+"use client";
 
-import { HumasLayout } from "@/components/layout/HumasLayout";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function DocsLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-	return (
+  return <HumasLayout>{children}</HumasLayout>;
-		<HumasLayout>
-			{children}
-		</HumasLayout>
-	);
 }

app/e-majalah-polri/daftar-majalah/layout.tsx

@@ -1,13 +0,0 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
-
-export default function EMajalahLayout({
-    children,
-}: {
-    children: React.ReactNode;
-}) {
-    return (
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
-}

app/e-majalah-polri/daftar-majalah/page.tsx

@@ -1,8 +1,12 @@
-import ListEnewsPolri from '@/components/table/tabel-emajalah-polri'
+"use client";
-import React from 'react'
+import { HumasLayout } from "@/components/layout/humas-layout";
+import ListEnewsPolri from "@/components/table/tabel-emajalah-polri";
+import React from "react";
 
 export default function ListEnewsPage() {
   return (
+    <HumasLayout>
       <ListEnewsPolri />
-    )
+    </HumasLayout>
+  );
 }

app/e-majalah-polri/detail/[id]/layout.tsx

@@ -1,13 +1,9 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function DetailEMajalahLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <>{children}</>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/e-majalah-polri/detail/[id]/page.tsx

@@ -1,8 +1,12 @@
-import EMagazineDetail from '@/components/detail/E-MagazineDetail'
+"use client";
-import React from 'react'
+import { HumasLayout } from "@/components/layout/humas-layout";
+import EMagazineDetail from "@/components/main/detail/e-magazine-detail";
+import React from "react";
 
 export default function EnewsDetailPage() {
   return (
+    <HumasLayout>
       <EMagazineDetail />
-    )
+    </HumasLayout>
+  );
 }

app/form-permohonan-informasi/layout.tsx

@@ -1,13 +1,10 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+"use client";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function ApplicationLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <HumasLayout>{children}</HumasLayout>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/kontak-kami/layout.tsx

@@ -1,13 +1,10 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+"use client";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function KontakLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <HumasLayout>{children}</HumasLayout>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/kontak-kami/page.tsx

@@ -1,7 +1,10 @@
-import Contact from '@/components/detail/Contact'
+import Contact from "@/components/main/detail/contact";
+import { Suspense } from "react";
 
 export default function VisiMisiPage() {
   return (
+    <Suspense>
       <Contact />
-    )
+    </Suspense>
+  );
 }

app/layout.tsx

@@ -1,46 +1,78 @@
+// RootLayout.tsx
+"use client";
 import { fontSans } from "@/config/fonts";
 import { siteConfig } from "@/config/site";
 import "@/styles/globals.css";
 import clsx from "clsx";
 import { Metadata } from "next";
 import { Providers } from "./providers";
+import LoadScript from "@/utils/global";
+import { NextIntlClientProvider } from "next-intl";
+import { useEffect, useState, type ReactNode } from "react";
+import storedLanguage from "@/store/language-store";
 
-export const metadata: Metadata = {
+// export const metadata: Metadata = {
-	title: {
+//   title: {
-		default: siteConfig.name,
+//     default: siteConfig.name,
-		template: `%s - ${siteConfig.name}`,
+//     template: `%s - ${siteConfig.name}`,
-	},
+//   },
-	description: siteConfig.description,
+//   description: siteConfig.description,
-	themeColor: [
+//   themeColor: [
-		{ media: "(prefers-color-scheme: light)", color: "white" },
+//     { media: "(prefers-color-scheme: light)", color: "white" },
-		{ media: "(prefers-color-scheme: dark)", color: "black" },
+//     { media: "(prefers-color-scheme: dark)", color: "black" },
-	],
+//   ],
-	icons: {
+//   icons: {
-		icon: "/logohumas.ico",
+//     icon: "/logohumas.ico",
-		shortcut: "/favicon-16x16.png",
+//     shortcut: "/favicon-16x16.png",
-		apple: "/apple-touch-icon.png",
+//     apple: "/apple-touch-icon.png",
-	},
+//   },
-};
+// };
 
-export default function RootLayout({
+export default function RootLayout({ children }: { children: ReactNode }) {
-	children,
+  const [localeNow, setLocaleNow] = useState<string>("id");
-}: {
+
-	children: React.ReactNode;
+  const locale = storedLanguage((state) => state.locale);
-}) {
+
+  useEffect(() => {
+    if (locale) {
+      setLocaleNow(locale);
+    }
+  }, [locale]);
+
+  const [messages, setMessages] = useState<any>(null);
+  useEffect(() => {
+    (async () => {
+      const loadedMessages = (await import(`../messages/${locale}.json`))
+        .default;
+      setMessages(loadedMessages);
+    })();
+  }, [locale]);
   return (
     <html lang="en" suppressHydrationWarning className="scroll-smooth">
-			<head />
+      <head>
+        <meta
+          name="theme-color"
+          content="white"
+          media="(prefers-color-scheme: light)"
+        />
+        <meta
+          name="theme-color"
+          content="black"
+          media="(prefers-color-scheme: dark)"
+        />
+        <LoadScript />
+      </head>
       <body
         className={clsx(
           "bg-background font-sans antialiased",
           fontSans.variable
         )}
       >
+        <NextIntlClientProvider locale={localeNow} messages={messages}>
           <Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
-					<main className="">
+            <main className="">{children}</main>
-						{children}
-					</main>
           </Providers>
+        </NextIntlClientProvider>
       </body>
     </html>
   );

app/news/[polda-name]/layout.tsx

@@ -1,13 +1,9 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function PoldaNewsLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <HumasLayout>{children}</HumasLayout>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/news/[polda-name]/page.tsx

@@ -1,8 +1,6 @@
-import ListNews from '@/components/detail/ListNews'
+import ListNews from "@/components/main/detail/list-news";
-import React from 'react'
+import React from "react";
 
 export default function PoldaNewsPage() {
-    return (
+  return <ListNews />;
-        <ListNews />
-    )
 }

app/news/all/layout.tsx

@@ -1,13 +1,9 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
+"use client";
 
 export default function AllNewsLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <>{children}</>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/news/all/page.tsx

@@ -1,8 +1,20 @@
-import ListNews from '@/components/detail/ListNews'
+"use client";
-import React from 'react'
+import ListNews from "@/components/main/detail/list-news";
+import React, { useEffect, useState } from "react";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function ListNewsPage() {
+  const [hasMounted, setHasMounted] = useState(false);
+
+  useEffect(() => {
+    setHasMounted(true);
+  }, []);
+
+  // Render
+  if (!hasMounted) return null;
   return (
+    <HumasLayout>
       <ListNews />
-    )
+    </HumasLayout>
+  );
 }

app/news/detail/[id]/layout.tsx

@@ -1,13 +1,7 @@
-import { HumasLayout } from "@/components/layout/HumasLayout";
-
 export default function NewsLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <>{children}</>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/news/detail/[id]/page.tsx

@@ -1,8 +1,20 @@
-import DetailPage from '@/components/detail/DetailPage'
+"use client";
-import React from 'react'
+import { HumasLayout } from "@/components/layout/humas-layout";
+import DetailPage from "@/components/main/detail/new-detail";
+import React, { useEffect, useState } from "react";
 
 export default function NewsPage() {
+  const [hasMounted, setHasMounted] = useState(false);
+
+  useEffect(() => {
+    setHasMounted(true);
+  }, []);
+
+  // Render
+  if (!hasMounted) return null;
   return (
+    <HumasLayout>
       <DetailPage />
-    )
+    </HumasLayout>
+  );
 }

app/page.tsx

@@ -1,8 +1,8 @@
-'use client'
+"use client";
-import BannerHumas from "@/components/Landing Page/BannerHumas";
+import BannerHumas from "@/components/landing/BannerHumas";
-import BodyLayout from "@/components/Landing Page/BodyLayout";
+import BodyLayout from "@/components/landing/BodyLayout";
-import HeaderNews from "@/components/Landing Page/HeaderNews";
+import HeaderNews from "@/components/landing/HeaderNews";
-import { HumasLayout } from "@/components/layout/HumasLayout";
+import { HumasLayout } from "@/components/layout/humas-layout";
 import { useEffect, useState } from "react";
 
 export default function Home() {

app/portal-ppid/admin/layout.tsx

@@ -1,13 +1,9 @@
-import { PPIDAdminLayout } from "@/components/layout/PPIDAdminLayout";
+import { PPIDAdminLayout } from "@/components/layout/ppid-admin-layout";
 
 export default function LayoutAdmin({
   children,
 }: {
   children: React.ReactNode;
 }) {
-    return (
+  return <PPIDAdminLayout>{children}</PPIDAdminLayout>;
-        <PPIDAdminLayout >
-            {children}
-        </PPIDAdminLayout>
-    );
 }

app/portal-ppid/e-ppid-polda/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function EPPIDPoldaLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/e-ppid-polda/page.tsx

@@ -1,7 +1,5 @@
-import PPIDPolda from '@/components/Portal PPID/PPIDPolda'
+import PPIDPolda from "@/components/layout/portal-ppid/PPIDPolda";
 
 export default function PPIDSakterPage() {
-    return (
+  return <PPIDPolda />;
-        <PPIDPolda />
-    )
 }

app/portal-ppid/e-ppid-satker/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function EPPIDSatkerLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/e-ppid-satker/page.tsx

@@ -1,7 +1,5 @@
-import PPIDSatker from '@/components/Portal PPID/PPIDSatker'
+import PPIDSatker from "@/components/layout/portal-ppid/PPIDSatker";
 
 export default function PPIDSakterPage() {
-    return (
+  return <PPIDSatker />;
-        <PPIDSatker />
-    )
 }

app/portal-ppid/informasi-publik/informasi-berkala/page.tsx

@@ -1,7 +1,5 @@
-import InformasiBerkala from '@/components/table/informasi-berkala'
+import InformasiBerkala from "@/components/table/informasi-berkala-table";
 
 export default function InformasiSMPage() {
-    return (
+  return <InformasiBerkala />;
-        <InformasiBerkala />
-    )
 }

app/portal-ppid/informasi-publik/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function InfoPublicLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/layanan-informasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function LayananInformasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/layanan-informasi/statistik-rekapitulasi/page.tsx

@@ -1,8 +1,6 @@
-import StatiticAndRecap from '@/components/detail/StatistikRekapitulas'
+import StatiticAndRecap from "@/components/main/detail/statistic-recap";
-import React from 'react'
+import React from "react";
 
 export default function StatisticPage() {
-    return (
+  return <StatiticAndRecap />;
-        <StatiticAndRecap />
-    )
 }

app/portal-ppid/page.tsx

@@ -1,16 +1,15 @@
-'use client'
+"use client";
-import FooterPPID from '@/components/Portal PPID/FooterPPID';
-import PPIDbody from '@/components/Portal PPID/PpidMain';
-import PPIDBanner from '@/components/Portal PPID/ppid-banner';
-import NavbarPPID from '@/components/navbar/NavbarPPID';
-import { usePathname } from 'next/navigation';
-import React from 'react';
-
 
+import NavbarPPID from "@/components/layout/navbar/NavbarPPID";
+import FooterPPID from "@/components/layout/portal-ppid/FooterPPID";
+import PPIDBanner from "@/components/layout/portal-ppid/ppid-banner";
+import PPIDbody from "@/components/layout/portal-ppid/PpidMain";
+import { usePathname } from "next/navigation";
+import React from "react";
 
 export default function PortalPPID(url: any) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
   return (
     <>
@@ -19,5 +18,5 @@ export default function PortalPPID(url: any) {
       <PPIDbody />
       <FooterPPID />
     </>
-    )
+  );
 }

app/portal-ppid/polda/[polda-name]/informasi-publik/informasi-berkala/page.tsx

@@ -1,7 +1,5 @@
-import InformasiBerkala from '@/components/table/informasi-berkala'
+import InformasiBerkala from "@/components/table/informasi-berkala-table";
 
 export default function InformasiSMPage() {
-    return (
+  return <InformasiBerkala />;
-        <InformasiBerkala />
-    )
 }

app/portal-ppid/polda/[polda-name]/informasi-publik/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function DinamicSatkerLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   // const pathname = usePathname();
   // console.log(pathname)
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/polda/[polda-name]/layanan-informasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function LayananInformasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/polda/[polda-name]/layanan-informasi/statistik-rekapitulasi/page.tsx

@@ -1,8 +1,6 @@
-import StatiticAndRecap from '@/components/detail/StatistikRekapitulas'
+import StatiticAndRecap from "@/components/main/detail/statistic-recap";
-import React from 'react'
+import React from "react";
 
 export default function StatisticPage() {
-    return (
+  return <StatiticAndRecap />;
-        <StatiticAndRecap />
-    )
 }

app/portal-ppid/polda/[polda-name]/page.tsx

@@ -1,24 +1,27 @@
-'use client'
+"use client";
-import PPIDSatkerMain from '@/components/Portal PPID/PPIDMainSatker';
+
-import PPIDBanner from '@/components/Portal PPID/ppid-banner';
+import FooterSatker from "@/components/layout/navbar/FooterSatker";
-import FooterSatker from '@/components/navbar/FooterSatker';
+import NavbarSatker from "@/components/layout/navbar/NavbarSatker";
-import NavbarSatker from '@/components/navbar/NavbarSatker';
+import PPIDBanner from "@/components/layout/portal-ppid/ppid-banner";
-import { usePathname } from 'next/navigation';
+import PPIDSatkerMain from "@/components/layout/portal-ppid/PPIDMainSatker";
-import React from 'react'
+import { usePathname } from "next/navigation";
+import React from "react";
 
 export default function PoldaPage() {
   const pathname = usePathname();
-    const url: string = pathname.split('polda/')[1].replace(/-/g, ' ').toUpperCase();
+  const url: string = pathname
-
+    .split("polda/")[1]
+    .replace(/-/g, " ")
+    .toUpperCase();
 
   return (
-        <div className='text-black'>
+    <div className="text-black">
-            <div className='text-black'>
+      <div className="text-black">
         <NavbarSatker />
         <PPIDBanner url={url} />
         <PPIDSatkerMain />
         <FooterSatker />
       </div>
     </div>
-    )
+  );
 }

app/portal-ppid/polda/[polda-name]/profile/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function DinamicSatkerLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   // const pathname = usePathname();
   // console.log(pathname)
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/polda/[polda-name]/profile/profile-singkat-ppid/page.tsx

@@ -1,8 +1,6 @@
-import About from '@/components/detail/About'
+import About from "@/components/main/detail/about";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfile() {
-    return (
+  return <About />;
-        <About />
-    )
 }

app/portal-ppid/polda/[polda-name]/profile/sejarah-ppid-polri/page.tsx

@@ -1,8 +1,6 @@
-import HistoryPPID from '@/components/page/HistoryPPID'
+import HistoryPPID from "@/components/page/history-ppid";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfilePage() {
-    return (
+  return <HistoryPPID />;
-        <HistoryPPID />
-    )
 }

app/portal-ppid/polda/[polda-name]/profile/struktur-ppid/page.tsx

@@ -1,7 +1,5 @@
-import StrukturOrganisasi from "@/components/detail/StrukturOrganisasi";
+import StrukturOrganisasi from "@/components/main/detail/structure";
 
 export default function StructurePPID() {
-    return (
+  return <StrukturOrganisasi />;
-        <StrukturOrganisasi />
-    )
 }

app/portal-ppid/polda/[polda-name]/profile/tugas-dan-fungsi-ppid/page.tsx

@@ -1,9 +1,5 @@
-import Task from "@/components/detail/TaskDetail";
+import Task from "@/components/main/detail/task-detail";
-
-
 
 export default function PPIDTask() {
-    return (
+  return <Task />;
-        <Task />
-    )
 }

app/portal-ppid/polda/[polda-name]/profile/visi-dan-misi-ppid/page.tsx

@@ -1,8 +1,6 @@
-import VisiMisi from '@/components/detail/VisiMisi'
+import VisiMisi from "@/components/main/detail/visi-misi";
-import React from 'react'
+import React from "react";
 
 export default function VMPPID() {
-    return (
+  return <VisiMisi />;
-        <VisiMisi />
-    )
 }

app/portal-ppid/polda/[polda-name]/regulasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function RegulasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/polda/[polda-name]/regulasi/page.tsx

@@ -1,15 +1,15 @@
-import PPIDSidebar from '@/components/Portal PPID/PPIDSidebar'
+import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
-import RegulationTable from '@/components/table/tabel-regulasi'
+import RegulationTable from "@/components/table/tabel-regulasi";
 
 export default function RegulasiPage() {
   return (
-        <div className='md:flex'>
+    <div className="md:flex">
-            <div className='w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5'>
+      <div className="w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5">
         <RegulationTable />
       </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
         <PPIDSidebar />
       </div>
     </div>
-    )
+  );
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/alur-pelayanan-informasi-publik/page.tsx

@@ -1,8 +1,6 @@
-import ServiceFlow from '@/components/detail/ServiceFlow'
+import ServiceFlow from "@/components/main/detail/service-flow";
-import React from 'react'
+import React from "react";
 
 export default function ServiceFlowPage() {
-    return (
+  return <ServiceFlow />;
-        <ServiceFlow />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/layout.tsx

@@ -1,20 +1,16 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function StandarLayananLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/maklumat-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceAnnouncement from '@/components/detail/ServiceAnnouncement'
+import ServiceAnnouncement from "@/components/main/detail/service-announcement";
-import React from 'react'
+import React from "react";
 
 export default function ServiceAnnouncePage() {
-    return (
+  return <ServiceAnnouncement />;
-        <ServiceAnnouncement />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/mekanisme-keberatan/page.tsx

@@ -1,8 +1,6 @@
-import ObjectionMecanism from '@/components/detail/ObjectionMecanism'
+import ObjectionMecanism from "@/components/main/detail/objection-mecanism";
-import React from 'react'
+import React from "react";
 
 export default function ObjectionMecanismPage() {
-    return (
+  return <ObjectionMecanism />;
-        <ObjectionMecanism />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/mekanisme-permohonan-penyelesaian-sengketa/page.tsx

@@ -1,8 +1,6 @@
-import RequestDispute from '@/components/detail/RequestDispute'
+import RequestDispute from "@/components/main/detail/reqeust-dispute";
-import React from 'react'
+import React from "react";
 
 export default function RequestDisputePage() {
-    return (
+  return <RequestDispute />;
-        <RequestDispute />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/standar-biaya-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceFee from '@/components/detail/ServiceFee'
+import ServiceFee from "@/components/main/detail/service-fee";
-import React from 'react'
+import React from "react";
 
 export default function ServiceFeePage() {
-    return (
+  return <ServiceFee />;
-        <ServiceFee />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/tata-cara-permohonan-informasi/page.tsx

@@ -1,8 +1,6 @@
-import RequestInformation from '@/components/detail/RequestInformation'
+import RequestInformation from "@/components/main/detail/request-information";
-import React from 'react'
+import React from "react";
 
 export default function RequestInformationPage() {
-    return (
+  return <RequestInformation />;
-        <RequestInformation />
-    )
 }

app/portal-ppid/polda/[polda-name]/standar-layanan/waktu-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceTime from '@/components/detail/ServiceTime'
+import ServiceTime from "@/components/main/detail/serive-time";
-import React from 'react'
+import React from "react";
 
 export default function ServiceTimePage() {
-    return (
+  return <ServiceTime />;
-        <ServiceTime />
-    )
 }

app/portal-ppid/profile/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function PPIDProfileLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/profile/profile-singkat-ppid/page.tsx

@@ -1,8 +1,6 @@
-import About from '@/components/detail/About'
+import About from "@/components/main/detail/about";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfile() {
-    return (
+  return <About />;
-        <About />
-    )
 }

app/portal-ppid/profile/sejarah-ppid-polri/page.tsx

@@ -1,8 +1,6 @@
-import HistoryPPID from '@/components/page/HistoryPPID'
+import HistoryPPID from "@/components/page/history-ppid";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfilePage() {
-    return (
+  return <HistoryPPID />;
-        <HistoryPPID />
-    )
 }

app/portal-ppid/profile/struktur-ppid/page.tsx

@@ -1,7 +1,5 @@
-import StrukturOrganisasi from "@/components/detail/StrukturOrganisasi";
+import StrukturOrganisasi from "@/components/main/detail/structure";
 
 export default function StructurePPID() {
-    return (
+  return <StrukturOrganisasi />;
-        <StrukturOrganisasi />
-    )
 }

app/portal-ppid/profile/tugas-dan-fungsi-ppid/page.tsx

@@ -1,9 +1,5 @@
-import Task from "@/components/detail/TaskDetail";
+import Task from "@/components/main/detail/task-detail";
-
-
 
 export default function PPIDTask() {
-    return (
+  return <Task />;
-        <Task />
-    )
 }

app/portal-ppid/profile/visi-dan-misi-ppid/page.tsx

@@ -1,8 +1,6 @@
-import VisiMisi from '@/components/detail/VisiMisi'
+import VisiMisi from "@/components/main/detail/visi-misi";
-import React from 'react'
+import React from "react";
 
 export default function VMPPID() {
-    return (
+  return <VisiMisi />;
-        <VisiMisi />
-    )
 }

app/portal-ppid/regulasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function RegulasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/regulasi/page.tsx

@@ -1,15 +1,15 @@
-import PPIDSidebar from '@/components/Portal PPID/PPIDSidebar'
+import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
-import RegulationTable from '@/components/table/tabel-regulasi'
+import RegulationTable from "@/components/table/tabel-regulasi";
 
 export default function RegulasiPage() {
   return (
-        <div className='md:flex'>
+    <div className="md:flex">
-            <div className='w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5'>
+      <div className="w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5">
         <RegulationTable />
       </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
         <PPIDSidebar />
       </div>
     </div>
-    )
+  );
 }

app/portal-ppid/satuan-kerja/[satker-name]/informasi-publik/informasi-berkala/page.tsx

@@ -1,7 +1,5 @@
-import InformasiBerkala from '@/components/table/informasi-berkala'
+import InformasiBerkala from "@/components/table/informasi-berkala-table";
 
 export default function InformasiSMPage() {
-    return (
+  return <InformasiBerkala />;
-        <InformasiBerkala />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/informasi-publik/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function DinamicSatkerLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   // const pathname = usePathname();
   // console.log(pathname)
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/layanan-informasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function LayananInformasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/layanan-informasi/statistik-rekapitulasi/page.tsx

@@ -1,8 +1,6 @@
-import StatiticAndRecap from '@/components/detail/StatistikRekapitulas'
+import StatiticAndRecap from "@/components/main/detail/statistic-recap";
-import React from 'react'
+import React from "react";
 
 export default function StatisticPage() {
-    return (
+  return <StatiticAndRecap />;
-        <StatiticAndRecap />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/page.tsx

@@ -1,20 +1,24 @@
-'use client'
+"use client";
-import PPIDSatkerMain from '@/components/Portal PPID/PPIDMainSatker';
+
-import PPIDBanner from '@/components/Portal PPID/ppid-banner';
+import FooterSatker from "@/components/layout/navbar/FooterSatker";
-import FooterSatker from '@/components/navbar/FooterSatker';
+import NavbarSatker from "@/components/layout/navbar/NavbarSatker";
-import NavbarSatker from '@/components/navbar/NavbarSatker';
+import PPIDBanner from "@/components/layout/portal-ppid/ppid-banner";
-import { usePathname } from 'next/navigation';
+import PPIDSatkerMain from "@/components/layout/portal-ppid/PPIDMainSatker";
+import { usePathname } from "next/navigation";
 
 export default function SatkerPage() {
   const pathname = usePathname();
-    const url: string = pathname.split('satuan-kerja/')[1].replace(/-/g, ' ').toUpperCase();
+  const url: string = pathname
+    .split("satuan-kerja/")[1]
+    .replace(/-/g, " ")
+    .toUpperCase();
 
   return (
-        <div className='text-black'>
+    <div className="text-black">
       <NavbarSatker />
       <PPIDBanner url={url} />
       <PPIDSatkerMain />
       <FooterSatker />
     </div>
-    )
+  );
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function DinamicSatkerLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   // const pathname = usePathname();
   // console.log(pathname)
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/profile-singkat-ppid/page.tsx

@@ -1,8 +1,6 @@
-import About from '@/components/detail/About'
+import About from "@/components/main/detail/about";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfile() {
-    return (
+  return <About />;
-        <About />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/sejarah-ppid-polri/page.tsx

@@ -1,8 +1,6 @@
-import HistoryPPID from '@/components/page/HistoryPPID'
+import HistoryPPID from "@/components/page/history-ppid";
-import React from 'react'
+import React from "react";
 
 export default function PPIDProfilePage() {
-    return (
+  return <HistoryPPID />;
-        <HistoryPPID />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/struktur-ppid/page.tsx

@@ -1,7 +1,5 @@
-import StrukturOrganisasi from "@/components/detail/StrukturOrganisasi";
+import StrukturOrganisasi from "@/components/main/detail/structure";
 
 export default function StructurePPID() {
-    return (
+  return <StrukturOrganisasi />;
-        <StrukturOrganisasi />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/tugas-dan-fungsi-ppid/page.tsx

@@ -1,9 +1,5 @@
-import Task from "@/components/detail/TaskDetail";
+import Task from "@/components/main/detail/task-detail";
-
-
 
 export default function PPIDTask() {
-    return (
+  return <Task />;
-        <Task />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/profile/visi-dan-misi-ppid/page.tsx

@@ -1,8 +1,6 @@
-import VisiMisi from '@/components/detail/VisiMisi'
+import VisiMisi from "@/components/main/detail/visi-misi";
-import React from 'react'
+import React from "react";
 
 export default function VMPPID() {
-    return (
+  return <VisiMisi />;
-        <VisiMisi />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/regulasi/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React from 'react';
+import React from "react";
 
 export default function RegulasiLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/regulasi/page.tsx

@@ -1,15 +1,15 @@
-import PPIDSidebar from '@/components/Portal PPID/PPIDSidebar'
+import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
-import RegulationTable from '@/components/table/tabel-regulasi'
+import RegulationTable from "@/components/table/tabel-regulasi";
 
 export default function RegulasiPage() {
   return (
-        <div className='md:flex'>
+    <div className="md:flex">
-            <div className='w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5'>
+      <div className="w-auto bg-[#E2E2E2] md:w-2/3 lg:w-[75%] px-2 md:px-0 lg:px-5">
         <RegulationTable />
       </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
         <PPIDSidebar />
       </div>
     </div>
-    )
+  );
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/alur-pelayanan-informasi-publik/page.tsx

@@ -1,8 +1,6 @@
-import ServiceFlow from '@/components/detail/ServiceFlow'
+import ServiceFlow from "@/components/main/detail/service-flow";
-import React from 'react'
+import React from "react";
 
 export default function ServiceFlowPage() {
-    return (
+  return <ServiceFlow />;
-        <ServiceFlow />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/layout.tsx

@@ -1,20 +1,16 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { SatkerLayout } from '@/components/layout/SatKerLayout';
+import { SatkerLayout } from "@/components/layout/satker-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function StandarLayananLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <SatkerLayout>{children}</SatkerLayout>;
-        <SatkerLayout>
-            {children}
-        </SatkerLayout>
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/maklumat-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceAnnouncement from '@/components/detail/ServiceAnnouncement'
+import ServiceAnnouncement from "@/components/main/detail/service-announcement";
-import React from 'react'
+import React from "react";
 
 export default function ServiceAnnouncePage() {
-    return (
+  return <ServiceAnnouncement />;
-        <ServiceAnnouncement />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/mekanisme-keberatan/page.tsx

@@ -1,8 +1,6 @@
-import ObjectionMecanism from '@/components/detail/ObjectionMecanism'
+import ObjectionMecanism from "@/components/main/detail/objection-mecanism";
-import React from 'react'
+import React from "react";
 
 export default function ObjectionMecanismPage() {
-    return (
+  return <ObjectionMecanism />;
-        <ObjectionMecanism />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/mekanisme-permohonan-penyelesaian-sengketa/page.tsx

@@ -1,8 +1,6 @@
-import RequestDispute from '@/components/detail/RequestDispute'
+import RequestDispute from "@/components/main/detail/reqeust-dispute";
-import React from 'react'
+import React from "react";
 
 export default function RequestDisputePage() {
-    return (
+  return <RequestDispute />;
-        <RequestDispute />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/standar-biaya-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceFee from '@/components/detail/ServiceFee'
+import ServiceFee from "@/components/main/detail/service-fee";
-import React from 'react'
+import React from "react";
 
 export default function ServiceFeePage() {
-    return (
+  return <ServiceFee />;
-        <ServiceFee />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/tata-cara-permohonan-informasi/page.tsx

@@ -1,8 +1,6 @@
-import RequestInformation from '@/components/detail/RequestInformation'
+import RequestInformation from "@/components/main/detail/request-information";
-import React from 'react'
+import React from "react";
 
 export default function RequestInformationPage() {
-    return (
+  return <RequestInformation />;
-        <RequestInformation />
-    )
 }

app/portal-ppid/satuan-kerja/[satker-name]/standar-layanan/waktu-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceTime from '@/components/detail/ServiceTime'
+import ServiceTime from "@/components/main/detail/serive-time";
-import React from 'react'
+import React from "react";
 
 export default function ServiceTimePage() {
-    return (
+  return <ServiceTime />;
-        <ServiceTime />
-    )
 }

app/portal-ppid/standar-layanan/alur-pelayanan-informasi-publik/page.tsx

@@ -1,8 +1,6 @@
-import ServiceFlow from '@/components/detail/ServiceFlow'
+import ServiceFlow from "@/components/main/detail/service-flow";
-import React from 'react'
+import React from "react";
 
 export default function ServiceFlowPage() {
-    return (
+  return <ServiceFlow />;
-        <ServiceFlow />
-    )
 }

app/portal-ppid/standar-layanan/layout.tsx

@@ -1,19 +1,15 @@
-'use client'
+"use client";
-import { PPIDLayout } from '@/components/layout/PPIDLayout';
+import { PPIDLayout } from "@/components/layout/ppid-layout";
-import { usePathname } from 'next/navigation';
+import { usePathname } from "next/navigation";
-import React, { Children } from 'react'
+import React, { Children } from "react";
 
 export default function StandarLayananLayout({
   children,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
   const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return <PPIDLayout>{children}</PPIDLayout>;
-        <PPIDLayout>
-            {children}
-        </PPIDLayout>
-    )
 }

app/portal-ppid/standar-layanan/maklumat-pelayanan/page.tsx

@@ -1,8 +1,6 @@
-import ServiceAnnouncement from '@/components/detail/ServiceAnnouncement'
+import ServiceAnnouncement from "@/components/main/detail/service-announcement";
-import React from 'react'
+import React from "react";
 
 export default function ServiceAnnouncePage() {
-    return (
+  return <ServiceAnnouncement />;
-        <ServiceAnnouncement />
-    )
 }

app/portal-ppid/standar-layanan/mekanisme-keberatan/page.tsx

@@ -1,8 +1,6 @@
-import ObjectionMecanism from '@/components/detail/ObjectionMecanism'
+import ObjectionMecanism from "@/components/main/detail/objection-mecanism";
-import React from 'react'
+import React from "react";
 
 export default function ObjectionMecanismPage() {
-    return (
+  return <ObjectionMecanism />;
-        <ObjectionMecanism />
-    )
 }