From 779dc1bbe01435d06f38daf13d7567c871426b0d Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:28:55 +0900 Subject: [PATCH 01/13] =?UTF-8?q?=F0=9F=9A=A8=20Fix:=20=EB=AA=85=EC=83=81?= =?UTF-8?q?=20=EB=81=9D=EB=82=B8=20=EB=92=A4=20Header,=20Footer=20?= =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/meditation/components/MeditationTimeSetter.tsx | 5 +++++ src/pages/meditation/components/MeditationTimer.style.ts | 2 +- src/pages/notice/states/readAlert.ts | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/pages/notice/states/readAlert.ts diff --git a/src/pages/meditation/components/MeditationTimeSetter.tsx b/src/pages/meditation/components/MeditationTimeSetter.tsx index 6de4dd80..e662423d 100644 --- a/src/pages/meditation/components/MeditationTimeSetter.tsx +++ b/src/pages/meditation/components/MeditationTimeSetter.tsx @@ -45,6 +45,11 @@ const MeditationTimeSetter = ({ themePicked }: MeditationTimeSetterProps) => { }; const handleEndMeditation = () => { + const headerEl = document.querySelector('header'); + const footerEl = document.querySelector('footer'); + + headerEl.style.display = 'flex'; + footerEl.style.display = 'flex'; navigate('/posting', { state: { channelId: themePicked.id, diff --git a/src/pages/meditation/components/MeditationTimer.style.ts b/src/pages/meditation/components/MeditationTimer.style.ts index 9875fe9d..d83ea7b7 100644 --- a/src/pages/meditation/components/MeditationTimer.style.ts +++ b/src/pages/meditation/components/MeditationTimer.style.ts @@ -56,7 +56,7 @@ export const TimerElement = styled.button<{ timerPaused: boolean }>` transition: 0.3s; } - z-index: 2; + z-index: 1; `; export const IconContainer = styled.div` diff --git a/src/pages/notice/states/readAlert.ts b/src/pages/notice/states/readAlert.ts new file mode 100644 index 00000000..6731f92c --- /dev/null +++ b/src/pages/notice/states/readAlert.ts @@ -0,0 +1,6 @@ +import { atom } from 'recoil'; + +export const readAlert = atom({ + key: 'readAlert', + default: false +}); From 04987c7e5cb8a82be236ddb54024aa099b595a63 Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:29:51 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=F0=9F=9A=A8=20Fix:=20=EB=AA=A8=EB=93=88?= =?UTF-8?q?=20=EC=95=88=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8D=98=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PostPreview/PostHeader.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/PostPreview/PostHeader.tsx b/src/components/PostPreview/PostHeader.tsx index be5dda77..67f40842 100644 --- a/src/components/PostPreview/PostHeader.tsx +++ b/src/components/PostPreview/PostHeader.tsx @@ -3,6 +3,7 @@ import { Icon } from '../Icon'; import { Avatar } from '../Avatar'; import { AvatarContainer, + PostInfoContainer, PostDetailInfoContainer, UserContainer, NameContainer, From 5a0c2bba2d6106449732d9aabe9a5e2d3ea208cc Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:31:34 +0900 Subject: [PATCH 03/13] =?UTF-8?q?=F0=9F=9A=A8=20Fix:=20PostContent=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=95=88=20=EB=B6=88=EB=9F=AC=EC=98=A4?= =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/postDetail/components/PostContent.style.ts | 2 +- src/pages/postDetail/components/PostContent.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/postDetail/components/PostContent.style.ts b/src/pages/postDetail/components/PostContent.style.ts index 022b48c1..0eebb9a5 100644 --- a/src/pages/postDetail/components/PostContent.style.ts +++ b/src/pages/postDetail/components/PostContent.style.ts @@ -68,7 +68,7 @@ export const PostContentMenu = styled.div` } } - & > p:first-child { + & > p:first-of-type { border-top-left-radius: 10px; border-top-right-radius: 10px; } diff --git a/src/pages/postDetail/components/PostContent.tsx b/src/pages/postDetail/components/PostContent.tsx index c7fef3c5..45534b6a 100644 --- a/src/pages/postDetail/components/PostContent.tsx +++ b/src/pages/postDetail/components/PostContent.tsx @@ -1,5 +1,5 @@ import { useState, useRef } from 'react'; -import { Link, useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router-dom'; import { useMutation } from '@tanstack/react-query'; import type { User } from '@/types'; @@ -13,6 +13,7 @@ import { PostContentMenu, PostEditConfirmButtonContainer } from './PostContent.style'; +import PostHeader from '@components/PostPreview/PostHeader'; import { Toast } from '@components/Toast'; import { deletePost, putPost } from '@apis/posts'; import { Button } from '@components/Button'; From 1573c39c676cd4ed4629d29d78f6a0810fceeb77 Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:37:22 +0900 Subject: [PATCH 04/13] =?UTF-8?q?=F0=9F=92=84=20Style:=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EA=B2=B0=EA=B3=BC=20scroll=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/layout/components/SearchBody.style.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/layout/components/SearchBody.style.ts b/src/pages/layout/components/SearchBody.style.ts index 9668a4a2..6493ff44 100644 --- a/src/pages/layout/components/SearchBody.style.ts +++ b/src/pages/layout/components/SearchBody.style.ts @@ -8,11 +8,10 @@ export const SearchResultContainer = styled.div` top: 50px; left: 0; z-index: 1; + overflow-y: scroll; `; -export const SearchResult = styled.div` - overflow: auto; -`; +export const SearchResult = styled.div``; export const SearchItem = styled.div` ${({ theme }) => theme.style.flexAlignCenter} From a7c41a6f5d750410b9b7687326555b693cecc26c Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:37:30 +0900 Subject: [PATCH 05/13] =?UTF-8?q?=F0=9F=92=84=20Style:=20Header=20?= =?UTF-8?q?=EC=99=80=20=EA=B1=B0=EB=A6=AC=EB=91=90=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/postDetail/components/PostContent.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/postDetail/components/PostContent.style.ts b/src/pages/postDetail/components/PostContent.style.ts index 0eebb9a5..2cddfe8a 100644 --- a/src/pages/postDetail/components/PostContent.style.ts +++ b/src/pages/postDetail/components/PostContent.style.ts @@ -80,6 +80,7 @@ export const PostContentMenu = styled.div` `; export const PostContentBody = styled.div` + margin-top: 10px; padding: 20px; width: 100%; line-height: 1.5; From d48d5b30c34596af94b75568792a3a11a49f5d3a Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 17:49:12 +0900 Subject: [PATCH 06/13] =?UTF-8?q?=F0=9F=92=84=20Style:=20FollowButton=20St?= =?UTF-8?q?yle=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/profile/components/FollowButton.tsx | 3 ++- src/pages/profile/components/FollowUser.style.ts | 6 ------ src/pages/profile/components/FollowUser.tsx | 2 +- src/pages/profile/components/ProfileHeader.style.ts | 11 ++--------- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/pages/profile/components/FollowButton.tsx b/src/pages/profile/components/FollowButton.tsx index f14ab096..ff64767e 100644 --- a/src/pages/profile/components/FollowButton.tsx +++ b/src/pages/profile/components/FollowButton.tsx @@ -22,7 +22,7 @@ const FollowButton = ({ followingUserId, possibleDeleteFollow, followedThisUser = true, - width = 68, + width = 80, height = 30, fontSize = 12, refetch @@ -67,6 +67,7 @@ const FollowButton = ({ ) : ( - + + + )} ); From a543cb0c2fd291dc292918de7bde5cc8db9c5ef3 Mon Sep 17 00:00:00 2001 From: Suyeon Date: Wed, 27 Sep 2023 18:16:39 +0900 Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=9A=A8=20Fix:=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20import=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/layout/components/IconNav.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/layout/components/IconNav.tsx b/src/pages/layout/components/IconNav.tsx index 55113b5d..940cfe39 100644 --- a/src/pages/layout/components/IconNav.tsx +++ b/src/pages/layout/components/IconNav.tsx @@ -7,8 +7,6 @@ import { AlertButton, SearchButton } from '@pages/layout/components'; import useSessionStorage from '@hooks/useSessionStorage'; import { LoginConfirm } from '@components/Confirm'; import { EtcNavContainer } from './IconNav.style'; -import { User } from '@/types'; - interface EtcNavProps { handleOpenSearchBox: () => void;