Merge branch 'FE' of https://github.com/JNU-econovation/econo-error i…

…nto FE
JNU-econovation · Aug 14, 2024 · bc0cbb4 · bc0cbb4
2 parents e7d7f12 + 822b5ae
commit bc0cbb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/FE/src/components/SideBar/publicFilter/PublicFilter.jsx b/FE/src/components/SideBar/publicFilter/PublicFilter.jsx
@@ -13,11 +13,11 @@ const PublicFilter = () => {
         <div style={{ fontSize: "1.1rem" }}>에코노 캘린더</div>
       </div>
       <StyledSceduleType>
-        <ScheduleToggle color={"#ff9898"} />
+        <ScheduleToggle color={"#FF968A"} />
         공식행사
       </StyledSceduleType>
       <StyledSceduleType>
-        <ScheduleToggle color={"#98c8ff"} />
+        <ScheduleToggle color={"#ffd4b5"} />
         주간발표
       </StyledSceduleType>
     </StyledPublicFilterFrame>

diff --git a/FE/src/components/common/FilterColorSelect.jsx b/FE/src/components/common/FilterColorSelect.jsx
@@ -16,7 +16,7 @@ const FilterColorSelect = ({ setFilterColor }) => {
       "#D6EFD8",
       "#FF968A",
       "#D4BDAC",
-      "#FFC8A2",
+      "#ffd4b5",
       "#AAEF98",
     ];
 

diff --git a/FE/src/components/common/FilterModify.jsx b/FE/src/components/common/FilterModify.jsx
@@ -28,8 +28,8 @@ const FilterModify = ({ filterName, filterID }) => {
       filterColor: filterColor,
     };
     axios
-      .post(
-        "/api/calendar/filter/" + filterID,
+      .put(
+        "/api/filter/" + filterID,
         {
           headers: { Authorization: `Bearer ${storedToken}` },
         },