From 7e16ec68b091a82d2c6ac86f593e5ad2bc2f5496 Mon Sep 17 00:00:00 2001
From: hanbinchoi <wkghskak@naver.com>
Date: Mon, 18 Dec 2023 18:03:44 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[FE]=20=E2=9C=A8=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/app/garden/[id]/page.tsx            | 2 ++
 client/src/app/leaf/[userId]/[leafId]/page.tsx | 2 ++
 client/src/app/page.tsx                        | 2 ++
 client/src/app/post/[id]/page.tsx              | 1 -
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/app/garden/[id]/page.tsx b/client/src/app/garden/[id]/page.tsx
index cfccfd5c..a2444114 100644
--- a/client/src/app/garden/[id]/page.tsx
+++ b/client/src/app/garden/[id]/page.tsx
@@ -20,6 +20,7 @@ import {
   PurchaseModal,
   EmptyInventoryModal,
 } from '@/components/garden';
+import { NotificationButton } from '@/components/common';
 
 interface GardenProps {
   params: { id: string };
@@ -69,6 +70,7 @@ export default function Garden({ params }: GardenProps) {
         </div>
         {isOpen && renderModal(type)}
       </div>
+      <NotificationButton />
       <Footer />
     </>
   );
diff --git a/client/src/app/leaf/[userId]/[leafId]/page.tsx b/client/src/app/leaf/[userId]/[leafId]/page.tsx
index de2397b8..f487daab 100644
--- a/client/src/app/leaf/[userId]/[leafId]/page.tsx
+++ b/client/src/app/leaf/[userId]/[leafId]/page.tsx
@@ -23,6 +23,7 @@ import {
   ShareModal,
   Footer,
   Screws,
+  NotificationButton,
 } from '@/components/common';
 
 import { DiaryDataInfo } from '@/types/data';
@@ -118,6 +119,7 @@ export default function Leaf({ params }: LeafProps) {
             />
           ))}
       </motion.div>
+      <NotificationButton />
       <Footer />
     </>
   );
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 6ad12916..9da4abf9 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -14,6 +14,7 @@ import MainSignupBanner from '@/components/main/MainSignupBanner';
 import ScrollDownButton from '@/components/main/ScrollDownButton';
 
 import { getScrollTop } from '@/utils/getScrollTop';
+import { NotificationButton } from '@/components/common';
 
 export default function Home() {
   const isClient = useClient();
@@ -82,6 +83,7 @@ export default function Home() {
                 </motion.section>
               )}
             </div>
+            <NotificationButton />
             <Footer />
           </>
         )}
diff --git a/client/src/app/post/[id]/page.tsx b/client/src/app/post/[id]/page.tsx
index 26b2a5bf..7ffb867e 100644
--- a/client/src/app/post/[id]/page.tsx
+++ b/client/src/app/post/[id]/page.tsx
@@ -66,7 +66,6 @@ export default function Post({ params }: PostProps) {
     window.scrollTo(0, 0);
     return router.refresh();
   });
-
   useEffect(() => {
     if (post?.comments) setComments(post?.comments);
   }, [post?.comments]);

From 7bf0179500c6c9e450ab6226a25d241b011cbf0c Mon Sep 17 00:00:00 2001
From: hanbinchoi <wkghskak@naver.com>
Date: Wed, 10 Jan 2024 22:10:03 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[FE]=E2=99=BB=EF=B8=8F=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=A0=9C=ED=95=9C=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/package-lock.json            | 24 ++++++++----------------
 client/src/app/page.tsx             |  2 --
 client/src/constants/contents.ts    |  2 +-
 client/src/utils/isValidFileSize.ts |  2 +-
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index e14694e7..10950d63 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -4925,8 +4925,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmmirror.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz",
       "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@emotion/is-prop-valid": {
       "version": "0.8.8",
@@ -5024,8 +5023,7 @@
     "@hookform/error-message": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@hookform/error-message/-/error-message-2.0.1.tgz",
-      "integrity": "sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg==",
-      "requires": {}
+      "integrity": "sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg=="
     },
     "@humanwhocodes/config-array": {
       "version": "0.11.11",
@@ -5491,8 +5489,7 @@
       "version": "5.3.2",
       "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv": {
       "version": "6.12.6",
@@ -6235,8 +6232,7 @@
       "version": "9.0.0",
       "resolved": "https://registry.npmmirror.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
       "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-import-resolver-node": {
       "version": "0.3.9",
@@ -6429,8 +6425,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmmirror.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
       "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "eslint-scope": {
       "version": "7.2.2",
@@ -7833,8 +7828,7 @@
     "react-hook-form": {
       "version": "7.45.4",
       "resolved": "https://registry.npmmirror.com/react-hook-form/-/react-hook-form-7.45.4.tgz",
-      "integrity": "sha512-HGDV1JOOBPZj10LB3+OZgfDBTn+IeEsNOKiq/cxbQAIbKaiJUe/KV8DBUzsx0Gx/7IG/orWqRRm736JwOfUSWQ==",
-      "requires": {}
+      "integrity": "sha512-HGDV1JOOBPZj10LB3+OZgfDBTn+IeEsNOKiq/cxbQAIbKaiJUe/KV8DBUzsx0Gx/7IG/orWqRRm736JwOfUSWQ=="
     },
     "react-infinite-scroller": {
       "version": "1.2.6",
@@ -8354,8 +8348,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
       "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ts-interface-checker": {
       "version": "0.1.13",
@@ -8494,8 +8487,7 @@
     "use-sync-external-store": {
       "version": "1.2.0",
       "resolved": "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "requires": {}
+      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
     },
     "util-deprecate": {
       "version": "1.0.2",
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 63251409..502bf273 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -86,9 +86,7 @@ export default function Home() {
 
               <InquiryButton />
             </div>
-
             <NotificationButton />
-
             <Footer />
           </>
         )}
diff --git a/client/src/constants/contents.ts b/client/src/constants/contents.ts
index 910ed067..82cc61d1 100644
--- a/client/src/constants/contents.ts
+++ b/client/src/constants/contents.ts
@@ -156,7 +156,7 @@ export const DIARY_FORM_TEXT = {
 };
 
 export const IMAGE_UPLOAD_TEXT = {
-  fileSizeWarn: '2mb 이하 이미지를 선택해주세요.',
+  fileSizeWarn: '4mb 이하 이미지를 선택해주세요.',
   noImageUploadError: '이미지를 필수로 등록해야 합니다.',
   imageUpload: '이미지 등록',
 };
diff --git a/client/src/utils/isValidFileSize.ts b/client/src/utils/isValidFileSize.ts
index 3a864e55..2a0401f9 100644
--- a/client/src/utils/isValidFileSize.ts
+++ b/client/src/utils/isValidFileSize.ts
@@ -1,6 +1,6 @@
 export default function isValidFileSize(file: File) {
   if (file && file.type.startsWith('image/')) {
-    if (file.size <= 2 * 1024 * 1024) {
+    if (file.size <= 4 * 1024 * 1024) {
       return true;
     }
   }