[#47] style : 전체 대시보드 가게 메뉴바 추가

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;

pages/dashboard/[store].tsx

@@ -50,7 +50,9 @@ const StorePage = () => {
           <FirstLayerChart title="신규 방문 인원" content="5" />
         </styles.SecondBox>
         <styles.ThirdBox>
-          <FirstLayerChart title="1인 평균 제휴 횟수" content="1.3회" />
+
+          <FirstLayerChart title="평균 혜택 이용 수" content="1.3회" />
+
         </styles.ThirdBox>
         <styles.FourthBox>
           <ComposedChart title="총 판매 금액 & 제휴 제공 금액" />

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<DateState>({
     dates: dates.aWeek,
   });
@@ -55,15 +60,15 @@ const DashBoardPage: React.FC = () => {
         </styles.TitleContainer>
 
         <styles.OptionContainer>
-          <styles.ButtonWrapper>
+          {/* <styles.ButtonWrapper>
             <styles.IndexButton>전체</styles.IndexButton>
             <styles.IndexButton>음식점</styles.IndexButton>
             <styles.IndexButton>카페</styles.IndexButton>
             <styles.IndexButton>미용</styles.IndexButton>
             <styles.IndexButton>문화</styles.IndexButton>
             <styles.IndexButton>기타</styles.IndexButton>
-          </styles.ButtonWrapper>
-
+          </styles.ButtonWrapper> */}
+          <Filter setContentFilter={setContentFilter} />
           <styles.ButtonWrapper>
             <styles.IndexButton>최근 7일</styles.IndexButton>
             <styles.IndexButton>최근 14일</styles.IndexButton>

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;
 

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 {

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<UserProps> = () => {
           <styles.AgreementInnerBox>
             <styles.Checks style={{ borderBottom: "1px solid #D0D0D0" }}>
               <Checkbox
+
+                icon={<CircleIcon />}
+                checkedIcon={<CheckCircleIcon />}
+
                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                   const { checked } = e.target;
                   checked
@@ -105,6 +110,8 @@ const UserPage: React.FC<UserProps> = () => {
             </styles.Checks>
             <styles.Checks>
               <Checkbox
+                icon={<CircleIcon />}
+                checkedIcon={<CheckCircleIcon />}
                 checked={checked.second}
                 name="second"
                 onChange={checkBoxHandler}
@@ -113,6 +120,8 @@ const UserPage: React.FC<UserProps> = () => {
             </styles.Checks>
             <styles.Checks>
               <Checkbox
+                icon={<CircleIcon />}
+                checkedIcon={<CheckCircleIcon />}
                 name="third"
                 checked={checked.third}
                 onChange={checkBoxHandler}
@@ -121,6 +130,8 @@ const UserPage: React.FC<UserProps> = () => {
             </styles.Checks>
             <styles.Checks>
               <Checkbox
+                icon={<CircleIcon />}
+                checkedIcon={<CheckCircleIcon />}
                 name="fourth"
                 checked={checked.fourth}
                 onChange={checkBoxHandler}
@@ -129,6 +140,8 @@ const UserPage: React.FC<UserProps> = () => {
             </styles.Checks>
             <styles.Checks>
               <Checkbox
+                icon={<CircleIcon />}
+                checkedIcon={<CheckCircleIcon />}
                 name="fifth"
                 checked={checked.fifth}
                 onChange={checkBoxHandler}