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 #39

Merged
merged 12 commits into from
Aug 19, 2024
Merged

[김창희] sprint2 #39

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
410c1ae
스프린트 미션1 - 01
changhui-chan Aug 9, 2024
00e2686
디렉토리 구조 수정
changhui-chan Aug 16, 2024
f13840a
수정
changhui-chan Aug 16, 2024
3cbc0de
수정
changhui-chan Aug 17, 2024
a511f30
수정
changhui-chan Aug 17, 2024
9b3ee3a
수정 및 페이지 구현
changhui-chan Aug 17, 2024
04c4c80
아이콘 추가, JS 코드 작성, 페이지 작성
changhui-chan Aug 17, 2024
b015a81
수정
changhui-chan Aug 17, 2024
b069e77
수정
changhui-chan Aug 17, 2024
ab8301c
변수 등록
changhui-chan Aug 17, 2024
aff02fc
chore: index.html 위치 수정
changhui-chan Aug 19, 2024
a4dbf69
Merge branch 'Basic-김창희' into Basic-김창희-sprint2
changhui-chan Aug 19, 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
20 changes: 20 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<title>판다마켓</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="판다마켓 구경오라이">
<link rel="icon" href="/src/assets/img/panda_head.svg">
<link rel="stylesheet" href="/src/styles/base.css">

</head>

<body>

<div data-include-html="/src/pages/home.html"></div>

<script src="/src/js/IncludeHtml.js"></script>
</body>

</html>
Binary file added src/assets/img/Img_home_01.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Img_home_02-1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Img_home_03.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Img_home_bottom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/Img_home_top.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/img/btn_visibility_off.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/img/btn_visibility_on.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/hamster1.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/hamster2.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/hamster3.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_facebook.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_google.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_instagram.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_kakao.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_twitter.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/ic_youtube.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/logo_lg.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/logo_md.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/logo_sm.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/logo_typo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions src/assets/img/panda_head.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions src/components/Footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<footer class="footer">
<div class="footer-content">
<div>
<p class="footer-letter" style="color: #9CA3AF;">&#x24D2;codeit - 2024</p>
</div>
<div style="display: flex; gap: 30px;">
<p class="footer-letter"><a href="/src/pages/privacy" style="color: #E5E7EB;">Privacy Policy</a></p>
<p class="footer-letter"><a href="/src/pages/faq" style="color: #E5E7EB;">FAQ</a></p>
</div>
<div>
<nav>
<ul>
<a href="https://www.facebook.com/codeit.kr" target="_blank" rel="noopener noreferrer">
<li><img src="/src/assets/img/ic_facebook.png" alt="페이스북"></li>
</a>
<a href="https://x.com/codeitkr" target="_blank" rel="noopener noreferrer">
<li><img src="/src/assets/img/ic_twitter.png" alt="X"></li>
</a>
<a href="https://www.youtube.com/channel/UCCM79CPm2WbBYTRaiNEExbg" target="_blank" rel="noopener noreferrer">
<li><img src="/src/assets/img/ic_youtube.png" alt="유튜브">
</li>
</a>
<a href="https://www.instagram.com/codeit_kr/" target="_blank" rel="noopener noreferrer">
<li><img src="/src/assets/img/ic_instagram.png" alt="인스타그램"></li>
</a>
</ul>
</nav>
</div>

</div>
</footer>
8 changes: 8 additions & 0 deletions src/components/Header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<header>
<div class="header">
<a href="/src/">
<img src="/src/assets/img/logo_sm.png" alt="로고 이미지">
</a>
<a href="/src/pages/login/"><button class="login-btn is-cursor-pointer btn" type="button">로그인</button></a>
</div>
</header>
79 changes: 79 additions & 0 deletions src/components/Home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<main>
<section class="top-bottom">
<div class="top-bottom-content">
<div class="top-letter-wrapper">
<h3>
일상의 모든 물건을<br>
거래해 보세요
</h3>
<a href="/src/pages/items/"><button class="top-btn is-cursor-pointer btn" type="button">구경하러 가기</button></a>
</div>
<img src="/src/assets/img/img_home_top.png" alt="배너 이미지">
</div>
</section>

<section class="main-items">
<div class="item-content">
<img src="/src/assets/img/img_home_01.png" alt="인기 이미지">
<div class="item-letter-wrapper">
<h5>Hot Item</h5>
<h3 id="first-label" class="item-big-letter">
인기 상품을<br>
확인해 보세요
</h3>
<p>
가장 HOT한 중고거래 물품을<br>
판다 마켓에서 확인해 보세요
</p>
</div>
</div>
</section>


<section class="main-items">
<div class="item-content">
<div class="item-letter-wrapper">
<h5>Search</h5>
<h3 id="second-label" class="item-big-letter">
구매를 원하는<br>
상품을 검색하세요
</h3>
<p>
구매하고 싶은 물품은 검색해서<br>
쉽게 찾아보세요
</p>
</div>
<img src="/src/assets/img/img_home_02-1.png" alt="구매 이미지">
</div>
</section>

<section class="main-items">
<div class="item-content">
<img src="/src/assets/img/img_home_03.png" alt="판매 이미지">
<div class="item-letter-wrapper">
<h5>Register</h5>
<h3 id="third-label" class="item-big-letter">
판매를 원하는<br>
상품을 등록하세요
</h3>
<p>
어떤 물건이든 판매하고 싶은 상품을<br>
쉽게 등록하세요
</p>
</div>
</div>
</section>

<section class="top-bottom">
<div class="top-bottom-content bottom-content">
<div>
<h3>
믿을 수 있는<br>
판다마켓 중고 거래
</h3>
</div>
<img src="/src/assets/img/img_home_bottom.png" alt="소개 이미지">
</div>
</section>

</main>
9 changes: 9 additions & 0 deletions src/components/faq/Faq.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div style="display: flex; flex-direction: column; align-items: center;">
<img src="/src/assets/img/hamster1.jpg" width="768px" height="524px">
<br>
<br>
<p style="font-size: 3rem;">멀보노?</p>
<br>
<br>
<a href="/src/"><button style="cursor: pointer; background-color: beige; color: blueviolet; border-radius: 24px; width: 128px; height: 64px;" type="button">돌아가기</button></a>
</div>
9 changes: 9 additions & 0 deletions src/components/items/Items.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div style="display: flex; flex-direction: column; align-items: center;">
<img src="/src/assets/img/hamster2.jpg" width="768px" height="524px">
<br>
<br>
<p style="font-size: 3rem;">멀보노?</p>
<br>
<br>
<a href="/src/"><button style="cursor: pointer; background-color: beige; color: blueviolet; border-radius: 24px; width: 128px; height: 64px;" type="button">돌아가기</button></a>
</div>
66 changes: 66 additions & 0 deletions src/components/login/Login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<section class="login-wrapper">
<div class="login-content">
<form class="form">
<a href="/src/"><img src="/src/assets/img/logo_lg.png" alt="로고 이미지"></a>
<div class="login-content-without-img">
<div class="login-content-without-signup">
<div class="login-content-without-btn">
<div class="input-email">
<label class="label-font" for="email-tag">이메일</label>
<div class="input-content">
<input class="email-tag" autocomplete="off" id="email-tag" type="email" placeholder="이메일을 입력해주세요"
required>
Comment on lines +9 to +12
Copy link
Collaborator

Choose a reason for hiding this comment

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

P2:
자동완성 기능 꺼주시고 라벨과 인풋을 연결하신거 좋습니다.
다만 focus시 영역이 인풋보다 작은 것 같아 가능하시면 수정되면 좋을 것 같습니다.

<div
style="margin-left: 12px; margin-right: 24px; width: 24px; height: 24px; display: flex; justify-content: center; align-items: center;">
</div>
</div>
</div>
<div class="input-password">
<label class="label-font" for="password-tag">비밀번호</label>
<div class="input-content">
<input class="password-tag" autocomplete="off" id="password-tag" type="password"
placeholder="비밀번호를 입력해주세요" required>
<img
style="margin-left: 12px; margin-right: 24px; width: 24px; height: 24px; display: flex; justify-content: center; align-items: center;"
class="password-icon" src="/src/assets/img/btn_visibility_off.svg">
</div>
</div>
</div>
<button class="login-submit-btn btn is-cursor-pointer" type="submit" disabled>로그인</button>
</div>
<div class="convenience-login">
<div class="convenience-login-content">
<p>간편 로그인하기</p>
<nav>
<ul>
<a href="https://www.google.com/" target="_blank" rel="noopener noreferrer">
<li
style="display: flex; justify-content: center; align-items: center; width: 42px; height: 42px; background: white; border-radius: 9999px; border: 1px #F9FAFB">
<img src="/src/assets/img/ic_google.png" alt="구글 로그인">
</li>
</a>
<a href="https://www.kakaocorp.com/page/" target="_blank" rel="noopener noreferrer">
<li
style="display: flex; justify-content: center; align-items: center; width: 42px; height: 42px; background: #F5E14B; border-radius: 9999px; border: 1px #F9FAFB">
<img src="/src/assets/img/ic_kakao.png" alt="카카오톡 로그인">
</li>
</a>
</ul>
</nav>
</div>

</div>
<div style="gap:4px; display: flex; align-items: center; justify-content: center;">
<p
style="color: #1F2937; font-size: 14px; font-family: Pretendard; font-weight: 500; line-height: 24px; word-wrap: break-word">
판다마켓이 처음이신가요?</p><a
style="color: #3692FF; font-size: 14px; font-family: Pretendard; font-weight: 500; text-decoration: underline; word-wrap: break-word"
href="/src/pages/signup/">회원가입</a>
</div>
</div>
</form>
</div>

</section>

<script src="/src/js/Login.js"></script>
9 changes: 9 additions & 0 deletions src/components/privacy/Privacy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div style="display: flex; flex-direction: column; align-items: center;">
<img src="/src/assets/img/hamster3.jpg" width="768px" height="524px">
<br>
<br>
<p style="font-size: 3rem;">멀보노?</p>
<br>
<br>
<a href="/src/"><button style="cursor: pointer; background-color: beige; color: blueviolet; border-radius: 24px; width: 128px; height: 64px;" type="button">돌아가기</button></a>
</div>
Loading