-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: GNB3 공지, 회비 페이지 레이아웃 구현 #35
Merged
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
53779e0
fix: GNB3 그룹 페이지 헤더, 탭바 CSS 문제 해결
crolvlee 1964a0d
Merge branch 'IT-Cotato:web_develop' into web_develop
crolvlee 5b62843
Merge remote-tracking branch 'upstream/web_develop' into web_develop
crolvlee 9b80f15
feat: 그룹 공지 리스트 레이아웃 구현
crolvlee d2988a1
feat: 그룹 회비 페이지 레이아웃 구현
crolvlee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
@@ -1,6 +1,4 @@ | ||
import React from 'react'; | ||
|
||
function Fee() { | ||
const Fee = () => { | ||
return ( | ||
<div> | ||
<h1>회비</h1> | ||
|
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 |
---|---|---|
@@ -1,33 +1,36 @@ | ||
import styled from 'styled-components'; | ||
import { Outlet } from 'react-router-dom'; | ||
import GroupHeader from '../../components/group/GroupHeader'; | ||
import GroupTabBar from '../../components/group/GroupTabBar'; | ||
|
||
const GroupContainer = styled.div` | ||
padding-top: 92px; // 헤더와 탭바의 높이를 고려한 여백 | ||
`; | ||
import GroupHeader from './group_components/GroupHeader'; | ||
import GroupTabBar from './group_components/GroupTabBar'; | ||
|
||
const FixedContainer = styled.div` | ||
position: fixed; | ||
position: sticky; | ||
top: 0; | ||
width: 100%; // 너비를 100%로 설정 | ||
max-width: 649px; // 최대 너비 제한 | ||
// box-sizing: border-box; | ||
// overflow: hidden; // 넘치는 내용 숨김 | ||
left: 0; | ||
width: 100%; | ||
background-color: white; | ||
z-index: 1000; | ||
`; | ||
|
||
const ContentContainer = styled.div` | ||
padding: 0 20px; | ||
overflow: hidden; | ||
display: flex; | ||
flex-direction: column; | ||
`; | ||
|
||
function GroupLayout() { | ||
const Group = () => { | ||
return ( | ||
<> | ||
<FixedContainer> | ||
<GroupHeader /> | ||
<GroupTabBar /> | ||
</FixedContainer> | ||
<GroupContainer> | ||
<ContentContainer> | ||
<Outlet /> | ||
</GroupContainer> | ||
</ContentContainer> | ||
</> | ||
); | ||
} | ||
|
||
export default GroupLayout; | ||
export default Group; |
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 |
---|---|---|
@@ -1,6 +1,4 @@ | ||
import React from 'react'; | ||
|
||
function Schedule() { | ||
const Schedule = () => { | ||
return ( | ||
<div> | ||
<h1>일정</h1> | ||
|
File renamed without changes.
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,47 @@ | ||
import styled from 'styled-components'; | ||
|
||
const Container = styled.div` | ||
border-bottom: 1px solid rgba(221, 221, 221, 0.5); /* 50% 투명도 */ | ||
padding: 16px 0; | ||
`; | ||
|
||
const NoticeTitle = styled.div` | ||
font-size: 16px; | ||
font-weight: bold; | ||
color: ${({ theme }) => theme.colors.neutral[700]}; | ||
display: flex; | ||
align-items: center; | ||
`; | ||
|
||
const NoticeDate = styled.div` | ||
font-size: 12px; | ||
margin-top: 10px; | ||
color: ${({ theme }) => theme.colors.neutral[400]}; | ||
`; | ||
|
||
const NewTag = styled.div` | ||
background-color: ${({ theme }) => theme.colors.main[500]}; | ||
color: #fff; | ||
width: 12px; | ||
height: 12px; | ||
padding: 2px 2px; | ||
font-size: 10px; | ||
margin-left: 8px; | ||
border-radius: 6px; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
`; | ||
|
||
const NoticeItem = ({ title, date, isNew }) => { | ||
return ( | ||
<Container> | ||
<NoticeTitle> | ||
{title} {isNew && <NewTag>N</NewTag>} | ||
</NoticeTitle> | ||
<NoticeDate>{date}</NoticeDate> | ||
</Container> | ||
); | ||
} | ||
|
||
export default NoticeItem; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이런거 요소가 많거나 길어지면
이런식으로 모아서 주는 방법도 있어