push dev-anang

.gitlab-ci.yml

@@ -7,20 +7,23 @@ build-dev:
   when: on_success
   only:
     - main
+    - dev-restructure
   image: docker:stable
   services:
-    - docker:dind
+  - name: docker:dind
+    command: ["--insecure-registry=103.82.242.92:8900"]
   script:
     - docker logout
-    - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN registry.gitlab.com
+    - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 103.82.242.92:8900
-    - docker build -t registry.gitlab.com/hanifsalafi/web-humas-polri:dev .
+    - docker build -t 103.82.242.92:8900/humas/web-humas-fe:dev .
-    - docker push registry.gitlab.com/hanifsalafi/web-humas-polri:dev
+    - docker push 103.82.242.92:8900/humas/web-humas-fe:dev
 
 auto-deploy:
   stage: deploy
   when: on_success
   only:
     - main
+    - dev-restructure
   image: curlimages/curl:latest
   services:
     - docker:dind

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

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

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

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

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

@@ -0,0 +1,14 @@
+"use client";
+import EditGeneratedArticle from "@/components/form/article/edit-generated-article";
+import { Card } 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">
+      <EditGeneratedArticle id={id} />
+    </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,24 +1,31 @@
-"use client"
+"use client";
 import { AddIcon } from "@/components/icons";
 import ArticleTable from "@/components/table/article-table";
 import { Button, Card } from "@nextui-org/react";
 import Link from "next/link";
 
 export default function BasicPage() {
-    return (
+  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 rounded-lg border-2">
-            <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">
+          <Link href="/admin/article/create">
-                        <Button size="md" color="primary" className="w-min">
+            <Button size="md" color="primary" className="w-min">
-                            <AddIcon />New Article
+              <AddIcon />
-                        </Button>
+              New Article
-                    </Link>
+            </Button>
-                </Card>
+          </Link>
-                <Card className="rounded-md my-5">
+          <Link href="/admin/article/generate">
-                    <ArticleTable />
+            <Button size="md" color="primary" className="w-min">
-                </Card>
+              <AddIcon />
-            </div>
+              Generate Article
+            </Button>
+          </Link>
         </div>
-    );
+        <div className="bg-white dark:bg-[#18181b] rounded-xl my-5 p-2">
+          <ArticleTable />
+        </div>
+      </div>
+    </div>
+  );
 }

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

@@ -1,39 +0,0 @@
-"use client"
-import { Card, Divider, Image } from "@nextui-org/react";
-
-export default function BasicPage() {
-	return (
-		<div className=" h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
-			<div className="px-4">
-				<div className="bg-blue-900 w-full h-[120px] my-5 rounded-md">
-					<div>
-						<div className="flex flex-row justify-between items-center">
-							<div>
-								<p className="text-2xl font-semibold ml-5 ">Basic Table</p>
-								<p className="text-gray-500 ml-5">Home<span className="text-black">{"  >  "}</span> <span className=" text-white">Basic Table</span></p>
-							</div>
-							<div className="pr-5">
-								<Image
-									width={110}
-									alt="NextUI hero Image"
-									src="https://modernize-nextjs-dark.vercel.app/_next/image?url=%2F_next%2Fstatic%2Fmedia%2FChatBc.3d875e2e.png&w=256&q=75"
-								/>
-							</div>
-						</div>
-					</div>
-				</div>
-				<Card className="rounded-md my-5">
-					<p className="ml-5 mt-5 text-lg">Basic Table</p>
-					<Divider className="w-full my-3" />
-					<div>
-						{/* <UsersTable />
-						<UserTable />
-						<CustomerTable />
-						<InvoiceTable />
-						<AuthtorsTable /> */}
-					</div>
-				</Card>
-			</div>
-		</div>
-	);
-}

app/(admin)/admin/e-magazine/create/page.tsx

@@ -0,0 +1,16 @@
+import CreateMagazineForm from '@/components/form/magazine/magazine-form'
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import { Card } from '@nextui-org/react'
+import React from 'react'
+
+const AdminMagazineCreate = () => {
+    return (
+        <div className=" h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
+            <div className="px-3">
+                <CreateMagazineForm />
+            </div>
+        </div>
+    )
+}
+
+export default AdminMagazineCreate

app/(admin)/admin/e-magazine/detail/page.tsx

@@ -0,0 +1,11 @@
+import CreateMagazineForm from '@/components/form/magazine/magazine-form'
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import React from 'react'
+
+const AdminMagazineDetail = () => {
+    return (
+        <div><CreateMagazineForm /></div>
+    )
+}
+
+export default AdminMagazineDetail

app/(admin)/admin/e-magazine/page.tsx

@@ -0,0 +1,10 @@
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import React from 'react'
+
+const AdminMagazine = () => {
+    return (
+        <div><MagazineTable /></div>
+    )
+}
+
+export default AdminMagazine

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

@@ -0,0 +1,15 @@
+import CreateMagazineForm from '@/components/form/magazine/magazine-form'
+import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/menu-data-form'
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import { Card } from '@nextui-org/react'
+import React from 'react'
+
+const AdminMenuDataCreate = () => {
+    return (
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+            <CreateMenuDataForm />
+        </Card>
+    )
+}
+
+export default AdminMenuDataCreate

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

@@ -0,0 +1,17 @@
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table'
+import { Image } from '@nextui-org/react'
+import React from 'react'
+
+const AdminMenuData = () => {
+    return (
+        <div className=" h-[96vh]  overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
+            <div className="px-3">
+                <MenuDataTable />
+            </div>
+        </div>
+
+    )
+}
+
+export default AdminMenuData

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

@@ -0,0 +1,16 @@
+import CreateMagazineForm from '@/components/form/magazine/magazine-form'
+import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/menu-data-form'
+import CreateMasterModuleForm from '@/components/form/master/master-module/master-module-form'
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import { Card } from '@nextui-org/react'
+import React from 'react'
+
+const AdminMasterModuleCreate = () => {
+    return (
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+            <CreateMasterModuleForm />
+        </Card>
+    )
+}
+
+export default AdminMasterModuleCreate

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

@@ -0,0 +1,16 @@
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table'
+import MasterModuleTable from '@/components/table/master/master-module/master-module-table'
+import React from 'react'
+
+const AdminMasterModule = () => {
+    return (
+        <div className=" h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
+            <div className="px-3">
+                <MasterModuleTable />
+            </div>
+        </div>
+    )
+}
+
+export default AdminMasterModule

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

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

app/(admin)/admin/master-role/detail/[id]/page.tsx

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

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

@@ -0,0 +1,24 @@
+"use client"
+import { AddIcon } from "@/components/icons";
+import MasterRoleTable from "@/components/table/master-role-table";
+import { Button, Card } from "@nextui-org/react";
+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="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">
+                            <AddIcon />New Role
+                        </Button>
+                    </Link>
+                </Card>
+                <Card className="rounded-md my-5">
+                    <MasterRoleTable />
+                </Card>
+            </div>
+        </div>
+    );
+}

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

@@ -0,0 +1,17 @@
+import CreateMagazineForm from '@/components/form/magazine/magazine-form'
+import CreateMenuDataForm from '@/components/form/master/master-menu/menu-data/menu-data-form'
+import CreateMasterModuleForm from '@/components/form/master/master-module/master-module-form'
+import CreateMasterUserLevelForm from '@/components/form/master/master-user-level/master-user-level-form'
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import { Card } from '@nextui-org/react'
+import React from 'react'
+
+const AdminMasterUserLevelCreate = () => {
+    return (
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
+            <CreateMasterUserLevelForm />
+        </Card>
+    )
+}
+
+export default AdminMasterUserLevelCreate

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

@@ -0,0 +1,17 @@
+import MagazineTable from '@/components/table/magazine/magazine-table'
+import MenuDataTable from '@/components/table/master/master-menu/menu-data/menu-data-table'
+import MasterModuleTable from '@/components/table/master/master-module/master-module-table'
+import MasterUserLevelTable from '@/components/table/master/master-user-level/master-user-level-table'
+import React from 'react'
+
+const AdminMasterUserLevel = () => {
+    return (
+        <div className=" h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-small ml-4">
+            <div className="px-3">
+                <MasterUserLevelTable />
+            </div>
+        </div>
+    )
+}
+
+export default AdminMasterUserLevel

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

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

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

@@ -0,0 +1,24 @@
+"use client"
+import { AddIcon } from "@/components/icons";
+import MasterUserTable from "@/components/table/master-user-table";
+import { Button, Card } from "@nextui-org/react";
+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="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">
+                            <AddIcon />New User
+                        </Button>
+                    </Link>
+                </Card>
+                <Card className="rounded-md my-5">
+                    <MasterUserTable />
+                </Card>
+            </div>
+        </div>
+    );
+}

app/(admin)/admin/menu1/submenu1/page.tsx

@@ -1,8 +0,0 @@
-import { ThemeSwitch } from "@/components/theme-switch";
-
-export default function Submenu1Page() {
-    return (
-        <div className="flex mt-10 mx-4 md:m-0">Submenu1
-        </div>
-    )
-}

app/(admin)/admin/menu1/submenu2/page.tsx

@@ -1,8 +0,0 @@
-import { ThemeSwitch } from "@/components/theme-switch";
-
-export default function Submenu2Page() {
-    return (
-        <div className="flex mt-10 mx-4 md:m-0">Submenu2
-        </div>
-    )
-}

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">
+      <StaticPageBuilder />
+    </Card>
+  );
+}

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

@@ -0,0 +1,26 @@
+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 (
+    <Card className="rounded-md border bg-transparent p-4">
+      <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="w-min">
+                <AddIcon />
+                Create Page
+              </Button>
+            </Link>
+          </div>
+          <div className="bg-white dark:bg-[#18181b] rounded-xl p-2">
+            <StaticPageTable />
+          </div>
+        </div>
+      </div>
+    </Card>
+  );
+}

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

@@ -1,9 +0,0 @@
-import React from 'react'
-
-const AdminDasboard = () => {
-    return (
-        <div>AdminDasboard</div>
-    )
-}
-
-export default AdminDasboard

app/admin/page.tsx

@@ -1,10 +0,0 @@
-import React from 'react'
-
-export default function AdminHumasPage() {
-    return (
-        <div className=''>
-            <div>1</div>
-            <div>1</div>
-        </div>
-    )
-}

app/auth/layout.tsx

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

app/auth/page.tsx

@@ -0,0 +1,8 @@
+import Login from '@/components/form/login'
+import React from 'react'
+
+export default function AuthPage() {
+    return (
+        <Login />
+    )
+}

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,
 }: {
-	children: React.ReactNode;
+  children: React.ReactNode;
 }) {
-	return (
+  return <HumasLayout>{children}</HumasLayout>;
-		<HumasLayout>
-			{children}
-		</HumasLayout>
-	);
 }

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

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

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

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

app/form-permohonan-informasi/layout.tsx

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

app/kontak-kami/layout.tsx

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

app/kontak-kami/page.tsx

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

app/layout.tsx

@@ -4,44 +4,55 @@ import "@/styles/globals.css";
 import clsx from "clsx";
 import { Metadata } from "next";
 import { Providers } from "./providers";
+import LoadScript from "@/utils/global";
 
 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({
-	children,
+  children,
 }: {
-	children: React.ReactNode;
+  children: React.ReactNode;
 }) {
-	return (
+  return (
-		<html lang="en" suppressHydrationWarning className="scroll-smooth">
+    <html lang="en" suppressHydrationWarning className="scroll-smooth">
-			<head />
+      <head>
-			<body
+        <meta
-				className={clsx(
+          name="theme-color"
-					"bg-background font-sans antialiased",
+          content="white"
-					fontSans.variable
+          media="(prefers-color-scheme: light)"
-				)}
+        />
-			>
+        <meta
-				<Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
+          name="theme-color"
-					<main className="">
+          content="black"
-						{children}
+          media="(prefers-color-scheme: dark)"
-					</main>
+        />
-				</Providers>
+        <LoadScript />
-			</body>
+      </head>
-		</html>
+      <body
-	);
+        className={clsx(
+          "bg-background font-sans antialiased",
+          fontSans.variable
+        )}
+      >
+        <Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
+          <main className="">{children}</main>
+        </Providers>
+      </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,
 }: {
-    children: React.ReactNode;
+  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";
+import { HumasLayout } from "@/components/layout/humas-layout";
 
 export default function AllNewsLayout({
-    children,
+  children,
 }: {
-    children: React.ReactNode;
+  children: React.ReactNode;
 }) {
-    return (
+  return <HumasLayout>{children}</HumasLayout>;
-        <HumasLayout>
-            {children}
-        </HumasLayout>
-    );
 }

app/news/all/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 ListNewsPage() {
-    return (
+  return <ListNews />;
-        <ListNews />
-    )
 }

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

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

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

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

app/page.tsx

@@ -1,27 +1,27 @@
-'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() {
-	const [hasMounted, setHasMounted] = useState(false);
+  const [hasMounted, setHasMounted] = useState(false);
 
-	useEffect(() => {
+  useEffect(() => {
-		setHasMounted(true);
+    setHasMounted(true);
-	}, []);
+  }, []);
 
-	// Render
+  // Render
-	if (!hasMounted) return null;
+  if (!hasMounted) return null;
 
-	return (
+  return (
-		<>
+    <>
-			<HumasLayout>
+      <HumasLayout>
-				<BannerHumas />
+        <BannerHumas />
-				<HeaderNews />
+        <HeaderNews />
-				<BodyLayout />
+        <BodyLayout />
-			</HumasLayout>
+      </HumasLayout>
-		</>
+    </>
-	);
+  );
 }

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,
 }: {
-    children: React.ReactNode;
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,23 +1,22 @@
-'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();
+  const pathname = usePathname();
-    console.log(pathname)
+  console.log(pathname);
 
-    return (
+  return (
-        <>
+    <>
-            <NavbarPPID />
+      <NavbarPPID />
-            <PPIDBanner url={url} />
+      <PPIDBanner url={url} />
-            <PPIDbody />
+      <PPIDbody />
-            <FooterPPID />
+      <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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    // const pathname = usePathname();
+  // 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/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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 pathname = usePathname();
-    const url: string = pathname.split('polda/')[1].replace(/-/g, ' ').toUpperCase();
+  const url: string = pathname
+    .split("polda/")[1]
+    .replace(/-/g, " ")
+    .toUpperCase();
 
-
+  return (
-    return (
+    <div className="text-black">
-        <div className='text-black'>
+      <div className="text-black">
-            <div className='text-black'>
+        <NavbarSatker />
-                <NavbarSatker />
+        <PPIDBanner url={url} />
-                <PPIDBanner url={url} />
+        <PPIDSatkerMain />
-                <PPIDSatkerMain />
+        <FooterSatker />
-                <FooterSatker />
+      </div>
-            </div>
+    </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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    // const pathname = usePathname();
+  // const pathname = usePathname();
-    // console.log(pathname)
+  // 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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 (
+  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 />
+        <RegulationTable />
-            </div>
+      </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
-                <PPIDSidebar />
+        <PPIDSidebar />
-            </div>
+      </div>
-        </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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 (
+  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 />
+        <RegulationTable />
-            </div>
+      </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
-                <PPIDSidebar />
+        <PPIDSidebar />
-            </div>
+      </div>
-        </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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    // const pathname = usePathname();
+  // 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/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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 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 (
+  return (
-        <div className='text-black'>
+    <div className="text-black">
-            <NavbarSatker />
+      <NavbarSatker />
-            <PPIDBanner url={url} />
+      <PPIDBanner url={url} />
-            <PPIDSatkerMain />
+      <PPIDSatkerMain />
-            <FooterSatker />
+      <FooterSatker />
-        </div>
+    </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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    // const pathname = usePathname();
+  // const pathname = usePathname();
-    // console.log(pathname)
+  // 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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 (
+  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 />
+        <RegulationTable />
-            </div>
+      </div>
-            <div className='w-auto md:w-1/3 lg:w-[25%]'>
+      <div className="w-auto md:w-1/3 lg:w-[25%]">
-                <PPIDSidebar />
+        <PPIDSidebar />
-            </div>
+      </div>
-        </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,
 }: {
-    children: React.ReactNode
+  children: React.ReactNode;
 }) {
-    const pathname = usePathname();
+  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 />
-    )
 }