Merge pull request #84 from dnd-side-project/feature/#83

자잘한 수정 및 로딩 컴포넌트 제작
dnd-side-project · Mar 18, 2024 · 9fe6419 · 9fe6419
2 parents daeae01 + fdbbb56
commit 9fe6419
Show file tree

Hide file tree

Showing 9 changed files with 498 additions and 156 deletions.
diff --git a/components/compositions/dashboard/tree-info.tsx b/components/compositions/dashboard/tree-info.tsx
@@ -35,7 +35,7 @@ const TreeInfo = ({ filter }: { filter: FilterType }) => {
             내 정원에 심어진 나무는
             <br />
             <b className="text-mainTitle1-bold mt-1 text-black">
-              총 {data?.user?.totalSurveyCnt ?? 0}그루
+             총 {data?.user?.totalSurveyCnt ?? 0}그루
             </b>
           </p>
           <div className="w-20 h-20 bg-text-main-whiteFF flex justify-center items-center rounded-full">

diff --git a/components/compositions/header/developer-info/index.tsx b/components/compositions/header/developer-info/index.tsx
@@ -43,7 +43,7 @@ const DeveloperInfo = () => {
       open={openAlert}
       onChangeOpen={setOpenAlert}
       trigger={
-        <p className="py-[14px] text-body1-bold text-text-main-black11">
+        <p className="py-[14px] text-body1-bold text-text-main-black11 cursor-pointer">
           제작 정보
         </p>
       }

diff --git a/components/compositions/header/edit-setting/index.tsx b/components/compositions/header/edit-setting/index.tsx
@@ -50,7 +50,7 @@ const EditProfile = () => {
       open={openAlert}
       onChangeOpen={setOpenAlert}
       trigger={
-        <p className="py-[14px] text-body1-bold text-text-main-black11">
+        <p className="py-[14px] text-body1-bold text-text-main-black11 cursor-pointer">
           프로필 편집
         </p>
       }

diff --git a/components/compositions/header/setting/index.tsx b/components/compositions/header/setting/index.tsx
@@ -62,7 +62,7 @@ const Setting = () => {
 
           <Modal
             trigger={
-              <p className="py-[14px] text-body1-bold text-text-main-black11">
+              <p className="py-[14px] text-body1-bold text-text-main-black11 cursor-pointer">
                 로그아웃
               </p>
             }
@@ -119,13 +119,10 @@ const Setting = () => {
           /> */}
         </section>
         <section className="py-4 px-5 flex flex-col items-start">
-          <h4 className="text-body3-medium text-text-sub-gray4f py-2">
+          <h4 className="text-body3-medium text-text-sub-gray4f py-2 ">
             남의 위키
           </h4>
           <DeveloperInfo />
-          <FilterProvider>
-            <WriteList />
-          </FilterProvider>
         </section>
       </div>
     </Drawer>

diff --git a/components/loading/index.tsx b/components/loading/index.tsx
diff --git a/components/svgs/many-trees.tsx b/components/svgs/many-trees.tsx
diff --git a/components/ui/drawer/index.tsx b/components/ui/drawer/index.tsx
@@ -54,7 +54,7 @@ const Drawer = ({
       const newState = !state ?? isMounted
       if (ref.current) {
         css(ref.current, {
-          position: 'absolute',
+          position: 'fixed',
           right: '-100%',
           top: '0px',
           width: '100%',

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -77,7 +77,7 @@ export default function NamuiWikiApp({
           <HydrationBoundary state={pageProps.dehydratedState}>
             <div className="grow hidden lg:flex flex-col pb-8">
               <div className="grow flex flex-col justify-center">
-                <h3 className="text-[32px] leading-[42px] text-text-main-black11">
+                <h3 className="font-bold text-[32px] leading-[42px] text-text-main-black11">
                   남이 쓰는 나의 소개서
                 </h3>
                 <div className="max-w-xs max-h-24 flex items-center flex-col grow mt-3">

diff --git a/pages/garden/index.tsx b/pages/garden/index.tsx
@@ -123,7 +123,7 @@ const Pages = () => {
             />
           </div>
           <Link href="/dashboard" className="w-full">
-            <button className="w-full px-4 py-3 rounded-md text-body3-medium  text-main-green-green800 bg-main-green-green50 ">
+            <button className="w-full px-4 py-3 rounded-md text-body3-medium text-main-green-green800 bg-main-green-green50 hover:text-main-green-green300 hover:bg-[#f3faf3] active:bg-main-green-green100 active:text-main-green-green800">
               내 결과 보기
             </button>
           </Link>