Merge pull request codestates-seb#379 from codestates-seb/develop

[FE] 🚀 배포를 위한 브랜치 병합
nalsae · Jan 11, 2024 · 3348b9c · 3348b9c
2 parents 28c4726 + 20f3f34
commit 3348b9c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/app/garden/[id]/page.tsx b/client/src/app/garden/[id]/page.tsx
@@ -25,6 +25,8 @@ import {
   EmptyInventoryModal,
   GuestbookModal,
 } from '@/components/garden';
+import { NotificationButton } from '@/components/common';
+
 import { InquiryButton } from '@/components/inquiry';
 
 interface GardenProps {

diff --git 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
@@ -19,6 +19,7 @@ import ScrollDownButton from '@/components/main/ScrollDownButton';
 import { InquiryButton } from '@/components/inquiry';
 
 import { getScrollTop } from '@/utils/getScrollTop';
+import { NotificationButton } from '@/components/common';
 
 export default function Home() {
   const isClient = useClient();

diff --git a/client/src/app/post/[id]/page.tsx b/client/src/app/post/[id]/page.tsx
@@ -67,7 +67,6 @@ export default function Post({ params }: PostProps) {
     window.scrollTo(0, 0);
     return router.refresh();
   });
-
   useEffect(() => {
     if (post?.comments) setComments(post?.comments);
   }, [post?.comments]);

diff --git 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
@@ -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;
     }
   }