diff --git a/FE/error/src/components/EconoCalendar.jsx b/FE/error/src/components/EconoCalendar.jsx
index b689f4f..8e52858 100644
--- a/FE/error/src/components/EconoCalendar.jsx
+++ b/FE/error/src/components/EconoCalendar.jsx
@@ -26,12 +26,9 @@ const EconoCalendar = ({ isLoggedIn, setIsLoggedIn }) => {
const uri = isUserLoggedIn
? "/api/calendar/all"
: "/api/calendar/all/public";
- const config = isUserLoggedIn
- ? { headers: { Authorization: `Bearer ${storedToken}` } }
- : {};
axios
- .get(uri, config)
+ .get(uri, { headers: { Authorization: `Bearer ${storedToken}` } })
.then((res) => {
const fetchedEvents = res.data.data.map((event) => ({
title: event.eventName,
diff --git a/FE/error/src/components/scheduleCreate/CreateModal.jsx b/FE/error/src/components/scheduleCreate/CreateModal.jsx
index e1c5103..cfa4085 100644
--- a/FE/error/src/components/scheduleCreate/CreateModal.jsx
+++ b/FE/error/src/components/scheduleCreate/CreateModal.jsx
@@ -29,7 +29,7 @@ const CreateModal = ({
const [eventEndTime, setEventEndTime] = useState("00:00");
const [selectedFilter, setSelectedFilter] = useState(null);
const [activeDropdown, setActiveDropdown] = useState(null);
- const storedToken = localStorage.getItem("slackToken");
+ const [privateFilters, setPrivateFilters] = useState([]);
useEffect(() => {
if (isOpen && selectedDate) {
@@ -39,16 +39,32 @@ const CreateModal = ({
setEventInfo("");
setEventPlace("");
setEventMemo("");
- setEventStartTime("00:00"); // 초기화 추가
- setEventEndTime("00:00"); // 초기화 추가
- setNewStartDate(selectedDate + "T00:00"); // 수정
- setNewEndDate(selectedDate + "T00:00"); // 수정
-
+ setEventStartTime("00:00");
+ setEventEndTime("00:00");
+ setNewStartDate(selectedDate + "T00:00");
+ setNewEndDate(selectedDate + "T00:00");
setSelectedFilter(null);
setActiveDropdown(null);
+
+ fetchFilters();
}
}, [isOpen, selectedDate]);
+ const storedToken = localStorage.getItem("slackToken");
+
+ const fetchFilters = async () => {
+ try {
+ const response = await axios.get("/api/filter", {
+ headers: { Authorization: `Bearer ${storedToken}` },
+ });
+ if (response.data && response.data.data) {
+ setPrivateFilters(response.data.data);
+ }
+ } catch (error) {
+ console.error("필터 정보를 가져오는 데 실패했습니다:", error);
+ }
+ };
+
const isFilterSelected = () => {
return selectedFilter && selectedFilter.category && selectedFilter.filter;
};
@@ -83,7 +99,6 @@ const CreateModal = ({
setEventStartTime(time);
setNewStartDate(`${StartDate}T${time}`);
- // 시작 시간이 종료 시간보다 늦을 경우, 종료 시간을 시작 시간과 같게 설정
if (StartDate === EndDate && time > eventEndTime) {
setEventEndTime(time);
setNewEndDate(`${EndDate}T${time}`);
@@ -92,7 +107,6 @@ const CreateModal = ({
const handleEndTimeSelect = (time) => {
if (StartDate === EndDate && time < eventStartTime) {
- // 종료 시간이 시작 시간보다 이를 경우, 시작 시간을 종료 시간과 같게 설정
setEventStartTime(time);
setNewStartDate(`${StartDate}T${time}`);
}
@@ -123,11 +137,11 @@ const CreateModal = ({
return selectedFilter.filter;
}
switch (category) {
- case "econo":
+ case "public":
return "에코노";
case "group":
return "그룹";
- case "personal":
+ case "private":
return "개인";
default:
return "";
@@ -147,7 +161,7 @@ const CreateModal = ({
const saveData = () => {
if (!eventName || !isFilterSelected()) {
- return; // 추가적인 안전장치
+ return;
}
const data = {
@@ -156,9 +170,8 @@ const CreateModal = ({
eventEndDate: eventEndDate,
eventPlace: eventPlace,
eventInfo: eventMemo,
- eventCategory: {
- [selectedFilter.category]: selectedFilter.filter,
- },
+ scheduleType: selectedFilter.category,
+ filterName: selectedFilter.filter,
};
axios
@@ -200,7 +213,7 @@ const CreateModal = ({