diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index bffb357a..00000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "next/core-web-vitals"
-}
diff --git a/app/[locale]/(protected)/supervisor/knowledge-base/page.tsx b/app/[locale]/(protected)/supervisor/knowledge-base/page.tsx
index fca7d79a..0e49ad74 100644
--- a/app/[locale]/(protected)/supervisor/knowledge-base/page.tsx
+++ b/app/[locale]/(protected)/supervisor/knowledge-base/page.tsx
@@ -50,24 +50,22 @@ const KnowledgeBase = () => {
                 <TabsList className="md:flex-col gap-2 flex-wrap md:items-start justify-start">
                   <CreateCategory onSuccess={fetchCategoryList} />
                   {categories?.map((category: any, index: number) => (
-                      <div>
-                        <TabsTrigger
-                          key={index}
-                          value={`category-${index}`}
-                          onClick={() => {
-                            fetchQuestions(category?.id);
-                          }}
-                          className="data-[state=active]:bg-secondary  data-[state=active]:text-default rounded-md px-6 py-3 w-full justify-start"
+                      <TabsTrigger
+                        key={index}
+                        value={`category-${index}`}
+                        onClick={() => {
+                          fetchQuestions(category?.id);
+                        }}
+                        className="data-[state=active]:bg-secondary  data-[state=active]:text-default rounded-md px-6 py-3 w-full justify-start"
+                      >
+                        {category?.name}
+                        <div
+                            className="absolute right-2 top-2 hidden group-hover:inline-flex"
+                            // onClick={() => deleteCategory(category?.id)}
                         >
-                          {category?.name}
-                          <div
-                              className="absolute right-2 top-2 hidden group-hover:inline-flex"
-                              // onClick={() => deleteCategory(category?.id)}
-                          >
-                            <Trash2 className="w-3.5 h-3.5  me-1" />
-                          </div>
-                        </TabsTrigger>
-                      </div>
+                          <Trash2 className="w-3.5 h-3.5  me-1" />
+                        </div>
+                      </TabsTrigger>
                   ))}
                 </TabsList>
               </CardContent>
diff --git a/app/[locale]/(public)/content-management/page.tsx b/app/[locale]/(public)/content-management/page.tsx
index 387cd808..cdcf5a4f 100644
--- a/app/[locale]/(public)/content-management/page.tsx
+++ b/app/[locale]/(public)/content-management/page.tsx
@@ -19,7 +19,7 @@ const dummyContent = [
   { title: "Operasi Zebra Nataru", thumbnail: "/assets/hot-topik-1.jpg", createdAt: "17 Agustus 2025", timezone: "14:20 WIB", clickCount: "28" },
 ];
 
-const ContentManagement = (props: { type: string }) => {
+const ContentManagement = () => {
   const [profile, setProfile] = useState<any>();
   const [province, setProvince] = useState([]);
   const [, setUser] = useState();
diff --git a/components/form/content/image-ai-form.tsx b/components/form/content/image-ai-form.tsx
index 20365b7b..3a9e4f3b 100644
--- a/components/form/content/image-ai-form.tsx
+++ b/components/form/content/image-ai-form.tsx
@@ -564,7 +564,7 @@ export default function FormImageAI() {
                   JIka Anda tidak Memberikan kata kunci, kami akan secara
                   otomatis membuat kata kunci yang relevan dari kata kunci utama
                   untuk setiap bagian dan menggunakannya untuk membuat artikel.
-                  Untuk menambahkan kata kunci baru, ketik ', + kata kunci'.
+                  Untuk menambahkan kata kunci baru, ketik &apos;, + kata kunci&apos;.
                 </p>
                 <div className="mt-3">
                   <Textarea
diff --git a/components/form/content/image-form.tsx b/components/form/content/image-form.tsx
index 61d426ed..a1bddb31 100644
--- a/components/form/content/image-form.tsx
+++ b/components/form/content/image-form.tsx
@@ -585,8 +585,8 @@ export default function FormImage() {
                       JIka Anda tidak Memberikan kata kunci, kami akan secara
                       otomatis membuat kata kunci yang relevan dari kata kunci
                       utama untuk setiap bagian dan menggunakannya untuk membuat
-                      artikel. Untuk menambahkan kata kunci baru, ketik ', +
-                      kata kunci'.
+                      artikel. Untuk menambahkan kata kunci baru, ketik &apos;, +
+                      kata kunci&apos;.
                     </p>
                     <div className="mt-3">
                       <Textarea
diff --git a/components/partials/header/notifications.tsx b/components/partials/header/notifications.tsx
index 7252b574..d46020dc 100644
--- a/components/partials/header/notifications.tsx
+++ b/components/partials/header/notifications.tsx
@@ -45,7 +45,6 @@ export type Notification = {
 };
 
 const getNotificationIcon = (notificationTypeId: number) => {
-  const router = useRouter();
   switch (notificationTypeId) {
     case 2:
       return <MessageCircle className="h-8 w-8 text-success" />;
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..e348edaf
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,13 @@
+import { FlatCompat } from '@eslint/eslintrc'
+
+const compat = new FlatCompat({
+  baseDirectory: import.meta.dirname,
+})
+
+const eslintConfig = [
+  ...compat.config({
+    extends: ['next/core-web-vitals', 'next/typescript'],
+  }),
+]
+
+export default eslintConfig
\ No newline at end of file
diff --git a/next.config.mjs b/next.config.mjs
index 6d5bcdda..197e0e17 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -45,6 +45,11 @@ const nextConfig = {
       },
     ],
   },
+  // eslint: {
+  //   // Warning: This allows production builds to successfully complete even if
+  //   // your project has ESLint errors.
+  //   ignoreDuringBuilds: true,
+  // },
 };
 
 export default bundleAnalyzer(withNextIntl(withNextra(nextConfig)));