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.

Sign up for GitHub

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

[최제원] Sprint2 #102

Merged
merged 4 commits into from
Nov 7, 2024
Merged

[최제원] Sprint2 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b349d93
div태그 대신 header 태그로 변경 및 logo-img에 대한 a태그 추가
CJewon Nov 4, 2024
0c982da
이미지 파일구조 수정 및 파일구조 수정에 따른 이미지들의 src 수정
CJewon Nov 5, 2024
3816e1b
login.html form태그와 label태그로 변경 및 비밀번호 가림 이미지 추가와 그에 맞는 css 적용
CJewon Nov 5, 2024
be7188f
signup.html form태그와 label태그로 변경 및 비밀번호 가림 이미지 추가와 그에 맞는 css 적용
CJewon Nov 5, 2024
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
43 changes: 30 additions & 13 deletions css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,39 +58,51 @@ h1 {
width: 100%;
}

.input-email__container,
.input-password__container {
.form__container {
display: flex;
flex-direction: column;
gap: 24px;
}

.form__group {
display: flex;
flex-direction: column;
gap: 16px;
width: 100%;
}

.input-email,
.input-password {
.form__group-input {
height: 56px;
border-radius: 12px;
border: 0px;
background-color: #f3f4f6;
padding: 15px 24px;
width: 100%;
}

.input-email,
.input-password,
.input-email::placeholder,
.input-password::placeholder {
.form__group-input,
.form__group-input::placeholder {
font-size: 16px;
line-height: 26px;
font-weight: 400;
}

.input-email__text,
.input-password__text {
.form__group-label {
font-size: 18px;
font-weight: 700;
line-height: 26px;
}

.form__group-input-container {
position: relative;
}

.form__group-img {
position: absolute;
right: 24px;
top: 15px;
}

.login-button {
width: 100%;
height: 56px;
Expand All @@ -104,9 +116,14 @@ h1 {
font-size: 20px;
line-height: 32px;
font-weight: 600;
border: 0;
}

.login-button:hover {
cursor: pointer;
}

.sns-login__container {
.social-login__container {
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -116,14 +133,14 @@ h1 {
background-color: #e6f2ff;
}

.sns-login__icon {
.social-login__icon {
display: flex;
justify-content: center;
align-items: center;
gap: 16px;
}

.sns-login__container > p {
.social-login__container > p {
font-size: 16px;
line-height: 26px;
font-weight: 500;
Expand Down
54 changes: 35 additions & 19 deletions css/signup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,45 +58,55 @@ h1 {
width: 100%;
}

.input-email__container,
.input-password__container,
.input-nickname__container,
.input-check-password__container {
.form__container {
display: flex;
flex-direction: column;
gap: 24px;
}

.form__group {
display: flex;
flex-direction: column;
gap: 16px;
width: 100%;
}

.input-email,
.input-password,
.input-nickname,
.input-check-password {
.form__group-input {
height: 56px;
border-radius: 12px;
border: 0px;
background-color: #f3f4f6;
padding: 15px 24px;
width: 100%;
}

.form__group-input:focus {
border: 1px solid #3692ff;
outline: none;
}

.input-email::placeholder,
.input-password::placeholder,
.input-nickname::placeholder,
.input-check-password::placeholder {
.form__group-input::placeholder {
font-size: 16px;
line-height: 26px;
font-weight: 400;
}

.input-email__text,
.input-password__text,
.input-nickname__text,
.input-check-password__text {
.form__group-label {
font-size: 18px;
font-weight: 700;
line-height: 26px;
}

.form__group-input-container {
position: relative;
}

.form__group-img {
position: absolute;
top: 15px;
right: 24px;
}

.signup-button {
width: 100%;
height: 56px;
Expand All @@ -110,9 +120,15 @@ h1 {
font-size: 20px;
line-height: 32px;
font-weight: 600;
border: 0;
}

.signup-button:hover,
.form__group-img:hover {
cursor: pointer;
}

.sns-login__container {
.social-login__container {
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -122,14 +138,14 @@ h1 {
background-color: #e6f2ff;
}

.sns-login__icon {
.social-login__icon {
display: flex;
justify-content: center;
align-items: center;
gap: 16px;
}

.sns-login__container > p {
.social-login__container > p {
font-size: 16px;
line-height: 26px;
font-weight: 500;
Expand Down
0 img/index/Img_home_top.png → img/Img_home_top.png
View file
Open in desktop
File renamed without changes
0 img/index/banner-img.png → img/banner-img.png
View file
Open in desktop
File renamed without changes
0 img/login/btn_visibility_on_24px.png → img/btn_visibility_on_24px.png
View file
Open in desktop
File renamed without changes
0 img/login/google-icon.png → img/google-icon.png
View file
Open in desktop
File renamed without changes
0 img/index/hot-items-img.png → img/hot-items-img.png
View file
Open in desktop
File renamed without changes
0 img/index/ic_facebook.png → img/ic_facebook.png
View file
Open in desktop
File renamed without changes
0 img/index/ic_instagram.png → img/ic_instagram.png
View file
Open in desktop
File renamed without changes
0 img/index/ic_twitter.png → img/ic_twitter.png
View file
Open in desktop
File renamed without changes
0 img/index/ic_youtube.png → img/ic_youtube.png
View file
Open in desktop
File renamed without changes
0 img/login/kakaotalk-icon.png → img/kakaotalk-icon.png
View file
Open in desktop
File renamed without changes
0 img/index/register-img.png → img/register-img.png
View file
Open in desktop
File renamed without changes
0 img/index/search-img.png → img/search-img.png
View file
Open in desktop
File renamed without changes
Binary file removed img/signup/google-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed img/signup/kakaotalk-icon.png
View file
Open in desktop
Binary file not shown.
Binary file removed img/signup/큰판다얼굴.png
View file
Open in desktop
Binary file not shown.
0 img/login/큰판다얼굴.png → img/큰판다얼굴.png
View file
Open in desktop
File renamed without changes
0 img/index/판다얼굴.png → img/판다얼굴.png
View file
Open in desktop
File renamed without changes
25 changes: 11 additions & 14 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<a href="/" class="header__logo">
<img
class="header__logo-img"
src="/img/index/판다얼굴.png"
src="/img/판다얼굴.png"
alt="판다마켓 로고"
/>
<span class="header__logo-text">판다마켓</span>
</a>
<a href="/login" class="header__login-button">로그인</a>
<a href="/login.html" class="header__login-button">로그인</a>
Copy link
Collaborator

Choose a reason for hiding this comment

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

엇 굳이 .html을 안붙여도 되지 않나요?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

화면 캡처 2024-11-07 090944
/login 으로 했을경우 사진과 같이 나와서 .html을 붙여줬습니다. 혹여 문제가 될까요 ?

</div>
</header>
<section class="main-banner">
Expand All @@ -27,16 +27,13 @@
<h1>일상의 모든 물건을<br />거래해 보세요</h1>
<a href="/items" class="main-banner__click-button">구경하러 가기</a>
</div>
<img
src="/img/index/Img_home_top.png"
alt="홈 페이지 상단 배너 이미지"
/>
<img src="/img/Img_home_top.png" alt="홈 페이지 상단 배너 이미지" />
</div>
</section>
<section class="feature-section">
<div class="feature-section__container">
<img
src="/img/index/hot-items-img.png"
src="/img/hot-items-img.png"
alt="핫 아이템"
class="feature-section__image"
/>
Expand All @@ -54,7 +51,7 @@ <h2 class="feature-section__content-box__title">
<section class="feature-section">
<div class="feature-section__container">
<img
src="/img/index/search-img.png"
src="/img/search-img.png"
alt="검색 아이템"
class="feature-section__image feature-section__image-left"
/>
Expand All @@ -74,7 +71,7 @@ <h2 class="feature-section__content-box__title">
<section class="feature-section">
<div class="feature-section__container">
<img
src="/img/index/register-img.png"
src="/img/register-img.png"
alt="등록 아이템"
class="feature-section__image"
/>
Expand All @@ -94,7 +91,7 @@ <h2 class="feature-section__content-box__title">
<div class="sub-banner__text-container">
<h1>믿을 수 있는<br />판다마켓 중고 거래</h1>
</div>
<img src="/img/index/banner-img.png" alt="서브 배너 이미지" />
<img src="/img/banner-img.png" alt="서브 배너 이미지" />
</div>
</section>
<footer class="footer-section">
Expand All @@ -107,16 +104,16 @@ <h1>믿을 수 있는<br />판다마켓 중고 거래</h1>
</li>
<li>
<a href="https://www.facebook.com" target="_blank">
<img src="/img/index/ic_facebook.png" alt="facebook" />
<img src="/img/ic_facebook.png" alt="facebook" />
</a>
<a href="https://www.twitter.com" target="_blank">
<img src="/img/index/ic_twitter.png" alt="twitter" />
<img src="/img/ic_twitter.png" alt="twitter" />
</a>
<a href="https://www.youtube.com" target="_blank">
<img src="/img/index/ic_youtube.png" alt="youtube" />
<img src="/img/ic_youtube.png" alt="youtube" />
</a>
<a href="https://www.instagram.com" target="_blank">
<img src="/img/index/ic_instagram.png" alt="instagram" />
<img src="/img/ic_instagram.png" alt="instagram" />
</a>
</li>
</ul>
Expand Down
70 changes: 41 additions & 29 deletions login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,64 @@
</head>
<body>
<section class="login">
<div class="logo__container">
<img src="/img/login/큰판다얼굴.png" alt="판다얼굴" class="logo__img" />
<header class="logo__container">
<a href="/" class="logo-img__link">
<img src="/img/큰판다얼굴.png" alt="판다얼굴" class="logo__img" />
</a>
<a href="/" class="logo__link"><h1>판다마켓</h1></a>
</div>
</header>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Good 👍🏻

<div class="login__container">
<div class="input-email__container">
<p class="input-email__text">이메일</p>
<input
type="text"
placeholder="이메일을 입력해주세요"
class="input-email"
/>
</div>
<div class="input-password__container">
<p class="input-password__text">비밀번호</p>
<input
type="password"
name="userPassword"
id="password"
placeholder="비밀번호를 입력해주세요"
class="input-password"
/>
</div>
<a href="/login" class="login-button">로그인</a>
<div class="sns-login__container">
<form action="/login" method="POST" class="form__container">
<div class="form__group">
<label class="form__group-label" for="focus">이메일</label>
<input
type="email"
placeholder="이메일을 입력해주세요"
class="form__group-input"
name="email"
/>
</div>
<div class="form__group">
<label class="form__group-label" for="focus">비밀번호</label>
<div class="form__group-input-container">
<input
type="password"
name="password"
id="password"
placeholder="비밀번호를 입력해주세요"
class="form__group-input"
/>
<img
src="/img/btn_visibility_on_24px.png"
alt="비밀번호 가림 이미지"
class="form__group-img"
/>
</div>
</div>
<button type="submit" class="login-button">로그인</button>
</form>
<div class="social-login__container">
<p>간편 로그인하기</p>
<div class="sns-login__icon">
<div class="social-login__icon">
Copy link
Collaborator

Choose a reason for hiding this comment

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

good 👍🏻

<a href="https://www.google.com/">
<img
src="/img/login/google-icon.png"
src="/img/google-icon.png"
alt="구글 아이콘"
class="sns-login__google-icon"
class="social-login__google-icon"
/>
</a>
<a href="“https://www.kakaocorp.com/page/">
<img
src="/img/login/kakaotalk-icon.png"
src="/img/kakaotalk-icon.png"
alt="카카오톡 아이콘"
class="sns-login__kakao-icon"
class="social-login__kakao-icon"
/>
</a>
</div>
</div>
<div class="sign-up__container">
<p>판다마켓이 처음이신가요?</p>
<a href="/signup" class="sign-up__link">회원가입</a>
<a href="/signup.html" class="sign-up__link">회원가입</a>
</div>
</div>
</section>
Expand Down
Loading
Loading