-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from pobu-team/develop
Develop -> Main
- Loading branch information
Showing
39 changed files
with
1,407 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import { Outlet } from 'react-router-dom'; | ||
import styled from 'styled-components'; | ||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import { NavermapsProvider } from 'react-naver-maps'; | ||
import NavigationBar from '../footer/NavigationBar'; | ||
|
||
const Container = styled.div` | ||
width: 100%; | ||
max-width: 375px; | ||
margin: auto; | ||
min-height: 100vh; | ||
max-height: fit-content; | ||
background-color: ${(props) => props.theme.colors.mainBackground}; | ||
`; | ||
|
||
export default function SearchLayout() { | ||
return ( | ||
<NavermapsProvider | ||
ncpClientId={process.env.REACT_APP_NAVER_CLIENT_ID as string} | ||
> | ||
<Container> | ||
<main> | ||
<Outlet /> | ||
</main> | ||
<NavigationBar /> | ||
</Container> | ||
</NavermapsProvider> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 5 additions & 6 deletions
11
...components/mypage/myLike/LikePoseList.tsx → src/components/mypage/LikePoseList.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import styled from 'styled-components'; | ||
|
||
const TabButton = styled.button<{active: boolean}>` | ||
width: 50%; | ||
background-color: transparent; | ||
border: none; | ||
font-size: 1.6rem; | ||
line-height: 2.6rem; | ||
font-weight: 600; | ||
color:${(props) => (props.active ? props.theme.colors.text : props.theme.colors.textAlternative)}; | ||
padding-block: 1.2rem; | ||
border-bottom: 2px solid ${(props) => (props.active ? props.theme.colors.text : 'transparent')}; | ||
cursor: pointer; | ||
`; | ||
|
||
interface PoseTabProps { | ||
isShowingRegisteredPoses: boolean, | ||
toggleTab: () => void | ||
} | ||
|
||
function PoseTab({ isShowingRegisteredPoses, toggleTab }: PoseTabProps) { | ||
return ( | ||
<div> | ||
<TabButton active={isShowingRegisteredPoses} onClick={toggleTab}> | ||
등록한 포즈 | ||
</TabButton> | ||
<TabButton active={!isShowingRegisteredPoses} onClick={toggleTab}> | ||
찜한 포즈 | ||
</TabButton> | ||
</div> | ||
); | ||
} | ||
|
||
export default PoseTab; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import styled from 'styled-components'; | ||
import useFetchLikeList from '../../hooks/useFetchLikeList'; | ||
import useFetchMyPoses from '../../hooks/useFetchMyPoses'; | ||
import PoseList from '../common/PoseList'; | ||
import EmptyPose from '../common/EmptyPose'; | ||
|
||
const PoseContainer = styled.div` | ||
padding: ${(props) => props.theme.sizes.contentPadding}; | ||
`; | ||
|
||
function RegisteredPoseList() { | ||
const likePoseIdArr = useFetchLikeList(); | ||
const { isLoading, data: filteredPoses } = useFetchMyPoses(); | ||
|
||
if (!isLoading && filteredPoses && filteredPoses.length > 0) { | ||
return ( | ||
<PoseContainer> | ||
<PoseList | ||
poses={filteredPoses} | ||
likePoseIdArr={likePoseIdArr} | ||
/> | ||
</PoseContainer> | ||
); | ||
} | ||
|
||
return ( | ||
<EmptyPose text="등록한" /> | ||
); | ||
} | ||
|
||
export default RegisteredPoseList; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
import styled from 'styled-components'; | ||
import { useNavigate } from 'react-router'; | ||
import useFetchMyInfo from '../../hooks/useFetchMemberInfo'; | ||
|
||
const ProfileContainer = styled.div` | ||
padding: 1.6rem 2.4rem; | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
`; | ||
|
||
const ImageNameBox = styled.div` | ||
display: flex; | ||
align-items: center; | ||
img { | ||
width: 64px; | ||
height: 64px; | ||
border-radius: 100%; | ||
margin-right: 1.2rem; | ||
} | ||
p { | ||
font-size: 2rem; | ||
line-height: 2.6rem; | ||
font-weight: 600; | ||
} | ||
`; | ||
|
||
const LogoutButton = styled.button` | ||
background-color: ${(props) => props.theme.colors.backgroundSecondary}; | ||
padding: 0.6rem 1.2rem; | ||
font-size: 1.4rem; | ||
line-height: 2.4rem; | ||
font-weight: 600; | ||
color: ${(props) => props.theme.colors.textNormal}; | ||
border: none; | ||
border-radius: 99px; | ||
width: 7.3rem; | ||
height: 3.6rem; | ||
cursor: pointer; | ||
`; | ||
|
||
function UserProfile() { | ||
const { data: myInfoResponse } = useFetchMyInfo(); | ||
const navigate = useNavigate(); | ||
return ( | ||
<ProfileContainer> | ||
<ImageNameBox> | ||
<img src={myInfoResponse?.data.profileImageUrl} alt="profile pic" /> | ||
<p>{myInfoResponse?.data.name}</p> | ||
</ImageNameBox> | ||
<LogoutButton | ||
type="button" | ||
onClick={() => { | ||
localStorage.removeItem('accessToken'); | ||
navigate('/'); | ||
}} | ||
> | ||
로그아웃 | ||
|
||
</LogoutButton> | ||
</ProfileContainer> | ||
); | ||
} | ||
|
||
export default UserProfile; |
Oops, something went wrong.