diff --git a/components/hooks/usePopupData.ts b/components/hooks/usePopupData.ts
index 24a790a..cc279e1 100644
--- a/components/hooks/usePopupData.ts
+++ b/components/hooks/usePopupData.ts
@@ -2,6 +2,7 @@ import { getPopups } from "@/pages/api/popup";
import { useEffect, useState } from "react";
+
interface Popup {
title: string;
content: string;
diff --git a/pages/dashboard/[store].tsx b/pages/dashboard/[store].tsx
index 7656f46..9746b93 100644
--- a/pages/dashboard/[store].tsx
+++ b/pages/dashboard/[store].tsx
@@ -50,7 +50,9 @@ const StorePage = () => {
-
+
+
+
diff --git a/pages/dashboard/index.tsx b/pages/dashboard/index.tsx
index 035a7c8..932aa71 100644
--- a/pages/dashboard/index.tsx
+++ b/pages/dashboard/index.tsx
@@ -9,6 +9,7 @@ import StackCharts from "./StackCharts";
import ListChart from "./ListChart";
import { useDashBoardData } from "@/components/hooks/useDashBoardData";
import BarChart from "./BarChart";
+import Filter from "@/components/organisms/Filter";
interface DashBoardProps {}
interface DateState {
@@ -25,6 +26,10 @@ const DashBoardPage: React.FC = () => {
const { dateRange, calculateDateRange } = useDateRange();
const barChartData = useDashBoardData({ selection: 1 }).data;
const barChartData2 = useDashBoardData({ selection: 2 }).data;
+ const [contentFilter, setContentFilter] = useState<
+ "NONE" | "FOOD" | "CAFE" | "BEAUTY" | "CULTURE" | "ETC"
+ >("FOOD");
+
const [dateFilter, setDateFilter] = useState({
dates: dates.aWeek,
});
@@ -55,15 +60,15 @@ const DashBoardPage: React.FC = () => {
-
+ {/*
전체
음식점
카페
미용
문화
기타
-
-
+ */}
+
최근 7일
최근 14일
diff --git a/pages/student/popup/index.tsx b/pages/student/popup/index.tsx
index 78eed23..b2768ff 100644
--- a/pages/student/popup/index.tsx
+++ b/pages/student/popup/index.tsx
@@ -9,6 +9,7 @@ import EmptyComponent from "@/components/atoms/EmptyComponent";
import { usePopupData } from "@/components/hooks/usePopupData";
import { Checkbox } from "@mui/material";
+
const PopupAdminPage: React.FC = () => {
const router = useRouter();
@@ -85,6 +86,5 @@ const PopupAdminPage: React.FC = () => {
);
};
-
export default PopupAdminPage;
diff --git a/pages/user/form/index.tsx b/pages/user/form/index.tsx
index 983c437..b5756a9 100644
--- a/pages/user/form/index.tsx
+++ b/pages/user/form/index.tsx
@@ -10,7 +10,6 @@ import { useRouter } from "next/router";
import { css } from "@emotion/css";
import styled from "@emotion/styled";
-
interface FormPageProps {}
enum Unions {
diff --git a/pages/user/index.tsx b/pages/user/index.tsx
index eefbfad..520a56d 100644
--- a/pages/user/index.tsx
+++ b/pages/user/index.tsx
@@ -3,7 +3,8 @@ import { Checkbox } from "@mui/material";
import Head from "next/head";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
-
+import CheckCircleIcon from "@mui/icons-material/CheckCircle";
+import CircleIcon from "@mui/icons-material/Circle";
interface UserProps {
name?: string;
isLogin?: boolean;
@@ -82,6 +83,10 @@ const UserPage: React.FC = () => {
}
+ checkedIcon={}
+
onChange={(e: React.ChangeEvent) => {
const { checked } = e.target;
checked
@@ -105,6 +110,8 @@ const UserPage: React.FC = () => {
}
+ checkedIcon={}
checked={checked.second}
name="second"
onChange={checkBoxHandler}
@@ -113,6 +120,8 @@ const UserPage: React.FC = () => {
}
+ checkedIcon={}
name="third"
checked={checked.third}
onChange={checkBoxHandler}
@@ -121,6 +130,8 @@ const UserPage: React.FC = () => {
}
+ checkedIcon={}
name="fourth"
checked={checked.fourth}
onChange={checkBoxHandler}
@@ -129,6 +140,8 @@ const UserPage: React.FC = () => {
}
+ checkedIcon={}
name="fifth"
checked={checked.fifth}
onChange={checkBoxHandler}