Merge pull request #327 from LikeLion-at-DGU/dev

🚀 Deploy
LikeLion-at-DGU · Aug 5, 2024 · 9e597cc · 9e597cc
2 parents cf637ce + 31f7901
commit 9e597cc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -39,21 +39,18 @@ const Content = styled.div`
 
 const Layout = () => {
   const location = useLocation();
+  const excludePaths = [/^\/login/, /^\/signup/, /^\/agree\/[0-1]/];
+
+  const isExcludedPath = excludePaths.some((regex) =>
+    regex.test(location.pathname)
+  );
 
   return (
     <Frame>
       <Wrapper>
         <Content>
           <Outlet />
-          {location.pathname === "/login" ||
-          location.pathname === "/signup" ||
-          location.pathname === "/signup/custom" ||
-          location.pathname === "/agree/0" ||
-          location.pathname === "/agree/1" ? (
-            <></>
-          ) : (
-            <Footer />
-          )}
+          {isExcludedPath ? <></> : <Footer />}
         </Content>
       </Wrapper>
     </Frame>

diff --git a/src/components/DateRangeCalendar/DateRangeCalendar.jsx b/src/components/DateRangeCalendar/DateRangeCalendar.jsx
@@ -130,11 +130,6 @@ const DateRangeCalendar = () => {
     } else {
       console.log("No date selected");
     }
-
-    setSelectedStartDate(formattedStartDate);
-    setSelectedEndDate(formattedEndDate);
-    setIsCalendarVisible(false);
-    setIsCheckVisible(true);
   };
 
   return (

diff --git a/src/components/mainRoutineBox/MainRoutineBox.jsx b/src/components/mainRoutineBox/MainRoutineBox.jsx
@@ -34,7 +34,7 @@ function MainRoutineBox({
       </S.TitleContainer>
       <S.BoxContent>
         {contentArray.map((line, index) => (
-          <div key={index}>{line.trim()}</div>
+          <div key={index}>‣{line.trim()}</div>
         ))}
       </S.BoxContent>
     </S.BoxContainer>

diff --git a/src/pages/NotFound/NotFount.jsx b/src/pages/NotFound/NotFount.jsx
@@ -26,9 +26,9 @@ export const NotFound = () => {
                 <p
                   style={{
                     color: "white",
-                    fontSize: "70px",
+                    fontSize: "80px",
                     fontFamily: "AppleSDGothicNeoB",
-                    fontWeight: "400",
+                    fontWeight: "700",
                     lineHeight: "20px",
                   }}
                 >
@@ -47,9 +47,9 @@ export const NotFound = () => {
                 <p
                   style={{
                     color: "white",
-                    fontSize: "20px",
+                    fontSize: "25px",
                     fontFamily: "AppleSDGothicNeoB",
-                    fontWeight: "400",
+                    fontWeight: "700",
                     lineHeight: "20px",
                   }}
                 >
@@ -58,9 +58,9 @@ export const NotFound = () => {
                 <p
                   style={{
                     color: "white",
-                    fontSize: "20px",
+                    fontSize: "25px",
                     fontFamily: "AppleSDGothicNeoB",
-                    fontWeight: "400",
+                    fontWeight: "700",
                     lineHeight: "20px",
                   }}
                 >
@@ -73,7 +73,7 @@ export const NotFound = () => {
                     color: "white",
                     fontSize: "20px",
                     fontFamily: "AppleSDGothicNeoL",
-                    fontWeight: "400",
+                    fontWeight: "200",
                     lineHeight: "20px",
                     marginTop: "1rem",
                   }}