-
Notifications
You must be signed in to change notification settings - Fork 31
[곽지훈] sprint2 #140
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
Merged
dongqui
merged 1 commit into
codeit-bootcamp-frontend:Basic-곽지훈
from
jihoon135:Basic-곽지훈-sprint2
Apr 22, 2025
The head ref may contain hidden characters: "Basic-\uACFD\uC9C0\uD6C8-sprint2"
Merged
[곽지훈] sprint2 #140
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "semi": true, | ||
| "singleQuote": true, | ||
| "trailingComma": "all", | ||
| "tabWidth": 2 | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode", | ||
| "editor.formatOnSave": true | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="kr"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <link rel="stylesheet" href="/panda_market_login.css" /> | ||
| <title>판다마켓 로그인 페이지</title> | ||
| </head> | ||
| <body> | ||
| <div class="login__container"> | ||
| <div class="logo__container"> | ||
| <a href="/"> | ||
| <img src="../img/panda__face.png" alt="판다얼굴" /> | ||
| </a> | ||
| <div class="logo__text">판다마켓</div> | ||
| </div> | ||
| <div class="login__input__text">이메일</div> | ||
| <input class="login__input" placeholder="이메일을 입력해주세요." /> | ||
|
|
||
| <div class="login__input__text">비밀번호</div> | ||
| <input | ||
| class="login__input" | ||
| type="password" | ||
| placeholder="비밀번호를 입력하세요" | ||
| /> | ||
| <div> | ||
| <button class="login__button">로그인</button> | ||
| </div> | ||
| <div class="snsAuth__container"> | ||
| <span>간편 로그인하기</span> | ||
| <div> | ||
| <a | ||
| href="https://www.google.com/" | ||
| target="_blank" | ||
| class="snsAuth__icon" | ||
| > | ||
| <img src="../img/Component 2.png" alt="구글 아이콘" /> | ||
| </a> | ||
| <a | ||
| href="https://www.kakaocorp.com/page/" | ||
| target="_blank" | ||
| class="snsAuth__icon" | ||
| > | ||
| <img src="../img/Component 3.png" alt="카카오톡 아이콘" /> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div class="explain__signup__text"> | ||
| <span>판다마켓이 처음이신가요?</span | ||
| ><a href="./signup.html" class="linked__page">회원가입</a> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="kr"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <link rel="stylesheet" href="/panda_market_login.css" /> | ||
| <title>판다마켓 회원가입 페이지</title> | ||
| </head> | ||
| <body> | ||
| <div class="signup__container"> | ||
| <div class="logo__container"> | ||
| <a href="/"> | ||
| <img src="../img/panda__face.png" alt="판다얼굴" /> | ||
| </a> | ||
| <div class="logo__text">판다마켓</div> | ||
| </div> | ||
| <div class="login__input__text">이메일</div> | ||
| <input class="login__input" placeholder="이메일을 입력해주세요." /> | ||
|
|
||
| <div class="login__input__text">닉네임</div> | ||
| <input class="login__input" placeholder="닉네임을 입력해주세요." /> | ||
|
|
||
| <div class="login__input__text">비밀번호</div> | ||
| <input | ||
| class="login__input" | ||
| type="password" | ||
| placeholder="비밀번호를 입력하세요" | ||
| /> | ||
|
|
||
| <div class="login__input__text">비밀번호 확인</div> | ||
| <input | ||
| class="login__input" | ||
| type="password" | ||
| placeholder="비밀번호를 확인하세요" | ||
| /> | ||
|
|
||
| <div> | ||
| <button class="login__button">회원가입</button> | ||
| </div> | ||
| <div class="snsAuth__container"> | ||
| <span>간편 로그인하기</span> | ||
| <div> | ||
| <a | ||
jihoon135 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| href="https://www.google.com/" | ||
| target="_blank" | ||
| class="snsAuth__icon" | ||
| > | ||
| <img src="../img/Component 2.png" alt="구글 아이콘" /> | ||
| </a> | ||
| <a | ||
| href="https://www.kakaocorp.com/page/" | ||
| target="_blank" | ||
| class="snsAuth__icon" | ||
| > | ||
| <img src="../img/Component 3.png" alt="카카오톡 아이콘" /> | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div class="explain__signup__text"> | ||
| <span>이미 회원이신가요?</span> | ||
| <a href="./login.html" class="linked__page">로그인</a> | ||
| </div> | ||
| </div> | ||
| <div></div> | ||
| </body> | ||
| </html> | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,114 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <html lang="ko"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <link rel="stylesheet" href="/panda_market.css" /> | ||
| <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet"> | ||
| <link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css" /> | ||
| <link | ||
| href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" | ||
| rel="stylesheet" | ||
| /> | ||
| <link | ||
| rel="stylesheet" | ||
| crossorigin | ||
| href="https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css" | ||
| /> | ||
| <title>판다마켓</title> | ||
| </head> | ||
| <body> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <div class="header__container"> | ||
| <a href="/" target="_blank"><img src="/img/title__logo.png"></a> | ||
| <a href="/html/login.html" target="_blank"><button>로그인</button></a> | ||
| </div> | ||
| <div class="header__container"> | ||
| <a href="/"><img src="/img/title__logo.png" alt="판다마켓" /></a> | ||
| <button onclick="window.location.href='/html/login.html';"> | ||
| 로그인 | ||
| </button> | ||
| </div> | ||
| </header> | ||
| <div class="main__image__container"> | ||
| <div> | ||
| <p>일상의 모든 물건을 <br/> 거래해 보세요</p> | ||
| <a href="/html/items.html" target="_blank"><button>구경하러 가기</button></a> | ||
| </div> | ||
| <div> | ||
| <img src="/img/img__home__top.png"> | ||
| </div> | ||
| <div> | ||
| <p> | ||
| 일상의 모든 물건을 <br /> | ||
| 거래해 보세요 | ||
| </p> | ||
| <a href="/html/items.html"><button>구경하러 가기</button></a> | ||
| </div> | ||
| <div> | ||
| <img src="/img/img__home__top.png" alt="메인이미지지" /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="flex__container"> | ||
| <div class="hot__item card__content__container hot__item__padding"> | ||
| <p class="min__title">Hot item</p> | ||
| <p class="explanation__content explanation__content__margin">인기 상품을 <br/> 확인해 보세요</p> | ||
| <p class="explanation__detail">가장 HOT한 중고거래 물품을<br/>판다 마켓에서 확인해 보세요</p> | ||
| </div> | ||
|
|
||
| <div class="search card__content__container__reverse search__padding"> | ||
| <p class="min__title">Search</p> | ||
| <p class="explanation__content explanation__content__margin__reverse">구매를 원하는<br/>상품을 검색하세요</p> | ||
| <p class="explanation__detail">구매하고 싶은 물품은 검색해서<br/> 쉽게 찾아보세요</p> | ||
| </div> | ||
|
|
||
| <div class="register card__content__container register__padding"> | ||
| <p class="min__title">Register</p> | ||
| <p class="explanation__content explanation__content__margin__detail">판매를 원하는<br/>상품을 등록하세요</p> | ||
| <p class="explanation__detail">어떤 물건이든 판매하고 싶은 상품을 <br/>쉽게 등록하세요</p> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| <div class="main__image__container"> | ||
| <div class="a"> | ||
| <p class="sizing__container">믿을 수 있는 <br/>판다마켓 중고 거래</p> | ||
| </div> | ||
| <div> | ||
| <img src="/img/Img_home_bottom.png"> | ||
| </div> | ||
| <div class="flex__container"> | ||
| <div class="hot__item card__content__container hot__item__padding"> | ||
| <h3 class="min__title">Hot item</h3> | ||
jihoon135 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <p class="explanation__content explanation__content__margin"> | ||
| 인기 상품을 <br /> | ||
| 확인해 보세요 | ||
| </p> | ||
| <p class="explanation__detail"> | ||
| 가장 HOT한 중고거래 물품을<br />판다 마켓에서 확인해 보세요 | ||
| </p> | ||
| </div> | ||
|
|
||
| <div class="search card__content__container__reverse search__padding"> | ||
| <h3 class="min__title">Search</h3> | ||
| <p class="explanation__content explanation__content__margin__reverse"> | ||
| 구매를 원하는<br />상품을 검색하세요 | ||
| </p> | ||
| <p class="explanation__detail"> | ||
| 구매하고 싶은 물품은 검색해서<br /> | ||
| 쉽게 찾아보세요 | ||
| </p> | ||
| </div> | ||
|
|
||
| <div class="register card__content__container register__padding"> | ||
| <h3 class="min__title">Register</h3> | ||
| <p class="explanation__content explanation__content__margin__detail"> | ||
| 판매를 원하는<br />상품을 등록하세요 | ||
| </p> | ||
| <p class="explanation__detail"> | ||
| 어떤 물건이든 판매하고 싶은 상품을 <br />쉽게 등록하세요 | ||
| </p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="main__image__container"> | ||
| <p class="sizing__container">믿을 수 있는 <br />판다마켓 중고 거래</p> | ||
| <div> | ||
| <img src="/img/Img_home_bottom.png" alt="바텀이미지" /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <footer> | ||
| <span style="color: #9CA3AF; padding-right:366.5px; margin-top:32px;">@codeit - 2024</span> | ||
| <a href="/html/privacy.html" target="_blank" style="color: #E5E7EB; padding-right: 15px; margin-top:32px;"> | ||
| <span class="footer__text">@codeit - 2024</span> | ||
| <a href="/html/privacy.html" class="footer__text--a"> | ||
| <span>Privacy Policy</span> | ||
| </a> | ||
| <a href="/html/faq.html" target="_blank" style="color: #E5E7EB; padding-left: 15px; margin-top:32px;"> | ||
| </a> | ||
| <a href="/html/faq.html" class="footer__text--a"> | ||
| <span>FAQ</span> | ||
| </a> | ||
| <span style="color: #FFFFFF; padding-left:366.5px; margin-top:32px;"> | ||
| <a href="https://www.facebook.com" target="_blank" style="margin-right:12px;"><i class="fa-brands fa-facebook"></i></a> | ||
| <a href="https://twitter.com" target="_blank" style="margin-right:12px;"><i class="fa-brands fa-twitter"></i></a> | ||
| <a href="https://www.youtube.com" target="_blank" style="margin-right:12px;"><i class="fa-brands fa-youtube"></i></a> | ||
| <a href="https://www.instagram.com" target="_blank"><i class="fa-brands fa-instagram"></i></a> | ||
| </span> | ||
| </footer> | ||
| </body> | ||
| </html> | ||
| </a> | ||
| <span class="footer__sns"> | ||
| <a | ||
| href="https://www.facebook.com" | ||
| target="_blank" | ||
| class="footer__marginRight" | ||
| ><i class="fa-brands fa-facebook"></i | ||
| ></a> | ||
| <a | ||
| href="https://twitter.com" | ||
| target="_blank" | ||
| class="footer__marginRight" | ||
| ><i class="fa-brands fa-twitter"></i | ||
| ></a> | ||
| <a | ||
| href="https://www.youtube.com" | ||
| target="_blank" | ||
| class="footer__marginRight" | ||
| ><i class="fa-brands fa-youtube"></i | ||
| ></a> | ||
| <a href="https://www.instagram.com" target="_blank" | ||
| ><i class="fa-brands fa-instagram"></i | ||
| ></a> | ||
| </span> | ||
| </footer> | ||
| </body> | ||
| </html> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.