Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
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
a4e2f60
개인 branch 생성후 커밋
evaain706 Feb 22, 2025
e52f0c1
초기 레이아웃구현
evaain706 Feb 23, 2025
0014062
상단요소 css작성
evaain706 Feb 23, 2025
3612840
section 레이아웃수정
evaain706 Feb 23, 2025
6e0cb4e
footer 컨텐츠요소 배치
evaain706 Feb 24, 2025
408357c
가상선택자를 통한 css색상적용 추가
evaain706 Feb 24, 2025
f6addd5
폰트적용
evaain706 Feb 24, 2025
a0a6a53
footer 레이아웃 / 텍스트 스타일링
evaain706 Feb 24, 2025
857ec75
a태그별 href / 호버 , 액티브상태별 컬러값 적용
evaain706 Feb 24, 2025
d6d44d4
section-content 요소별간격 조정
evaain706 Feb 24, 2025
3ea5ba9
상단,하단 랜딩이미지컨테이너 이름수정/ img태그 width height 인라인이아닌 css파일로 이동
evaain706 Feb 24, 2025
a9ba0ce
랜딩컨테이너div이름 재수정
evaain706 Feb 24, 2025
9c19aec
랜딩 div 폰트사이즈 수정
evaain706 Feb 25, 2025
43d7a24
html 주석추가
evaain706 Feb 25, 2025
9220a7f
PR템플릿 작성
evaain706 Feb 25, 2025
20e7c0a
PR템플릿 수정
evaain706 Feb 25, 2025
945a3f2
클릭 가능한요소에 css수정
evaain706 Feb 25, 2025
74327e4
Merge pull request #20 from evaain706/Basic-맹은빈-sprint1
GANGYIKIM Feb 26, 2025
22ce732
스프린트미션2 작업시작
evaain706 Mar 4, 2025
10fb995
siginup페이지 추가
evaain706 Mar 4, 2025
e4c2044
로그인페이지 컨테이너 위치 잡기
evaain706 Mar 4, 2025
958df3c
로그인페이지 컨테이너 내부 요소 초기위치 수정
evaain706 Mar 4, 2025
542ca61
로그인 페이지 틀잡기완료 + signup.html
evaain706 Mar 5, 2025
7f5114c
input box text 패딩조절
evaain706 Mar 6, 2025
16b5cd0
login,siginup css수정
evaain706 Mar 6, 2025
0f3b697
index.html nav바 최상단 고정
evaain706 Mar 6, 2025
2f76557
login , signup 페이지 css 수정
evaain706 Mar 9, 2025
36d7be6
prettier 적용
evaain706 Mar 9, 2025
234b1ec
reset.css 추가
evaain706 Mar 10, 2025
f7dc27b
페이지 캡처
evaain706 Mar 10, 2025
f1d5d98
Merge pull request #75 from evaain706/Basic-맹은빈-sprint2
GANGYIKIM Mar 12, 2025
0316d60
미션3 시작, 피드백사항 수정
evaain706 Mar 13, 2025
b7abe70
px -> rem 변경
evaain706 Mar 13, 2025
d92f490
메인페이지 태블릿화면 중간
evaain706 Mar 13, 2025
6ea9616
index.html 태블릿화면 css 수정 / 모바일화면 시작
evaain706 Mar 14, 2025
4c3d466
index.html 모바일 css수정
evaain706 Mar 15, 2025
7b366b6
index.html section영역 css 수정
evaain706 Mar 15, 2025
5e3500e
비밀번호 input 아이콘추가, css수정
evaain706 Mar 17, 2025
e45c5ac
signup.html 모바일사이즈 css 시작
evaain706 Mar 17, 2025
8d42d3e
index.html 모바일 footer 배치 수정
evaain706 Mar 18, 2025
d1523e2
메타태그 추가
evaain706 Mar 18, 2025
8658cd1
메타태그 수정
evaain706 Mar 18, 2025
c5756de
login , signup 버튼색상수정/ 메타태그 수정
evaain706 Mar 18, 2025
a523255
Merge pull request #110 from evaain706/Basic-맹은빈-sprint3
GANGYIKIM Mar 21, 2025
6164c0b
login , signup html수정 / 로그인검증,회원가입검증 js파일 초안
evaain706 Mar 21, 2025
26a0490
에러border css수정/ 비밀번호 아이콘 변경js
evaain706 Mar 22, 2025
e935a30
수정사항 적용
evaain706 Mar 22, 2025
74237f4
메타태그 수정
evaain706 Mar 22, 2025
977643c
메타태그 수정
evaain706 Mar 22, 2025
76c748f
css 수정
evaain706 Mar 22, 2025
1c871fb
url수정
evaain706 Mar 22, 2025
de0adcc
tailwind css적용,API연결
evaain706 May 6, 2025
ddae8e7
tailwind 설정추가/ 페이지네이션/ css수정
evaain706 May 6, 2025
60bbf7d
레이아웃 수정
evaain706 May 6, 2025
2d8d8cd
레이아웃 수정/라우터 추가
evaain706 May 7, 2025
c2611fc
구조변경/레아아웃 수정
evaain706 May 8, 2025
1b8d165
정렬로직 수정
evaain706 May 8, 2025
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
37 changes: 31 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,40 @@
## 요구사항

● UI 디자인 기초 토픽을 수강해 보세요.

● 피그마 디자인에 맞게 페이지를 만들어 주세요.

● React와 같은 UI 라이브러리를 사용하지 않고 진행합니다.

● HTML, CSS 파일을 Netlify로 배포해 주세요. (https://gentle-cactus-6c2f2d.netlify.app/)

● PC사이즈만 고려해 주어진 디자인으로 구현합니다.

### 기본

- [x]
- []
- []
- [x] 랜딩 페이지의 url path는 루트('/')로 설정합니다.

- [x] title은 "판다마켓"로 설정합니다.

- [x] 화면의 너비가 1920px 이상이면 하늘색 배경색은 너비를 꽉 채우도록 채워지고, 내부 요소들의 위치는 고정되고, 여백만 커지도록 합니다.

- [x] 화면의 너비가 1920px 보다 작아질 때, "판다마켓" 로고의 왼쪽 여백 200px"로그인" 버튼의 오른쪽 여백 200px이 유지되고, 화면의 너비가 작아질수록 두 요소간 거리가 가까워지도록 설정합니다.

- [x] 클릭으로 기능이 동작해야 하는 경우, 사용자가 클릭할 수 있는 요소임을 알 수 있도록 CSS 속성 cursor: pointer 로 설정합니다.

- [x] "판다마켓" 클릭 시 루트 페이지('/')로 이동합니다.

- [x] '로그인'버튼 클릭 시 로그인 페이지('/login')로 이동합니다 (빈 페이지)

- [x] "구경하러가기"버튼 클릭 시('/items')로 이동합니다.(빈 페이지)

- [x] "Privacy Policy", "FAQ"는 클릭 시 각각 Privacy 페이지('/privacy'), FAQ 페이지('/faq')로 이동합니다.(모두 빈 페이지)

- [x] 페이스북, 트위터, 유튜브, 인스타그램 아이콘을 클릭 시 각각의 홈페이지로 새로운 창이 열리면서 이동합니다.

### 심화

- [x]
- []
- [] 사용자의 브라우저가 크고 작아짐에 따라 페이지의 요소간 간격, 요소의 크기, font-size 등 모든 크기와 관련된 값이 크고 작아지도록 설정해 보세요.(설정값은 자유입니다)

## 주요 변경사항

Expand All @@ -18,7 +43,7 @@

## 스크린샷

![image](이미지url)
![image](/siteImg.png)

## 멘토에게

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ on:
pull_request:
types: [closed]

permissions:
pull-requests: write

jobs:
delete-branch:
runs-on: ubuntu-latest
steps:
- name: delete branch
uses: SvanBoxel/delete-merged-branch@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Binary file added images/bottomImg.png
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 images/card1.png
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 images/card2.png
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 images/card3.png
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 images/icons/eyeOpen.png
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 images/icons/eyesIcon.png
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 images/icons/googleLogo.png
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 images/icons/ic_facebook.png
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 images/icons/ic_instagram.png
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 images/icons/ic_twitter.png
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 images/icons/ic_youtube.png
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 images/icons/kakaoLogo.png
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 images/loginPageLogo.png
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 images/logo.png
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 images/metaImage.png
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 images/mobileLogo.png
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 images/topImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
156 changes: 156 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- HTML Meta Tags -->
<title>판다마켓</title>
<meta name="description" content="일상의 모든 물건을 거래해보세요" />

<!-- Facebook Meta Tags -->
<meta
property="og:url"
content="https://bespoke-sfogliatella-a26ba3.netlify.app/"
/>
<meta property="og:type" content="website" />
<meta property="og:title" content="판다마켓" />
<meta property="og:description" content="일상의 모든 물건을 거래해보세요" />
<meta
property="og:image"
content="https://opengraph.b-cdn.net/production/images/869c2051-4ad6-4f97-803d-3c1ad1612f77.png?token=r7V4-zkwA3TCODl5ab_EX_ELI2D29Y1-oWtczyUAuYI&height=623&width=1200&expires=33278639894"
/>

<!-- Twitter Meta Tags -->
<meta name="twitter:card" content="summary_large_image" />
<meta
property="twitter:domain"
content="bespoke-sfogliatella-a26ba3.netlify.app"
/>
<meta
property="twitter:url"
content="https://bespoke-sfogliatella-a26ba3.netlify.app/"
/>
<meta name="twitter:title" content="판다마켓" />
<meta
name="twitter:description"
content="일상의 모든 물건을 거래해보세요"
/>
<meta
name="twitter:image"
content="https://opengraph.b-cdn.net/production/images/869c2051-4ad6-4f97-803d-3c1ad1612f77.png?token=r7V4-zkwA3TCODl5ab_EX_ELI2D29Y1-oWtczyUAuYI&height=623&width=1200&expires=33278639894"
/>

<link rel="stylesheet" href="style.css" />
</head>
<body>
<!-- 헤더 -->
<header class="header">
<div class="header-content">
<a href="/">
<img class="logoImg" src="/images/logo.png" alt="판다마켓" />
</a>

<a href="/pages/login.html" class="header-button button">로그인</a>
</div>
</header>
<!-- 상단랜딩 -->
<div class="topLanding">
<div class="top-content">
<div class="top-content-text">
<h2>일상의 모든 물건을<br />거래해 보세요</h2>
<a
href="./react-page/dist/index.html#/items"
class="items-button button"
>
구경하러 가기
</a>
</div>
<img class="topLandingImg" src="/images/topImg.png" alt="topImg" />
</div>
</div>
<!-- 섹션 -->
<section class="section">
<div class="section-content">
<div class="section-card">
<img class="section-Img" src="/images/card1.png" alt="sectionImg1" />
<div class="section-text card1">
<p class="section-text-tag">Hot item</p>
<p class="section-text-title">인기 상품을 확인해 보세요</p>
<p class="section-text-subtitle">
가장 HOT한 중고거래 물품을<br />판다 마켓에서 확인해 보세요
</p>
</div>
</div>
</div>

<div class="section-content">
<div class="section-card reverse">
<div class="section-text card2">
<p class="section-text-tag">Search</p>
<p class="section-text-title">
구매를 원하는<br />상품을 검색하세요
</p>
<p class="section-text-subtitle">
구매하고 싶은 물품은 검색해서 쉽게 찾아보세요
</p>
</div>

<img class="section-Img" src="/images/card2.png" alt="sectionImg2" />
</div>
</div>

<div class="section-content">
<div class="section-card card3">
<img class="section-Img" src="/images/card3.png" alt="sectionImg3" />
<div class="section-text">
<p class="section-text-tag">Register</p>
<p class="section-text-title">판매를 원하는 상품을 등록하세요</p>
<p class="section-text-subtitle">
어떤 물건이든 판매하고싶은 상품을<br />쉽게 등록하세요
</p>
</div>
</div>
</div>
</section>
<!-- 하단 랜딩 -->
<div class="bottomLanding">
<div class="bottom-content">
<div class="bottom-content-text">
<h2>믿을 수 있는<br />판다마켓 중고 거래</h2>
</div>

<img
class="bottomLandingImg"
src="/images/bottomImg.png"
alt="bottomImg"
/>
</div>
</div>
<!-- 푸터 -->
<footer class="footer">
<div class="footer-content">
<div class="footer-left-text">
<p>@codeit - 2024</p>
</div>
<div class="footer-middle-text">
<a href="/pages/privacy.html">Privacy Policy</a>
<a href="/pages/faq.html">FAQ</a>
</div>
<div class="footer-icons">
<a href="https://www.facebook.com/" target="_blank">
<img src="/images/icons/ic_facebook.png" alt="facebook" />
</a>
<a href="https://x.com/" target="_blank">
<img src="/images/icons/ic_twitter.png" alt="twitter" />
</a>
<a href="https://www.youtube.com/" target="_blank">
<img src="/images/icons/ic_youtube.png" alt="youtube" />
</a>
<a href="https://www.instagram.com/" target="_blank">
<img src="/images/icons/ic_instagram.png" alt="instagram" />
</a>
</div>
</div>
</footer>
</body>
</html>
Loading
Loading