Fix: 문구 수정

gom-3 · Oct 10, 2023 · 96a00f8 · 96a00f8
1 parent b1c9264
commit 96a00f8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/src/components/NavigationBar/index.tsx b/src/components/NavigationBar/index.tsx
@@ -2,13 +2,17 @@ import { FoldIcon } from '@assets/svg';
 import { useState, useEffect } from 'react';
 import NavigationBarItemGroups from './NavigationBarItemGroup';
 import { event, sendEvent } from 'analytics';
+import useAuth from '@hooks/auth/useAuth';
 
 interface Props {
   isFold: boolean;
   setIsFold: (isFold: boolean) => void;
 }
 
 const NavigationBar = ({ isFold, setIsFold }: Props) => {
+  const {
+    state: { accountMe },
+  } = useAuth();
   const [canHover, setCanHover] = useState(true);
 
   useEffect(() => {
@@ -41,12 +45,7 @@ const NavigationBar = ({ isFold, setIsFold }: Props) => {
         </div>
         <NavigationBarItemGroups />
         <div className="absolute bottom-[1.875rem] mt-[3.125rem] flex cursor-pointer flex-col items-center">
-          <img
-            className="h-[3.125rem] w-[3.125rem] rounded-full object-cover"
-            src="https://i.namu.wiki/i/GYWTca0tsaAfzBFcTsqoCt8wB_mrCGoSIoivXhaukvxQBil3JtX-BOXyEqqJRJJA7qTb-dpjv9YGfE7izuZ00Q.webp"
-            alt="user-profile"
-          />
-          <div className="mt-2 ">{'곰세마리'}님</div>
+          <div className="mt-2 ">{accountMe?.name}</div>
         </div>
       </div>
     </div>

diff --git a/src/index.css b/src/index.css
@@ -22,6 +22,12 @@ body::-webkit-scrollbar {
   flex-direction: column;
 }
 
+@media screen and (max-width: 1800px) {
+  html {
+    font-size: 14px !important;
+  }
+}
+
 @media screen and (max-width: 1680px) {
   html {
     font-size: 12px !important;

diff --git a/src/pages/MakeShiftPage/components/ShiftCalendar.tsx b/src/pages/MakeShiftPage/components/ShiftCalendar.tsx
@@ -173,7 +173,7 @@ export default function ShiftCalendar() {
               color: shift.wardShiftTypes.find((x) => x.name === '오프')?.textColor,
             }}
           >
-            W
+            WO
           </div>
         </div>
       </div>

diff --git a/src/pages/MakeShiftPage/components/Toolbar.tsx b/src/pages/MakeShiftPage/components/Toolbar.tsx
@@ -61,7 +61,7 @@ function Toolbar() {
           onClick={() => changeMonth('next')}
           className="h-[1.875rem] w-[1.875rem] cursor-pointer"
         />
-        <p className="ml-[1.25rem] font-apple text-[.875rem] text-main-1" onClick={() => test()}>
+        <p className="ml-[1.25rem] font-apple text-[.875rem] text-main-1">
           기본 OFF {shift?.days.filter((x) => x.dayType !== 'workday').length}일
         </p>
       </div>

diff --git a/src/pages/MemberPage/components/NurseEditDrawer.tsx b/src/pages/MemberPage/components/NurseEditDrawer.tsx
@@ -53,7 +53,6 @@ function NurseEditDrawer() {
         className="absolute left-[1.25rem] top-[.8125rem] h-[1.875rem] w-[1.875rem] scale-x-[-1] cursor-pointer"
         onClick={() => selectNurse(null)}
       />
-      <p className="ml-[1.5625rem] font-apple text-base font-medium text-sub-3">간호사별 관리</p>
       <div className="mb-[1.25rem] mt-[3.75rem] flex h-[2.625rem] w-full items-center px-[2.5rem]">
         <div className="h-[2.625rem] w-[2.625rem] rounded-full bg-gray-400 " />
         <TextField

diff --git a/src/pages/MemberPage/components/ShiftTeamList.tsx b/src/pages/MemberPage/components/ShiftTeamList.tsx
@@ -257,7 +257,7 @@ function ShiftTeamList() {
                             borderBottom: '.4375rem solid transparent',
                           }}
                         />
-                        초대하지 않아도, 가상의 프로필을 만들어 관리할 수 있어요! &nbsp; (언제든지
+                        초대하지 않아도, 가상의 간호사를 만들어 관리할 수 있어요! &nbsp; (언제든지
                         초대해서 연동 가능합니다.)
                       </div>
                     </div>
@@ -341,7 +341,9 @@ function ShiftTeamList() {
                                 <DragIcon className="invisible absolute left-[.75rem] h-[1.5rem] w-[1.5rem] group-hover:visible" />
                                 <div className="peer relative font-apple text-[1.25rem] font-semibold text-sub-1">
                                   {nurse.name}
-                                  <div className="absolute right-[-.3125rem] top-0 h-[.3125rem] w-[.3125rem] rounded-full bg-red"></div>
+                                  {!nurse.isConnected && (
+                                    <div className="absolute right-[-.3125rem] top-0 h-[.3125rem] w-[.3125rem] rounded-full bg-red"></div>
+                                  )}
                                 </div>
                                 <div className="invisible absolute top-0 z-30 flex translate-y-[-60%] items-center gap-[.5rem] whitespace-nowrap rounded-[.3125rem] bg-white px-2 py-1 font-apple text-[.875rem] text-sub-2 shadow-shadow-2 peer-hover:visible">
                                   <div
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,7 +173,7 @@ export default function ShiftCalendar() { @@
                   color: shift.wardShiftTypes.find((x) => x.name === '오프')?.textColor,
                 }}
               >
-                W
+                WO
               </div>
             </div>
           </div>
@@ Expand Down @@