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.

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

Develop #72

Merged
merged 172 commits into from
Dec 14, 2023
Merged
Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
27bf87b
chac page making start
betterb2etr Sep 12, 2023
8df8bd2
making
betterb2etr Sep 21, 2023
6d831bc
delete for merge
betterb2etr Sep 21, 2023
bfa4e96
Merge pull request #5 from Tekken-Supporter/feature/betterb2etr
betterb2etr Sep 21, 2023
cddc80d
계정 정보 페이지 연결
newjinlee Sep 21, 2023
a5bacd4
css with figma
betterb2etr Sep 26, 2023
56d5f44
css making
betterb2etr Sep 26, 2023
ab692da
chacinfo 초안 완성
betterb2etr Sep 26, 2023
af7d6dc
로그인 가능 회원가입 가능
newjinlee Sep 26, 2023
d166f45
Merge pull request #6 from Tekken-Supporter/feature/newjinlee
newjinlee Sep 26, 2023
6bb4243
making
betterb2etr Oct 4, 2023
495d3a5
메인화면 수정
newjinlee Oct 11, 2023
7330a87
회의 전 급박한 수정
newjinlee Oct 11, 2023
1ea045f
Merge pull request #7 from Tekken-Supporter/feature/newjinlee
newjinlee Oct 11, 2023
b2f9ebc
chacinfo js changing
betterb2etr Oct 11, 2023
b40899e
계정정보 수정
newjinlee Oct 11, 2023
c385634
Merge pull request #8 from Tekken-Supporter/feature/newjinlee
newjinlee Oct 11, 2023
8d890c8
수정중
betterb2etr Oct 11, 2023
c05d555
Merge pull request #9 from Tekken-Supporter/feature/betterb2etr
sw0501 Nov 1, 2023
2843ae1
1101 for pull develeop
betterb2etr Nov 1, 2023
5c351e1
try develop to feature
betterb2etr Nov 1, 2023
2cb75b7
Merge pull request #10 from Tekken-Supporter/feature/betterb2etr
sw0501 Nov 1, 2023
131f003
일단 올려
newjinlee Nov 2, 2023
519ff78
ranking page 수정
betterb2etr Nov 2, 2023
a1ee811
reposition for user
betterb2etr Nov 3, 2023
4c13c7b
chacinfo modify
betterb2etr Nov 4, 2023
a425c1d
making ranking js
betterb2etr Nov 7, 2023
4b67391
정리
newjinlee Nov 8, 2023
d691d9b
다시 원상복귀
newjinlee Nov 8, 2023
a80378c
fight
newjinlee Nov 8, 2023
6c1915c
ranking js 수정
betterb2etr Nov 8, 2023
2d29bd0
1:1대결 신청창
newjinlee Nov 8, 2023
2fa8b48
Merge pull request #11 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 8, 2023
f0166f8
...
newjinlee Nov 8, 2023
4e4c45e
...
betterb2etr Nov 8, 2023
ad3c73a
merge/
betterb2etr Nov 8, 2023
a8aaabc
Merge pull request #12 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 8, 2023
f12bf9b
Merge branch 'develop' into feature/betterb2etr
betterb2etr Nov 8, 2023
5aafe8e
Merge pull request #13 from Tekken-Supporter/feature/betterb2etr
betterb2etr Nov 8, 2023
bce86cc
login 수정
newjinlee Nov 10, 2023
c84b2fd
making
betterb2etr Nov 10, 2023
09d35f5
ranking page 수정
newjinlee Nov 10, 2023
cc420dd
Merge pull request #14 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 10, 2023
698d796
Feat: Github Action 추가
sw0501 Nov 10, 2023
a08f132
changing
betterb2etr Nov 10, 2023
e36a597
Merge branch 'develop' into feature/betterb2etr
betterb2etr Nov 10, 2023
a11a04a
Merge pull request #15 from Tekken-Supporter/feature/betterb2etr
betterb2etr Nov 10, 2023
4e41004
merging
betterb2etr Nov 17, 2023
4fb9db0
merging 1336
betterb2etr Nov 17, 2023
cb06aff
머지
betterb2etr Nov 17, 2023
1d3b0ab
머지 2
betterb2etr Nov 17, 2023
82bddab
시연용
newjinlee Nov 17, 2023
c5e2d6b
시연용
newjinlee Nov 17, 2023
17299f0
Merge branch 'develop' into feature/newjinlee
newjinlee Nov 17, 2023
a72c9a2
Merge pull request #18 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 17, 2023
bf0eb09
myinfo page 완성
newjinlee Nov 20, 2023
2cdc363
Merge pull request #19 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 20, 2023
64db4d3
charinfo 로그아웃 수정
newjinlee Nov 20, 2023
c216a30
Merge pull request #20 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 20, 2023
1c2cc61
mod: challenge 수정
newjinlee Nov 21, 2023
00d6795
Merge pull request #21 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 21, 2023
5eb7e44
mod: challenge board 추가
newjinlee Nov 21, 2023
a045156
Merge pull request #22 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 21, 2023
13d1585
mod: challenge 전 마지막 수정
newjinlee Nov 21, 2023
3cca311
Merge pull request #23 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 21, 2023
05e2490
mod: ㄹㅇ 찐막
newjinlee Nov 21, 2023
6b46ebc
Merge pull request #24 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 21, 2023
6aa75ea
mod: myinfo, challenge 수정
newjinlee Nov 23, 2023
28d02f7
Merge pull request #25 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 23, 2023
bea237e
mod: myinfo 정보 수정
newjinlee Nov 23, 2023
dadadd9
Merge pull request #26 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 23, 2023
8c64190
Design: 배경 변경
newjinlee Nov 23, 2023
c3bb9ae
Merge pull request #27 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 23, 2023
2b4c799
mod: challenge accept api 연결
newjinlee Nov 24, 2023
fa79157
Merge pull request #28 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 24, 2023
1b5236d
ranking modify
betterb2etr Nov 25, 2023
3b22ba7
feat: 아이디 캐시에 저장
newjinlee Nov 26, 2023
af0150f
mod: challenge_apply 바로 위 티어에만 도전 가능하게 수정
newjinlee Nov 26, 2023
be45215
feat: challenge 대결 결과 저장
newjinlee Nov 26, 2023
b3b8e71
Merge pull request #29 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 26, 2023
29857b7
Merge pull request #30 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 26, 2023
8e113b7
Merge pull request #31 from Tekken-Supporter/develop
betterb2etr Nov 26, 2023
9532899
feat: challenge result 창 띄우기
newjinlee Nov 26, 2023
d2d0e89
Merge pull request #32 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 26, 2023
799b002
modify ranking
betterb2etr Nov 26, 2023
9433db2
Merge pull request #33 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 26, 2023
63db0ef
불필요한 요소들 제거
betterb2etr Nov 27, 2023
14e913f
갈아엎음 캐릭터
betterb2etr Nov 27, 2023
7cc78eb
Merge pull request #34 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 27, 2023
b1cc808
review cors done!
betterb2etr Nov 27, 2023
eacc137
저장된 리뷰보임 완성
betterb2etr Nov 27, 2023
3e07e65
Merge pull request #35 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 27, 2023
bb03908
feat: challenge 미확인 신청 기능 추가
newjinlee Nov 28, 2023
ad45d34
Merge pull request #36 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 28, 2023
575adc4
mod: charinfo, ranking 배경수정
newjinlee Nov 28, 2023
632e485
ranking end!
betterb2etr Nov 28, 2023
164fc1a
making
betterb2etr Nov 28, 2023
ce870e2
Merge pull request #37 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 28, 2023
30f51ed
Merge pull request #38 from Tekken-Supporter/develop
newjinlee Nov 28, 2023
c32416c
feat: challenge 미확인 신청, 전적 기능 구현
newjinlee Nov 28, 2023
8f355cf
mod: challenge list 수정
newjinlee Nov 28, 2023
88de1f7
Merge pull request #39 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 28, 2023
0b988a4
design: myinfo 배경 조정
newjinlee Nov 28, 2023
93cb1c0
design: challenge 배경 조정
newjinlee Nov 28, 2023
8002dd1
Merge pull request #40 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 28, 2023
10dfae4
layoutreposition
betterb2etr Nov 29, 2023
40d21ef
review is not working
betterb2etr Nov 29, 2023
dcf5251
Merge pull request #41 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 29, 2023
072bea9
Merge pull request #42 from Tekken-Supporter/develop
newjinlee Nov 29, 2023
890d172
feat: challenge 대결 결과 입력
newjinlee Nov 29, 2023
f99e4a5
Merge pull request #43 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
a674594
design: 가독성 조정
newjinlee Nov 29, 2023
34388dc
Merge pull request #44 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
d3d3d6c
mod: logo 수정
newjinlee Nov 29, 2023
99d12c4
Merge pull request #45 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
b1192db
mod: challenge css
newjinlee Nov 29, 2023
f5d60b8
Merge pull request #46 from Tekken-Supporter/develop
betterb2etr Nov 29, 2023
5420d1b
mod: challenge past list top 안 뜨는 문제 해결
newjinlee Nov 29, 2023
4642e27
Merge pull request #47 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
3e37682
Update challenge.html
newjinlee Nov 29, 2023
f3c70cc
Merge pull request #48 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
5343cc4
meeting
betterb2etr Nov 29, 2023
ef426ad
Merge pull request #49 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 29, 2023
f7042aa
mod: challenge 수정
newjinlee Nov 29, 2023
764fee6
Merge pull request #51 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
6497bd7
font
betterb2etr Nov 29, 2023
ebf2bad
Update challenge_result.js
newjinlee Nov 29, 2023
3967550
Merge pull request #52 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
ab145f2
mod: 모든 창 로그아웃
newjinlee Nov 29, 2023
d6ccb56
post!
betterb2etr Nov 29, 2023
a8fd046
Merge pull request #54 from Tekken-Supporter/develop
betterb2etr Nov 29, 2023
5c18263
post
betterb2etr Nov 29, 2023
17ae3f3
Merge pull request #55 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 29, 2023
1857a05
Merge branch 'feature/newjinlee' into develop
newjinlee Nov 29, 2023
f8287cb
Merge pull request #50 from Tekken-Supporter/develop
newjinlee Nov 29, 2023
4f39d3f
feat: charinfo review 게시
newjinlee Nov 29, 2023
8d58f4d
Merge pull request #56 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
9f4d36a
difficulty
betterb2etr Nov 29, 2023
34fd427
mod: charinfo review char dropbox
newjinlee Nov 29, 2023
ca7b2b0
Merge pull request #57 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
66c44ac
making
betterb2etr Nov 29, 2023
b9d5620
Merge branch 'develop' into feature/seohyun
betterb2etr Nov 29, 2023
42bb65c
Merge pull request #58 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 29, 2023
96fafe3
Merge pull request #59 from Tekken-Supporter/develop
betterb2etr Nov 29, 2023
2b0f879
d
betterb2etr Nov 29, 2023
1811ea7
mod: challenge result 수정
newjinlee Nov 29, 2023
eccd1a4
Merge pull request #60 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
93ea0fa
Merge pull request #61 from Tekken-Supporter/develop
newjinlee Nov 29, 2023
3212bff
Update challenge_result.js
newjinlee Nov 29, 2023
4e87c0c
Merge branch 'feature/newjinlee' of https://github.com/Tekken-Support…
newjinlee Nov 29, 2023
1509a26
Merge pull request #62 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
0998908
mod: reviewsend 기능 수정
newjinlee Nov 29, 2023
d794210
mod: charinfo css 정리
newjinlee Nov 29, 2023
5f32b05
Merge pull request #63 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
16f36d7
dd
betterb2etr Nov 29, 2023
d46f133
Merge branch 'feature/seohyun' into develop
betterb2etr Nov 29, 2023
1e0c151
Merge pull request #64 from Tekken-Supporter/develop
betterb2etr Nov 29, 2023
0b6aab4
upload pics
betterb2etr Nov 29, 2023
855743c
mod: charinfo html, css 구조 정리
newjinlee Nov 29, 2023
ca97cea
deletee getReview
betterb2etr Nov 29, 2023
cef81a4
Merge pull request #66 from Tekken-Supporter/feature/seohyun
betterb2etr Nov 29, 2023
dd737da
Revert "mod: charinfo html, css 구조 정리"
newjinlee Nov 29, 2023
83f6849
Merge branch 'feature/newjinlee' into develop
newjinlee Nov 29, 2023
0505954
Merge pull request #67 from Tekken-Supporter/develop
newjinlee Nov 29, 2023
25a7b45
Merge branch 'feature/newjinlee' of https://github.com/Tekken-Support…
newjinlee Nov 29, 2023
60a0020
mod: charinfo css html 구조 수정
newjinlee Nov 29, 2023
896b71c
Merge pull request #68 from Tekken-Supporter/feature/newjinlee
newjinlee Nov 29, 2023
f2d2144
design: 배경 변경
newjinlee Dec 14, 2023
c4588a9
Merge pull request #70 from Tekken-Supporter/feature/newjinlee
newjinlee Dec 14, 2023
3eaf663
design: wrapper color
newjinlee Dec 14, 2023
54f75e5
Merge pull request #71 from Tekken-Supporter/feature/newjinlee
newjinlee Dec 14, 2023
b517bdf
Merge branch 'main' into develop
newjinlee Dec 14, 2023
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
Prev Previous commit
Next Next commit
정리
...
newjinlee committed Nov 8, 2023
commit 4b67391427362ead5cc0870f60181b83902f5105
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
25 changes: 23 additions & 2 deletions fight.html → html/fight.html
Original file line number Diff line number Diff line change
@@ -24,11 +24,32 @@ <h2 class="logo">Tekken</h2>
<a href="tier.html" class="tier">티어표</a>
<a href="fight.html" class="fight"><strong>1:1대결</strong></a>
<a href="help.html" class="help">캐릭터 도움말</a>
<button class="btnLogout" onclick="logout()">로그아웃</button>
<button class="btnLogout">로그아웃</button>
</nav>
</header>


<div class="fight-quest">
<form action="">
<div class="message-icon">
<i class="bi bi-telegram"></i>
<span>1:1 대결 신청</span>
</div>
<div id="input-field">
<i class="bi bi-person"></i>
<span>To.</span>
<input type="text" placeholder="Name" name="Name">
</div>
<div id="input-field">
<i class="bi bi-telephone"></i>
<input type="text" placeholder="ID" name="ID">
</div>
<div id="input-field">
<i class="bi bi-chat-right-dots"></i>
<textarea type="Message" placeholder="Message" rows="5"></textarea>
</div>
<input type="submit" value="Submit" class="send-btn">
</form>
</div>


<script type="module" src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.esm.js"></script>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.