diff --git a/components/form/magazine/create-magazine-form.tsx b/components/form/magazine/create-magazine-form.tsx
index 6575916..9c510e6 100644
--- a/components/form/magazine/create-magazine-form.tsx
+++ b/components/form/magazine/create-magazine-form.tsx
@@ -81,6 +81,9 @@ const createArticleSchema = z.object({
       }),
     })
   ),
+  category: z.array(categorySchema).nonempty({
+    message: "Kategori harus memiliki setidaknya satu item",
+  }),
 });
 
 export default function NewCreateMagazineForm() {
@@ -90,6 +93,30 @@ export default function NewCreateMagazineForm() {
   const editor = useRef(null);
   const [files, setFiles] = useState<FileWithPreview[]>([]);
   const [thumbnailImg, setThumbnailImg] = useState<File[]>([]);
+  const [listCategory, setListCategory] = useState<CategoryType[]>([]);
+
+  useEffect(() => {
+    fetchCategory();
+  }, []);
+
+  const fetchCategory = async () => {
+    const res = await getArticleByCategory();
+    if (res?.data?.data) {
+      setupCategory(res?.data?.data);
+    }
+  };
+
+  const setupCategory = (data: any) => {
+    const temp = [];
+    for (const element of data) {
+      temp.push({
+        id: element.id,
+        label: element.title,
+        value: element.id,
+      });
+    }
+    setListCategory(temp);
+  };
 
   const { getRootProps, getInputProps } = useDropzone({
     onDrop: (acceptedFiles) => {
@@ -153,6 +180,8 @@ export default function NewCreateMagazineForm() {
       typeId: 1,
       slug: values.slug,
       statusId: 1,
+      categoryIds: values.category.map((a) => a.id).join(","),
+
       //   description: htmlToString(removeImgTags(values.description)),
       description: values.description,
       // rows: values.rows,
@@ -385,6 +414,37 @@ export default function NewCreateMagazineForm() {
         {errors?.slug && (
           <p className="text-red-400 text-sm mb-3">{errors.slug?.message}</p>
         )}
+
+        <p className="text-sm mt-3">Kategori</p>
+        <Controller
+          control={control}
+          name="category"
+          render={({ field: { onChange, value } }) => (
+            <ReactSelect
+              className="basic-single text-black z-50"
+              classNames={{
+                control: (state: any) =>
+                  "!rounded-lg bg-white !border-1 !border-gray-200 dark:!border-stone-500",
+              }}
+              classNamePrefix="select"
+              onChange={onChange}
+              closeMenuOnSelect={false}
+              components={animatedComponents}
+              isClearable={true}
+              isSearchable={true}
+              isMulti={true}
+              placeholder="Kategori..."
+              name="sub-module"
+              options={listCategory}
+            />
+          )}
+        />
+        {errors?.category && (
+          <p className="text-red-400 text-sm mb-3">
+            {errors.category?.message}
+          </p>
+        )}
+
         <p className="text-sm mt-3">Thumbnail</p>
 
         {thumbnailImg.length > 0 ? (
diff --git a/components/main/dashboard/dashboard-container.tsx b/components/main/dashboard/dashboard-container.tsx
index e216131..fc027bd 100644
--- a/components/main/dashboard/dashboard-container.tsx
+++ b/components/main/dashboard/dashboard-container.tsx
@@ -89,6 +89,15 @@ export default function DashboardContainer() {
     endDate: parseDate(convertDateFormatNoTimeV2(new Date())),
   });
 
+  const [topContentDate, setTopContentDate] = useState({
+    startDate: parseDate(
+      convertDateFormatNoTimeV2(
+        new Date(new Date().setDate(new Date().getDate() - 7))
+      )
+    ),
+    endDate: parseDate(convertDateFormatNoTimeV2(new Date())),
+  });
+
   const [typeDate, setTypeDate] = useState("monthly");
   const [summary, setSummary] = useState<any>();
 
@@ -122,7 +131,17 @@ export default function DashboardContainer() {
 
   useEffect(() => {
     fetchTopPages();
-  }, [topPagespage]);
+  }, [topPagespage, topContentDate]);
+
+  const getDate = (data: any) => {
+    if (data === null) {
+      return "";
+    } else {
+      return `${data.year}-${data.month < 10 ? `0${data.month}` : data.month}-${
+        data.day < 10 ? `0${data.day}` : data.day
+      }`;
+    }
+  };
 
   async function fetchTopPages() {
     const req = {
@@ -130,6 +149,8 @@ export default function DashboardContainer() {
       page: topPagespage,
       search: "",
       sort: "desc",
+      startDate: getDate(topContentDate.startDate),
+      endDate: getDate(topContentDate.endDate),
     };
     const res = await getTopArticles(req);
     setTopPages(getTableNumber(10, res.data?.data));
@@ -139,6 +160,7 @@ export default function DashboardContainer() {
   useEffect(() => {
     fetchPostCount();
   }, [postContentDate]);
+
   async function fetchPostCount() {
     const getDate = (data: any) => {
       return `${data.year}-${data.month < 10 ? `0${data.month}` : data.month}-${
@@ -432,14 +454,6 @@ export default function DashboardContainer() {
                   Mingguan
                 </Button>
                 <div className="w-[140px]">
-                  {/* <Datepicker
-                    value={startDateValue}
-                    displayFormat="DD/MM/YYYY"
-                    asSingle={true}
-                    useRange={false}
-                    onChange={(e: any) => setStartDateValue(e)}
-                    inputClassName="z-50 w-full text-xs lg:text-sm bg-transparent border-1 border-gray-200 px-2 py-[6px] rounded-sm lg:rounded-lg h-[30px] lg:h-[40px] text-gray-600 dark:text-gray-300"
-                  /> */}
                   <Popover
                     placement="bottom"
                     classNames={{ content: ["!bg-transparent", "p-0"] }}
@@ -472,12 +486,64 @@ export default function DashboardContainer() {
           <div className="flex flex-col w-full lg:w-[45%] gap-6 shadow-md bg-white dark:bg-[#18181b] rounded-lg p-8 text-xs lg:text-sm">
             <div className="flex justify-between font-semibold">
               <p>Top Pages</p>
+              <div className="w-[220px] flex flex-row gap-2 justify-between font-semibold">
+                <Popover
+                  placement="bottom"
+                  classNames={{ content: ["!bg-transparent", "p-0"] }}
+                >
+                  <PopoverTrigger>
+                    <a className="cursor-pointer">
+                      {convertDateFormatNoTime(topContentDate.startDate)}
+                    </a>
+                  </PopoverTrigger>
+                  <PopoverContent className="bg-transparent">
+                    <Calendar
+                      value={topContentDate.startDate}
+                      onChange={(e) =>
+                        setTopContentDate({
+                          startDate: e,
+                          endDate: topContentDate.endDate,
+                        })
+                      }
+                      maxValue={topContentDate.endDate}
+                    />
+                  </PopoverContent>
+                </Popover>
+                -
+                <Popover
+                  placement="bottom"
+                  classNames={{ content: ["!bg-transparent", "p-0"] }}
+                >
+                  <PopoverTrigger>
+                    <a className="cursor-pointer ">
+                      {convertDateFormatNoTime(topContentDate.endDate)}
+                    </a>
+                  </PopoverTrigger>
+                  <PopoverContent className="bg-transparent">
+                    <Calendar
+                      value={topContentDate.endDate}
+                      onChange={(e) =>
+                        setTopContentDate({
+                          startDate: topContentDate.startDate,
+                          endDate: e,
+                        })
+                      }
+                      minValue={topContentDate.startDate}
+                    />
+                  </PopoverContent>
+                </Popover>
+              </div>
             </div>
             <div className="flex flex-row border-b-1">
               <div className="w-[5%]">No</div>
               <div className="w-[85%]">Title</div>
               <div className="w-[10%] text-center">Visits</div>
             </div>
+            {(!topPages || topPages?.length < 1) && (
+              <div className="flex justify-center items-center">
+                Tidak ada Data
+              </div>
+            )}
             {topPages?.map((list) => (
               <div key={list.id} className="flex flex-row border-b-1">
                 <div className="w-[5%]">{list?.no}</div>
@@ -485,23 +551,25 @@ export default function DashboardContainer() {
                 <div className="w-[10%] text-center">{list?.viewCount}</div>
               </div>
             ))}
-            <div className="my-2 w-full flex justify-center">
-              <Pagination
-                isCompact
-                showControls
-                showShadow
-                color="primary"
-                classNames={{
-                  base: "bg-transparent",
-                  wrapper: "bg-transparent",
-                  item: "w-fit px-3",
-                  cursor: "w-fit px-3",
-                }}
-                page={topPagespage}
-                total={topPagesTotalPage}
-                onChange={(page) => setTopPagesPage(page)}
-              />
-            </div>
+            {topPages?.length > 0 && (
+              <div className="my-2 w-full flex justify-center">
+                <Pagination
+                  isCompact
+                  showControls
+                  showShadow
+                  color="primary"
+                  classNames={{
+                    base: "bg-transparent",
+                    wrapper: "bg-transparent",
+                    item: "w-fit px-3",
+                    cursor: "w-fit px-3",
+                  }}
+                  page={topPagespage}
+                  total={topPagesTotalPage}
+                  onChange={(page) => setTopPagesPage(page)}
+                />
+              </div>
+            )}
           </div>
         </div>
       </div>