-
Notifications
You must be signed in to change notification settings - Fork 3
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 #35 from crolvlee/web_develop
feat: GNB3 공지, 회비 페이지 레이아웃 구현
- Loading branch information
Showing
12 changed files
with
306 additions
and
98 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
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,30 +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; | ||
left: 0; | ||
width: 100%; | ||
background-color: white; | ||
z-index: 1000; | ||
`; | ||
|
||
const ContentContainer = styled.div` | ||
overflow: hidden; | ||
display: flex; | ||
flex-direction: column; | ||
height: 100vh; | ||
`; | ||
|
||
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> | ||
|
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,40 @@ | ||
import styled from 'styled-components'; | ||
|
||
const Container = styled.div` | ||
display: flex; | ||
padding: 12px 0; | ||
// border-bottom: 1px solid #ddd; | ||
align-items: center; | ||
&:last-child { | ||
border-bottom: none; | ||
} | ||
`; | ||
|
||
const ExpenseDate = styled.div` | ||
font-size: 16px; | ||
color: ${({ theme }) => theme.colors.neutral[800]}; | ||
`; | ||
|
||
const ExpenseDescription = styled.div` | ||
font-size: 16px; | ||
margin-left: 16px; | ||
color: ${({ theme }) => theme.colors.neutral[800]}; | ||
flex: 1; | ||
`; | ||
|
||
const ExpenseAmount = styled.div` | ||
font-size: 18px; | ||
font-weight: 600; | ||
color: ${({ theme }) => theme.colors.main[500]}; | ||
margin-left: auto; | ||
`; | ||
|
||
const ExpenseItem = ({ date, description, amount }) => ( | ||
<Container> | ||
<ExpenseDate>{date}</ExpenseDate> | ||
<ExpenseDescription>{description}</ExpenseDescription> | ||
<ExpenseAmount>{amount}</ExpenseAmount> | ||
</Container> | ||
); | ||
|
||
export default ExpenseItem; |
Oops, something went wrong.