fix: merge dev-1

This commit is contained in:
Sabda Yagra 2026-02-09 10:57:30 +07:00
commit 8ead2c6352
4 changed files with 1 additions and 20 deletions

View File

@ -41,16 +41,7 @@ import { useEffect, useState } from "react";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea"; import { Textarea } from "@/components/ui/textarea";
import { Link, useRouter } from "@/i18n/routing"; import { Link, useRouter } from "@/i18n/routing";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import dynamic from "next/dynamic"; import dynamic from "next/dynamic";
import { Checkbox } from "@/components/ui/checkbox";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import Swal from "sweetalert2"; import Swal from "sweetalert2";
import withReactContent from "sweetalert2-react-content"; import withReactContent from "sweetalert2-react-content";
import { close, error, loading } from "@/config/swal"; import { close, error, loading } from "@/config/swal";

View File

@ -22,9 +22,7 @@ import {
TableHeader, TableHeader,
TableRow, TableRow,
} from "@/components/ui/table"; } from "@/components/ui/table";
import { useSearchParams } from "next/navigation"; import { useSearchParams } from "next/navigation";
import { close, loading } from "@/config/swal"; import { close, loading } from "@/config/swal";
import { Link, useRouter } from "@/i18n/routing"; import { Link, useRouter } from "@/i18n/routing";
import columns from "./banner-column"; import columns from "./banner-column";

View File

@ -10,6 +10,7 @@ import {
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
formatDateToIndonesian, formatDateToIndonesian,
getOnlyDate,
htmlToString, htmlToString,
} from "@/utils/globals"; } from "@/utils/globals";
import { Link, useRouter } from "@/i18n/routing"; import { Link, useRouter } from "@/i18n/routing";

View File

@ -14,8 +14,6 @@ import {
getSortedRowModel, getSortedRowModel,
useReactTable, useReactTable,
} from "@tanstack/react-table"; } from "@tanstack/react-table";
import { Button } from "@/components/ui/button";
import { import {
Table, Table,
TableBody, TableBody,
@ -24,17 +22,10 @@ import {
TableHeader, TableHeader,
TableRow, TableRow,
} from "@/components/ui/table"; } from "@/components/ui/table";
import { useSearchParams } from "next/navigation"; import { useSearchParams } from "next/navigation";
import TablePagination from "@/components/table/table-pagination";
import columns from "./column"; import columns from "./column";
import { listEnableCategory } from "@/service/content/content";
import { Checkbox } from "@/components/ui/checkbox";
import { close, loading } from "@/config/swal"; import { close, loading } from "@/config/swal";
import { Link, useRouter } from "@/i18n/routing"; import { Link, useRouter } from "@/i18n/routing";
import CreateFAQModal from "./create"; import CreateFAQModal from "./create";
import { useTranslations } from "next-intl"; import { useTranslations } from "next-intl";
import { getTags } from "@/service/content"; import { getTags } from "@/service/content";