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

Merge: 메인으로 머지 #122

Merged
merged 56 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
63b68d9
Style: scoreBoard가 cavnas옆에 위치
Hosung99 Jun 28, 2024
f718595
Refactor: is_final적용
Hosung99 Jun 28, 2024
67fa9dd
Refactor: 점수가 scoreBoard옆에 위치하도록 수정
Hosung99 Jun 28, 2024
6c30575
Merge pull request #107 from BeyondPong/dev-refactor#105
mixsung Jun 28, 2024
0821475
Style: 결과 컨테이너 css 수정
Hosung99 Jun 28, 2024
6f16b33
Refactor: 토너먼트게임 로직 일부 수정
Hosung99 Jun 28, 2024
92552ef
Merge pull request #108 from BeyondPong/dev-refactor#105
mixsung Jun 28, 2024
0020e3f
Refactor: waitGame위치 수정
Hosung99 Jun 28, 2024
2da9dde
Merge pull request #109 from BeyondPong/dev-refactor#105
mixsung Jun 28, 2024
645cb3f
Refactor: finalRound 로직 추가
Hosung99 Jun 28, 2024
0a41cca
Merge pull request #110 from BeyondPong/dev-refactor#105
mixsung Jun 28, 2024
a3d3524
Refactor: 2FA 페이지 재구성-전송버튼 추가 및 타이머 설정
mixsung Jun 28, 2024
39690ab
Style: scoreBoard가 cavnas옆에 위치
Hosung99 Jun 28, 2024
c711900
Refactor: is_final적용
Hosung99 Jun 28, 2024
246651f
Refactor: 점수가 scoreBoard옆에 위치하도록 수정
Hosung99 Jun 28, 2024
6f2d23c
Style: 결과 컨테이너 css 수정
Hosung99 Jun 28, 2024
389753b
Refactor: 토너먼트게임 로직 일부 수정
Hosung99 Jun 28, 2024
1886e8f
Refactor: waitGame위치 수정
Hosung99 Jun 28, 2024
ff06372
Refactor: finalRound 로직 추가
Hosung99 Jun 28, 2024
a1d565b
Merge branch 'dev' of https://github.com/BeyondPong/Frontend into dev
mixsung Jun 28, 2024
3fee1c9
Feature: 2FA 토큰 만료 시 문구 추가
mixsung Jun 28, 2024
c4b7803
Bug: 친구삭제 버튼의 div를 눌렀을 때 attribute를 찾지 못하는 버그 수정
mixsung Jun 28, 2024
9ffc469
Bug: 친구추가 버튼의 div를 눌렀을 때 attribute를 찾지 못하는 버그 수정
mixsung Jun 28, 2024
95ea3f2
Refactor: 친구 목록에 친구가 없을 때 문구 띄우기
mixsung Jun 28, 2024
c665df0
Refactor: 출력문 제거
mixsung Jun 28, 2024
f3f0a15
Merge pull request #111 from BeyondPong/dev-refact#104
Hosung99 Jun 28, 2024
a974a5c
Merge pull request #113 from BeyondPong/dev-feat#112
Hosung99 Jun 28, 2024
a85751c
Refactor: finalRound css추가
Hosung99 Jun 28, 2024
04114a2
Refactor: finalRound 소켓 이벤트추가
Hosung99 Jun 28, 2024
6d43883
Refactor: inputBox 엔터이벤트 추가
Hosung99 Jun 28, 2024
a8a608b
Merge pull request #114 from BeyondPong/dev-refactor#105
mixsung Jun 28, 2024
ca4fa01
Bug: 친구추가 및 삭제 버튼 attribute 잘 받아오도록 수정
mixsung Jun 30, 2024
da84763
Merge pull request #116 from BeyondPong/dev-bug#115
Hosung99 Jul 1, 2024
d25e95f
Refactor: paddle 움직임버그 수정
Hosung99 Jul 1, 2024
2a21984
Merge pull request #117 from BeyondPong/dev-refactor#105
mixsung Jul 1, 2024
0a65829
Bug: Modified 2FA code enter enable
mixsung Jul 1, 2024
127ef2f
Refactor: 검색창에 자동 focus
Hosung99 Jul 1, 2024
d1f62ab
Refactor: 닉네임 한글 입력시 중복이벤트 발생 수정
Hosung99 Jul 1, 2024
88b24e3
Merge pull request #119 from BeyondPong/dev-refactor#105
mixsung Jul 1, 2024
6d0ea3f
Refactor: Paddle 색 수정
Hosung99 Jul 1, 2024
a914cbe
Refactor: 소켓 끊겨도 재연결하도록
Hosung99 Jul 1, 2024
dead5f5
Refactor: 패들 움직임 버그 수정
Hosung99 Jul 1, 2024
018a9de
Refactor: XSS공격 방지 추가
Hosung99 Jul 1, 2024
b9a9e5e
Feature: 프로필 history에 텍스트 크기 조정 기능 추가
mixsung Jul 1, 2024
b86bc82
Feature: 프로필필 history에 텍스트 크기 조정 기능 추가-엔터로 가능하도록
mixsung Jul 1, 2024
0ab12b0
Refactor: 게임 end플래그 추가
Hosung99 Jul 1, 2024
751b47a
Refact: 게임 end플래그 제거
mixsung Jul 2, 2024
3a52f35
Merge pull request #120 from BeyondPong/dev-feat#118
Hosung99 Jul 4, 2024
3ec7559
Style: 캔버스가 항상 화면 가운데 위치
Hosung99 Jul 4, 2024
b998d74
docs: 프론트 env추가
Hosung99 Jul 4, 2024
28511cd
Refacto: API주소 env로 빼기
Hosung99 Jul 4, 2024
c0f07fa
Refactor: 토너먼트 두번실행 수정
Hosung99 Jul 4, 2024
a8111ac
Refactor: resetting요청 추가
Hosung99 Jul 4, 2024
44d6b25
Refactor: resetting문구 스타일 수정
Hosung99 Jul 4, 2024
340c105
Refactor: 문구 Css수정
Hosung99 Jul 4, 2024
65d5c71
Feature: env.js추가
Hosung99 Jul 4, 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
90 changes: 80 additions & 10 deletions frontend/static/css/2fa.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
word-break: break-all;
align-items: center;
justify-content: center;
margin-bottom: 1rem;
/* margin-bottom: 1rem; */
gap: 1rem;
color: var(--profile-color);
padding: 1rem;
}

.fa_modal h2 {
/* font-size: calc(2vw + 2vh); */
font-size: calc(1.5vw + 1.5vh + 0.5vmin);
color: var(--item-color);
white-space: normal;
Expand All @@ -44,8 +43,16 @@
}

.fa_modal h4 {
/* padding: 0 4rem; */
font-size: calc(0.5vw + 1vh + 0.5vmin);
font-weight: lighter;
text-align: left;
margin: 0;
}

.fa_modal h5 {
font-size: calc(0.5vw + 0.5vh + 0.5vmin);
font-weight: lighter;
}

.email_input {
Expand All @@ -59,16 +66,16 @@
}

.fa_code_input {
width: 58%;
height: 7vh;
width: 2em;
height: auto;
text-align: center;
font-size: calc(1vw + 1vh + 0.5vmin);
border-radius: 7px;
background-color: black;
color: white;
}

#checkBtn {
/* #checkBtn {
position: relative;
top: -6px;
border: 0;
Expand All @@ -92,9 +99,21 @@
0 8px 8px 10px rgba(5, 5, 5, 0.5);
background-color: var(--profile-background);
transition: filter 0.3s ease;
} */

#codeVerifyBtn {
width: 100%;
height: 4vh;
color: var(--black-color);
background-color: var(--profile-background);
padding: 0.2rem 1rem;
border-radius: 5px;
cursor: pointer;
font-weight: bold;
font-size: calc(1vw + 0.5vh + 0.5vmin);
}

#sendBtn {
/* #sendBtn {
top: -6px;
border: 0;
transition: all 40ms linear;
Expand Down Expand Up @@ -124,6 +143,51 @@
color: var(--black-color);
box-shadow: 0 0 0 1px #c4b224 inset, 0 0 0 1px rgba(255, 255, 255, 0.15) inset, 0 1px 3px 1px rgba(0, 0, 0, 0.3);
background-color: var(--profile-background);
} */

#user_email {
font-size: calc(0.5vw + 1vh + 0.5vmin);
margin: 0;
}

#timer {
color: var(--profile-color);
font-size: calc(0.5vw + 0.5vh + 0.5vmin);
font-weight: lighter;
margin: 0;
padding-bottom: 1rem;
}

.timer_container {
text-align: center;
}

.fa-paper-plane {
margin-right: 0.4rem;
}

#emailSendBtn {
font-size: calc(0.5vw + 0.5vh + 0.5vmin);
color: var(--profile-color);
background-color: var(--disabled-background-color);
padding: 0.2rem 0.8rem;
border-radius: 5px;
cursor: pointer;
font-weight: bold;
text-align: center;
margin: 0;
}

#emailSendBtnBox {
padding-bottom: 0.5rem;
}

.email_container_flex {
display: flex;
flex-direction: row;
gap: 0.7rem;
align-items: center;
justify-content: center;
}

.fa_modal button:hover {
Expand All @@ -135,8 +199,14 @@
width: 100%;
justify-content: center;
gap: 1rem;
margin-top: 1rem;
margin-bottom: 2rem;
margin-bottom: 1rem;
}

.fa_code_container_box {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.fa_code_input:focus {
Expand Down Expand Up @@ -211,7 +281,7 @@

#dropdown_2fa {
position: absolute;
left: 80%;
left: 70%;
top: 10%;
z-index: 1001;
}
}
14 changes: 5 additions & 9 deletions frontend/static/css/game.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
canvas {
position: absolute;
top: 10%;
left: 25%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.win {
Expand All @@ -12,15 +13,11 @@ canvas {
#scoreBoard {
text-align: center;
display: flex;
position: absolute;
flex-direction: column;
justify-content: space-between;
color: white;
justify-content: center;
left: calc(25% + 50% + 20px);
font-size: calc(1em + 1vw);
transform: translateX(0);
gap: 50%;
height: 100%;
}

.remote_buttonContainer {
Expand All @@ -30,10 +27,9 @@ canvas {
align-items: center;
gap: 10px;
position: absolute;
top: 35%;
left: 50%;
transform: translate(-50%, -50%);
width: 50%;
background-color: rgba(0, 0, 0, 0.5);
white-space: nowrap;
}

Expand Down
95 changes: 82 additions & 13 deletions frontend/static/css/play.css
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@
filter: brightness(90%);
}

[data-toggle="tooltip"] {
[data-toggle='tooltip'] {
position: relative;
display: inline-block;
}

[data-toggle="tooltip"]::before {
content: "";
[data-toggle='tooltip']::before {
content: '';
position: absolute;
top: -0.3rem;
left: 50%;
Expand All @@ -167,13 +167,13 @@
opacity: 0;
}

[data-placement="bottom"]::before {
[data-placement='bottom']::before {
top: 100%;
margin-top: 0.5rem;
transform: translateX(-50%) translatey(-100%) rotate(-180deg);
}

[data-toggle="tooltip"]::after {
[data-toggle='tooltip']::after {
content: attr(tooltip-title);
position: absolute;
left: 50%;
Expand All @@ -198,20 +198,20 @@
transform: translateX(-50%) translateY(0%);
}

[data-toggle="tooltip"]:hover::after,
[data-toggle="tooltip"]:hover::before {
opacity: 1
[data-toggle='tooltip']:hover::after,
[data-toggle='tooltip']:hover::before {
opacity: 1;
}

[data-toggle="tooltip"]:hover::after,
[data-toggle="tooltip"]:hover::before,
[data-toggle='tooltip']:hover::after,
[data-toggle='tooltip']:hover::before,
.show-tooltip::after,
.show-tooltip::before {
opacity: 1;
}

.no-tooltip[data-toggle="tooltip"]:hover::before,
.no-tooltip[data-toggle="tooltip"]:hover::after {
.no-tooltip[data-toggle='tooltip']:hover::before,
.no-tooltip[data-toggle='tooltip']:hover::after {
opacity: 0;
}

Expand Down Expand Up @@ -440,4 +440,73 @@
to {
transform: rotate(360deg);
}
}
}

#finalRoundContainer {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
font-size: 3em;
color: white;
z-index: 1000;
}

#finalRoundTop,
#finalRoundBottom {
position: absolute;
width: 100%;
height: 50%;
display: flex;
justify-content: center;
align-items: center;
color: white;
font-size: 5rem;
overflow: hidden;
}

#finalRoundTop {
top: 0;
background: rgba(0, 0, 0, 0.8);
clip-path: inset(0 0 50% 0);
animation: slideTop 1s forwards, fadeOut 1s 2s forwards;
}

#finalRoundBottom {
bottom: 0;
background: rgba(0, 0, 0, 0.8);
clip-path: inset(50% 0 0 0);
animation: slideBottom 1s forwards, fadeOut 1s 2s forwards;
}

@keyframes slideTop {
0% {
transform: translateY(-100%);
}
100% {
transform: translateY(50%);
}
}

@keyframes slideBottom {
0% {
transform: translateY(100%);
}
100% {
transform: translateY(-50%);
}
}

@keyframes fadeOut {
0% {
opacity: 1;
}
100% {
opacity: 0;
}
}
Loading