Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions 19-Sprint-Mission
Submodule 19-Sprint-Mission added at 2ff18d
Empty file added 2025-08-05/README.md
Empty file.
28 changes: 28 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Weekly Branch – 학습 공유 & PR 리뷰 공간

이 브랜치는 조원들이 매일 학습한 내용을 공유하고, 리뷰를 통해 함께 성장하기 위한 공간입니다.

## 📌 PR 작성 규칙

### ✅ 제목

- `[08-05] 조원이름`
예시: `[08-05] 혁`

### ✅ 내용

- 오늘 학습한 내용 요약
- 코드 설명 또는 질문
- 피드백 받고 싶은 부분

### ✅ 머지 조건

- 팀원 전원의 Approve
- Squash and Merge 사용

### ✅ 머지 시 커밋 메시지 작성 규칙

PR을 `Squash and Merge`할 때 최종 커밋 메시지는 다음 규칙을 따릅니다:

- 형식: `[날짜] 조원이름 - 학습 정리`
- 예시: `[08-05] 혁 - 학습 정리`
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
22 changes: 11 additions & 11 deletions index.html → sprint_mission_001/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<div class="wrapper">
<header>
<div class="header-wrap">
<a href="/"><img src="/images/Property 1=lg.png" alt=""></a>
<a href="/sprint_mission_001/index.html"><img src="/sprint_mission_001/images/Property 1=lg.png" alt=""></a>

<div class="login-btn">
<a href="/login.html" >로그인</a>
<a href="/sprint_mission_001/login.html" >로그인</a>
</div>
</div>
</header>
Expand All @@ -31,14 +31,14 @@ <h1>일상의 모든 물건을<br>

</div>

<img src="/images/pandaimages/Img_home_top.png" alt="판다이미지">
<img src="/sprint_mission_001/images/pandaimages/Img_home_top.png" alt="판다이미지">
</div>
</div>
</main>

<section>
<div class="section-wrap">
<img src="/images/section_images/Img_home_01.png" alt="인기 상품 확인 이미지" class="section-img">
<img src="/sprint_mission_001/images/section_images/Img_home_01.png" alt="인기 상품 확인 이미지" class="section-img">

<div class="section-text">
<span>Hot item</span>
Expand All @@ -65,14 +65,14 @@ <h1>구매를 원하는<br>
쉽게 찾아보세요</p>
</div>

<img src="/images/section_images/Img_home_02.png" alt="검색 이미지" class="section-img">
<img src="/sprint_mission_001/images/section_images/Img_home_02.png" alt="검색 이미지" class="section-img">

</div>
</section>

<section>
<div class="section-wrap">
<img src="/images/section_images/Img_home_03.png" alt="등록 이미지" class="section-img">
<img src="/sprint_mission_001/images/section_images/Img_home_03.png" alt="등록 이미지" class="section-img">

<div class="section-text">
<span>Register</span>
Expand All @@ -92,7 +92,7 @@ <h1>판매를 원하는<br>
<h1>믿을 수 있는<br>
판다마켓 중고거래</h1>

<img src="/images/pandaimages/Img_home_top.png" alt="판다이미지">
<img src="/sprint_mission_001/images/pandaimages/Img_home_bottom.png" alt="판다이미지">
</div>
</section>

Expand All @@ -106,10 +106,10 @@ <h1>믿을 수 있는<br>
</div>

<div class="sns">
<a href="https://www.instagram.com/"><img src="/images/SNSlogo/ic_instagram.png" alt="instagram logo" target></a>
<a href="https://www.facebook.com/"><img src="/images/SNSlogo/ic_facebook.png" alt="facebook logo" target></a>
<a href="https://x.com/"><img src="/images/SNSlogo/ic_twitter.png" alt="ic_twitter logo" target></a>
<a href="https://www.youtube.com/"><img src="/images/SNSlogo/ic_youtube.png" alt="youtube logo" target></a>
<a href="https://www.instagram.com/"><img src="/sprint_mission_001/images/SNSlogo/ic_instagram.png" alt="instagram logo" target></a>
<a href="https://www.facebook.com/"><img src="/sprint_mission_001/images/SNSlogo/ic_facebook.png" alt="facebook logo" target></a>
<a href="https://x.com/"><img src="/sprint_mission_001/images/SNSlogo/ic_twitter.png" alt="ic_twitter logo" target></a>
<a href="https://www.youtube.com/"><img src="/sprint_mission_001/images/SNSlogo/ic_youtube.png" alt="youtube logo" target></a>
</div>
</div>
</footer>
Expand Down
22 changes: 17 additions & 5 deletions login.css → sprint_mission_001/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ body {

a {
cursor: pointer;
text-decoration: none;
}

button {
Expand All @@ -36,6 +37,12 @@ button {
justify-content: center;
}

.login-id {
display: flex;
flex-direction: column;
gap: 30px;
}

.login-id > div {
display: flex;
flex-direction: column;
Expand All @@ -46,9 +53,7 @@ button {
.login-id span {
font-size: 18px;
font-weight: 700;
font-style: bold;
line-height: 26px;
color: #1F2937;
}

.login-id input {
Expand All @@ -70,14 +75,19 @@ button {
line-height: 32px;
text-align: center;
}
.login-pw {

.login-pw, .login-id-text {
position:relative;
display: flex;
flex-direction: column;
gap: 10px;
}

.show-pw {
position: absolute;
right: 20px;
top: 50%;
transform: translateY(-50%);
transform: translateY(30%);
width: 24px;
height: 24px;
cursor: pointer;
Expand All @@ -90,7 +100,6 @@ button {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20px;
padding: 10px 23px;
background-color: #E6F2FF;
}
Expand All @@ -113,3 +122,6 @@ button {
margin-right: 10px;
}

.login-signup .underline {
text-decoration: underline;
}
59 changes: 59 additions & 0 deletions sprint_mission_001/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>panda market login</title>
<link rel="stylesheet" href="login.css">
</head>
<body>
<div class="sign-wrap">
<div class="login-logo">
<a href="/sprint_mission_001/index.html"><img src="/sprint_mission_001/images/Property 1=lg.png" alt="판다마켓 로고"></a>
</div>

<div class="login-input-wrap">

<div class="login-id">

<form class="login-id-text">
<span>이메일</span>
<input type="text" placeholder="이메일을 입력해주세요">
</form>

<div class="login-pw-text">

<form class="login-pw">
<span>비밀번호</span>
<input type="password" placeholder="비밀번호를 입력해주세요">
<img src="/sprint_mission_001/images/Vector.png" alt="show password" class="show-pw">
</form>
</div>
</div>


<button type="submit" class="login-btn">로그인</button>


<button class="easy-login">
<span>간편 로그인하기</span>
<div class="sns-logo">
<a href="https://www.google.com/">
<img src="/sprint_mission_001/images/SNSlogo/google_logo.png" alt="google로그인 아이콘">
</a>
<a href="https://www.kakaocorp.com/page/">
<img src="/sprint_mission_001/images/SNSlogo/kakao_logo.png" alt="kakako로그인 아이콘">
</a>
</div>
</button>


<div class="login-signup">
<span>판다마켓이 처음이신가요?</span>
<a href="/sprint_mission_001/signup.html" class="underline">회원가입</a>
</div>
</div>
</div>
</div>
</body>
</html>
121 changes: 121 additions & 0 deletions sprint_mission_001/signup.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/* log-in and sign-up page css */
* {
box-sizing: border-box;
margin: 0;
padding: 0;
border: none;
}

body {
font-family: "Pretendard", sans-serif;
font-size: clamp(14px, 1vw, 18px);
margin: 0;
}

a {
cursor: pointer;
text-decoration: none;
}

button {
cursor: pointer;
}

.sign-wrap {
width: 640px;
margin: 230px auto;
}

.login-input-wrap {
display: flex;
flex-direction: column;
gap: 20px;
}

.sign-wrap .login-logo {
display: flex;
justify-content: center;
}

.login-id > div {
display: flex;
flex-direction: column;
gap: 10px;
margin-bottom: 30px;
}

.login-id span {
font-size: 18px;
font-weight: 700;
font-style: bold;
line-height: 26px;
color: #1F2937;
}

.login-id input {
width: 640px;
height: 60px;
border-radius: 12px;
padding: 0 20px;
background-color: #F3F4F6;
}

.login-btn {
width: 640px;
height: 56px;
background-color: #3692FF;
border-radius: 40px;
color: #FFFFFF;
font-size: 18px;
font-weight: 600;
line-height: 32px;
text-align: center;
}

.login-pw {
position:relative;
}

.show-pw {
position: absolute;
right: 20px;
top: 50%;
transform: translateY(-50%);
width: 24px;
height: 24px;
cursor: pointer;
}

.easy-login {
width: 640px;
height: 74px;
border-radius: 8px;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20px;
padding: 10px 23px;
background-color: #E6F2FF;
}

.easy-login > span {
font-size: 16px;
font-weight: 500;
line-height: 26px;
color: #1F2937;
}

.login-signup {
display: flex;
justify-content: center;
margin-top: 20px;
gap: 5px;
}

.easy-login .sns-logo a{
margin-right: 10px;
}

.login-signup .underline {
text-decoration: underline;
}
Loading