feat:drone

.drone.yml

@@ -0,0 +1,34 @@
+kind: pipeline
+type: ssh
+name: humas-fe-build
+
+server:
+  host:
+    from_secret: ssh_host
+  user:
+    from_secret: ssh_user
+  ssh_key:
+    from_secret: ssh_key
+
+steps:
+  - name: prepare repo
+    when:
+      branch:
+        - prod
+    commands:
+      - rm -rf /opt/build/web-humas-fe
+      - mkdir -p /opt/build/web-humas-fe
+      - cd /opt/build
+      - git clone http://38.47.180.165:3000/humas/web-humas-fe.git
+      - cd /opt/build/web-humas-fe
+      - git checkout $DRONE_BRANCH
+
+  - name: build image
+    when:
+      branch:
+        - prod
+    commands:
+      - docker login 38.47.180.165:3000 -u administrator -p HarborDockerImageRep0
+      - cd /opt/build/web-humas-fe
+      - docker build -t 38.47.180.165:3000/humas/web-humas-fe:$DRONE_BRANCH .
+      - docker push 38.47.180.165:3000/humas/web-humas-fe:$DRONE_BRANCH

.env

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

.gitlab-ci.yml

@@ -7,11 +7,10 @@ build-dev:
   when: on_success
   only:
     - main
-    - dev-restructure
   image: docker:stable
   services:
-    - name: docker:dind
+  - name: docker:dind
-      command: ["--insecure-registry=103.82.242.92:8900"]
+    command: ["--insecure-registry=103.82.242.92:8900"]
   script:
     - docker logout
     - docker login -u $DEPLOY_USERNAME -p $DEPLOY_TOKEN 103.82.242.92:8900
@@ -23,9 +22,8 @@ auto-deploy:
   when: on_success
   only:
     - main
-    - dev-restructure
   image: curlimages/curl:latest
   services:
     - docker:dind
   script:
-    - curl --user admin:$JENKINS_PWD http://38.47.180.165:8080/job/autodeploy-humas/build?token=autodeployhumas
+    - curl --user cekmedsos:$JENKINS_PWD http://103.82.242.92: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,12 +1,10 @@
-import CreateArticleForm from "@/components/form/article/create-article-form";
+import FormArticle from '@/components/form/form-article'
-import FormArticle from "@/components/form/form-article";
+import { Card } from '@nextui-org/react'
-import { Card } from "@nextui-org/react";
 
 export default function CreateArticle() {
-  return (
+    return (
-    <div className="h-[96vh] bg-transparent p-8 !bg-slate-100 dark:!bg-black overflow-y-auto">
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
-      {/* <FormArticle /> */}
+            <FormArticle />
-      <CreateArticleForm />
+        </Card>
-    </div>
+    )
-  );
 }

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

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

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

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

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

@@ -1,27 +0,0 @@
-"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

@@ -1,10 +0,0 @@
-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,49 +1,24 @@
-"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();
+    return (
-  const setGeneratedArticleIdStore = generatedArticleIds(
+        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
-    (state) => state.setArticleIds
+            <div className="px-4">
-  );
+                <Card className="rounded-md my-5 pl-5 py-2">
-  const goGenerate = () => {
+                    <Link href="/admin/article/create">
-    setGeneratedArticleIdStore({
+                        <Button size="md" color="primary" className="w-min">
-      singleArticle: [],
+                            <AddIcon />New Article
-      bulkArticle: [],
+                        </Button>
-      rewriteArticle: [],
+                    </Link>
-    });
+                </Card>
-    router.push("/admin/article/generate");
+                <Card className="rounded-md my-5">
-  };
+                    <ArticleTable />
-
+                </Card>
-  return (
+            </div>
-    <div className="overflow-x-hidden overflow-y-scroll">
-      <div className="px-2 md:px-4 w-full">
-        <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" className="bg-[#F07C00] text-white">
-              New Article
-              <AddIcon />
-            </Button>
-          </Link>
-          {/* <Button
-            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 />
-        </div>
-      </div>
-    </div>
-  );
 }

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

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

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

@@ -1,4 +0,0 @@
-"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 (
+    return (
-    <Card className="h-[96vh] rounded-md border bg-transparent">
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
-      <FormMasterUserRole />
+            <FormMasterUserRole />
-    </Card>
+        </Card>
-  );
+    )
 }

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

@@ -1,29 +1,24 @@
-"use client";
+"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 (
+    return (
-    <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2">
+        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
-      <div className="px-4">
+            <div className="px-4">
-        <Card className="rounded-md my-5 pl-5 py-2">
+                <Card className="rounded-md my-5 pl-5 py-2">
-          <Link href="/admin/master-role/create">
+                    <Link href="/admin/master-role/create">
-            <Button
+                        <Button size="md" color="primary" className="w-min">
-              size="md"
+                            <AddIcon />New Role
-              color="primary"
+                        </Button>
-              className="bg-[#F07C00] text-white"
+                    </Link>
-            >
+                </Card>
-              <AddIcon />
+                <Card className="rounded-md my-5">
-              New Role
+                    <MasterRoleTable />
-            </Button>
+                </Card>
-          </Link>
+            </div>
-        </Card>
+        </div>
-        <Card className="rounded-md my-5">
+    );
-          <MasterRoleTable />
-        </Card>
-      </div>
-    </div>
-  );
 }

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 (
+    return (
-    <Card className="h-[96vh] rounded-md border bg-transparent">
+        <Card className="h-[96vh] rounded-md my- ml-3 border bg-transparent">
-      <FormMasterUser />
+            <FormMasterUser />
-    </Card>
+        </Card>
-  );
+    )
 }

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

@@ -1,29 +1,24 @@
-"use client";
+"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 (
+    return (
-    <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2">
+        <div className="h-[96vh] overflow-x-hidden overflow-y-scroll gap-0 grid rounded-lg border-2 ml-4">
-      <div className="px-4">
+            <div className="px-4">
-        <Card className="rounded-md my-5 pl-5 py-2">
+                <Card className="rounded-md my-5 pl-5 py-2">
-          <Link href="/admin/master-user/create">
+                    <Link href="/admin/master-user/create">
-            <Button
+                        <Button size="md" color="primary" className="w-min">
-              size="md"
+                            <AddIcon />New User
-              color="primary"
+                        </Button>
-              className="bg-[#F07C00] text-white"
+                    </Link>
-            >
+                </Card>
-              <AddIcon />
+                <Card className="rounded-md my-5">
-              New User
+                    <MasterUserTable />
-            </Button>
+                </Card>
-          </Link>
+            </div>
-        </Card>
+        </div>
-        <Card className="rounded-md my-5">
+    );
-          <MasterUserTable />
-        </Card>
-      </div>
-    </div>
-  );
 }

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

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

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

app/auth/page.tsx

@@ -1,28 +1,8 @@
-"use client"
+import Login from '@/components/form/login'
-
+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() {
-
+    return (
-  const isAuthenticated = Cookies.get("is_authenticated") || "false";
+        <Login />
-
+    )
-  console.log("isAuthenticated : ", isAuthenticated);
-  
-  const [hasMounted, setHasMounted] = useState(false);
-
-  useEffect(() => {
-    setHasMounted(true);
-  }, []);
-
-  // Render
-  if (!hasMounted) return null;
-
-  return (
-    isAuthenticated == "true" ?
-    <Login /> : 
-    <QudoLogin />
-  );
 }

app/docs/layout.tsx

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

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

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

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

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

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

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

app/form-permohonan-informasi/layout.tsx

@@ -1,10 +1,13 @@
-"use client";
+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 <HumasLayout>{children}</HumasLayout>;
+    return (
+        <HumasLayout>
+            {children}
+        </HumasLayout>
+    );
 }

app/kontak-kami/layout.tsx

@@ -1,10 +1,13 @@
-"use client";
+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 <HumasLayout>{children}</HumasLayout>;
+    return (
+        <HumasLayout>
+            {children}
+        </HumasLayout>
+    );
 }

app/kontak-kami/page.tsx

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

app/layout.tsx

@@ -1,79 +1,47 @@
-// 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({ children }: { children: ReactNode }) {
+export default function RootLayout({
-  const [localeNow, setLocaleNow] = useState<string>("id");
+	children,
-
+}: {
-  const locale = storedLanguage((state) => state.locale);
+	children: React.ReactNode;
-
+}) {
-  useEffect(() => {
+	return (
-    if (locale) {
+		<html lang="en" suppressHydrationWarning className="scroll-smooth">
-      setLocaleNow(locale);
+			<head />
-    }
+			<body
-  }, [locale]);
+				className={clsx(
-
+					"bg-background font-sans antialiased",
-  const [messages, setMessages] = useState<any>(null);
+					fontSans.variable
-  useEffect(() => {
+				)}
-    (async () => {
+			>
-      const loadedMessages = (await import(`../messages/${locale}.json`))
+				<Providers themeProps={{ attribute: "class", defaultTheme: "dark" }}>
-        .default;
+					<main className="">
-      setMessages(loadedMessages);
+						{children}
-    })();
+					</main>
-  }, [locale]);
+				</Providers>
-  return (
+			</body>
-    <html lang="en" suppressHydrationWarning className="scroll-smooth">
+		</html>
-      <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="">{children}</main>
-          </Providers>
-        </NextIntlClientProvider>
-      </body>
-    </html>
-  );
 }

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

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

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

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

app/news/all/layout.tsx

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

app/news/all/page.tsx

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

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

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

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

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

app/page.tsx

@@ -1,27 +1,27 @@
-"use client";
+'use client'
-import BannerHumas from "@/components/landing/BannerHumas";
+import BannerHumas from "@/components/Landing Page/BannerHumas";
-import BodyLayout from "@/components/landing/BodyLayout";
+import BodyLayout from "@/components/Landing Page/BodyLayout";
-import HeaderNews from "@/components/landing/HeaderNews";
+import HeaderNews from "@/components/Landing Page/HeaderNews";
-import { HumasLayout } from "@/components/layout/humas-layout";
+import { HumasLayout } from "@/components/layout/HumasLayout";
 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,9 +1,13 @@
-import { PPIDAdminLayout } from "@/components/layout/ppid-admin-layout";
+import { PPIDAdminLayout } from "@/components/layout/PPIDAdminLayout";
 
 export default function LayoutAdmin({
-  children,
+    children,
 }: {
-  children: React.ReactNode;
+    children: React.ReactNode;
 }) {
-  return <PPIDAdminLayout>{children}</PPIDAdminLayout>;
+    return (
+        <PPIDAdminLayout >
+            {children}
+        </PPIDAdminLayout>
+    );
 }

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

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

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

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

app/portal-ppid/page.tsx

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

@@ -1,15 +1,15 @@
-import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
+import PPIDSidebar from '@/components/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,6 +1,8 @@
-import ServiceFlow from "@/components/main/detail/service-flow";
+import ServiceFlow from '@/components/detail/ServiceFlow'
-import React from "react";
+import React from 'react'
 
 export default function ServiceFlowPage() {
-  return <ServiceFlow />;
+    return (
+        <ServiceFlow />
+    )
 }

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

@@ -1,16 +1,20 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

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

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

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

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

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

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

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

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

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

app/portal-ppid/profile/layout.tsx

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

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

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

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

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

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

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

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

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

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

app/portal-ppid/regulasi/layout.tsx

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

app/portal-ppid/regulasi/page.tsx

@@ -1,15 +1,15 @@
-import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
+import PPIDSidebar from '@/components/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,5 +1,7 @@
-import InformasiBerkala from "@/components/table/informasi-berkala-table";
+import InformasiBerkala from '@/components/table/informasi-berkala'
 
 export default function InformasiSMPage() {
-  return <InformasiBerkala />;
+    return (
+        <InformasiBerkala />
+    )
 }

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

@@ -1,24 +1,20 @@
-"use client";
+'use client'
-
+import PPIDSatkerMain from '@/components/Portal PPID/PPIDMainSatker';
-import FooterSatker from "@/components/layout/navbar/FooterSatker";
+import PPIDBanner from '@/components/Portal PPID/ppid-banner';
-import NavbarSatker from "@/components/layout/navbar/NavbarSatker";
+import FooterSatker from '@/components/navbar/FooterSatker';
-import PPIDBanner from "@/components/layout/portal-ppid/ppid-banner";
+import NavbarSatker from '@/components/navbar/NavbarSatker';
-import PPIDSatkerMain from "@/components/layout/portal-ppid/PPIDMainSatker";
+import { usePathname } from 'next/navigation';
-import { usePathname } from "next/navigation";
 
 export default function SatkerPage() {
-  const pathname = usePathname();
+    const pathname = usePathname();
-  const url: string = pathname
+    const url: string = pathname.split('satuan-kerja/')[1].replace(/-/g, ' ').toUpperCase();
-    .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,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

@@ -1,15 +1,15 @@
-import PPIDSidebar from "@/components/layout/portal-ppid/PPIDSidebar";
+import PPIDSidebar from '@/components/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,6 +1,8 @@
-import ServiceFlow from "@/components/main/detail/service-flow";
+import ServiceFlow from '@/components/detail/ServiceFlow'
-import React from "react";
+import React from 'react'
 
 export default function ServiceFlowPage() {
-  return <ServiceFlow />;
+    return (
+        <ServiceFlow />
+    )
 }

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

@@ -1,16 +1,20 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-import { SatkerLayout } from "@/components/layout/satker-layout";
+import { SatkerLayout } from '@/components/layout/SatKerLayout';
-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 <SatkerLayout>{children}</SatkerLayout>;
+    return (
+        <SatkerLayout>
+            {children}
+        </SatkerLayout>
+    )
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,15 +1,19 @@
-"use client";
+'use client'
-import { PPIDLayout } from "@/components/layout/ppid-layout";
+import { PPIDLayout } from '@/components/layout/PPIDLayout';
-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 <PPIDLayout>{children}</PPIDLayout>;
+    return (
+        <PPIDLayout>
+            {children}
+        </PPIDLayout>
+    )
 }

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

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