Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
fc5dffe
chore: PR 템플릿 추가
withyj-codeit Sep 3, 2023
93a0e93
chore: 머지 후 브랜치 삭제 github action 추가
withyj-codeit Sep 3, 2023
b2e37bd
reset
hanseulhee Oct 10, 2023
6f8bbb0
Merge branch 'codeit-bootcamp-frontend:main' into main
hanseulhee Oct 10, 2023
e11e25f
fix: 머지 후 브랜치 삭제 github action 수정
hanseulhee Oct 10, 2023
212e864
env: workflows 폴더로 이동
hanseulhee Oct 10, 2023
4dc5dd0
Merge pull request #237 from hanseulhee/fix-github-actions
withyj-codeit Nov 6, 2023
0c818c3
First sprint
Jiii-Eun May 15, 2025
b449d64
Merge pull request #1 from Jiii-Eun/Basic-최지은-sprint1
baeggmin May 15, 2025
01ec6df
redactor: 폴더 정리 및 파일 이동
Jiii-Eun May 17, 2025
b265e5c
refactor(mentor): sprint1 수정과 sprint2첫번째 완성
Jiii-Eun May 17, 2025
e248809
Style.css파일 삭제
Jiii-Eun May 18, 2025
7b54837
Change file 작업전추가
Jiii-Eun May 18, 2025
e5e2cf2
Conflict 수정
Jiii-Eun May 19, 2025
c846b85
Refactor: auth.css submit에 cursor추가
Jiii-Eun May 19, 2025
cf47d79
Refactor: sprint2 수정
Jiii-Eun May 21, 2025
29422d4
Refactor(mentor): 테블릿, 모바일크기 설정
Jiii-Eun Jun 2, 2025
928c117
Meta태그 추가 및 수정
Jiii-Eun Jun 2, 2025
e84e75e
Refactor(mentor): spring3완성
Jiii-Eun Jun 2, 2025
cf77c9c
refactor: auth.css 중복 padding삭제
Jiii-Eun Jun 2, 2025
9ae66b0
refactor: height수정
Jiii-Eun Jun 3, 2025
7abdb3a
feat: sprint4완성
Jiii-Eun Jun 10, 2025
b991613
refactor: 비밀번호 일치 수정
Jiii-Eun Jun 10, 2025
0629498
refactor: 코드 위치 변경
Jiii-Eun Jun 10, 2025
ecdfd77
refactor: 로그인 js연결
Jiii-Eun Jun 10, 2025
6bbfd80
refactor: submit버튼 수정필요
Jiii-Eun Jun 10, 2025
90c4ca0
refactor: submit버튼 활성화
Jiii-Eun Jun 10, 2025
e4cf89b
refactor: 코드 위치수정
Jiii-Eun Jun 10, 2025
f5385ac
refactor: submit상태 코드 유효성 추가
Jiii-Eun Jun 12, 2025
00e5395
feat: items구조 및 api 연결
Jiii-Eun Aug 3, 2025
7fe3cc8
feat: 초기세팅, items구조, api 연결
Jiii-Eun Aug 3, 2025
427d7bf
파일 복구
Jiii-Eun Aug 4, 2025
746bc94
중간 저장
Jiii-Eun Aug 4, 2025
99eb977
feat: 공통스타일 및 헤더푸터 스타이리 설정
Jiii-Eun Aug 4, 2025
98a3274
feat: items페이지 구현
Jiii-Eun Aug 8, 2025
f55ea9f
style: PageList 스타일 분리
Jiii-Eun Aug 8, 2025
838e468
style: itemOrder 커서 통일
Jiii-Eun Aug 8, 2025
d58466e
docs: readme삭제
Jiii-Eun Aug 8, 2025
13c1c71
Merge branch 'React-최지은-sprint5' into React-최지은
Jiii-Eun Aug 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
27 changes: 27 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
## 요구사항

### 기본

- [x]
- []
- []

### 심화

- [x]
- []

## 주요 변경사항

-
-

## 스크린샷

![image](이미지url)

## 멘토에게

-
-
- 셀프 코드 리뷰를 통해 질문 이어가겠습니다.
14 changes: 14 additions & 0 deletions .github/workflows/delete-merged-branch-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: delete branch on close pr

on:
pull_request:
types: [closed]

jobs:
delete-branch:
runs-on: ubuntu-latest
steps:
- name: delete branch
uses: SvanBoxel/delete-merged-branch@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
146 changes: 146 additions & 0 deletions 1-4/css/auth.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
.material-symbols-outlined {
font-variation-settings: "FILL" 0, "wght" 400, "GRAD" 0, "opsz" 24;
}
* {
color: var(--gray-800);
}
html,
body {
height: 100%;
}

.auth_container {
min-height: 100%;
min-width: 16rem;
display: flex;
align-items: center;
justify-content: center;
}

.width_container {
max-width: 40rem;
width: 100%;
}

.user_input label,
.user_input input,
.auth.btn {
display: block;
width: 100%;
}

.user_input label {
font-size: 1.125rem;
font-weight: 700;
margin-bottom: 1rem;
}

.user_input input,
.auth.btn {
margin-bottom: 1.5rem;
}

.logo {
justify-content: center;
margin-bottom: 2.5rem;
}
.logo h1 {
font-size: 4.15rem;
}
.logo_img {
max-width: 6.5rem;
}

.user_input input {
background-color: var(--gray-100);
border-radius: 0.75rem;
padding: 0 1.5rem;
}

.error_text {
position: absolute;
bottom: -1rem;
left: 0;
font-size: 0.875rem;
color: #ff0000;
}

.auth.btn {
font-size: 1.25rem;
font-weight: 600;
background-color: var(--gray-400);
}

.input_wrap {
position: relative;
}
.password_icon {
position: absolute;
right: 1.5rem;
top: 50%;
transform: translateY(-50%);
cursor: pointer;
}

.icon_cover {
width: 2.625rem;
height: 2.625rem;
border-radius: 50%;
overflow: hidden;
}
.sns_icon {
display: block;
}

.auth_text a {
color: var(--primary-100);
border-bottom: 0.06rem solid var(--primary-100);
}

.simple_login {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 1.5rem;
background-color: #e6f2ff;
padding: 1rem 1.5rem;
border-radius: var(--border-8);
}

.simple_login span {
word-break: keep-all;
font-weight: 500;
}
.sns_login {
display: flex;
justify-content: flex-end;
gap: 1rem;
}

.auth_helper {
text-align: center;
}
.auth_link {
margin-left: 0.3rem;
}

@media screen and (max-width: 767px) {
.auth_container {
padding: 1rem;
}

.logo h1 {
font-size: 2rem;
}
.logo_img {
max-width: 3.25rem;
}
.user_input label {
font-size: 0.875rem;
margin-bottom: 0.5rem;
}

.width_container {
max-width: 25rem;
}
}
141 changes: 141 additions & 0 deletions 1-4/css/common.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
* {
color: var(--gray-700);
}
h2,
.main span {
font-weight: 700;
}
h2 {
font-size: 2.5rem;
word-break: keep-all;
line-height: 3rem;
}

section:not(.main) {
background-color: #cfe5ff;
}

.intro,
.ending {
padding-top: 4.2rem;
}
.flex_div {
height: 33rem;
display: flex;
justify-content: space-between;
align-items: flex-end;
}
.title_div {
margin-bottom: 6.25rem;
width: 30rem;
}
.ending .title_div {
margin-bottom: 11rem;
}

.intro h2 {
margin-bottom: 2rem;
}

.intro .shopping {
display: block;
font-size: 1.25rem;
text-align: center;
width: 21rem;
}

.main img {
max-width: 36.75rem;
}
.main .card {
display: flex;
align-items: center;
justify-content: center;
gap: 3.5rem;
padding: 7rem 0;
}
.main .card.right {
flex-direction: row-reverse;
text-align: right;
}

.card_info span {
display: block;
font-size: 1.125rem;
color: var(--primary-100);
margin-bottom: 1.4rem;
}
.card_info h2 {
width: 18rem;
margin-bottom: 2.8rem;
}
.card_info p {
font-size: 1.5rem;
}

@media screen and (max-width: 1199px) {
.flex_div {
flex-direction: column;
justify-content: flex-end;
align-items: center;
gap: 5rem;
text-align: center;
}
.intro .flex_div {
height: 48rem;
}
.ending .flex_div {
height: 58rem;
}
.title_div {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
}

.card_outter {
margin: 1.5rem;
}

.main .card.right {
flex-direction: column;
}
.main .card {
flex-direction: column;
align-items: unset;
padding: 0 0 3.25rem;
}
.main img {
max-width: 100%;
border-radius: var(--border-16);
}
.card_info h2 {
width: 100%;
font-size: 2rem;
margin-bottom: 1.5rem;
}
.card_info p {
font-size: 1.125rem;
}
}

@media screen and (max-width: 767px) {
.intro,
.ending {
padding-top: 0;
}

.flex_div {
height: 33.75rem;
}

.title_div {
max-width: 21rem;
}

.main .card {
padding: 1.5rem 0;
}
}
Loading
Loading