Merge branch 'develop' of https://github.com/4bujak-4bujak/frontend i…

…nto develop
4bujak-4bujak · Jun 12, 2024 · 497202f · 497202f
2 parents b46d28b + 7349fa2
commit 497202f
Show file tree

Hide file tree

Showing 25 changed files with 520 additions and 789 deletions.
diff --git a/src/components/home/MainHeader.tsx b/src/components/home/MainHeader.tsx
@@ -1,23 +1,22 @@
 'use client';
-import Link from 'next/link';
+import { useRouter } from 'next/router';
 import React from 'react';
 
 const MainHeader = () => {
+  const router = useRouter();
   return (
     <header>
       <div className="flex justify-between items-center py-2">
-        <div className="w-[116px] h-8">
+        <div className="w-[116px] h-8 cursor-pointer">
           <img src="/officelogowhite.svg" alt="" className="w-full" />
         </div>
         <div className="flex justify-center items-center gap-6">
-          <div>
+          <div onClick={() => router.push('mypage/question')}>
             <img src="/home/Inquiry_white.svg" alt="" />
           </div>
-          <Link href={'/notification'}>
-            <div>
-              <img src="/home/Notification_white.svg" alt="" />
-            </div>
-          </Link>
+          <div onClick={() => router.push('/notification')}>
+            <img src="/home/Notification_white.svg" alt="" />
+          </div>
         </div>
       </div>
     </header>

diff --git a/src/components/home/OfficeInfo.tsx b/src/components/home/OfficeInfo.tsx
@@ -37,16 +37,17 @@ const OfficeInfo = () => {
 
   return (
     <div>
-      {data.length == 0 ? <OfficeInfoNone /> : null}
-      {data.map((room: todayListData, i: number) => {
-        if (room.spaceType == 'FOCUSDESK') {
-          return <OfficeInfoFocus data={room} key={i} />;
-        } else if (room.spaceType == 'MEETINGROOM') {
-          return <OfficeInfoMeeting data={room} key={i} />;
-        } else {
-          return <OfficeInfoRecharging data={room} key={i} />;
-        }
-      })}
+      {data && data.length == 0 ? <OfficeInfoNone /> : null}
+      {data &&
+        data.map((room: todayListData, i: number) => {
+          if (room.spaceType == 'FOCUSDESK') {
+            return <OfficeInfoFocus data={room} key={i} />;
+          } else if (room.spaceType == 'MEETINGROOM') {
+            return <OfficeInfoMeeting data={room} key={i} />;
+          } else {
+            return <OfficeInfoRecharging data={room} key={i} />;
+          }
+        })}
     </div>
   );
 };

diff --git a/src/components/home/OfficeNotice.tsx b/src/components/home/OfficeNotice.tsx
@@ -36,7 +36,7 @@ const OfficeNotice: React.FC = () => {
 
   return (
     <>
-      <div className="w-full h-12 mt-7 bg-gray-200 flex items-center gap-[13px] px-[13px] py-[14px] rounded shadow border border-gray-200">
+  <div className="w-full h-12 mt-7 flex items-center gap-[13px] px-[13px] py-[14px] rounded shadow border border-gray-200" style={{ backgroundColor: 'rgb(228, 224, 245)' }}>
         <div>
           <img src="/home/notice.svg" alt="" />
         </div>

diff --git a/src/components/layout/footer/Footer.tsx b/src/components/layout/footer/Footer.tsx
@@ -41,7 +41,7 @@ const Footer = () => {
               )}
             </div>
             <div className="text-center text-black text-xs font-normal font-['Pretendard']">
-              예약/일정
+              예약
             </div>
           </div>
         </Link>

diff --git a/src/components/layout/header/Header.tsx b/src/components/layout/header/Header.tsx
@@ -9,7 +9,7 @@ const Header = () => {
         <img src="/officelogo.svg" alt="" />
       </div>
       <div className="flex items-center justify-center gap-6">
-        <div className="cursor-pointer">
+        <div onClick={() => router.push('mypage/question')} className="cursor-pointer">
           <img src="/Inquiry.svg" alt="" />
         </div>
         <Link href={'/notification'}>

diff --git a/src/components/reservation/meetingRoom/DatePickerModal.tsx b/src/components/reservation/meetingRoom/DatePickerModal.tsx
@@ -330,11 +330,12 @@ const DatePickerModal: React.FC<DatePickerModalProps> = ({
           </div>
         )}
         <div className="pt-[10px] w-full text-center items-center">
-          <button
-            className="absolute bottom-[30px] flex w-[88%] mx-auto h-12 bg-indigo-700 text-white rounded-lg justify-center items-center"
-            onClick={handleConfirm}>
-            확인
-          </button>
+        <button
+          className="absolute bottom-[30px] flex w-[88%] mx-auto h-12 text-white rounded-lg justify-center items-center"
+          style={{ backgroundColor: '#4E32BB' }}
+          onClick={handleConfirm}>
+          확인
+        </button>
         </div>
       </div>
     </div>