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

회원가입 페이지 외 #2

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

회원가입 페이지 외 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
aed770b
202407030522
jeongsaeyeong Jul 3, 2024
8289a7b
202407032338
jeongsaeyeong Jul 3, 2024
5310911
password hidden-show
kangjuen Jul 3, 2024
1ca7cba
202407041514
kangjuen Jul 4, 2024
8c417d5
202407041820
kangjuen Jul 4, 2024
d5e188e
202407042253
kangjuen Jul 4, 2024
843cd6d
회원가입 성공 페이지
kangjuen Jul 4, 2024
0d0da69
202407050249
kangjuen Jul 4, 2024
fca1dcc
202407050251
kangjuen Jul 4, 2024
115d028
202407050303
kangjuen Jul 4, 2024
4b20d87
약관동의
kangjuen Jul 5, 2024
9421082
회원가입 성공페이지 연결
kangjuen Jul 5, 2024
e114e3c
login.css join.css 수정
kangjuen Jul 5, 2024
6f321b2
회원가입 사진첨부 수정
kangjuen Jul 5, 2024
af46bf6
약관 팝업
kangjuen Jul 5, 2024
04c0512
약관 팝업~~~~
kangjuen Jul 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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
206 changes: 149 additions & 57 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,80 +20,93 @@
<body>
<div class="main_wrap container">
<header id="header">
<h1>기로프</h1>
<h1><a href="/">기로프</a></h1>
<a href="/template/login.html">로그인</a>
<div>
<button class="create" onclick="showPop()">
<img src="./static/assets/img/plus.svg" alt="">
</button>
<a href="./template/login/login.html">
<a href="./template/mypage.html">
<div class="profile"></div>
</a>
</div>
</header>
<main id="main">
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="profile profile03"></div>
<div class="profile profile04"></div>
<div class="profile profile05"></div>
<a href="./template/team.html">
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="profile profile03"></div>
<div class="profile profile04"></div>
<div class="profile profile05"></div>
</div>
</div>
</div>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
</div>
</div>
</div>
<div class="bottom">
<div class="day">D-17</div>
<div class="parcent">60%</div>
</div>
</div>
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="bottom">
<div class="day">D-17</div>
<div class="parcent">60%</div>
</div>
</div>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
</a>
<a href="">
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="profile profile03"></div>
<div class="profile profile04"></div>
<div class="profile profile05"></div>
</div>
</div>
</div>
<div class="bottom">
<div class="day">--</div>
<div class="parcent">50%</div>
</div>
</div>
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
</div>
</div>
</div>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
<div class="bottom">
<div class="day">D-17</div>
<div class="parcent">60%</div>
</div>
</div>
<div class="bottom">
<div class="day">D-41</div>
<div class="parcent">25%</div>
</a>
<a href="">
<div class="box">
<div class="top">
<h2>여기톤 10조</h2>
<div class="profile_box">
<div class="profile profile01"></div>
<div class="profile profile02"></div>
<div class="profile profile03"></div>
<div class="profile profile04"></div>
<div class="profile profile05"></div>
</div>
</div>
<div class="middle">
<div class="graph">
<canvas id="doughnut-chart" width="100" height="100"></canvas>
</div>
</div>
<div class="bottom">
<div class="day">D-17</div>
<div class="parcent">60%</div>
</div>
</div>
</div>
</a>
</main>

<!-- 팝업창 -->
<div class="popup_wrap">
<div class="popup_wrap none">
<div class="popup">
<div class="first none">
<div class="first">
<img src="./static/assets/img/mainpopup.png" alt="">
<h3>팀 만들기</h3>
<p>
Expand All @@ -102,21 +115,100 @@ <h3>팀 만들기</h3>
</p>
<div class="btn_box">
<button class="no" onclick="noPop()">취소</button>
<button class="craetebtn">추가</button>
<button class="craetebtn" onclick="teamName()">추가</button>
</div>
</div>
<div class="second">
<div class="second none">
<h3>팀명</h3>
<input type="text">
<input type="text" placeholder="Untitled">
<div class="btn_box">
<button class="no" onclick="noPop()">취소</button>
<button class="craetebtn" onclick="addFriend()">다음</button>
</div>
</div>
<div class="third none">
<h3>Untitled</h3>
<div class="team_list">
<div>
<img src="./static/assets/img/profile.png" alt="profile">
<p>rlfhvm (나)</p>
</div>
<div>
<img src="./static/assets/img/profile.png" alt="profile">
<p>rlfhvm (나)</p>
</div>
<div>
<img src="./static/assets/img/profile.png" alt="profile">
<p>rlfhvm (나)</p>
</div>
<div>
<img src="./static/assets/img/profile.png" alt="profile">
<p>rlfhvm (나)</p>
</div>
<div>
<img src="./static/assets/img/profile.png" alt="profile">
<p>rlfhvm (나)</p>
</div>
</div>
<div class="btn_box">
<button class="no" onclick="noPop()">취소</button>
<button class="craetebtn">다음</button>
<button class="craetebtn">완료</button>
</div>
</div>
</div>
</div>

<!-- 친구 추가창 -->
<div class="add_team none">
<div class="search">
<input type="text" placeholder="아이디로 검색하기">
<button><img src="./static/assets/img/search.svg" alt="search"></button>
</div>
<div class="plus_friend">
<div>
<p>person6</p>
<button><img src="./static/assets/img/deletebtn_white.svg" alt="delete"></button>
</div>
</div>
<div class="list_wrap">
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
<div class="list">
<p>rlfhvm</p>
<button><img src="./static/assets/img/profilebtn.svg" alt=""></button>
</div>
</div>
</div>
</div>
<script src="./static/js/mainchart.js"></script>

<!-- script -->
<!-- gsap -->

<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.11.0/gsap.min.js"></script>
<script src="./static/js/main.js"></script>
<script src="./static/js/chart.js"></script>
</body>

</html>
Binary file added static/.DS_Store
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion static/assets/css/reset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,5 @@ button,
input,
::placeholder {
font-family: var(--mainfont);
}
}

83 changes: 83 additions & 0 deletions static/assets/css/section/agree.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.agree1, .agree2, .agree3 {
position: absolute;
top: 0;
left: 50%;
width: 430px;
height: 932px;
transform: translate(-50%);
z-index: 1;
background: var(--white);
display: none;
}

.agree1.active, .agree2.active, .agree3.active {
display: block;
}

.header-ag .top-ag .title-ag {
font-size: 28px;
font-weight: 600;
}

.backbtn-ag1 {
margin-bottom: 10px;
}

.backbtn-ag2 {
margin-bottom: 10px;
}

.top-ag {
padding: 30px 30px 19px 30px;
gap: 24px;
margin-top: 20px;
}

.title-ag {
font-size: 24px !important;
margin-top: 15px;
}

.text-container {
margin-left: 35px;
margin-right: 35px;
}

.text-box {
border: 1px solid black;
border-radius: 20px;
width: 360px;
height: 707px;
overflow: scroll;
-ms-overflow-style: none;

}

.text-box::-webkit-scrollbar {
display:none;
}

.text-box p {
color: #555555;
padding: 20px;
font-size: 14px;
}

.text-container3 {
margin-left: 35px;
margin-right: 35px;
}

.text-box3 {
border: 1px solid black;
border-radius: 20px;
width: 360px;
height: 430px;
}


.text-box3 p {
color: #555555;
padding: 20px;
font-size: 14px;
}
Empty file added static/assets/css/section/find_password.css
View file
Open in desktop
Empty file.
Loading