feat: fixing strucuture of internationalism

middleware.ts

@@ -1,15 +0,0 @@
-import createMiddleware from "next-intl/middleware";
-import { locales, defaultLocale } from "@/config/locales";
-
-// This middleware intercepts requests and handles locale-based routing
-export default createMiddleware({
-  locales,
-  defaultLocale,
-  // Always require a locale prefix
-  localePrefix: 'always'
-});
-
-export const config = {
-  // Match only internationalized pathnames
-  matcher: ["/", "/(in|en)/:path*"],
-};

next.config.mjs

@@ -4,7 +4,12 @@ import withBundleAnalyzer from "@next/bundle-analyzer";
 
 /** @type {import('next').NextConfig} */
 
-const withNextIntl = createNextIntlPlugin();
+const withNextIntl = createNextIntlPlugin({
+  experimental: {
+    createMessagesDeclaration: './src/i18n/messages/in.json'
+  }
+});
+
 
 const withNextra = nextra({
   theme: "nextra-theme-docs",
@@ -16,10 +21,6 @@ const bundleAnalyzer = withBundleAnalyzer({
 });
 
 const nextConfig = {
-  // i18n: {
-  //   locales: ["en", "in"],
-  //   defaultLocale: "in",
-  // },
   images: {
     remotePatterns: [
       {

package.json

@@ -101,13 +101,13 @@
     "lucide-react": "^0.390.0",
     "moment": "^2.30.1",
     "next": "^14.2.3",
-    "next-intl": "^3.19.1",
+    "next-intl": "^4.0.0",
     "next-themes": "^0.3.0",
     "nextra": "^2.13.4",
     "nextra-theme-docs": "^2.13.4",
     "qs": "^6.13.1",
     "quill": "^2.0.2",
-    "react": "^18",
+    "react": "^19.0.0",
     "react-advanced-news-ticker": "^1.0.1",
     "react-apexcharts": "^1.4.1",
     "react-audio-player": "^0.17.0",
@@ -116,7 +116,7 @@
     "react-cssfx-loading": "^2.1.0",
     "react-datepicker": "^7.5.0",
     "react-day-picker": "^8.10.1",
-    "react-dom": "^18",
+    "react-dom": "^19.0.0",
     "react-dropzone": "^14.2.3",
     "react-geocode": "^0.2.3",
     "react-hook-form": "^7.52.1",
@@ -168,7 +168,7 @@
     "eslint": "^8",
     "eslint-config-next": "14.2.3",
     "postcss": "^8",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.4",
     "typescript": "^5"
   }
 }

src/app/[locale]/(protected)/admin/add-experts/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/add-experts/component/table.tsx

@@ -52,7 +52,7 @@ import { listDataMedia } from "@/lib/services/broadcast/broadcast";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { listDataExperts } from "@/lib/services/experts/experts";
 
 const dummyData = [

src/app/[locale]/(protected)/admin/add-experts/create/page.tsx

@@ -15,7 +15,7 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import withReactContent from "sweetalert2-react-content";
 import Swal from "sweetalert2";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import {
   Select,
   SelectContent,

src/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/component/column.tsx

@@ -13,7 +13,7 @@ import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import Swal from "sweetalert2";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import withReactContent from "sweetalert2-react-content";
 import { close, error, loading } from "@/config/swal";
 import { deleteMediaBlastAccount } from "@/lib/services/broadcast/broadcast";

src/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/component/table.tsx

@@ -37,7 +37,7 @@ import {
 import { getMediaBlastAccountPage } from "@/lib/services/broadcast/broadcast";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { Icon } from "@iconify/react/dist/iconify.js";
 
 const AccountListTable = () => {

src/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/create/page.tsx

@@ -31,7 +31,7 @@ import {
   saveMediaBlastCampaign,
 } from "@/lib/services/broadcast/broadcast";
 import { error } from "@/config/swal";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Checkbox } from "@/components/ui/checkbox";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 

src/app/[locale]/(protected)/admin/broadcast/campaign-list/account-list/edit/[id]/page.tsx

@@ -32,7 +32,7 @@ import {
   saveMediaBlastCampaign,
 } from "@/lib/services/broadcast/broadcast";
 import { error } from "@/config/swal";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Checkbox } from "@/components/ui/checkbox";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { useParams } from "next/navigation";

src/app/[locale]/(protected)/admin/broadcast/campaign-list/component/column.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 
 const columns: ColumnDef<any>[] = [
   {

src/app/[locale]/(protected)/admin/broadcast/campaign-list/component/table.tsx

@@ -67,8 +67,8 @@ import {
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 
 const CampaignListTable = () => {
   const router = useRouter();

src/app/[locale]/(protected)/admin/broadcast/campaign-list/create/page.tsx

@@ -28,7 +28,7 @@ import { Calendar } from "@/components/ui/calendar";
 import { getOnlyDate } from "@/lib/utils/globals";
 import { saveMediaBlastCampaign } from "@/lib/services/broadcast/broadcast";
 import { error } from "@/config/swal";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 
 const FormSchema = z.object({
   date: z.date({

src/app/[locale]/(protected)/admin/broadcast/campaign-list/edit/[id]/page.tsx

@@ -31,7 +31,7 @@ import {
   saveMediaBlastCampaign,
 } from "@/lib/services/broadcast/broadcast";
 import { error } from "@/config/swal";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { useParams } from "next/navigation";
 import { useEffect } from "react";
 

src/app/[locale]/(protected)/admin/broadcast/email/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/broadcast/email/component/table.tsx

@@ -67,7 +67,7 @@ import {
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 
 const BroadcastEmailTable = () => {
   const router = useRouter();

src/app/[locale]/(protected)/admin/broadcast/page.tsx

@@ -6,7 +6,7 @@ import { PlusIcon } from "lucide-react";
 import EscalationTable from "../../shared/communication/escalation/components/escalation-table";
 import InternalTable from "../../shared/communication/internal/components/internal-table";
 import { useState } from "react";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { Button } from "@/components/ui/button";
 import BroadcastEmailTable from "./email/component/table";
 import BroadcastWhatsAppTable from "./whatsapp/component/table";

src/app/[locale]/(protected)/admin/broadcast/whatsapp/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/broadcast/whatsapp/component/table.tsx

@@ -67,7 +67,7 @@ import {
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 
 const BroadcastWhatsAppTable = () => {
   const router = useRouter();

src/app/[locale]/(protected)/admin/management-user/external/detail/[id]/page.tsx

@@ -23,7 +23,7 @@ import {
 import { useEffect, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";

src/app/[locale]/(protected)/admin/management-user/external/edit/[id]/page.tsx

@@ -40,7 +40,7 @@ import {
 import { useEffect, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import dynamic from "next/dynamic";
 import { Checkbox } from "@/components/ui/checkbox";

src/app/[locale]/(protected)/admin/management-user/internal/create/page.tsx

@@ -39,7 +39,7 @@ import {
 import { useEffect, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import dynamic from "next/dynamic";
 import { Checkbox } from "@/components/ui/checkbox";

src/app/[locale]/(protected)/admin/management-user/internal/detail/[id]/page.tsx

@@ -40,7 +40,7 @@ import {
 import { useEffect, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import dynamic from "next/dynamic";
 import { Checkbox } from "@/components/ui/checkbox";

src/app/[locale]/(protected)/admin/management-user/internal/edit/[id]/page.tsx

@@ -40,7 +40,7 @@ import {
 import { useEffect, useState } from "react";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import dynamic from "next/dynamic";
 import { Checkbox } from "@/components/ui/checkbox";

src/app/[locale]/(protected)/admin/management-user/page.tsx

@@ -4,7 +4,7 @@ import UserExternalTable from "@/components/features/table/management-user/manag
 import UserInternalTable from "@/components/features/table/management-user/management-user-internal-table";
 import { Button } from "@/components/ui/button";
 import ManagementUserVisualization from "@/components/features/visualization/management-user-viz";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import Cookies from "js-cookie";

src/app/[locale]/(protected)/admin/media-tracking/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/media-tracking/detail/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/media-tracking/detail/component/table.tsx

@@ -64,7 +64,7 @@ import { listDataMedia } from "@/lib/services/broadcast/broadcast";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { Label } from "@/components/ui/label";
 import {
   Dialog,

src/app/[locale]/(protected)/admin/media-tracking/media-online/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/media-tracking/media-online/component/table.tsx

@@ -64,7 +64,7 @@ import { listDataMedia } from "@/lib/services/broadcast/broadcast";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 
 const MediaOnlineTable = () => {
   const router = useRouter();

src/app/[locale]/(protected)/admin/media-tracking/tb-news/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/media-tracking/tb-news/detail/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/media-tracking/tb-news/detail/component/table.tsx

@@ -64,7 +64,7 @@ import { listDataMedia } from "@/lib/services/broadcast/broadcast";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { Label } from "@/components/ui/label";
 import {
   Dialog,

src/app/[locale]/(protected)/admin/settings/banner/component/banner-column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/settings/banner/component/banner-table.tsx

@@ -26,7 +26,7 @@ import {
 import { useSearchParams } from "next/navigation";
 
 import { close, loading } from "@/config/swal";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import columns from "./banner-column";
 import { listBanner, listStaticBanner } from "@/lib/services/settings/settings";
 

src/app/[locale]/(protected)/admin/settings/banner/component/column.tsx

@@ -16,7 +16,7 @@ import {
   getOnlyDate,
   htmlToString,
 } from "@/lib/utils/globals";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import {
   Accordion,
   AccordionContent,

src/app/[locale]/(protected)/admin/settings/banner/component/static-toogle.tsx

@@ -1,6 +1,6 @@
 import { Switch } from "@/components/ui/switch";
 import { useToast } from "@/components/ui/use-toast";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { setStaticBanner } from "@/lib/services/settings/settings";
 
 export default function StaticToogle(props: {

src/app/[locale]/(protected)/admin/settings/banner/component/status-toogle.tsx

@@ -1,6 +1,6 @@
 import { Switch } from "@/components/ui/switch";
 import { useToast } from "@/components/ui/use-toast";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { setBanner } from "@/lib/services/settings/settings";
 
 export default function StatusToogle(props: {

src/app/[locale]/(protected)/admin/settings/banner/component/table.tsx

@@ -64,7 +64,7 @@ import { listDataMedia } from "@/lib/services/broadcast/broadcast";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 
 const ContentListTable = () => {
   const router = useRouter();

src/app/[locale]/(protected)/admin/settings/category/component/column.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import StatusToogle from "./status";
 import { error } from "@/config/swal";
 import { deleteCategory } from "@/lib/services/settings/settings";

src/app/[locale]/(protected)/admin/settings/category/component/create.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import { getUserRoles, postCategory } from "@/lib/services/settings/settings";

src/app/[locale]/(protected)/admin/settings/category/component/edit.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/category/component/status.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { Switch } from "@/components/ui/switch";
 import { error } from "@/config/swal";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { publishUnpublishCategory } from "@/lib/services/settings/settings";
 
 export default function StatusToogle(props: {

src/app/[locale]/(protected)/admin/settings/category/component/table.tsx

@@ -32,8 +32,8 @@ import columns from "./column";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 import { getCategories } from "@/lib/services/settings/settings";
 import {
   Dialog,

src/app/[locale]/(protected)/admin/settings/faq/component/column.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { error } from "@/config/swal";
 import { deleteCategory, deleteDataFAQ } from "@/lib/services/settings/settings";
 import { useToast } from "@/components/ui/use-toast";

src/app/[locale]/(protected)/admin/settings/faq/component/create.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/faq/component/edit.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/faq/component/table.tsx

@@ -32,8 +32,8 @@ import columns from "./column";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 import { getCategories, getListFAQ } from "@/lib/services/settings/settings";
 import {
   Dialog,

src/app/[locale]/(protected)/admin/settings/feedback/component/column.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { error } from "@/config/swal";
 import { deleteCategory, deleteDataFAQ } from "@/lib/services/settings/settings";
 import { useToast } from "@/components/ui/use-toast";

src/app/[locale]/(protected)/admin/settings/feedback/component/create.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/feedback/component/edit.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/feedback/component/table.tsx

@@ -32,8 +32,8 @@ import columns from "./column";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 import {
   getCategories,
   getListFAQ,

src/app/[locale]/(protected)/admin/settings/tag/component/column.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { error } from "@/config/swal";
 import { deleteCategory, deleteDataFAQ } from "@/lib/services/settings/settings";
 import { useToast } from "@/components/ui/use-toast";

src/app/[locale]/(protected)/admin/settings/tag/component/create.tsx

@@ -20,7 +20,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 
 import { Fragment, useEffect, useState } from "react";

src/app/[locale]/(protected)/admin/settings/tag/component/edit.tsx

@@ -21,7 +21,7 @@ import {
   FormLabel,
   FormMessage,
 } from "@/components/ui/form";
-import { useRouter } from "@/i18n/routing";
+import { useRouter } from "@/i18n/navigation";
 import { Input } from "@/components/ui/input";
 import { Checkbox } from "@/components/ui/checkbox";
 import {

src/app/[locale]/(protected)/admin/settings/tag/component/table.tsx

@@ -32,8 +32,8 @@ import columns from "./column";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 import {
   getCategories,
   getListFAQ,

src/app/[locale]/(protected)/admin/survey/component/column.tsx

@@ -12,9 +12,9 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 
-import { Link, useRouter } from "@/i18n/routing";
+import { Link, useRouter } from "@/i18n/navigation";
 import { format } from "date-fns";
-import header from "/components/partials/header";
+import header from "@/components/partials/header";
 import { date } from "zod";
 
 const columns: ColumnDef<any>[] = [

src/app/[locale]/(protected)/admin/survey/component/table.tsx

@@ -67,8 +67,8 @@ import {
 import { listEnableCategory } from "@/lib/services/content/content";
 import { Checkbox } from "@/components/ui/checkbox";
 import { close, loading } from "@/config/swal";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
-import { NewCampaignIcon } from "/components/icon";
+import { NewCampaignIcon } from "@/components/icon";
 import search from "../../../app/chat/components/search";
 import {
   Select,

src/app/[locale]/(protected)/admin/survey/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 import SiteBreadcrumb from "@/components/ui/structures/site-breadcrumb";
 import { useState } from "react";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import { Button } from "@/components/ui/button";
 import SurveyListTable from "./component/table";
 

src/app/[locale]/(protected)/app/calendar/event-modal.tsx

@@ -22,7 +22,7 @@ import { Calendar } from "@/components/ui/calendar";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import { Loader2, CalendarIcon } from "lucide-react";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 import { CalendarCategory } from "./data";
 import {
   Dialog,

src/app/[locale]/(protected)/app/chat/[id]/page.tsx

@@ -9,7 +9,7 @@ import {
 } from "@/components/ui/dropdown-menu";
 import { Card, CardContent, CardHeader, CardFooter } from "@/components/ui/card";
 import Image from 'next/image';
-import { redirect } from '@/components/ui/structures/navigation';
+import { redirect } from '@/i18n/navigation';
 import MessageFooter from './components/message-footer';
 import ChatHeader from './components/chat-header';
 import InfoWrapper from './components/info-wrapper';

src/app/[locale]/(protected)/app/chat/components/contact-list.tsx

@@ -5,7 +5,7 @@ import { Badge } from "@/components/ui/badge";
 import { cn } from "@/lib/utils/utils"
 import { Icon } from "@/components/ui/icon";
 import { type Contact as ContactType, type Chat as ChatType } from "../utils";
-import { Link, usePathname } from "@/components/ui/structures/navigation";
+import { Link, usePathname } from "@/i18n/navigation";
 import { useChatConfig } from "@/lib/hooks/use-chat";
 
 

src/app/[locale]/(protected)/app/chat/utils.ts

@@ -1,5 +1,5 @@
 import { chats, contacts, profileUser } from '@/app/api/chat/data'
-import { baseURL } from '/config'
+import { baseURL } from '@/config'
 
 
 export const getContacts = async () => {

src/app/[locale]/(protected)/app/email/[id]/components/go-back.tsx

@@ -4,7 +4,7 @@ import {
 
 } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import { useRouter } from '@/components/ui/structures/navigation';
+import { useRouter } from '@/i18n/navigation';
 const GoBack = () => {
     const router = useRouter()
     return (

src/app/[locale]/(protected)/app/email/[id]/page.tsx

@@ -1,4 +1,4 @@
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import { Card, CardHeader, CardContent } from "@/components/ui/card";

src/app/[locale]/(protected)/app/email/layout.tsx

@@ -3,7 +3,7 @@ import MailWrapper from "./mail-wrapper";
 import MailSidebarWrapper from "./sidebar-wrapper";
 import { Card, CardContent } from "@/components/ui/card";
 import Compose from "./compose";
-import Nav from "/components/nav";
+import Nav from "@/components/nav";
 import { ScrollArea } from "@/components/ui/scroll-area";
 export const metadata: Metadata = {
   title: "Mail",

src/app/[locale]/(protected)/app/email/mail.tsx

@@ -12,8 +12,8 @@ import {
 import {ReactNode,useState} from "react";
 import { Button } from "@/components/ui/button";
 import { Trash2 } from "lucide-react";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
-import { Link } from "@/components/ui/structures/navigation"
+import { Link } from "@/i18n/navigation"
 const MailItem = ({ mail }: { mail: any }) => {
   const { image, title, isfav, time, name, id } = mail;
   const [open, setOpen] = useState<boolean>(false)

src/app/[locale]/(protected)/app/kanban/column.tsx

@@ -17,7 +17,7 @@ import TaskCard from "./task";
 import { Plus, Trash2 } from "lucide-react";
 import EmptyTask from "./empty";
 
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 
 function ColumnContainer({ column, tasks, handleOpenTask }: { column: Column; tasks: Task[], handleOpenTask: () => void }) {
     const [editMode, setEditMode] = useState<boolean>(false);

src/app/[locale]/(protected)/app/kanban/task.tsx

@@ -14,7 +14,7 @@ import {
 import { Button } from "@/components/ui/button";
 import {  MoreVertical, SquarePen, Trash2 } from "lucide-react";
 import { Progress } from "@/components/ui/progress";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 import { useState } from "react";
 import EditTask from "./edit-task";
 import { Icon } from "@/components/ui/icon";

src/app/[locale]/(protected)/app/projects/[id]/page.tsx

@@ -2,7 +2,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
 import { BarChart } from "lucide-react";
 import { Icon } from "@/components/ui/icon";
 import ProgressBlock from "@/components/features/blocks/progress-block";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 
 import { meets, tasks, messagesData, activityList, teamData, files } from "./data"
 import Image from "next/image";

src/app/[locale]/(protected)/app/projects/grid/components/project-action.tsx

@@ -2,7 +2,7 @@
 import React, { useState } from 'react'
 import { Button } from "@/components/ui/button";
 import EditProject from "../../edit-project";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 import { Eye, MoreVertical, SquarePen, Trash2 } from "lucide-react";
 import {
     DropdownMenu,
@@ -11,7 +11,7 @@ import {
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
 import { defaultProjects } from '../../data';
-import { Link } from '@/i18n/routing'; const ProjectAction = () => {
+import { Link } from '@/i18n/navigation'; const ProjectAction = () => {
     const [editTaskOpen, setEditTaskOpen] = useState<boolean>(false);
     const [deleteProject, setDeleteProject] = useState<boolean>(false)
     return (

src/app/[locale]/(protected)/app/projects/list/components/list-table.tsx

@@ -32,9 +32,9 @@ import {
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu"
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 import EditProject from "../../edit-project";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 import { Input } from "@/components/ui/input";
 
 const ListTable = ({ projects }: { projects: Project[] }) => {

src/app/[locale]/(protected)/app/projects/page.tsx

@@ -1,5 +1,5 @@
 
-import { redirect } from '@/components/ui/structures/navigation'
+import { redirect } from '@/i18n/navigation'
 
 const ProjectPage = () => {
   redirect('/app/projects/grid')

src/app/[locale]/(protected)/app/projects/project-wrapper.tsx

@@ -4,7 +4,7 @@ import { Filter, List, Plus } from "lucide-react";
 import CreateProject from "./create-project";
 import { useState } from "react";
 import { cn } from "@/lib/utils/utils"
-import { Link, usePathname } from "@/components/ui/structures/navigation";
+import { Link, usePathname } from "@/i18n/navigation";
 import { getProjectNav } from "./data";
 
 const ProjectWrapper = ({ children }: { children: React.ReactNode }) => {

src/app/[locale]/(protected)/app/todo/page.tsx

@@ -5,7 +5,7 @@ import { ScrollArea } from "@/components/ui/scroll-area";
 import TodoHeader from "./todo-header";
 import Todo from "./todo";
 import TodoSidebarWrapper from "./sidebar-wrapper";
-import Nav from "/components/nav";
+import Nav from "@/components/nav";
 import { useTranslations } from "next-intl";
 const TodoPage = () => {
 const t = useTranslations("TodoApp");

src/app/[locale]/(protected)/app/todo/todo.tsx

@@ -16,7 +16,7 @@ import { Todo as TodoProps } from "./data";
 import { Button } from "@/components/ui/button";
 import { SquarePen, Trash2 } from "lucide-react";
 import { useState } from "react";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 
 const Todo = ({ todo }: { todo: TodoProps }) => {
   const { image, title, isfav, category } = todo;

src/app/[locale]/(protected)/charts/appex-charts/charts-appex-area/page.tsx

@@ -6,7 +6,7 @@ import IrregularTimeSeries from "./irregular-time-series";
 import StackedAreaChart from "./stacked-area";
 import NullValueAreaChart from "./null-value-area";
 import GithubStyleChart from "./github-style-chart";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 import GithubStyleCharts1 from "./github-styles-charts1";
 import NegativeAreaChart from "./negative-areachart";
 import Image from "next/image";

src/app/[locale]/(protected)/components/button/link-button.tsx

@@ -1,5 +1,5 @@
 import { Button } from "@/components/ui/button";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 const LinkButton = () => {
   return (
     <div className="flex flex-wrap gap-3">

src/app/[locale]/(protected)/components/button/source-code.ts

@@ -258,7 +258,7 @@ const BlockButton = () => {
 export default BlockButton;`
 
 export const linkButton=`import { Button } from "@/components/ui/button";
-import {Link} from '@/i18n/routing';
+import {Link} from '@/i18n/navigation';
 const LinkButton = () => {
   return (
     <div className="flex flex-wrap gap-3">

src/app/[locale]/(protected)/components/card/basic-card.tsx

@@ -8,7 +8,7 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import Image from "next/image";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 
 const BasicCard = () => {
   return (

src/app/[locale]/(protected)/components/card/marketing-image-card.tsx

@@ -7,7 +7,7 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import Image from "next/image";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 
 const MarketingImageCard = () => {
   return (

src/app/[locale]/(protected)/components/card/sales-automation-card.tsx

@@ -6,7 +6,7 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 
 const SalesAutomationCard = () => {
   return (

src/app/[locale]/(protected)/components/typography/page.tsx

@@ -1,4 +1,4 @@
-import { Link } from '@/i18n/routing';
+import { Link } from '@/i18n/navigation';
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Icon } from "@/components/ui/icon";
 import React from "react";

src/app/[locale]/(protected)/contributor/agenda-setting/event-modal.tsx

@@ -28,7 +28,7 @@ import {
   ChevronDown,
   Music,
 } from "lucide-react";
-import DeleteConfirmationDialog from "/components/delete-confirmation-dialog";
+import DeleteConfirmationDialog from "@/components/ui/structures/delete-confirmation-dialog";
 import { CalendarCategory } from "./data";
 import {
   Dialog,
@@ -38,7 +38,7 @@ import {
   DialogTrigger,
 } from "@/components/ui/dialog";
 import { Textarea } from "@/components/ui/textarea";
-import { error, loading, success } from "@/lib/swal";
+import { error, loading, success } from "@/lib/utils/swal";
 import Cookies from "js-cookie";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";

src/app/[locale]/(protected)/contributor/blog/components/blog-table.tsx

@@ -46,7 +46,7 @@ import { Label } from "@/components/ui/label";
 import { listEnableCategory } from "@/lib/services/content/content";
 import { useTranslations } from "next-intl";
 import { CardHeader, CardTitle } from "@/components/ui/card";
-import { Link } from "@/i18n/routing";
+import { Link } from "@/i18n/navigation";
 import useTableColumns from "./columns";
 
 const BlogTable = () => {

src/app/[locale]/(protected)/contributor/blog/components/columns.tsx

@@ -12,11 +12,11 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link, useRouter } from "@/components/ui/structures/navigation";
+import { Link, useRouter } from "@/i18n/navigation";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
 import { deleteBlog } from "@/lib/services/blog/blog";
-import { error, loading } from "@/lib/swal";
+import { error, loading } from "@/lib/utils/swal";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {

src/app/[locale]/(protected)/contributor/blog/page.tsx

@@ -3,7 +3,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import BlogTable from "./components/blog-table";
 import { Plus } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 
 const BlogPage = async () => {
   return (

src/app/[locale]/(protected)/contributor/content/audio/components/columns.tsx

@@ -12,10 +12,10 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import withReactContent from "sweetalert2-react-content";
 import { deleteMedia } from "@/lib/services/content/content";
-import { error } from "@/lib/swal";
+import { error } from "@/lib/utils/swal";
 import Swal from "sweetalert2";
 import { useTranslations } from "next-intl";
 

src/app/[locale]/(protected)/contributor/content/audio/page.tsx

@@ -5,7 +5,7 @@ import { UploadIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Icon } from "@iconify/react/dist/iconify.js";
 import TableAudio from "./components/table-audio";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const ReactTableAudioPage = () => {

src/app/[locale]/(protected)/contributor/content/image/components/columns.tsx

@@ -13,11 +13,11 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useRouter } from "next/navigation";
 import { useToast } from "@/components/ui/use-toast";
 import { deleteMedia } from "@/lib/services/content/content";
-import { error, loading } from "@/lib/swal";
+import { error, loading } from "@/lib/utils/swal";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
 import { useTranslations } from "next-intl";

src/app/[locale]/(protected)/contributor/content/image/components/table-image.tsx

@@ -65,7 +65,7 @@ import { loading } from "@/config/swal";
 import { toast } from "sonner";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
-import { error } from "@/lib/swal";
+import { error } from "@/lib/utils/swal";
 import { Label } from "@/components/ui/label";
 import { format } from "date-fns";
 import useTableColumns from "./columns";

src/app/[locale]/(protected)/contributor/content/image/page.tsx

@@ -5,7 +5,7 @@ import TableImage from "./components/table-image";
 import { UploadIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const ReactTableImagePage = () => {

src/app/[locale]/(protected)/contributor/content/spit/table-spit/columns.tsx

@@ -15,7 +15,7 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 import withReactContent from "sweetalert2-react-content";
 import Swal from "sweetalert2";

src/app/[locale]/(protected)/contributor/content/teks/components/columns.tsx

@@ -12,8 +12,8 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
-import { error } from "@/lib/swal";
+import { error } from "@/lib/utils/swal";
 import { deleteMedia } from "@/lib/services/content/content";
 import withReactContent from "sweetalert2-react-content";
 import Swal from "sweetalert2";

src/app/[locale]/(protected)/contributor/content/teks/page.tsx

@@ -6,7 +6,7 @@ import { Newspaper, NewspaperIcon, UploadIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Icon } from "@iconify/react/dist/iconify.js";
 import TableTeks from "./components/table-teks";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const ReactTableTeksPage = () => {

src/app/[locale]/(protected)/contributor/content/video/components/columns.tsx

@@ -12,11 +12,11 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { deleteMedia } from "@/lib/services/content/content";
 import Swal from "sweetalert2";
 import withReactContent from "sweetalert2-react-content";
-import { error } from "@/lib/swal";
+import { error } from "@/lib/utils/swal";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {

src/app/[locale]/(protected)/contributor/content/video/page.tsx

@@ -6,7 +6,7 @@ import { UploadIcon } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Icon } from "@iconify/react/dist/iconify.js";
 import TableVideo from "./components/table-video";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const ReactTableVideoPage = () => {

src/app/[locale]/(protected)/contributor/planning/mediahub/components/columns.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {

src/app/[locale]/(protected)/contributor/planning/medsos-mediahub/components/columns.tsx

@@ -12,7 +12,7 @@ import {
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { format } from "date-fns";
-import { Link } from "@/components/ui/structures/navigation";
+import { Link } from "@/i18n/navigation";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {