Skip to content
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

[7주차] TherapEase 과제 제출합니다. #7

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7f0f935
init project
flowersayo Jun 13, 2023
2c4a0c5
docs: 커밋 템플릿 생성
Gaeun-Kwon Jun 13, 2023
797d157
feat: 프로젝트 초기 세팅
Gaeun-Kwon Jun 13, 2023
da58cf2
docs: 이슈 템플릿 생성
Gaeun-Kwon Jun 13, 2023
6cb4bfe
feat: 라우팅 수정
Gaeun-Kwon Jun 13, 2023
a954685
Merge branch 'main' of https://github.com/TherapEase-CEOS/react-vote-…
Gaeun-Kwon Jun 13, 2023
0423a52
fix : add React dependency
flowersayo Jun 16, 2023
ca4c396
feat: Header 컴포넌트 생성 및 라우팅 변경 (#6)
Gaeun-Kwon Jun 18, 2023
858cb99
feat: Layout 사이즈 설정
Gaeun-Kwon Jun 18, 2023
714246d
feat: 메인페이지 레이아웃 (#8)
flowersayo Jun 18, 2023
75708ab
fix: 기존 컴포넌트 조정
Gaeun-Kwon Jun 18, 2023
09ff328
feat: part main page ui
Gaeun-Kwon Jun 18, 2023
1c6ffcf
feat: part vote page ui
Gaeun-Kwon Jun 18, 2023
e5f6362
feat: part result page ui
Gaeun-Kwon Jun 18, 2023
df20dd3
chore: add eslintrc.json
Gaeun-Kwon Jun 20, 2023
32463bb
feat: demo main page layout
flowersayo Jun 18, 2023
5eb0b28
feat: demo vote page ui
flowersayo Jun 18, 2023
0e3997e
feat: demo result page ui
flowersayo Jun 18, 2023
17094c8
fix: 기존 컴포넌트 조정
Gaeun-Kwon Jun 18, 2023
0a857ab
feat: part main page ui
Gaeun-Kwon Jun 18, 2023
fa1dd4d
feat: part vote page ui
Gaeun-Kwon Jun 18, 2023
13a5b2d
feat: part result page ui
Gaeun-Kwon Jun 18, 2023
a76f3ed
Merge branch 'feature/#3-part-pages-ui' of https://github.com/TherapE…
Gaeun-Kwon Jun 21, 2023
0829037
feat: 데모페이지 UI (#11)
flowersayo Jun 24, 2023
c3c154c
Revert "feat: 데모페이지 UI (#11)" (#13)
flowersayo Jun 25, 2023
b287a55
Merge branch 'develop' into release
flowersayo Jun 25, 2023
2eb5b43
feat: 데모페이지 UI (#11)
flowersayo Jun 24, 2023
621ee1a
add: create axios modules
flowersayo Jun 26, 2023
79a5e42
add : create db.json for json API Mock Server
flowersayo Jun 26, 2023
525af81
add missing commit (a76f3ed)
flowersayo Jun 26, 2023
61ffe54
add: add interface
flowersayo Jun 26, 2023
8ccdf49
chore : move interface.tsx
flowersayo Jun 26, 2023
02c7dd4
feat: 회원가입, 로그인 화면 UI 구현 (#12)
Gaeun-Kwon Jun 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,16 @@ function App() {

const Layout = () => {
return (
<>
<div
style={{
width: '100vw',
height: 'calc(100vh - 3.5rem)',
paddingTop: '3.5rem',
}}
>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

지금까지 global.css로 스타일링 해왔는데, layout으로 스타일링 해줄 수도 있네요!

<Header />
<Outlet />
</>
</div>
);
};

Expand Down
3 changes: 3 additions & 0 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,13 @@ const Header = () => {
};

const Container = styled.div`
position: fixed;
top: 0;
width: 100vw;
height: 3.5rem;
display: flex;
align-items: center;
background-color: #ffff;

.ceosLogo {
cursor: pointer;
Expand Down