Compare commits
18 Commits
v2026.2.6-
...
v2026.2.7-
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d8efa4e61 | |||
| 69fce52bed | |||
| 13adf908bf | |||
| 3bbfb8740f | |||
| 0d04ec91e7 | |||
| 20a969705d | |||
| 4944d2aa21 | |||
| 2ec37a802b | |||
| 6a5ba84b5e | |||
| 6be0d52fb7 | |||
| f493f94368 | |||
| cd93a26c2c | |||
| 175581cdd5 | |||
| 5f856e4d70 | |||
| e0495d182e | |||
| 0b7c1406cf | |||
| 30edc5782b | |||
| d92a7f3aa0 |
42
CHANGELOG.md
42
CHANGELOG.md
@@ -1,7 +1,47 @@
|
||||
# Changelog
|
||||
|
||||
|
||||
## (unreleased)
|
||||
## v2026.2.7-0 (2026-04-21)
|
||||
|
||||
### Changes
|
||||
|
||||
* Small changes on docs - and improve text on homepage #8. [Lang]
|
||||
|
||||
* Massive refactor on front-end for unification and readiness #8. [Lang]
|
||||
|
||||
* Update all doc blocks on back-end #8. [Lang]
|
||||
|
||||
* Small refactors on back-end #8. [Lang]
|
||||
|
||||
* Add RecentBattle entity that is a Materialized View to speed up the view - and further refactor on ProfileController #8. [Lang]
|
||||
|
||||
* Create the UserStats entity what is a Materialized View to store Profile stats for every user - & massive ProfileController refactor #8. [Lang]
|
||||
|
||||
* Refactor the SecurityController #7. [Lang]
|
||||
|
||||
* Refactor the code - there was unnecessary codes and wrongly formatted or designed code that are related to Repositories #7. [Lang]
|
||||
|
||||
* Upgrade the doctrine related back-end pkgs to the latest available version #7. [Lang]
|
||||
|
||||
* Add filter to the Profile page's recent plays and an infite list too #7. [Lang]
|
||||
|
||||
* Upgrade to the latest doctrine pkg on back-end #7. [Lang]
|
||||
|
||||
### Fix
|
||||
|
||||
* Do not hide the end-game overlay ever #8. [Lang]
|
||||
|
||||
* The username was not recognized properly #7. [Lang]
|
||||
|
||||
|
||||
## v2026.2.6-1 (2026-04-19)
|
||||
|
||||
### Fix
|
||||
|
||||
* The PostgreSQL logo was horrible #7. [Lang]
|
||||
|
||||
|
||||
## v2026.2.6-0 (2026-04-19)
|
||||
|
||||
### Changes
|
||||
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
@keyframes appear {
|
||||
from { opacity: 0; transform: scale(0.94); }
|
||||
to { opacity: 1; transform: scale(1); }
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#hero-auth {
|
||||
padding: 20px;
|
||||
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.auth-page {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
200
assets/css/homepage/_battle-dialog.scss
Normal file
200
assets/css/homepage/_battle-dialog.scss
Normal file
@@ -0,0 +1,200 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
// ── Avatar ───────────────────────────────────────────────────────────────────
|
||||
|
||||
.bd-avatar-wrap {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.bd-avatar-ring-wrap {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.bd-avatar-ring {
|
||||
width: 72px;
|
||||
height: 72px;
|
||||
border-radius: 50%;
|
||||
background: var(--bd-avatar-gradient);
|
||||
border: 2px solid var(--bd-avatar-border);
|
||||
box-shadow: var(--bd-avatar-glow);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font: 800 24px 'Rajdhani', sans-serif;
|
||||
color: var(--bd-avatar-color);
|
||||
letter-spacing: 2px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.bd-avatar-img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
.bd-avatar-bonus {
|
||||
position: absolute;
|
||||
bottom: -6px;
|
||||
right: -6px;
|
||||
background: #ffd700;
|
||||
border-radius: 50%;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
box-shadow: 0 0 12px rgba(255, 215, 0, 0.6), 0 0 0 2px rgba(7, 9, 13, 1);
|
||||
border: 2px solid rgba(0, 0, 0, 0.5);
|
||||
z-index: 10;
|
||||
|
||||
i {
|
||||
color: #000;
|
||||
font-size: 14px;
|
||||
}
|
||||
}
|
||||
|
||||
.bd-avatar-name {
|
||||
font: 700 15px 'Rajdhani', sans-serif;
|
||||
color: var(--bd-avatar-color);
|
||||
letter-spacing: 1px;
|
||||
max-width: 120px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.bd-avatar-side {
|
||||
font: 600 10px 'Rajdhani', sans-serif;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 2px;
|
||||
color: rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
|
||||
// ── StatRow ──────────────────────────────────────────────────────────────────
|
||||
|
||||
.bd-stat-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 9px 0;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.05);
|
||||
|
||||
&__icon {
|
||||
width: 16px;
|
||||
color: rgba(149, 207, 245, 0.4);
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
&__label {
|
||||
font: 500 13px 'Rajdhani', sans-serif;
|
||||
color: rgba(255, 255, 255, 0.45);
|
||||
flex: 1;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
|
||||
&__value {
|
||||
font: 700 13px 'Rajdhani', sans-serif;
|
||||
color: var(--bd-stat-value-color, rgba(255, 255, 255, 0.75));
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
}
|
||||
|
||||
// ── BonusPoints ──────────────────────────────────────────────────────────────
|
||||
|
||||
.bd-bonus {
|
||||
padding: 16px 20px 0;
|
||||
border-top: 1px solid rgba(255, 255, 255, 0.08);
|
||||
margin: 16px 0;
|
||||
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
&__column {
|
||||
padding: 16px;
|
||||
border-radius: 6px;
|
||||
|
||||
&--red {
|
||||
border: 1px solid rgba(173, 10, 5, 0.2);
|
||||
background: rgba(173, 10, 5, 0.05);
|
||||
}
|
||||
|
||||
&--blue {
|
||||
border: 1px solid rgba(149, 207, 245, 0.2);
|
||||
background: rgba(149, 207, 245, 0.05);
|
||||
}
|
||||
}
|
||||
|
||||
&__heading {
|
||||
font: 700 12px 'Rajdhani', sans-serif;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 2px;
|
||||
color: #ffd700;
|
||||
display: block;
|
||||
margin-bottom: 12px;
|
||||
|
||||
i {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
&__rows {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
// ── BattleDialog header actions & bonus score row ────────────────────────────
|
||||
|
||||
.bd-header-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.bd-bonus-score {
|
||||
margin-bottom: 8px;
|
||||
|
||||
&__red {
|
||||
font: 700 13px 'Rajdhani', sans-serif;
|
||||
color: #f67d52;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
|
||||
i {
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
|
||||
&__blue {
|
||||
font: 700 13px 'Rajdhani', sans-serif;
|
||||
color: #95cff5;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
|
||||
i {
|
||||
font-size: 11px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bd-result-badge {
|
||||
background: var(--bd-result-bg);
|
||||
border: 1px solid var(--bd-result-border);
|
||||
color: var(--bd-result-color);
|
||||
}
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
main div.txt {
|
||||
color: rgba(255, 255, 255, 0.85);
|
||||
max-width: 900px;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.hero-cta {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.feature-block {
|
||||
width: 100%;
|
||||
padding: 80px 40px;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
footer {
|
||||
background: #040608;
|
||||
border-top: 1px solid rgba(35, 111, 135, 0.12);
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
header {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.hero--compact {
|
||||
min-height: unset;
|
||||
padding: 36px 60px 48px;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.hero {
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
@@ -427,10 +427,88 @@
|
||||
}
|
||||
}
|
||||
|
||||
.profile-games__filter-wrap {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.profile-games__filter-icon {
|
||||
position: absolute;
|
||||
left: 14px;
|
||||
font-size: 12px;
|
||||
color: rgba(149, 207, 245, 0.4);
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.profile-games__filter {
|
||||
width: 100%;
|
||||
background: rgba(255, 255, 255, 0.025);
|
||||
border: 1px solid rgba(255, 255, 255, 0.07);
|
||||
border-radius: 6px;
|
||||
padding: 9px 14px 9px 36px;
|
||||
font: 500 13px 'Rajdhani', sans-serif;
|
||||
color: #fff;
|
||||
letter-spacing: 0.5px;
|
||||
transition: border-color 200ms ease, background 200ms ease;
|
||||
|
||||
&::placeholder {
|
||||
color: rgba(255, 255, 255, 0.3);
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
background: rgba(255, 255, 255, 0.045);
|
||||
border-color: rgba(35, 111, 135, 0.55);
|
||||
}
|
||||
}
|
||||
|
||||
.profile-games {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
|
||||
&.is-filtering + .profile-games__load-more {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.is-filtering .profile-game--hidden:not(.profile-game--filtered-out) {
|
||||
display: grid;
|
||||
}
|
||||
|
||||
.profile-game--filtered-out {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&__load-more {
|
||||
align-self: center;
|
||||
margin-top: 14px;
|
||||
background: rgba(35, 111, 135, 0.12);
|
||||
color: rgba(149, 207, 245, 0.75);
|
||||
border: 1px solid rgba(35, 111, 135, 0.3);
|
||||
border-radius: 6px;
|
||||
padding: 9px 20px;
|
||||
font: 600 12px 'Rajdhani', sans-serif;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 1.5px;
|
||||
cursor: pointer;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
transition: background 200ms ease, border-color 200ms ease, color 200ms ease;
|
||||
|
||||
i {
|
||||
font-size: 11px;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: rgba(35, 111, 135, 0.22);
|
||||
border-color: rgba(35, 111, 135, 0.55);
|
||||
color: rgba(149, 207, 245, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.profile-game {
|
||||
@@ -469,6 +547,10 @@
|
||||
border-left-color: rgba(255, 193, 7, 0.4);
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
&--hidden {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.profile-game__badge {
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
* {
|
||||
outline: none;
|
||||
padding: 0;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
@media screen and (max-width: 900px) {
|
||||
.hero h1 {
|
||||
font-size: 44px;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
main {
|
||||
background: #07090d;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.back-from-game {
|
||||
display: inline-block;
|
||||
position: fixed;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
html {
|
||||
height: 100%;
|
||||
padding: 0;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .game-wrapper .users .user-container .user-control {
|
||||
background: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.5) 0%, rgba(125, 185, 232, 0) 100%);
|
||||
background: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.5) 0%, rgba(125, 185, 232, 0) 100%);
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .grid {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .game-wrapper .users .active-mines-container {
|
||||
background: -moz-radial-gradient(center, ellipse cover, rgba(255, 252, 252, 1) 0%, rgba(255, 252, 252, 0.99) 1%, rgba(106, 106, 106, 0.39) 61%, rgba(106, 106, 106, 0) 100%);
|
||||
background: -webkit-radial-gradient(center, ellipse cover, rgba(255, 252, 252, 1) 0%, rgba(255, 252, 252, 0.99) 1%, rgba(106, 106, 106, 0.39) 61%, rgba(106, 106, 106, 0) 100%);
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .game-wrapper .game-overlay {
|
||||
background: rgba(255, 255, 255, 0.2);
|
||||
display: flex;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
@media screen and (max-width: 900px) {
|
||||
#mine-wrapper .game-wrapper .users {
|
||||
visibility: hidden;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .game-timer-container {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
#mine-wrapper .game-wrapper .users {
|
||||
width: 180px;
|
||||
padding: 0 10px 0 0;
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.opd-paper {
|
||||
background: #07090d !important;
|
||||
background-image: linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
@use "sass:color";
|
||||
|
||||
.twofa-status {
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
@use 'homepage/reset';
|
||||
@use 'homepage/animations';
|
||||
@use 'homepage/header';
|
||||
@@ -12,4 +21,5 @@
|
||||
@use 'homepage/tech';
|
||||
@use 'homepage/footer';
|
||||
@use 'homepage/profile';
|
||||
@use 'homepage/battle-dialog';
|
||||
@use 'homepage/responsive';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
/*!*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
.mine-beta {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
||||
@@ -1,36 +1,32 @@
|
||||
import React, { useRef, useState } from 'react';
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
export default function AvatarUpload({ uploadUrl, initialThumbUrl, initials }) {
|
||||
const [thumbUrl, setThumbUrl] = useState(initialThumbUrl || null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState(null);
|
||||
import React, { useMemo, useRef } from 'react';
|
||||
import { string } from 'prop-types';
|
||||
import { useProfileDataProvider } from '@mine-hooks/useGameDataProvider';
|
||||
|
||||
export const AvatarUpload = ({ uploadUrl, initialThumbUrl, initials }) => {
|
||||
const inputRef = useRef(null);
|
||||
const [thumbUrl, setThumbUrl] = React.useState(initialThumbUrl || null);
|
||||
const { uploadAvatarMutation: { isPending, error, mutate } } = useProfileDataProvider();
|
||||
|
||||
function handleClick() {
|
||||
inputRef.current?.click();
|
||||
}
|
||||
|
||||
function handleChange(e) {
|
||||
const handleChange = e => {
|
||||
const file = e.target.files?.[0];
|
||||
if (!file) return;
|
||||
|
||||
const fd = new FormData();
|
||||
fd.append('avatar', file);
|
||||
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
fetch(uploadUrl, { method: 'POST', body: fd })
|
||||
.then(r => r.json())
|
||||
.then(data => {
|
||||
if (data.error) {
|
||||
setError(data.error);
|
||||
return;
|
||||
}
|
||||
mutate({ uploadUrl, file }, {
|
||||
onSuccess: data => {
|
||||
setThumbUrl(data.thumbUrl);
|
||||
|
||||
const navImg = document.querySelector('.hero-auth-avatar:not(.hero-auth-avatar--initials)');
|
||||
const navInitials = document.querySelector('.hero-auth-avatar.hero-auth-avatar--initials');
|
||||
|
||||
if (navImg) {
|
||||
navImg.src = data.thumbUrl;
|
||||
} else if (navInitials) {
|
||||
@@ -40,16 +36,17 @@ export default function AvatarUpload({ uploadUrl, initialThumbUrl, initials }) {
|
||||
img.className = 'hero-auth-avatar';
|
||||
navInitials.replaceWith(img);
|
||||
}
|
||||
})
|
||||
.catch(() => setError('Upload failed. Please try again.'))
|
||||
.finally(() => setLoading(false));
|
||||
}
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const errorMessage = useMemo(() => error?.message ?? null, [error]);
|
||||
|
||||
return (
|
||||
<div
|
||||
className={`profile-avatar${loading ? ' profile-avatar--loading' : ''}`}
|
||||
className={`profile-avatar${isPending ? ' profile-avatar--loading' : ''}`}
|
||||
title="Click to change profile picture"
|
||||
onClick={handleClick}
|
||||
onClick={() => inputRef.current?.click()}
|
||||
>
|
||||
{thumbUrl
|
||||
? <img src={thumbUrl} alt={initials} className="profile-avatar__img" />
|
||||
@@ -65,7 +62,13 @@ export default function AvatarUpload({ uploadUrl, initialThumbUrl, initials }) {
|
||||
style={{ display: 'none' }}
|
||||
onChange={handleChange}
|
||||
/>
|
||||
{error && <div className="profile-avatar__error">{error}</div>}
|
||||
{errorMessage && <div className="profile-avatar__error">{errorMessage}</div>}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
AvatarUpload.propTypes = {
|
||||
uploadUrl: string.isRequired,
|
||||
initialThumbUrl: string,
|
||||
initials: string.isRequired,
|
||||
};
|
||||
|
||||
@@ -1,34 +1,21 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { array } from 'prop-types';
|
||||
import { formatDuration } from '@global-utils/format';
|
||||
import Dialog from '@mui/material/Dialog';
|
||||
import { createTheme, ThemeProvider } from '@mui/material/styles';
|
||||
import Avatar from './battle-dialog/Avatar';
|
||||
import StatRow from './battle-dialog/StatRow';
|
||||
import BonusPoints from './battle-dialog/BonusPoints';
|
||||
import { createTheme, styled, ThemeProvider } from '@mui/material/styles';
|
||||
import { Avatar, BonusPoints, StatRow } from '@global-components';
|
||||
|
||||
const darkTheme = createTheme({ palette: { mode: 'dark' } });
|
||||
|
||||
const DIALOG_SX = {
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0,0,0,0.9)',
|
||||
width: '580px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
};
|
||||
|
||||
const RESULT_META = {
|
||||
win: {
|
||||
label: 'Victory',
|
||||
@@ -53,7 +40,7 @@ const RESULT_META = {
|
||||
},
|
||||
};
|
||||
|
||||
export default function BattleDialog({ games }) {
|
||||
export const BattleDialog = ({ games }) => {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [game, setGame] = useState(null);
|
||||
const [copied, setCopied] = useState(false);
|
||||
@@ -73,7 +60,7 @@ export default function BattleDialog({ games }) {
|
||||
}, [games]);
|
||||
|
||||
if (!game) {
|
||||
return <ThemeProvider theme={darkTheme}><Dialog open={false} sx={DIALOG_SX} /></ThemeProvider>;
|
||||
return <ThemeProvider theme={darkTheme}><StyledDialog open={false} /></ThemeProvider>;
|
||||
}
|
||||
|
||||
const meta = RESULT_META[game.result] ?? RESULT_META.draw;
|
||||
@@ -82,22 +69,12 @@ export default function BattleDialog({ games }) {
|
||||
const endReason = resign
|
||||
? `${resign.charAt(0).toUpperCase() + resign.slice(1)} resigned`
|
||||
: 26 <= maxPoints ? 'Points' : 'Abandoned';
|
||||
const shareUrl = `${window.location.origin}/battle/${game.uuid}`;
|
||||
const canContinue = !resign && 26 > maxPoints;
|
||||
const canShare = !canContinue;
|
||||
const bothRegistered = game.bothRegistered;
|
||||
const canContinue = bothRegistered && !resign && 26 > maxPoints;
|
||||
const playUrl = `${window.location.origin}/play/${game.uuid}`;
|
||||
const shareUrl = `${window.location.origin}/battle/${game.uuid}`;
|
||||
|
||||
const formatDuration = (from, to) => {
|
||||
if (!from || !to) return null;
|
||||
const diffMs = new Date(to.replace(' ', 'T')) - new Date(from.replace(' ', 'T'));
|
||||
if (isNaN(diffMs) || 0 >= diffMs) return null;
|
||||
const totalSec = Math.floor(diffMs / 1000);
|
||||
const h = Math.floor(totalSec / 3600);
|
||||
const m = Math.floor((totalSec % 3600) / 60);
|
||||
const s = totalSec % 60;
|
||||
if (0 < h) return `${h}h ${m}m ${s}s`;
|
||||
if (0 < m) return `${m}m ${s}s`;
|
||||
return `${s}s`;
|
||||
};
|
||||
const duration = formatDuration(game.created, game.date);
|
||||
const pointDiff = Math.abs((game.redPoints ?? 0) - (game.bluePoints ?? 0));
|
||||
const winnerColor = (game.redPoints ?? 0) > (game.bluePoints ?? 0) ? '#f67d52'
|
||||
@@ -113,7 +90,7 @@ export default function BattleDialog({ games }) {
|
||||
|
||||
return (
|
||||
<ThemeProvider theme={darkTheme}>
|
||||
<Dialog open={open} onClose={() => setOpen(false)} sx={DIALOG_SX}>
|
||||
<StyledDialog open={open} onClose={() => setOpen(false)}>
|
||||
<div className="bd">
|
||||
<div className="bd-header">
|
||||
<div className="bd-header-left">
|
||||
@@ -122,7 +99,7 @@ export default function BattleDialog({ games }) {
|
||||
<i className="fa fa-crosshairs" /> Match Details
|
||||
</h2>
|
||||
</div>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<div className="bd-header-actions">
|
||||
{canContinue ? (
|
||||
<a
|
||||
className="bd-continue"
|
||||
@@ -133,7 +110,7 @@ export default function BattleDialog({ games }) {
|
||||
<i className="fa fa-play" />
|
||||
Continue
|
||||
</a>
|
||||
) : (
|
||||
) : canShare ? (
|
||||
<button
|
||||
className={`bd-share${copied ? ' bd-share--copied' : ''}`}
|
||||
onClick={handleShare}
|
||||
@@ -143,7 +120,7 @@ export default function BattleDialog({ games }) {
|
||||
<i className={`fa ${copied ? 'fa-check' : 'fa-share-alt'}`} />
|
||||
{copied ? 'Copied!' : 'Share'}
|
||||
</button>
|
||||
)}
|
||||
) : null}
|
||||
<button className="bd-close" onClick={() => setOpen(false)} aria-label="Close">
|
||||
<i className="fa fa-times" />
|
||||
</button>
|
||||
@@ -160,33 +137,19 @@ export default function BattleDialog({ games }) {
|
||||
<span className="bd-vs-score__sep">:</span>
|
||||
<span className="bd-vs-score__blue">{game.bluePoints ?? '—'}</span>
|
||||
</div>
|
||||
<div className="bd-vs-score" style={{ marginBottom: 8 }}>
|
||||
<span style={{
|
||||
font: '700 13px \'Rajdhani\', sans-serif',
|
||||
color: '#f67d52',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: 4,
|
||||
}}
|
||||
>
|
||||
<i className="fa fa-star" style={{ fontSize: 11 }} /> {(game.redBonusPoints ?? 0).toFixed(1)}
|
||||
<div className="bd-vs-score bd-bonus-score">
|
||||
<span className="bd-bonus-score__red">
|
||||
<i className="fa fa-star" /> {(game.redBonusPoints ?? 0).toFixed(1)}
|
||||
</span>
|
||||
<span className="bd-vs-score__sep">:</span>
|
||||
<span style={{
|
||||
font: '700 13px \'Rajdhani\', sans-serif',
|
||||
color: '#95cff5',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: 4,
|
||||
}}
|
||||
>
|
||||
{(game.blueBonusPoints ?? 0).toFixed(1)} <i className="fa fa-star" style={{ fontSize: 11 }} />
|
||||
<span className="bd-bonus-score__blue">
|
||||
{(game.blueBonusPoints ?? 0).toFixed(1)} <i className="fa fa-star" />
|
||||
</span>
|
||||
</div>
|
||||
<div className="bd-vs-label">VS</div>
|
||||
<div
|
||||
className="bd-result-badge"
|
||||
style={{ background: meta.bg, border: `1px solid ${meta.border}`, color: meta.color }}
|
||||
style={{ '--bd-result-bg': meta.bg, '--bd-result-border': meta.border, '--bd-result-color': meta.color }}
|
||||
>
|
||||
<i className={`fa ${meta.icon}`} /> {meta.label}
|
||||
</div>
|
||||
@@ -226,7 +189,33 @@ export default function BattleDialog({ games }) {
|
||||
game={game}
|
||||
/>
|
||||
</div>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
BattleDialog.propTypes = {
|
||||
games: array.isRequired,
|
||||
};
|
||||
|
||||
const StyledDialog = styled(Dialog)({
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0,0,0,0.9)',
|
||||
width: '580px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
});
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
import { useEffect, useRef } from 'react';
|
||||
import { string } from 'prop-types';
|
||||
|
||||
/**
|
||||
* ContactForm Component
|
||||
@@ -80,4 +81,9 @@ const ContactForm = ({ siteKey, recaptchaFieldId }) => {
|
||||
return null;
|
||||
};
|
||||
|
||||
ContactForm.propTypes = {
|
||||
siteKey: string.isRequired,
|
||||
recaptchaFieldId: string.isRequired,
|
||||
};
|
||||
|
||||
export default ContactForm;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
import React, { useState, useCallback } from 'react';
|
||||
import { shape, string } from 'prop-types';
|
||||
|
||||
const base64ToArrayBuffer = base64 => {
|
||||
const binary = atob(base64.replace(/([-_])/g, m => ('-' === m ? '+' : '/')));
|
||||
@@ -107,4 +108,11 @@ const PasskeyLogin = ({ apiRoutes }) => {
|
||||
);
|
||||
};
|
||||
|
||||
export default PasskeyLogin;
|
||||
export default PasskeyLogin;
|
||||
|
||||
PasskeyLogin.propTypes = {
|
||||
apiRoutes: shape({
|
||||
authenticationBegin: string.isRequired,
|
||||
authenticationComplete: string.isRequired,
|
||||
}).isRequired,
|
||||
};
|
||||
|
||||
@@ -9,13 +9,15 @@
|
||||
|
||||
import React, { Fragment, useCallback, useEffect, useState } from 'react';
|
||||
import Dialog from '@mui/material/Dialog';
|
||||
import { styled } from '@mui/material/styles';
|
||||
import DialogTitle from '@mui/material/DialogTitle';
|
||||
import DialogContent from '@mui/material/DialogContent';
|
||||
import DialogActions from '@mui/material/DialogActions';
|
||||
import Button from '@mui/material/Button';
|
||||
import TextField from '@mui/material/TextField';
|
||||
import { arrayOf, shape, string, bool } from 'prop-types';
|
||||
|
||||
const DIALOG_SX = {
|
||||
const StyledDialog = styled(Dialog)({
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#0a0e14',
|
||||
color: '#e0e0e0',
|
||||
@@ -47,7 +49,7 @@ const DIALOG_SX = {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
const base64ToArrayBuffer = base64 => {
|
||||
const binary = atob(base64.replace(/([-_])/g, m => ('-' === m ? '+' : '/')));
|
||||
@@ -314,7 +316,7 @@ const PasskeyManager = ({ credentials, apiRoutes }) => {
|
||||
)}
|
||||
</div>
|
||||
|
||||
<Dialog open={addModalOpen} onClose={closeAddModal} sx={DIALOG_SX}>
|
||||
<StyledDialog open={addModalOpen} onClose={closeAddModal}>
|
||||
<DialogTitle>Add New Passkey</DialogTitle>
|
||||
<DialogContent>
|
||||
<TextField
|
||||
@@ -344,9 +346,9 @@ const PasskeyManager = ({ credentials, apiRoutes }) => {
|
||||
Continue
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
|
||||
<Dialog open={renameModalOpen} onClose={closeRenameModal} sx={DIALOG_SX}>
|
||||
<StyledDialog open={renameModalOpen} onClose={closeRenameModal}>
|
||||
<DialogTitle>Rename Passkey</DialogTitle>
|
||||
<DialogContent>
|
||||
<TextField
|
||||
@@ -374,9 +376,9 @@ const PasskeyManager = ({ credentials, apiRoutes }) => {
|
||||
Rename
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
|
||||
<Dialog open={deleteModalOpen} onClose={closeDeleteModal} sx={DIALOG_SX}>
|
||||
<StyledDialog open={deleteModalOpen} onClose={closeDeleteModal}>
|
||||
<DialogTitle>Delete Passkey</DialogTitle>
|
||||
<DialogContent>
|
||||
<p>
|
||||
@@ -402,9 +404,25 @@ const PasskeyManager = ({ credentials, apiRoutes }) => {
|
||||
Delete
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default PasskeyManager;
|
||||
|
||||
PasskeyManager.propTypes = {
|
||||
credentials: arrayOf(shape({
|
||||
id: string.isRequired,
|
||||
credentialName: string.isRequired,
|
||||
createdAt: string,
|
||||
lastUsedAt: string,
|
||||
isBackupEligible: bool,
|
||||
isBackupAuthenticated: bool,
|
||||
})).isRequired,
|
||||
apiRoutes: shape({
|
||||
credentials: string.isRequired,
|
||||
registrationBegin: string.isRequired,
|
||||
registrationComplete: string.isRequired,
|
||||
}).isRequired,
|
||||
};
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { BarChart } from '@mui/x-charts/BarChart';
|
||||
import { LineChart } from '@mui/x-charts/LineChart';
|
||||
import { PieChart } from '@mui/x-charts/PieChart';
|
||||
import { createTheme, ThemeProvider } from '@mui/material/styles';
|
||||
import { shape, arrayOf, number, string } from 'prop-types';
|
||||
|
||||
const darkTheme = createTheme({
|
||||
palette: {
|
||||
@@ -136,3 +146,20 @@ export default function ProfileCharts({ chartData }) {
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
|
||||
ProfileCharts.propTypes = {
|
||||
chartData: shape({
|
||||
months: arrayOf(string).isRequired,
|
||||
wins: arrayOf(number).isRequired,
|
||||
losses: arrayOf(number).isRequired,
|
||||
draws: arrayOf(number).isRequired,
|
||||
pieWins: number.isRequired,
|
||||
pieLosses: number.isRequired,
|
||||
pieDraws: number.isRequired,
|
||||
recentGames: shape({
|
||||
labels: arrayOf(string).isRequired,
|
||||
mines: arrayOf(number).isRequired,
|
||||
bonus: arrayOf(number).isRequired,
|
||||
}).isRequired,
|
||||
}).isRequired,
|
||||
};
|
||||
|
||||
@@ -7,92 +7,48 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import React, { useMemo } from 'react';
|
||||
import { string } from 'prop-types';
|
||||
|
||||
export default function Avatar({ name, color, avatarUrl, bonusPoints = 0 }) {
|
||||
export const Avatar = ({ name, color, avatarUrl, bonusPoints = 0 }) => {
|
||||
const isRed = 'red' === color;
|
||||
const initials = (name || '?').slice(0, 2).toUpperCase();
|
||||
const initials = useMemo(() => (name || '?').slice(0, 2).toUpperCase(), [name]);
|
||||
|
||||
const gradient = isRed
|
||||
? 'linear-gradient(135deg, rgba(173,10,5,0.6) 0%, rgba(246,125,82,0.4) 100%)'
|
||||
: 'linear-gradient(135deg, rgba(35,111,135,0.6) 0%, rgba(41,128,185,0.4) 100%)';
|
||||
const glow = isRed
|
||||
? '0 0 0 3px rgba(173,10,5,0.2), 0 0 28px rgba(173,10,5,0.35)'
|
||||
: '0 0 0 3px rgba(35,111,135,0.2), 0 0 28px rgba(35,111,135,0.35)';
|
||||
const border = isRed
|
||||
? 'rgba(173,10,5,0.5)'
|
||||
: 'rgba(35,111,135,0.5)';
|
||||
const textColor = isRed ? '#f67d52' : '#95cff5';
|
||||
const cssVars = isRed ? {
|
||||
'--bd-avatar-gradient': 'linear-gradient(135deg, rgba(173,10,5,0.6) 0%, rgba(246,125,82,0.4) 100%)',
|
||||
'--bd-avatar-glow': '0 0 0 3px rgba(173,10,5,0.2), 0 0 28px rgba(173,10,5,0.35)',
|
||||
'--bd-avatar-border': 'rgba(173,10,5,0.5)',
|
||||
'--bd-avatar-color': '#f67d52',
|
||||
} : {
|
||||
'--bd-avatar-gradient': 'linear-gradient(135deg, rgba(35,111,135,0.6) 0%, rgba(41,128,185,0.4) 100%)',
|
||||
'--bd-avatar-glow': '0 0 0 3px rgba(35,111,135,0.2), 0 0 28px rgba(35,111,135,0.35)',
|
||||
'--bd-avatar-border': 'rgba(35,111,135,0.5)',
|
||||
'--bd-avatar-color': '#95cff5',
|
||||
};
|
||||
|
||||
return (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 10, position: 'relative' }}>
|
||||
<div style={{ position: 'relative' }}>
|
||||
<div style={{
|
||||
width: 72, height: 72, borderRadius: '50%',
|
||||
background: avatarUrl ? 'transparent' : gradient,
|
||||
border: `2px solid ${border}`,
|
||||
boxShadow: glow,
|
||||
display: 'flex', alignItems: 'center', justifyContent: 'center',
|
||||
font: '800 24px \'Rajdhani\', sans-serif',
|
||||
color: textColor,
|
||||
letterSpacing: 2,
|
||||
overflow: 'hidden',
|
||||
}}
|
||||
>
|
||||
{avatarUrl ? (
|
||||
<img
|
||||
src={avatarUrl}
|
||||
alt={name}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
objectFit: 'cover',
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
initials
|
||||
)}
|
||||
<div className="bd-avatar-wrap" style={cssVars}>
|
||||
<div className="bd-avatar-ring-wrap">
|
||||
<div className="bd-avatar-ring">
|
||||
{avatarUrl
|
||||
? <img src={avatarUrl} alt={name} className="bd-avatar-img" />
|
||||
: initials}
|
||||
</div>
|
||||
{0 < bonusPoints && (
|
||||
<div style={{
|
||||
position: 'absolute',
|
||||
bottom: -6,
|
||||
right: -6,
|
||||
background: '#ffd700',
|
||||
borderRadius: '50%',
|
||||
width: 28,
|
||||
height: 28,
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
boxShadow: '0 0 12px rgba(255, 215, 0, 0.6), 0 0 0 2px rgba(7, 9, 13, 1)',
|
||||
border: '2px solid rgba(0,0,0,0.5)',
|
||||
zIndex: 10,
|
||||
}}
|
||||
>
|
||||
<i className="fa fa-star" style={{ color: '#000', fontSize: 14 }} />
|
||||
<div className="bd-avatar-bonus">
|
||||
<i className="fa fa-star" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<span style={{
|
||||
font: '700 15px \'Rajdhani\', sans-serif',
|
||||
color: textColor,
|
||||
letterSpacing: 1,
|
||||
maxWidth: 120, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
|
||||
textAlign: 'center',
|
||||
}}
|
||||
>
|
||||
{name}
|
||||
</span>
|
||||
<span style={{
|
||||
font: '600 10px \'Rajdhani\', sans-serif',
|
||||
textTransform: 'uppercase',
|
||||
letterSpacing: 2,
|
||||
color: 'rgba(255,255,255,0.3)',
|
||||
}}
|
||||
>
|
||||
{isRed ? 'Red' : 'Blue'}
|
||||
</span>
|
||||
<span className="bd-avatar-name">{name}</span>
|
||||
<span className="bd-avatar-side">{isRed ? 'Red' : 'Blue'}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
Avatar.propTypes = {
|
||||
name: string,
|
||||
color: string,
|
||||
avatarUrl: string,
|
||||
bonusPoints: string,
|
||||
};
|
||||
|
||||
@@ -1,7 +1,17 @@
|
||||
import { useMemo } from 'react';
|
||||
import StatRow from './StatRow';
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
export default function BonusPoints({ game }) {
|
||||
import { useMemo } from 'react';
|
||||
import { StatRow } from './StatRow';
|
||||
import { object } from 'prop-types';
|
||||
|
||||
export const BonusPoints = ({ game }) => {
|
||||
const hasBonuspoints = useMemo(
|
||||
() => 0 < game?.redBonusPoints
|
||||
|| 0 < game?.blueBonusPoints
|
||||
@@ -45,95 +55,68 @@ export default function BonusPoints({ game }) {
|
||||
],
|
||||
);
|
||||
|
||||
if (!hasBonuspoints) {
|
||||
return '';
|
||||
}
|
||||
if (!hasBonuspoints) return '';
|
||||
|
||||
return (
|
||||
<div style={{
|
||||
padding: '16px 20px 0',
|
||||
borderTop: '1px solid rgba(255,255,255,0.08)',
|
||||
marginTop: 16,
|
||||
marginBottom: 16,
|
||||
}}
|
||||
>
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: 16 }}>
|
||||
{/* Red Bonus */}
|
||||
<div style={{
|
||||
padding: 16,
|
||||
border: '1px solid rgba(173,10,5,0.2)',
|
||||
borderRadius: 6,
|
||||
background: 'rgba(173,10,5,0.05)',
|
||||
}}
|
||||
>
|
||||
<span style={{
|
||||
font: '700 12px \'Rajdhani\', sans-serif',
|
||||
textTransform: 'uppercase',
|
||||
letterSpacing: 2,
|
||||
color: '#ffd700',
|
||||
display: 'block',
|
||||
marginBottom: 12,
|
||||
}}
|
||||
>
|
||||
<i className="fa fa-star" style={{ marginRight: 8 }} /> Red Bonus Statistics
|
||||
<div className="bd-bonus">
|
||||
<div className="bd-bonus__grid">
|
||||
<div className="bd-bonus__column bd-bonus__column--red">
|
||||
<span className="bd-bonus__heading">
|
||||
<i className="fa fa-star" /> Red Bonus Statistics
|
||||
</span>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 0 }}>
|
||||
<StatRow
|
||||
icon="fa-star" label="Total Bonus Points" value={(game.redBonusPoints ?? 0).toFixed(1)}
|
||||
valueColor="#ffd700"
|
||||
/>
|
||||
{0 < game.redBonusStats?.blindHits
|
||||
&& <StatRow icon="fa-bullseye" label="Blind hits" value={game.redBonusStats.blindHits} />}
|
||||
{0 < game.redBonusStats?.chainBest
|
||||
&& <StatRow icon="fa-link" label="Best chain" value={game.redBonusStats.chainBest} />}
|
||||
{0 < game.redBonusStats?.edgeMines
|
||||
&& <StatRow icon="fa-border-all" label="Edge mines" value={game.redBonusStats.edgeMines} />}
|
||||
{0 < game.redBonusStats?.lastMineHits
|
||||
&& <StatRow icon="fa-hourglass-end" label="Endgame mines" value={game.redBonusStats.lastMineHits} />}
|
||||
{0 < game.redBonusStats?.biggestReveal
|
||||
&& <StatRow icon="fa-expand" label="Biggest reveal" value={game.redBonusStats.biggestReveal} />}
|
||||
{hasRedNoBonuses
|
||||
&& <StatRow icon="fa-minus-circle" label="Status" value="No bonuses" valueColor="rgba(255,255,255,0.3)" />}
|
||||
<div className="bd-bonus__rows">
|
||||
<StatRow icon="fa-star" label="Total Bonus Points" value={(game.redBonusPoints ?? 0).toFixed(1)} valueColor="#ffd700" />
|
||||
{0 < game.redBonusStats?.blindHits && (
|
||||
<StatRow icon="fa-bullseye" label="Blind hits" value={game.redBonusStats.blindHits} />
|
||||
)}
|
||||
{0 < game.redBonusStats?.chainBest && (
|
||||
<StatRow icon="fa-link" label="Best chain" value={game.redBonusStats.chainBest} />
|
||||
)}
|
||||
{0 < game.redBonusStats?.edgeMines && (
|
||||
<StatRow icon="fa-border-all" label="Edge mines" value={game.redBonusStats.edgeMines} />
|
||||
)}
|
||||
{0 < game.redBonusStats?.lastMineHits && (
|
||||
<StatRow icon="fa-hourglass-end" label="Endgame mines" value={game.redBonusStats.lastMineHits} />
|
||||
)}
|
||||
{0 < game.redBonusStats?.biggestReveal && (
|
||||
<StatRow icon="fa-expand" label="Biggest reveal" value={game.redBonusStats.biggestReveal} />
|
||||
)}
|
||||
{hasRedNoBonuses && (
|
||||
<StatRow icon="fa-minus-circle" label="Status" value="No bonuses" valueColor="rgba(255,255,255,0.3)" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<div style={{
|
||||
padding: 16,
|
||||
border: '1px solid rgba(149,207,245,0.2)',
|
||||
borderRadius: 6,
|
||||
background: 'rgba(149,207,245,0.05)',
|
||||
}}
|
||||
>
|
||||
<span style={{
|
||||
font: '700 12px \'Rajdhani\', sans-serif',
|
||||
textTransform: 'uppercase',
|
||||
letterSpacing: 2,
|
||||
color: '#ffd700',
|
||||
display: 'block',
|
||||
marginBottom: 12,
|
||||
}}
|
||||
>
|
||||
<i className="fa fa-star" style={{ marginRight: 8 }} /> Blue Bonus Statistics
|
||||
<div className="bd-bonus__column bd-bonus__column--blue">
|
||||
<span className="bd-bonus__heading">
|
||||
<i className="fa fa-star" /> Blue Bonus Statistics
|
||||
</span>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: 0 }}>
|
||||
<StatRow
|
||||
icon="fa-star" label="Total Bonus Points" value={(game.blueBonusPoints ?? 0).toFixed(1)}
|
||||
valueColor="#ffd700"
|
||||
/>
|
||||
{0 < game.blueBonusStats?.blindHits
|
||||
&& <StatRow icon="fa-bullseye" label="Blind hits" value={game.blueBonusStats.blindHits} />}
|
||||
{0 < game.blueBonusStats?.chainBest
|
||||
&& <StatRow icon="fa-link" label="Best chain" value={game.blueBonusStats.chainBest} />}
|
||||
{0 < game.blueBonusStats?.edgeMines
|
||||
&& <StatRow icon="fa-border-all" label="Edge mines" value={game.blueBonusStats.edgeMines} />}
|
||||
{0 < game.blueBonusStats?.lastMineHits
|
||||
&& <StatRow icon="fa-hourglass-end" label="Endgame mines" value={game.blueBonusStats.lastMineHits} />}
|
||||
{0 < game.blueBonusStats?.biggestReveal
|
||||
&& <StatRow icon="fa-expand" label="Biggest reveal" value={game.blueBonusStats.biggestReveal} />}
|
||||
{hasBlueNoBonuses
|
||||
&& <StatRow icon="fa-minus-circle" label="Status" value="No bonuses" valueColor="rgba(255,255,255,0.3)" />}
|
||||
<div className="bd-bonus__rows">
|
||||
<StatRow icon="fa-star" label="Total Bonus Points" value={(game.blueBonusPoints ?? 0).toFixed(1)} valueColor="#ffd700" />
|
||||
{0 < game.blueBonusStats?.blindHits && (
|
||||
<StatRow icon="fa-bullseye" label="Blind hits" value={game.blueBonusStats.blindHits} />
|
||||
)}
|
||||
{0 < game.blueBonusStats?.chainBest && (
|
||||
<StatRow icon="fa-link" label="Best chain" value={game.blueBonusStats.chainBest} />
|
||||
)}
|
||||
{0 < game.blueBonusStats?.edgeMines && (
|
||||
<StatRow icon="fa-border-all" label="Edge mines" value={game.blueBonusStats.edgeMines} />
|
||||
)}
|
||||
{0 < game.blueBonusStats?.lastMineHits && (
|
||||
<StatRow icon="fa-hourglass-end" label="Endgame mines" value={game.blueBonusStats.lastMineHits} />
|
||||
)}
|
||||
{0 < game.blueBonusStats?.biggestReveal && (
|
||||
<StatRow icon="fa-expand" label="Biggest reveal" value={game.blueBonusStats.biggestReveal} />
|
||||
)}
|
||||
{hasBlueNoBonuses && (
|
||||
<StatRow icon="fa-minus-circle" label="Status" value="No bonuses" valueColor="rgba(255,255,255,0.3)" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
BonusPoints.propTypes = {
|
||||
game: object.isRequired,
|
||||
};
|
||||
|
||||
@@ -8,33 +8,24 @@
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { node, string } from 'prop-types';
|
||||
|
||||
export default function StatRow({ icon, label, value, valueColor }) {
|
||||
return (
|
||||
<div style={{
|
||||
display: 'flex', alignItems: 'center',
|
||||
gap: 10, padding: '9px 0',
|
||||
borderBottom: '1px solid rgba(255,255,255,0.05)',
|
||||
}}
|
||||
export const StatRow = ({ icon, label, value, valueColor }) => (
|
||||
<div className="bd-stat-row">
|
||||
<i className={`fa ${icon} bd-stat-row__icon`} />
|
||||
<span className="bd-stat-row__label">{label}</span>
|
||||
<span
|
||||
className="bd-stat-row__value"
|
||||
style={valueColor ? { '--bd-stat-value-color': valueColor } : undefined}
|
||||
>
|
||||
<i className={`fa ${icon}`} style={{ width: 16, color: 'rgba(149,207,245,0.4)', fontSize: 13 }} />
|
||||
<span style={{
|
||||
font: '500 13px \'Rajdhani\', sans-serif',
|
||||
color: 'rgba(255,255,255,0.45)',
|
||||
flex: 1,
|
||||
letterSpacing: 0.5,
|
||||
}}
|
||||
>
|
||||
{label}
|
||||
</span>
|
||||
<span style={{
|
||||
font: '700 13px \'Rajdhani\', sans-serif',
|
||||
color: valueColor || 'rgba(255,255,255,0.75)',
|
||||
letterSpacing: 0.5,
|
||||
}}
|
||||
>
|
||||
{value}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
{value}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
|
||||
StatRow.propTypes = {
|
||||
icon: string.isRequired,
|
||||
label: string.isRequired,
|
||||
value: node.isRequired,
|
||||
valueColor: string,
|
||||
};
|
||||
|
||||
18
assets/js/components/index.js
Normal file
18
assets/js/components/index.js
Normal file
@@ -0,0 +1,18 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
export { AvatarUpload } from './AvatarUpload';
|
||||
export { BattleDialog } from './BattleDialog';
|
||||
export { default as ContactForm } from './ContactForm';
|
||||
export { default as PasskeyLogin } from './PasskeyLogin';
|
||||
export { default as PasskeyManager } from './PasskeyManager';
|
||||
export { default as ProfileCharts } from './ProfileCharts';
|
||||
export { BonusPoints } from './battle-dialog/BonusPoints';
|
||||
export { Avatar } from './battle-dialog/Avatar';
|
||||
export { StatRow } from './battle-dialog/StatRow';
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
import React from 'react';
|
||||
import { createRoot } from 'react-dom/client';
|
||||
import ContactForm from './components/ContactForm';
|
||||
import { ContactForm } from '@global-components';
|
||||
|
||||
const wrapper = document.getElementById('contact-form-wrapper');
|
||||
|
||||
@@ -28,4 +28,3 @@ if (wrapper) {
|
||||
console.error('ContactForm: Missing siteKey or recaptchaFieldId in data attributes');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ import React, { useRef } from 'react';
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||
import { GameProvider } from '@mine-contexts';
|
||||
import { GameBoard } from '@mine-components';
|
||||
import { string } from 'prop-types';
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
|
||||
@@ -34,3 +35,9 @@ const MineSeeker = ({ env, gameId, opponentName = '' }) => {
|
||||
};
|
||||
|
||||
export default MineSeeker;
|
||||
|
||||
MineSeeker.propTypes = {
|
||||
env: string.isRequired,
|
||||
gameId: string,
|
||||
opponentName: string,
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { func, number, string } from 'prop-types';
|
||||
|
||||
const BonusBox = ({ color, points, onClick, title }) => (
|
||||
<button
|
||||
@@ -23,3 +24,10 @@ const BonusBox = ({ color, points, onClick, title }) => (
|
||||
);
|
||||
|
||||
export default BonusBox;
|
||||
|
||||
BonusBox.propTypes = {
|
||||
color: string.isRequired,
|
||||
points: number.isRequired,
|
||||
onClick: func.isRequired,
|
||||
title: string,
|
||||
};
|
||||
|
||||
@@ -9,67 +9,12 @@
|
||||
|
||||
import React from 'react';
|
||||
import Dialog from '@mui/material/Dialog';
|
||||
import { BONUS_LABELS } from '@mine-utils';
|
||||
|
||||
const DIALOG_SX = {
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0, 0, 0, 0.9)',
|
||||
width: '560px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
};
|
||||
|
||||
const formatPlayerName = name => {
|
||||
if (name && name.startsWith('anon_')) {
|
||||
return 'Anonymous';
|
||||
}
|
||||
|
||||
if (name && 10 < name.length) {
|
||||
return name.substring(0, 7) + '...';
|
||||
}
|
||||
|
||||
return name || 'Unknown';
|
||||
};
|
||||
|
||||
const PlayerColumn = ({ color, player }) => (
|
||||
<div className={`bsd-column bsd-column--${color}`}>
|
||||
<div className="bsd-column-header">
|
||||
<span className="bsd-column-name">{formatPlayerName(player.name)}</span>
|
||||
<span className="bsd-column-total">
|
||||
<i className="fa fa-star" />
|
||||
{player.bonusPoints}
|
||||
</span>
|
||||
</div>
|
||||
<ul className="bsd-stats">
|
||||
{Object.entries(BONUS_LABELS).map(([key, { label, desc }]) => (
|
||||
<li key={key} className="bsd-stat">
|
||||
<div className="bsd-stat-text">
|
||||
<span className="bsd-stat-label">{label}</span>
|
||||
<span className="bsd-stat-desc">{desc}</span>
|
||||
</div>
|
||||
<span className="bsd-stat-value">{player.bonusStats?.[key] ?? 0}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
import { styled } from '@mui/material/styles';
|
||||
import { PlayerColumn } from '@mine-components';
|
||||
import { bool, func, shape, string, number, object } from 'prop-types';
|
||||
|
||||
const BonusStatsDialog = ({ open, onClose, red, blue }) => (
|
||||
<Dialog open={open} onClose={onClose} sx={DIALOG_SX}>
|
||||
<StyledDialog open={open} onClose={onClose}>
|
||||
<div className="bsd">
|
||||
<div className="bsd-header">
|
||||
<div className="bsd-header-text">
|
||||
@@ -91,7 +36,44 @@ const BonusStatsDialog = ({ open, onClose, red, blue }) => (
|
||||
Bonus points are awarded alongside the main score for skillful play.
|
||||
</p>
|
||||
</div>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
);
|
||||
|
||||
const StyledDialog = styled(Dialog)({
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0, 0, 0, 0.9)',
|
||||
width: '560px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
});
|
||||
|
||||
export default BonusStatsDialog;
|
||||
|
||||
BonusStatsDialog.propTypes = {
|
||||
open: bool.isRequired,
|
||||
onClose: func.isRequired,
|
||||
red: shape({
|
||||
name: string,
|
||||
bonusPoints: number,
|
||||
bonusStats: object,
|
||||
}).isRequired,
|
||||
blue: shape({
|
||||
name: string,
|
||||
bonusPoints: number,
|
||||
bonusStats: object,
|
||||
}).isRequired,
|
||||
};
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { func, node, string } from 'prop-types';
|
||||
|
||||
const CAPTCHA_STORAGE_KEY = 'mineseeker_captcha_verified';
|
||||
const CAPTCHA_TOKEN_KEY = 'mineseeker_captcha_token';
|
||||
@@ -87,7 +88,7 @@ const CaptchaOverlay = ({ siteKey, onVerified, children }) => {
|
||||
};
|
||||
|
||||
if (verified) {
|
||||
return <>{children}</>;
|
||||
return <Fragment>{children}</Fragment>;
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -114,3 +115,9 @@ const CaptchaOverlay = ({ siteKey, onVerified, children }) => {
|
||||
};
|
||||
|
||||
export default CaptchaOverlay;
|
||||
|
||||
CaptchaOverlay.propTypes = {
|
||||
siteKey: string.isRequired,
|
||||
onVerified: func,
|
||||
children: node,
|
||||
};
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
import { Fragment, useEffect, useState } from 'react';
|
||||
import { func, number } from 'prop-types';
|
||||
|
||||
const ChallengeCountdown = ({ onAccept, onDecline, seconds = 30 }) => {
|
||||
const [countdown, setCountdown] = useState(seconds);
|
||||
@@ -39,3 +40,9 @@ const ChallengeCountdown = ({ onAccept, onDecline, seconds = 30 }) => {
|
||||
};
|
||||
|
||||
export default ChallengeCountdown;
|
||||
|
||||
ChallengeCountdown.propTypes = {
|
||||
onAccept: func.isRequired,
|
||||
onDecline: func.isRequired,
|
||||
seconds: number,
|
||||
};
|
||||
|
||||
@@ -12,6 +12,7 @@ import { useGame } from '@mine-contexts';
|
||||
import { useServerCommunication } from '@mine-hooks';
|
||||
import CaptchaOverlay from './CaptchaOverlay';
|
||||
import GridControl from './grid/GridControl';
|
||||
import { bool, string } from 'prop-types';
|
||||
|
||||
export const GameBoard = ({ gameAssoc, gameInherited, opponentName = '', isEnvDev }) => {
|
||||
const { gridReady } = useGame();
|
||||
@@ -42,3 +43,10 @@ export const GameBoard = ({ gameAssoc, gameInherited, opponentName = '', isEnvDe
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
GameBoard.propTypes = {
|
||||
gameAssoc: string.isRequired,
|
||||
gameInherited: bool.isRequired,
|
||||
opponentName: string,
|
||||
isEnvDev: bool,
|
||||
};
|
||||
|
||||
@@ -7,22 +7,10 @@
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React, { useEffect, useRef, useState } from 'react';
|
||||
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { BonusBox, BonusStatsDialog, Avatar } from '@mine-components';
|
||||
import { formatTime } from '@global-utils/format';
|
||||
import { useGame } from '@mine-contexts';
|
||||
import BonusBox from './BonusBox';
|
||||
import BonusStatsDialog from './BonusStatsDialog';
|
||||
|
||||
const renderAvatar = player => {
|
||||
if (!player.registered) return null;
|
||||
return (
|
||||
<div className="timer-avatar">
|
||||
{player.avatar
|
||||
? <img src={player.avatar} alt={player.name} className="timer-avatar__img" />
|
||||
: <span className="timer-avatar__initials">{player.name.slice(0, 2).toUpperCase()}</span>
|
||||
}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const GameTimer = () => {
|
||||
const { overlay, connectionLost, endRef, activePlayer, red, blue } = useGame();
|
||||
@@ -85,84 +73,61 @@ const GameTimer = () => {
|
||||
}
|
||||
}, [activePlayer, isRunning]);
|
||||
|
||||
const syncTimes = useCallback(() => {
|
||||
let currentRedTime = pausedRedTimeRef.current;
|
||||
let currentBlueTime = pausedBlueTimeRef.current;
|
||||
|
||||
if (!activePlayer && redStartTimeRef.current) {
|
||||
currentRedTime += Math.floor((Date.now() - redStartTimeRef.current) / 1000);
|
||||
} else if (activePlayer && blueStartTimeRef.current) {
|
||||
currentBlueTime += Math.floor((Date.now() - blueStartTimeRef.current) / 1000);
|
||||
}
|
||||
|
||||
setRedTime(currentRedTime);
|
||||
setBlueTime(currentBlueTime);
|
||||
}, [activePlayer]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!isRunning) {
|
||||
if (timerIntervalRef.current) {
|
||||
clearInterval(timerIntervalRef.current);
|
||||
}
|
||||
if (timerIntervalRef.current) clearInterval(timerIntervalRef.current);
|
||||
return;
|
||||
}
|
||||
|
||||
timerIntervalRef.current = setInterval(() => {
|
||||
let currentRedTime = pausedRedTimeRef.current;
|
||||
let currentBlueTime = pausedBlueTimeRef.current;
|
||||
|
||||
if (!activePlayer && redStartTimeRef.current) {
|
||||
currentRedTime += Math.floor((Date.now() - redStartTimeRef.current) / 1000);
|
||||
} else if (activePlayer && blueStartTimeRef.current) {
|
||||
currentBlueTime += Math.floor((Date.now() - blueStartTimeRef.current) / 1000);
|
||||
}
|
||||
|
||||
setRedTime(currentRedTime);
|
||||
setBlueTime(currentBlueTime);
|
||||
}, 100);
|
||||
timerIntervalRef.current = setInterval(syncTimes, 100);
|
||||
|
||||
return () => {
|
||||
if (timerIntervalRef.current) {
|
||||
clearInterval(timerIntervalRef.current);
|
||||
}
|
||||
if (timerIntervalRef.current) clearInterval(timerIntervalRef.current);
|
||||
};
|
||||
}, [isRunning, activePlayer]);
|
||||
}, [isRunning, activePlayer, syncTimes]);
|
||||
|
||||
useEffect(() => {
|
||||
const handleFocus = () => {
|
||||
if (isRunning) {
|
||||
let currentRedTime = pausedRedTimeRef.current;
|
||||
let currentBlueTime = pausedBlueTimeRef.current;
|
||||
|
||||
if (!activePlayer && redStartTimeRef.current) {
|
||||
currentRedTime += Math.floor((Date.now() - redStartTimeRef.current) / 1000);
|
||||
} else if (activePlayer && blueStartTimeRef.current) {
|
||||
currentBlueTime += Math.floor((Date.now() - blueStartTimeRef.current) / 1000);
|
||||
}
|
||||
|
||||
setRedTime(currentRedTime);
|
||||
setBlueTime(currentBlueTime);
|
||||
}
|
||||
if (isRunning) syncTimes();
|
||||
};
|
||||
|
||||
window.addEventListener('focus', handleFocus);
|
||||
return () => window.removeEventListener('focus', handleFocus);
|
||||
}, [isRunning, activePlayer]);
|
||||
}, [isRunning, activePlayer, syncTimes]);
|
||||
|
||||
useEffect(() => () => {
|
||||
if (timerIntervalRef.current) clearInterval(timerIntervalRef.current);
|
||||
}, []);
|
||||
|
||||
const formatTime = seconds => {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const secs = seconds % 60;
|
||||
return `${String(mins).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
|
||||
};
|
||||
|
||||
const openBonusDialog = () => setBonusDialogOpen(true);
|
||||
const closeBonusDialog = () => setBonusDialogOpen(false);
|
||||
|
||||
return (
|
||||
<div className="game-timer-container">
|
||||
<BonusBox color="red" points={red.bonusPoints ?? 0} onClick={openBonusDialog} />
|
||||
<BonusBox color="red" points={red.bonusPoints ?? 0} onClick={() => setBonusDialogOpen(true)} />
|
||||
<div className={`game-timer red-timer ${!activePlayer ? 'active' : ''}`}>
|
||||
{renderAvatar(red)}
|
||||
<Avatar player={red} />
|
||||
<i className={`fa ${!activePlayer ? 'fa-hourglass-half' : 'fa-hourglass-start'} timer-icon`} />
|
||||
<span className="timer-display">{formatTime(redTime)}</span>
|
||||
</div>
|
||||
<div className={`game-timer blue-timer ${activePlayer ? 'active' : ''}`}>
|
||||
{renderAvatar(blue)}
|
||||
<Avatar player={blue} />
|
||||
<i className={`fa ${activePlayer ? 'fa-hourglass-half' : 'fa-hourglass-start'} timer-icon`} />
|
||||
<span className="timer-display">{formatTime(blueTime)}</span>
|
||||
</div>
|
||||
<BonusBox color="blue" points={blue.bonusPoints ?? 0} onClick={openBonusDialog} />
|
||||
<BonusStatsDialog open={bonusDialogOpen} onClose={closeBonusDialog} red={red} blue={blue} />
|
||||
<BonusBox color="blue" points={blue.bonusPoints ?? 0} onClick={() => setBonusDialogOpen(true)} />
|
||||
<BonusStatsDialog open={bonusDialogOpen} onClose={() => setBonusDialogOpen(false)} red={red} blue={blue} />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -8,37 +8,11 @@
|
||||
*/
|
||||
|
||||
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { formatSince } from '@global-utils/format';
|
||||
import Dialog from '@mui/material/Dialog';
|
||||
import { styled } from '@mui/material/styles';
|
||||
import { useLobbyDataProvider } from '@mine-hooks';
|
||||
|
||||
const DIALOG_SX = {
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0, 0, 0, 0.9)',
|
||||
width: '500px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
};
|
||||
|
||||
const formatSince = isoStr => {
|
||||
const diff = Math.floor((Date.now() - new Date(isoStr)) / 60000);
|
||||
if (1 > diff) return 'just now';
|
||||
if (1 === diff) return '1 min ago';
|
||||
return `${diff} min ago`;
|
||||
};
|
||||
import { bool, func, string } from 'prop-types';
|
||||
|
||||
const OnlinePlayersDialog = ({ open, onClose, currentGameAssoc, isEnvDev = false }) => {
|
||||
const [players, setPlayers] = useState([]);
|
||||
@@ -171,11 +145,9 @@ const OnlinePlayersDialog = ({ open, onClose, currentGameAssoc, isEnvDev = false
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog
|
||||
<StyledDialog
|
||||
open={open}
|
||||
onClose={0 < waitingCountdown ? undefined : onClose}
|
||||
disableEscapeKeyDown={0 < waitingCountdown}
|
||||
sx={DIALOG_SX}
|
||||
>
|
||||
<div className="opd">
|
||||
<div className="opd-header">
|
||||
@@ -286,8 +258,37 @@ const OnlinePlayersDialog = ({ open, onClose, currentGameAssoc, isEnvDev = false
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</Dialog>
|
||||
</StyledDialog>
|
||||
);
|
||||
};
|
||||
|
||||
const StyledDialog = styled(Dialog)({
|
||||
'& .MuiDialog-paper': {
|
||||
background: '#07090d',
|
||||
backgroundImage: `
|
||||
linear-gradient(rgba(35, 111, 135, 0.08) 1px, transparent 1px),
|
||||
linear-gradient(90deg, rgba(35, 111, 135, 0.08) 1px, transparent 1px)
|
||||
`,
|
||||
backgroundSize: '46px 46px',
|
||||
border: '1px solid rgba(35, 111, 135, 0.4)',
|
||||
borderRadius: '12px',
|
||||
boxShadow: '0 0 80px rgba(35, 111, 135, 0.15), 0 32px 80px rgba(0, 0, 0, 0.9)',
|
||||
width: '500px',
|
||||
maxWidth: '94vw',
|
||||
overflow: 'hidden',
|
||||
color: '#fff',
|
||||
},
|
||||
'& .MuiBackdrop-root': {
|
||||
background: 'rgba(2, 4, 8, 0.88)',
|
||||
backdropFilter: 'blur(4px)',
|
||||
},
|
||||
});
|
||||
|
||||
export default OnlinePlayersDialog;
|
||||
|
||||
OnlinePlayersDialog.propTypes = {
|
||||
open: bool.isRequired,
|
||||
onClose: func.isRequired,
|
||||
currentGameAssoc: string,
|
||||
isEnvDev: bool,
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
import { Fragment, useState } from 'react';
|
||||
import { OnlinePlayersDialog } from '@mine-components';
|
||||
import { bool, string } from 'prop-types';
|
||||
|
||||
const WaitingOverlayContent = ({ shareUrl, currentGameAssoc, opponentName = '', inviteOnly = false }) => {
|
||||
const [dialogOpen, setDialogOpen] = useState(false);
|
||||
@@ -94,3 +95,10 @@ const ShareLinkBox = ({ url }) => {
|
||||
};
|
||||
|
||||
export default WaitingOverlayContent;
|
||||
|
||||
WaitingOverlayContent.propTypes = {
|
||||
shareUrl: string.isRequired,
|
||||
currentGameAssoc: string,
|
||||
opponentName: string,
|
||||
inviteOnly: bool,
|
||||
};
|
||||
|
||||
@@ -13,6 +13,7 @@ import GridField from './GridField';
|
||||
import UserControl from '../user/UserControl';
|
||||
import GameTimer from '../GameTimer';
|
||||
import { BOMB_SYMBOLS, bombRadius } from '@mine-utils';
|
||||
import { func, string } from 'prop-types';
|
||||
|
||||
const GridControl = ({ gameAssoc, onClick, resign }) => {
|
||||
const {
|
||||
@@ -23,11 +24,13 @@ const GridControl = ({ gameAssoc, onClick, resign }) => {
|
||||
|
||||
const [copied, setCopied] = useState(false);
|
||||
const shareUrl = gameAssoc ? `${window.location.origin}/play/${gameAssoc}` : null;
|
||||
const endShareUrl = gameAssoc ? `${window.location.origin}/battle/${gameAssoc}` : null;
|
||||
const isAuthenticated = '1' === document.getElementById('mine-wrapper')?.dataset.isAuthenticated;
|
||||
|
||||
const handleShare = () => {
|
||||
if (!shareUrl) return;
|
||||
navigator.clipboard.writeText(shareUrl).then(() => {
|
||||
const url = endRef.current ? endShareUrl : shareUrl;
|
||||
if (!url) return;
|
||||
navigator.clipboard.writeText(url).then(() => {
|
||||
setCopied(true);
|
||||
setTimeout(() => setCopied(false), 2200);
|
||||
});
|
||||
@@ -59,10 +62,11 @@ const GridControl = ({ gameAssoc, onClick, resign }) => {
|
||||
<div className={`game-overlay${overlay ? '' : ' hide'}`}>
|
||||
<div className="game-overlay-window">
|
||||
<h1>{overlayTitle}</h1>
|
||||
{'string' === typeof overlaySubTitle ? (
|
||||
{'string' === typeof overlaySubTitle && (
|
||||
<h2>{overlaySubTitle}</h2>
|
||||
) : (
|
||||
overlaySubTitle
|
||||
)}
|
||||
{'string' !== typeof overlaySubTitle && (
|
||||
<Fragment>{overlaySubTitle}</Fragment>
|
||||
)}
|
||||
{gameAssoc && endRef.current && (
|
||||
<div className="game-overlay-actions">
|
||||
@@ -111,3 +115,9 @@ const GridControl = ({ gameAssoc, onClick, resign }) => {
|
||||
};
|
||||
|
||||
export default GridControl;
|
||||
|
||||
GridControl.propTypes = {
|
||||
gameAssoc: string,
|
||||
onClick: func.isRequired,
|
||||
resign: func.isRequired,
|
||||
};
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
import React, { memo, useMemo } from 'react';
|
||||
import { IMAGES } from '@mine-utils';
|
||||
import { func, shape, bool, number, string } from 'prop-types';
|
||||
|
||||
const bombSrc = area => {
|
||||
if (null === area) return null;
|
||||
@@ -75,3 +76,16 @@ const GridField = memo(function GridField({ cell, onClick, onMouseEnter }) {
|
||||
});
|
||||
|
||||
export default GridField;
|
||||
|
||||
GridField.propTypes = {
|
||||
cell: shape({
|
||||
currentImage: string,
|
||||
currentObj: string,
|
||||
active: bool,
|
||||
lastClickedRed: bool,
|
||||
lastClickedBlue: bool,
|
||||
bombTargetArea: number,
|
||||
}).isRequired,
|
||||
onClick: func.isRequired,
|
||||
onMouseEnter: func.isRequired,
|
||||
};
|
||||
|
||||
@@ -16,3 +16,7 @@ export { default as GridControl } from './grid/GridControl';
|
||||
export { default as GridField } from './grid/GridField';
|
||||
export { default as User } from './user/User';
|
||||
export { default as UserControl } from './user/UserControl';
|
||||
export { default as BonusBox } from './BonusBox';
|
||||
export { default as BonusStatsDialog } from './BonusStatsDialog';
|
||||
export { Avatar } from './timer/Avatar';
|
||||
export { PlayerColumn } from './profile/PlayerColumn';
|
||||
|
||||
52
assets/js/mine-seeker/components/profile/PlayerColumn.jsx
Normal file
52
assets/js/mine-seeker/components/profile/PlayerColumn.jsx
Normal file
@@ -0,0 +1,52 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { object, string } from 'prop-types';
|
||||
import { BONUS_LABELS } from '@mine-utils';
|
||||
|
||||
const formatPlayerName = name => {
|
||||
if (name && name.startsWith('anon_')) {
|
||||
return 'Anonymous';
|
||||
}
|
||||
|
||||
if (name && 10 < name.length) {
|
||||
return name.substring(0, 7) + '...';
|
||||
}
|
||||
|
||||
return name || 'Unknown';
|
||||
};
|
||||
|
||||
export const PlayerColumn = ({ color, player }) => (
|
||||
<div className={`bsd-column bsd-column--${color}`}>
|
||||
<div className="bsd-column-header">
|
||||
<span className="bsd-column-name">{formatPlayerName(player.name)}</span>
|
||||
<span className="bsd-column-total">
|
||||
<i className="fa fa-star" />
|
||||
{player.bonusPoints}
|
||||
</span>
|
||||
</div>
|
||||
<ul className="bsd-stats">
|
||||
{Object.entries(BONUS_LABELS).map(([key, { label, desc }]) => (
|
||||
<li key={key} className="bsd-stat">
|
||||
<div className="bsd-stat-text">
|
||||
<span className="bsd-stat-label">{label}</span>
|
||||
<span className="bsd-stat-desc">{desc}</span>
|
||||
</div>
|
||||
<span className="bsd-stat-value">{player.bonusStats?.[key] ?? 0}</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
|
||||
PlayerColumn.propTypes = {
|
||||
color: string.isRequired,
|
||||
player: object.isRequired,
|
||||
};
|
||||
28
assets/js/mine-seeker/components/timer/Avatar.jsx
Normal file
28
assets/js/mine-seeker/components/timer/Avatar.jsx
Normal file
@@ -0,0 +1,28 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { object } from 'prop-types';
|
||||
|
||||
export const Avatar = ({ player }) => {
|
||||
if (!player.registered) return '';
|
||||
|
||||
return (
|
||||
<div className="timer-avatar">
|
||||
{player.avatar
|
||||
? <img src={player.avatar} alt={player.name} className="timer-avatar__img" />
|
||||
: <span className="timer-avatar__initials">{player.name.slice(0, 2).toUpperCase()}</span>
|
||||
}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
Avatar.propTypes = {
|
||||
player: object.isRequired,
|
||||
};
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
import React, { memo } from 'react';
|
||||
import { IMAGES } from '@mine-utils';
|
||||
import { bool, func, number, string } from 'prop-types';
|
||||
|
||||
const User = memo(function User(
|
||||
{
|
||||
@@ -52,3 +53,15 @@ const User = memo(function User(
|
||||
});
|
||||
|
||||
export default User;
|
||||
|
||||
User.propTypes = {
|
||||
color: string.isRequired,
|
||||
webPlayer: string,
|
||||
name: string,
|
||||
desc: string,
|
||||
active: bool,
|
||||
mines: number,
|
||||
haveBomb: bool,
|
||||
enabledBomb: bool,
|
||||
onClickBombSelector: func.isRequired,
|
||||
};
|
||||
|
||||
@@ -11,6 +11,7 @@ import React, { Fragment, useState } from 'react';
|
||||
import { useGame } from '@mine-contexts';
|
||||
import User from './User';
|
||||
import BonusStatsDialog from '../BonusStatsDialog';
|
||||
import { func } from 'prop-types';
|
||||
|
||||
const UserControl = ({ resign }) => {
|
||||
const { webPlayer, activePlayer, foundMines, red, blue, onBombToggle } = useGame();
|
||||
@@ -69,3 +70,7 @@ const UserControl = ({ resign }) => {
|
||||
}
|
||||
|
||||
export default UserControl;
|
||||
|
||||
UserControl.propTypes = {
|
||||
resign: func.isRequired,
|
||||
};
|
||||
|
||||
@@ -187,7 +187,7 @@ export const GameProvider = ({ children }) => {
|
||||
syncBlue(p => ({ ...p, mines: 'blue' === player ? bp : p.mines }));
|
||||
}
|
||||
|
||||
// Update bonus points and stats
|
||||
/** Update bonus points and stats */
|
||||
syncRed(p => ({
|
||||
...p,
|
||||
bonusPoints: 'red' === player ? redBonusPoints : p.bonusPoints,
|
||||
@@ -218,7 +218,10 @@ export const GameProvider = ({ children }) => {
|
||||
if (redWins || blueWins || resign) {
|
||||
sounds.current.won.play();
|
||||
|
||||
if (!resign) showOverlay((redWins ? 'Red' : 'Blue') + ' wins the game!', 'Play again!');
|
||||
if (!resign) {
|
||||
endRef.current = true;
|
||||
showOverlay((redWins ? 'Red' : 'Blue') + ' wins the game!', null);
|
||||
}
|
||||
|
||||
showLeftMines(leftMines);
|
||||
syncActivePlayer(false);
|
||||
@@ -251,20 +254,20 @@ export const GameProvider = ({ children }) => {
|
||||
return (
|
||||
<GameContext.Provider
|
||||
value={{
|
||||
// State (for rendering)
|
||||
/** State (for rendering) */
|
||||
webPlayer, activePlayer, overlay, overlayTitle, overlaySubTitle,
|
||||
mines, bombSelected, foundMines, red, blue, cells, gridReady, connectionLost, gameUuid,
|
||||
// Setters needed by useServerComm
|
||||
/** Setters needed by useServerComm */
|
||||
setCells, setGridReady, setGameUuid,
|
||||
// Refs (needed by useServerComm for async-safe reads)
|
||||
/** Refs (needed by useServerComm for async-safe reads) */
|
||||
webPlayerRef, activePlayerRef, bombSelectedRef, connectionLostRef, lastClickedRef, endRef,
|
||||
// Sync helpers
|
||||
/** Sync helpers */
|
||||
syncWebPlayer, syncActivePlayer, syncBombSelected, syncConnLost, syncRed, syncBlue,
|
||||
// Game logic called by useServerComm
|
||||
/** Game logic called by useServerComm */
|
||||
showOverlay, hideOverlay,
|
||||
applyRevealedCell, applyStep,
|
||||
makeGameEndIfItEnds, resignProcess,
|
||||
// UI action
|
||||
/** UI action */
|
||||
onBombToggle,
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -30,7 +30,7 @@ const useGameDataProvider = gameAssoc => {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ gameAssoc }),
|
||||
}),
|
||||
}).then(r => r.json()),
|
||||
});
|
||||
|
||||
const joinMutation = useMutation({
|
||||
@@ -112,3 +112,21 @@ export const useLobbyDataProvider = () => {
|
||||
};
|
||||
|
||||
export default useGameDataProvider;
|
||||
|
||||
/**
|
||||
* Profile Data Provider Hook
|
||||
* Centralized API communication layer for profile-related mutations
|
||||
*/
|
||||
export const useProfileDataProvider = () => {
|
||||
const uploadAvatarMutation = useMutation({
|
||||
mutationFn: ({ uploadUrl, file }) => {
|
||||
const fd = new FormData();
|
||||
fd.append('avatar', file);
|
||||
return fetch(uploadUrl, { method: 'POST', body: fd })
|
||||
.then(r => r.json())
|
||||
.then(data => { if (data.error) throw new Error(data.error); return data; });
|
||||
},
|
||||
});
|
||||
|
||||
return { uploadAvatarMutation };
|
||||
};
|
||||
|
||||
@@ -10,9 +10,8 @@
|
||||
import React, { useEffect, useRef } from 'react';
|
||||
import { useGame } from '@mine-contexts';
|
||||
import { DESC, IMAGES } from '@mine-utils';
|
||||
import useStepTimer from './useStepTimer';
|
||||
import useGameDataProvider from './useGameDataProvider';
|
||||
import { ChallengeCountdown, WaitingOverlayContent } from '@mine-components';
|
||||
import { useGameDataProvider, useStepTimer } from '@mine-hooks';
|
||||
|
||||
const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev) => {
|
||||
const {
|
||||
@@ -211,7 +210,7 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
* For a truly restored game, keep the "Waiting for opponent..." overlay
|
||||
* up until we actually see a heartbeat from the other player.
|
||||
*/
|
||||
if (!isTrueRestoredRef.current || 0 !== opponentLastSeenRef.current) {
|
||||
if (!endRef.current && (!isTrueRestoredRef.current || 0 !== opponentLastSeenRef.current)) {
|
||||
hideOverlay();
|
||||
}
|
||||
};
|
||||
@@ -294,7 +293,7 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
onSuccess: () => {
|
||||
showOverlay('Challenge accepted!', 'Waiting for the challenger to join...');
|
||||
},
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
|
||||
@@ -311,7 +310,7 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
/>
|
||||
) : '');
|
||||
},
|
||||
}
|
||||
},
|
||||
);
|
||||
};
|
||||
|
||||
@@ -366,7 +365,7 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
if (me && payload.color && payload.color !== me) {
|
||||
const wasFirst = 0 === opponentLastSeenRef.current;
|
||||
opponentLastSeenRef.current = Date.now();
|
||||
if (wasFirst && isTrueRestoredRef.current) {
|
||||
if (wasFirst && isTrueRestoredRef.current && !endRef.current) {
|
||||
hideOverlay();
|
||||
}
|
||||
}
|
||||
@@ -457,7 +456,12 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
/** Open event source after showing overlay */
|
||||
openEventSource();
|
||||
} else {
|
||||
await startMutation.mutateAsync();
|
||||
const startResponse = await startMutation.mutateAsync();
|
||||
if (!startResponse?.success) {
|
||||
showOverlay('Error', 'Failed to start game. Please try again.');
|
||||
isEnvDev && console.error('Start game failed:', startResponse);
|
||||
return;
|
||||
}
|
||||
openEventSource();
|
||||
wInit();
|
||||
}
|
||||
@@ -467,6 +471,7 @@ const useServerCommunication = (gameAssoc, gameInherited, opponentName, isEnvDev
|
||||
startHeartbeat();
|
||||
} catch (e) {
|
||||
isEnvDev && console.error('Connection error', e);
|
||||
showOverlay('Error', 'Connection failed. Please try again.');
|
||||
setTimeout(() => window.location.reload(), 500);
|
||||
}
|
||||
})();
|
||||
|
||||
@@ -10,24 +10,18 @@
|
||||
import { useRef } from 'react';
|
||||
|
||||
const useStepTimer = () => {
|
||||
// Record when the current turn started (timestamp)
|
||||
const turnStartTimeRef = useRef(null);
|
||||
// Flag to track if we've already recorded a turn start
|
||||
const turnStartedRef = useRef(false);
|
||||
|
||||
const getStepElapsed = (currentActivePlayer, isGameRunning) => {
|
||||
// If game not running, return 0
|
||||
if (!isGameRunning) return 0;
|
||||
|
||||
// Only initialize the turn timer ONCE per call to getStepElapsed
|
||||
// This prevents resetting on multiple calls
|
||||
if (!turnStartedRef.current) {
|
||||
turnStartTimeRef.current = Date.now();
|
||||
turnStartedRef.current = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// After initialization, just calculate elapsed time
|
||||
if (turnStartTimeRef.current) {
|
||||
return Math.floor((Date.now() - turnStartTimeRef.current) / 1000);
|
||||
}
|
||||
@@ -40,7 +34,6 @@ const useStepTimer = () => {
|
||||
turnStartedRef.current = false;
|
||||
};
|
||||
|
||||
// Call this when we know a turn has actually changed (from server response)
|
||||
const startNewTurn = () => {
|
||||
turnStartTimeRef.current = Date.now();
|
||||
turnStartedRef.current = true;
|
||||
|
||||
@@ -9,8 +9,7 @@
|
||||
|
||||
import React from 'react';
|
||||
import { createRoot } from 'react-dom/client';
|
||||
import PasskeyManager from './components/PasskeyManager';
|
||||
import PasskeyLogin from './components/PasskeyLogin';
|
||||
import { PasskeyLogin, PasskeyManager } from '@global-components';
|
||||
|
||||
const passkeyManagerRoot = document.getElementById('passkey-manager-root');
|
||||
|
||||
|
||||
@@ -1,18 +1,30 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import { createRoot } from 'react-dom/client';
|
||||
import ProfileCharts from './components/ProfileCharts';
|
||||
import BattleDialog from './components/BattleDialog';
|
||||
import AvatarUpload from './components/AvatarUpload';
|
||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
||||
import { AvatarUpload, BattleDialog, ProfileCharts } from '@global-components';
|
||||
|
||||
const queryClient = new QueryClient();
|
||||
|
||||
const avatarRoot = document.getElementById('profile-avatar-root');
|
||||
if (avatarRoot) {
|
||||
const { uploadUrl, thumbUrl, initials } = avatarRoot.dataset;
|
||||
createRoot(avatarRoot).render(
|
||||
<AvatarUpload
|
||||
uploadUrl={uploadUrl}
|
||||
initialThumbUrl={thumbUrl || null}
|
||||
initials={initials}
|
||||
/>,
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<AvatarUpload
|
||||
uploadUrl={uploadUrl}
|
||||
initialThumbUrl={thumbUrl || null}
|
||||
initials={initials}
|
||||
/>
|
||||
</QueryClientProvider>,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -29,3 +41,28 @@ if (battleRoot) {
|
||||
<BattleDialog games={JSON.parse(battleRoot.dataset.games)} />,
|
||||
);
|
||||
}
|
||||
|
||||
const list = document.querySelector('.profile-games');
|
||||
const loadMoreBtn = document.querySelector('[data-load-more]');
|
||||
if (list && loadMoreBtn) {
|
||||
const batchSize = parseInt(list.dataset.batchSize, 10) || 5;
|
||||
loadMoreBtn.addEventListener('click', () => {
|
||||
const hidden = list.querySelectorAll('.profile-game--hidden');
|
||||
Array.from(hidden).slice(0, batchSize).forEach(el => el.classList.remove('profile-game--hidden'));
|
||||
if (0 === list.querySelectorAll('.profile-game--hidden').length) {
|
||||
loadMoreBtn.remove();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
const filterInput = document.querySelector('[data-filter]');
|
||||
if (list && filterInput) {
|
||||
filterInput.addEventListener('input', () => {
|
||||
const term = filterInput.value.trim().toLowerCase();
|
||||
list.classList.toggle('is-filtering', 0 < term.length);
|
||||
list.querySelectorAll('.profile-game').forEach(card => {
|
||||
const opp = card.querySelector('.profile-game__opponent')?.textContent.trim().toLowerCase() ?? '';
|
||||
card.classList.toggle('profile-game--filtered-out', 0 < term.length && !opp.includes(term));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
44
assets/js/utils/format.js
Normal file
44
assets/js/utils/format.js
Normal file
@@ -0,0 +1,44 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
/** Formats a duration in seconds as MM:SS. */
|
||||
export const formatTime = seconds => {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const secs = seconds % 60;
|
||||
return `${String(mins).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats the difference between two 'YYYY-MM-DD HH:mm' strings as a
|
||||
* human-readable duration (e.g. "1h 4m 23s", "4m 23s", "23s").
|
||||
* Returns null when the inputs are missing or the diff is not positive.
|
||||
*/
|
||||
export const formatDuration = (from, to) => {
|
||||
if (!from || !to) return null;
|
||||
const diffMs = new Date(to.replace(' ', 'T')) - new Date(from.replace(' ', 'T'));
|
||||
if (isNaN(diffMs) || 0 >= diffMs) return null;
|
||||
const totalSec = Math.floor(diffMs / 1000);
|
||||
const h = Math.floor(totalSec / 3600);
|
||||
const m = Math.floor((totalSec % 3600) / 60);
|
||||
const s = totalSec % 60;
|
||||
if (0 < h) return `${h}h ${m}m ${s}s`;
|
||||
if (0 < m) return `${m}m ${s}s`;
|
||||
return `${s}s`;
|
||||
};
|
||||
|
||||
/**
|
||||
* Formats an ISO timestamp as a "X min ago" string (minute resolution).
|
||||
* Returns 'just now' for differences under one minute.
|
||||
*/
|
||||
export const formatSince = isoStr => {
|
||||
const diff = Math.floor((Date.now() - new Date(isoStr)) / 60000);
|
||||
if (1 > diff) return 'just now';
|
||||
if (1 === diff) return '1 min ago';
|
||||
return `${diff} min ago`;
|
||||
};
|
||||
@@ -11,13 +11,13 @@
|
||||
"private": true,
|
||||
"require": {
|
||||
"php": ">=8.5",
|
||||
"ext-gd": "*",
|
||||
"ext-iconv": "*",
|
||||
"ext-json": "*",
|
||||
"ext-gd": "*",
|
||||
"doctrine/dbal": "^3.7",
|
||||
"doctrine/doctrine-bundle": ">=2.11 <2.14",
|
||||
"doctrine/doctrine-migrations-bundle": "^3.0",
|
||||
"doctrine/orm": "^2.6",
|
||||
"doctrine/dbal": "^4.3",
|
||||
"doctrine/doctrine-bundle": "^3.2",
|
||||
"doctrine/doctrine-migrations-bundle": "^4.0",
|
||||
"doctrine/orm": "^3.5",
|
||||
"endroid/qr-code": "^6.1",
|
||||
"firebase/php-jwt": "^7.0",
|
||||
"league/flysystem-aws-s3-v3": "^3.0",
|
||||
|
||||
544
composer.lock
generated
544
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -11,9 +11,12 @@ doctrine:
|
||||
url: '%env(resolve:DATABASE_URL)%'
|
||||
|
||||
orm:
|
||||
auto_generate_proxy_classes: '%kernel.debug%'
|
||||
enable_native_lazy_objects: true
|
||||
naming_strategy: doctrine.orm.naming_strategy.underscore
|
||||
auto_mapping: true
|
||||
schema_ignore_classes:
|
||||
- App\Entity\UserStats
|
||||
- App\Entity\RecentBattle
|
||||
mappings:
|
||||
App:
|
||||
is_bundle: false
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 5.1 KiB |
@@ -32,7 +32,7 @@ use Symfony\Component\Routing\Attribute\Route;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[AsController]
|
||||
class GameController extends AbstractController
|
||||
@@ -91,7 +91,7 @@ class GameController extends AbstractController
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$contactMessage->setIpAddress($request->getClientIp());
|
||||
$contactMessage->ipAddress = $request->getClientIp();
|
||||
|
||||
$em->persist($contactMessage);
|
||||
$em->flush();
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -15,6 +15,8 @@ use App\Repository\PlayedGameRepository;
|
||||
use App\Service\ResolveUserNamesService;
|
||||
use App\Util\RpcManager;
|
||||
use App\Util\TopicManager;
|
||||
use DateTimeInterface;
|
||||
use Exception;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -49,10 +51,17 @@ class MercureController extends AbstractController
|
||||
#[Route('/api/game/start', name: 'MineSeekerBundle_api_game_start', methods: ['POST'])]
|
||||
public function start(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->toArray();
|
||||
$result = $this->rpcManager->saveGrid($data['gameAssoc']);
|
||||
try {
|
||||
$data = $request->toArray();
|
||||
$result = $this->rpcManager->saveGrid($data['gameAssoc']);
|
||||
|
||||
return $this->json(['success' => $result]);
|
||||
return $this->json(['success' => $result]);
|
||||
} catch (Exception $e) {
|
||||
return $this->json(
|
||||
['success' => false, 'error' => 'Failed to start game: ' . $e->getMessage()],
|
||||
Response::HTTP_INTERNAL_SERVER_ERROR
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[Route('/api/game/connect/{gameAssoc}', name: 'MineSeekerBundle_api_game_connect', methods: ['GET'])]
|
||||
@@ -61,7 +70,7 @@ class MercureController extends AbstractController
|
||||
try {
|
||||
$payload = $this->rpcManager->getConnectInformation($gameAssoc);
|
||||
return new Response($payload, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new Response('', Response::HTTP_INTERNAL_SERVER_ERROR);
|
||||
}
|
||||
}
|
||||
@@ -137,16 +146,16 @@ class MercureController extends AbstractController
|
||||
|
||||
$result = array_map(static function (PlayedGame $g): array {
|
||||
$name = match (true) {
|
||||
null !== $g->getRed() => $g->getRed()->getUsername(),
|
||||
null !== $g->getRedAnon() => $g->getRedAnon()->getUserName(),
|
||||
null !== $g->getBlue() => $g->getBlue()->getUsername(),
|
||||
default => $g->getBlueAnon()?->getUserName() ?? 'Unknown',
|
||||
null !== $g->red => $g->red->getUsername(),
|
||||
null !== $g->redAnon => $g->redAnon->userName,
|
||||
null !== $g->blue => $g->blue->getUsername(),
|
||||
default => $g->blueAnon?->userName ?? 'Unknown',
|
||||
};
|
||||
|
||||
return [
|
||||
'gameAssoc' => $g->getGameAssoc(),
|
||||
'gameAssoc' => $g->gameAssoc,
|
||||
'name' => $name,
|
||||
'since' => $g->getCreated()?->format(\DateTimeInterface::ATOM) ?? '',
|
||||
'since' => $g->created?->format(DateTimeInterface::ATOM) ?? '',
|
||||
];
|
||||
}, $games);
|
||||
|
||||
|
||||
@@ -10,12 +10,19 @@
|
||||
|
||||
namespace App\Controller;
|
||||
|
||||
use App\Entity\PlayedGame;
|
||||
use App\Dto\BattleShareDto;
|
||||
use App\Dto\ProfileChartDataFactory;
|
||||
use App\Dto\ProfileGameDto;
|
||||
use App\Dto\ProfileGameDtoFactory;
|
||||
use App\Dto\ProfileStatsDto;
|
||||
use App\Dto\ProfileViewDto;
|
||||
use App\Entity\User;
|
||||
use App\Entity\RecentBattle;
|
||||
use App\Repository\PlayedGameRepository;
|
||||
use App\Repository\RecentBattleRepository;
|
||||
use App\Repository\UserStatsRepository;
|
||||
use App\Service\BattleCardGenerator;
|
||||
use App\Service\WebAuthnService;
|
||||
use DateTime;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use League\Flysystem\FilesystemException;
|
||||
use League\Flysystem\FilesystemOperator;
|
||||
@@ -50,165 +57,42 @@ use function count;
|
||||
class ProfileController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PlayedGameRepository $repo,
|
||||
private readonly WebAuthnService $webAuthnService,
|
||||
private readonly LoggerInterface $logger,
|
||||
private readonly LoggerInterface $logger,
|
||||
private readonly PlayedGameRepository $repo,
|
||||
private readonly UserStatsRepository $userStatsRepo,
|
||||
private readonly RecentBattleRepository $recentBattleRepo,
|
||||
private readonly WebAuthnService $webAuthnService,
|
||||
private readonly ProfileGameDtoFactory $profileGameDtoFactory,
|
||||
private readonly ProfileChartDataFactory $profileChartDataFactory,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('/profile', name: 'MineSeekerBundle_profile')]
|
||||
public function index(CacheManager $cacheManager): Response
|
||||
public function index(): Response
|
||||
{
|
||||
/** @var User $user */
|
||||
$user = $this->getUser();
|
||||
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
|
||||
|
||||
$total = $this->repo->countFinishedForUser($user);
|
||||
$wins = $this->repo->countWinsForUser($user);
|
||||
$losses = $this->repo->countLossesForUser($user);
|
||||
$draws = $this->repo->countDrawsForUser($user);
|
||||
$userId = $user->id;
|
||||
$stats = ProfileStatsDto::fromUserStats($this->userStatsRepo->findByUserId($userId));
|
||||
$recent = $this->recentBattleRepo->findRecentForUser($userId, 30);
|
||||
|
||||
/** Build monthly buckets for the last 6 months */
|
||||
$monthlyData = [];
|
||||
for ($i = 5; $i >= 0; $i--) {
|
||||
$dt = new DateTime("first day of -$i months midnight");
|
||||
$key = $dt->format('Y-m');
|
||||
$monthlyData[$key] = ['label' => $dt->format('M'), 'wins' => 0, 'losses' => 0, 'draws' => 0];
|
||||
}
|
||||
$gamesData = array_map(
|
||||
fn(RecentBattle $battle): ProfileGameDto => $this->profileGameDtoFactory->createFromRecentBattle($battle),
|
||||
$recent,
|
||||
);
|
||||
|
||||
$since = new DateTime('first day of -5 months midnight');
|
||||
$recentGames = $this->repo->findFinishedForUserSince($user, $since);
|
||||
$userId = $user->getId();
|
||||
$chartData = $this->profileChartDataFactory->buildChartData($user, $userId, $stats);
|
||||
|
||||
foreach ($recentGames as $game) {
|
||||
if (!$game->getUpdated()) {
|
||||
continue;
|
||||
}
|
||||
$view = new ProfileViewDto(
|
||||
stats: $stats,
|
||||
recent: $recent,
|
||||
gamesData: $gamesData,
|
||||
chartData: $chartData,
|
||||
);
|
||||
|
||||
$month = $game->getUpdated()->format('Y-m');
|
||||
if (!isset($monthlyData[$month])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$isRed = $game->getRed()?->getId() === $userId;
|
||||
$myPts = $isRed ? $game->getRedPoints() : $game->getBluePoints();
|
||||
$oppPts = $isRed ? $game->getBluePoints() : $game->getRedPoints();
|
||||
$resign = $game->getResign();
|
||||
$myColor = $isRed ? 'red' : 'blue';
|
||||
$oppColor = $isRed ? 'blue' : 'red';
|
||||
|
||||
$result = 'draws';
|
||||
if ($resign === $myColor) {
|
||||
$result = 'losses';
|
||||
} elseif ($resign === $oppColor) {
|
||||
$result = 'wins';
|
||||
} elseif ($myPts !== null && $oppPts !== null) {
|
||||
if ($myPts > $oppPts) $result = 'wins';
|
||||
elseif ($myPts < $oppPts) $result = 'losses';
|
||||
}
|
||||
|
||||
$monthlyData[$month][$result]++;
|
||||
}
|
||||
|
||||
$months = array_column(array_values($monthlyData), 'label');
|
||||
|
||||
$bonus = $this->repo->findBonusStatsForUser($user);
|
||||
|
||||
return $this->render('Security/profile.html.twig', [
|
||||
'stats' => [
|
||||
'total' => $total,
|
||||
'wins' => $wins,
|
||||
'losses' => $losses,
|
||||
'draws' => $draws,
|
||||
'minesHit' => $this->repo->findTotalMinesForUser($user),
|
||||
'winRate' => $total > 0 ? (int)round($wins / $total * 100) : 0,
|
||||
'avgScore' => $this->repo->findAvgScoreForUser($user),
|
||||
'bonusPoints' => $bonus['totalBonusPoints'],
|
||||
'avgBonus' => $bonus['avgBonusPoints'],
|
||||
'bestChain' => $bonus['bestChain'],
|
||||
'blindHits' => $bonus['totalBlindHits'],
|
||||
'edgeMines' => $bonus['totalEdgeMines'],
|
||||
],
|
||||
'recent' => ($recent = $this->repo->findRecentFinishedForUser($user)),
|
||||
'gamesData' => array_map(function (PlayedGame $game) use ($userId, $cacheManager): array {
|
||||
$isRed = $game->getRed()?->getId() === $userId;
|
||||
$resign = $game->getResign();
|
||||
$myColor = $isRed ? 'red' : 'blue';
|
||||
$oppColor = $isRed ? 'blue' : 'red';
|
||||
$myPts = $isRed ? $game->getRedPoints() : $game->getBluePoints();
|
||||
$oppPts = $isRed ? $game->getBluePoints() : $game->getRedPoints();
|
||||
$result = 'draw';
|
||||
|
||||
if ($resign === $myColor) $result = 'loss';
|
||||
elseif ($resign === $oppColor) $result = 'win';
|
||||
elseif ($myPts !== null && $oppPts !== null) {
|
||||
if ($myPts > $oppPts) $result = 'win';
|
||||
elseif ($myPts < $oppPts) $result = 'loss';
|
||||
}
|
||||
|
||||
$redAvatarPath = $game->getRed()?->getAvatarPath();
|
||||
$blueAvatarPath = $game->getBlue()?->getAvatarPath();
|
||||
|
||||
return [
|
||||
'id' => $game->getId(),
|
||||
'uuid' => $game->getUuid()?->toRfc4122(),
|
||||
'redName' =>
|
||||
$game->getRed()?->getUsername() ?? $game->getRedAnon()?->getUserName() ?? 'Guest',
|
||||
'blueName' =>
|
||||
$game->getBlue()?->getUsername() ?? $game->getBlueAnon()?->getUserName() ?? 'Guest',
|
||||
'redAvatar' => $redAvatarPath ? $cacheManager->generateUrl($redAvatarPath, 'avatar_thumb') : null,
|
||||
'blueAvatar' => $blueAvatarPath ? $cacheManager->generateUrl($blueAvatarPath, 'avatar_thumb') : null,
|
||||
'redPoints' => $game->getRedPoints(),
|
||||
'bluePoints' => $game->getBluePoints(),
|
||||
'redExplodedBomb' => $game->getRedExplodedBomb(),
|
||||
'blueExplodedBomb' => $game->getBlueExplodedBomb(),
|
||||
'resign' => $resign,
|
||||
'created' => $game->getCreated()?->format('Y-m-d H:i'),
|
||||
'date' => $game->getUpdated()?->format('Y-m-d H:i'),
|
||||
'isRed' => $isRed,
|
||||
'result' => $result,
|
||||
'myPoints' => $myPts,
|
||||
'oppPoints' => $oppPts,
|
||||
'redBonusPoints' => $game->getRedBonusPoints() ?? 0,
|
||||
'blueBonusPoints' => $game->getBlueBonusPoints() ?? 0,
|
||||
'redBonusStats' => $game->getRedBonusStats() ?? [],
|
||||
'blueBonusStats' => $game->getBlueBonusStats() ?? [],
|
||||
];
|
||||
}, $recent),
|
||||
'chartData' => [
|
||||
'months' => $months,
|
||||
'wins' => array_column(array_values($monthlyData), 'wins'),
|
||||
'losses' => array_column(array_values($monthlyData), 'losses'),
|
||||
'draws' => array_column(array_values($monthlyData), 'draws'),
|
||||
'pieWins' => $wins,
|
||||
'pieLosses' => $losses,
|
||||
'pieDraws' => $draws,
|
||||
'recentGames' => $this->buildRecentGamesSeries($user, $userId),
|
||||
],
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Build per-game data for the last 15 finished games, oldest → newest.
|
||||
*
|
||||
* @return array{labels:string[],mines:int[],bonus:float[]}
|
||||
*/
|
||||
private function buildRecentGamesSeries(User $user, int $userId): array
|
||||
{
|
||||
$recent = $this->repo->findRecentFinishedForUser($user, 15);
|
||||
$recent = array_reverse($recent);
|
||||
|
||||
$labels = [];
|
||||
$mines = [];
|
||||
$bonus = [];
|
||||
foreach ($recent as $i => $game) {
|
||||
$isRed = $game->getRed()?->getId() === $userId;
|
||||
$labels[] = '#' . ($i + 1);
|
||||
$mines[] = (int) ($isRed ? $game->getRedPoints() : $game->getBluePoints());
|
||||
$bonus[] = (float) ($isRed ? $game->getRedBonusPoints() : $game->getBlueBonusPoints()) ?: 0;
|
||||
}
|
||||
|
||||
return ['labels' => $labels, 'mines' => $mines, 'bonus' => $bonus];
|
||||
return $this->render('Security/profile.html.twig', $view->toTemplateContext());
|
||||
}
|
||||
|
||||
#[Route(
|
||||
@@ -219,55 +103,13 @@ class ProfileController extends AbstractController
|
||||
)]
|
||||
public function battleShare(Uuid $uuid): Response
|
||||
{
|
||||
$game = $this->repo->findOneBy(['uuid' => $uuid]);
|
||||
$game = $this->repo->findOneByUuid($uuid);
|
||||
|
||||
if (!$game) {
|
||||
throw $this->createNotFoundException('Battle not found.');
|
||||
}
|
||||
|
||||
$redName = $game->getRed()?->getUsername() ?? ($game->getRedAnon() !== null ? 'Anonymous' : 'Guest');
|
||||
$blueName = $game->getBlue()?->getUsername() ?? ($game->getBlueAnon() !== null ? 'Anonymous' : 'Guest');
|
||||
$redPts = $game->getRedPoints();
|
||||
$bluePts = $game->getBluePoints();
|
||||
$resign = $game->getResign();
|
||||
$redAvatar = $game->getRed()?->getAvatarPath();
|
||||
$blueAvatar = $game->getBlue()?->getAvatarPath();
|
||||
$redBonusPoints = $game->getRedBonusPoints() ?? 0;
|
||||
$blueBonusPoints = $game->getBlueBonusPoints() ?? 0;
|
||||
$redBonusStats = $game->getRedBonusStats() ?? [];
|
||||
$blueBonusStats = $game->getBlueBonusStats() ?? [];
|
||||
|
||||
if ($resign === 'red') {
|
||||
$summary = "$redName resigned — $blueName wins";
|
||||
} elseif ($resign === 'blue') {
|
||||
$summary = "$blueName resigned — $redName wins";
|
||||
} elseif ($redPts !== null && $bluePts !== null) {
|
||||
if ($redPts > $bluePts) {
|
||||
$summary = "$redName defeated $blueName ($redPts – $bluePts)";
|
||||
} elseif ($bluePts > $redPts) {
|
||||
$summary = "$blueName defeated $redName ($bluePts – $redPts)";
|
||||
} else {
|
||||
$summary = "$redName and $blueName drew ($redPts – $bluePts)";
|
||||
}
|
||||
} else {
|
||||
$summary = "$redName vs $blueName";
|
||||
}
|
||||
|
||||
return $this->render('Game/battle_share.html.twig', [
|
||||
'game' => $game,
|
||||
'redName' => $redName,
|
||||
'blueName' => $blueName,
|
||||
'redPts' => $redPts,
|
||||
'bluePts' => $bluePts,
|
||||
'resign' => $resign,
|
||||
'redAvatar' => $redAvatar,
|
||||
'blueAvatar' => $blueAvatar,
|
||||
'redBonusPoints' => $redBonusPoints,
|
||||
'blueBonusPoints' => $blueBonusPoints,
|
||||
'redBonusStats' => $redBonusStats,
|
||||
'blueBonusStats' => $blueBonusStats,
|
||||
'ogTitle' => "MineSeeker · $summary",
|
||||
'ogDesc' => "Watch the battle replay: $summary — played on MineSeeker, the multiplayer minesweeper.",
|
||||
]);
|
||||
return $this->render('Game/battle_share.html.twig', BattleShareDto::fromPlayedGame($game)->toTemplateContext());
|
||||
}
|
||||
|
||||
#[Route(
|
||||
@@ -306,6 +148,7 @@ class ProfileController extends AbstractController
|
||||
$user = $this->getUser();
|
||||
|
||||
$file = $request->files->get('avatar');
|
||||
|
||||
if (!$file instanceof UploadedFile) {
|
||||
return $this->json(['error' => 'No file uploaded.'], 400);
|
||||
}
|
||||
@@ -321,7 +164,7 @@ class ProfileController extends AbstractController
|
||||
|
||||
$ext = $file->guessExtension() ?? 'jpg';
|
||||
$newPath = sprintf('avatar/%s.%s', Uuid::v4()->toRfc4122(), $ext);
|
||||
$oldPath = $user->getAvatarPath();
|
||||
$oldPath = $user->avatarPath;
|
||||
|
||||
/** Remove old file and any cached thumbnails */
|
||||
if ($oldPath) {
|
||||
@@ -343,7 +186,7 @@ class ProfileController extends AbstractController
|
||||
}
|
||||
fclose($stream);
|
||||
|
||||
$user->setAvatarPath($newPath);
|
||||
$user->avatarPath = $newPath;
|
||||
$em->flush();
|
||||
|
||||
return $this->json([
|
||||
@@ -360,18 +203,18 @@ class ProfileController extends AbstractController
|
||||
|
||||
$credentials = $this->webAuthnService->getCredentialsForUser($user);
|
||||
$credentialsData = array_map(fn($cred) => [
|
||||
'id' => $cred->getId(),
|
||||
'credentialName' => $cred->getCredentialName(),
|
||||
'createdAt' => $cred->getCreatedAt()?->format('Y-m-d H:i:s'),
|
||||
'lastUsedAt' => $cred->getLastUsedAt()?->format('Y-m-d H:i:s'),
|
||||
'isBackupEligible' => $cred->isBackupEligible(),
|
||||
'isBackupAuthenticated' => $cred->isBackupAuthenticated(),
|
||||
'id' => $cred->id,
|
||||
'credentialName' => $cred->credentialName,
|
||||
'createdAt' => $cred->createdAt?->format('Y-m-d H:i:s'),
|
||||
'lastUsedAt' => $cred->lastUsedAt?->format('Y-m-d H:i:s'),
|
||||
'isBackupEligible' => $cred->isBackupEligible,
|
||||
'isBackupAuthenticated' => $cred->isBackupAuthenticated,
|
||||
], $credentials);
|
||||
|
||||
return $this->render('Security/profile_security.html.twig', [
|
||||
'credentials' => $credentialsData,
|
||||
'isTotpEnabled' => $user->isTotpAuthenticationEnabled(),
|
||||
'backupCodesCount' => count($user->getBackupCodes()),
|
||||
'backupCodesCount' => count($user->backupCodes),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,16 +15,17 @@ use App\Form\ForgotPasswordFormType;
|
||||
use App\Form\RegistrationFormType;
|
||||
use App\Form\ResetPasswordFormType;
|
||||
use App\Repository\UserRepository;
|
||||
use App\Service\Email\SendActivationEmailService;
|
||||
use App\Service\Email\SendPasswordResetEmailService;
|
||||
use App\Service\Email\SendUserActivationNotificationService;
|
||||
use App\Service\Email\SendUserRegistrationNotificationService;
|
||||
use DateTime;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use LogicException;
|
||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\DependencyInjection\Attribute\Autowire;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\RequestStack;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Attribute\AsController;
|
||||
use Symfony\Component\Mailer\MailerInterface;
|
||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
@@ -44,21 +45,28 @@ use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
|
||||
class SecurityController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
#[Autowire(env: 'APP_CONTACT_MAIL_ADDRESS')]
|
||||
private readonly string $appContactMailAddress,
|
||||
private readonly EntityManagerInterface $em,
|
||||
private readonly RequestStack $requestStack,
|
||||
private readonly UserRepository $userRepository,
|
||||
private readonly UserPasswordHasherInterface $passwordHasher,
|
||||
private readonly AuthenticationUtils $authenticationUtils,
|
||||
private readonly SendActivationEmailService $activationEmail,
|
||||
private readonly SendPasswordResetEmailService $passwordResetEmail,
|
||||
private readonly SendUserActivationNotificationService $activationNotificationEmail,
|
||||
private readonly SendUserRegistrationNotificationService $registrationNotificationEmail,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('/login', name: 'MineSeekerBundle_login')]
|
||||
public function login(AuthenticationUtils $authenticationUtils): Response
|
||||
public function login(): Response
|
||||
{
|
||||
if ($this->getUser()) {
|
||||
return $this->redirectToRoute('MineSeekerBundle_homepage');
|
||||
}
|
||||
|
||||
return $this->render('Security/login.html.twig', [
|
||||
'last_username' => $authenticationUtils->getLastUsername(),
|
||||
'error' => $authenticationUtils->getLastAuthenticationError(),
|
||||
'last_username' => $this->authenticationUtils->getLastUsername(),
|
||||
'error' => $this->authenticationUtils->getLastAuthenticationError(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -69,30 +77,25 @@ class SecurityController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/register', name: 'MineSeekerBundle_register')]
|
||||
public function register(
|
||||
Request $request,
|
||||
UserPasswordHasherInterface $hasher,
|
||||
EntityManagerInterface $em,
|
||||
MailerInterface $mailer,
|
||||
): Response {
|
||||
public function register(): Response
|
||||
{
|
||||
if ($this->getUser()) {
|
||||
return $this->redirectToRoute('MineSeekerBundle_homepage');
|
||||
}
|
||||
|
||||
$user = new User();
|
||||
$form = $this->createForm(RegistrationFormType::class, $user);
|
||||
$form->handleRequest($request);
|
||||
$form->handleRequest($this->requestStack->getCurrentRequest());
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$token = bin2hex(random_bytes(32));
|
||||
|
||||
$user
|
||||
->setIsVerified(false)
|
||||
->setVerificationToken($token)
|
||||
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()));
|
||||
$user->isVerified = false;
|
||||
$user->verificationToken = $token;
|
||||
$user->password = $this->passwordHasher->hashPassword($user, $form->get('plainPassword')->getData());
|
||||
|
||||
$em->persist($user);
|
||||
$em->flush();
|
||||
$this->em->persist($user);
|
||||
$this->em->flush();
|
||||
|
||||
$activationUrl = $this->generateUrl(
|
||||
'MineSeekerBundle_activate',
|
||||
@@ -105,32 +108,10 @@ class SecurityController extends AbstractController
|
||||
$activationUrl = str_replace('http://', 'https://', $activationUrl);
|
||||
}
|
||||
|
||||
$mailer->send(
|
||||
new TemplatedEmail()
|
||||
->from('noreply@mineseeker.hu')
|
||||
->to($user->getEmail())
|
||||
->subject('Activate your MineSeeker account')
|
||||
->htmlTemplate('emails/activation.html.twig')
|
||||
->context([
|
||||
'username' => $user->getUsername(),
|
||||
'activation_url' => $activationUrl,
|
||||
])
|
||||
);
|
||||
$this->activationEmail->send($user, $activationUrl);
|
||||
$this->registrationNotificationEmail->send($user, new DateTime());
|
||||
|
||||
/** Send admin notification about new user registration */
|
||||
$mailer->send(
|
||||
new TemplatedEmail()
|
||||
->from('noreply@mineseeker.hu')
|
||||
->to($this->appContactMailAddress)
|
||||
->subject('🎉 New User Registration: ' . $user->getUsername())
|
||||
->htmlTemplate('emails/user_registration_notification.html.twig')
|
||||
->context([
|
||||
'user' => $user,
|
||||
'registeredAt' => new DateTime(),
|
||||
])
|
||||
);
|
||||
|
||||
$this->addFlash('verify_email', $user->getEmail());
|
||||
$this->addFlash('verify_email', $user->email);
|
||||
|
||||
return $this->redirectToRoute('MineSeekerBundle_register');
|
||||
}
|
||||
@@ -139,29 +120,24 @@ class SecurityController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/forgot-password', name: 'MineSeekerBundle_forgot_password')]
|
||||
public function forgotPassword(
|
||||
Request $request,
|
||||
UserRepository $userRepository,
|
||||
EntityManagerInterface $em,
|
||||
MailerInterface $mailer,
|
||||
): Response {
|
||||
public function forgotPassword(): Response
|
||||
{
|
||||
if ($this->getUser()) {
|
||||
return $this->redirectToRoute('MineSeekerBundle_homepage');
|
||||
}
|
||||
|
||||
$form = $this->createForm(ForgotPasswordFormType::class);
|
||||
$form->handleRequest($request);
|
||||
$form->handleRequest($this->requestStack->getCurrentRequest());
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$email = $form->get('email')->getData();
|
||||
$user = $userRepository->findOneByEmail($email);
|
||||
$user = $this->userRepository->findOneByEmail($email);
|
||||
|
||||
if ($user && $user->isVerified()) {
|
||||
if ($user && $user->isVerified) {
|
||||
$token = bin2hex(random_bytes(32));
|
||||
$user
|
||||
->setResetToken($token)
|
||||
->setResetTokenExpiresAt(new DateTime('+1 hour'));
|
||||
$em->flush();
|
||||
$user->resetToken = $token;
|
||||
$user->resetTokenExpiresAt = new DateTime('+1 hour');
|
||||
$this->em->flush();
|
||||
|
||||
$resetUrl = $this->generateUrl(
|
||||
'MineSeekerBundle_reset_password',
|
||||
@@ -174,20 +150,9 @@ class SecurityController extends AbstractController
|
||||
$resetUrl = str_replace('http://', 'https://', $resetUrl);
|
||||
}
|
||||
|
||||
$mailer->send(
|
||||
new TemplatedEmail()
|
||||
->from('noreply@mineseeker.hu')
|
||||
->to($email)
|
||||
->subject('Reset your MineSeeker password')
|
||||
->htmlTemplate('emails/reset_password.html.twig')
|
||||
->context([
|
||||
'username' => $user->getUsername(),
|
||||
'reset_url' => $resetUrl,
|
||||
])
|
||||
);
|
||||
$this->passwordResetEmail->send($email, $user->getUsername(), $resetUrl);
|
||||
}
|
||||
|
||||
// Always show the same flash to prevent email enumeration
|
||||
$this->addFlash('reset_sent', $email);
|
||||
|
||||
return $this->redirectToRoute('MineSeekerBundle_forgot_password');
|
||||
@@ -197,29 +162,24 @@ class SecurityController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/reset-password/{token}', name: 'MineSeekerBundle_reset_password')]
|
||||
public function resetPassword(
|
||||
string $token,
|
||||
Request $request,
|
||||
UserRepository $userRepository,
|
||||
EntityManagerInterface $em,
|
||||
UserPasswordHasherInterface $hasher,
|
||||
): Response {
|
||||
$user = $userRepository->findOneByResetToken($token);
|
||||
public function resetPassword(string $token): Response
|
||||
{
|
||||
$user = $this->userRepository->findOneByResetToken($token);
|
||||
|
||||
if (!$user || $user->getResetTokenExpiresAt() < new DateTime()) {
|
||||
if (!$user || $user->resetTokenExpiresAt < new DateTime()) {
|
||||
$this->addFlash('error', 'This password reset link is invalid or has expired.');
|
||||
return $this->redirectToRoute('MineSeekerBundle_forgot_password');
|
||||
}
|
||||
|
||||
$form = $this->createForm(ResetPasswordFormType::class);
|
||||
$form->handleRequest($request);
|
||||
$form->handleRequest($this->requestStack->getCurrentRequest());
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$user
|
||||
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()))
|
||||
->setResetToken(null)
|
||||
->setResetTokenExpiresAt(null);
|
||||
$em->flush();
|
||||
$user->password = $this->passwordHasher->hashPassword($user, $form->get('plainPassword')->getData());
|
||||
$user->resetToken = null;
|
||||
$user->resetTokenExpiresAt = null;
|
||||
|
||||
$this->em->flush();
|
||||
|
||||
$this->addFlash('success', 'Your password has been reset. You can now sign in.');
|
||||
|
||||
@@ -230,30 +190,20 @@ class SecurityController extends AbstractController
|
||||
}
|
||||
|
||||
#[Route('/activate/{token}', name: 'MineSeekerBundle_activate')]
|
||||
public function activate(string $token, EntityManagerInterface $em, MailerInterface $mailer): Response
|
||||
public function activate(string $token): Response
|
||||
{
|
||||
$user = $em->getRepository(User::class)->findOneBy(['verificationToken' => $token]);
|
||||
$user = $this->em->getRepository(User::class)->findOneBy(['verificationToken' => $token]);
|
||||
|
||||
if (!$user) {
|
||||
$this->addFlash('error', 'This activation link is invalid or has already been used.');
|
||||
return $this->redirectToRoute('MineSeekerBundle_login');
|
||||
}
|
||||
|
||||
$user->setIsVerified(true)->setVerificationToken(null);
|
||||
$em->flush();
|
||||
$user->isVerified = true;
|
||||
$user->verificationToken = null;
|
||||
$this->em->flush();
|
||||
|
||||
/** Send admin notification about account activation */
|
||||
$mailer->send(
|
||||
new TemplatedEmail()
|
||||
->from('noreply@mineseeker.hu')
|
||||
->to($this->appContactMailAddress)
|
||||
->subject('✅ User Account Activated: ' . $user->getUsername())
|
||||
->htmlTemplate('emails/user_activation_notification.html.twig')
|
||||
->context([
|
||||
'user' => $user,
|
||||
'activatedAt' => new DateTime(),
|
||||
])
|
||||
);
|
||||
$this->activationNotificationEmail->send($user, new DateTime());
|
||||
|
||||
$this->addFlash('success', 'Your account is now active. Welcome, ' . $user->getUsername() . '!');
|
||||
|
||||
|
||||
@@ -156,16 +156,16 @@ class TwoFactorController extends AbstractController
|
||||
$code = $request->request->getString('_auth_code');
|
||||
|
||||
// Temporarily set the pending secret to verify the code
|
||||
$user->setTotpSecret($pendingSecret);
|
||||
$user->totpSecret = $pendingSecret;
|
||||
|
||||
if (!$this->totpAuthenticator->checkCode($user, $code)) {
|
||||
$user->setTotpSecret(null);
|
||||
$user->totpSecret = null;
|
||||
$this->addFlash('error', 'Invalid verification code. Please try again.');
|
||||
return $this->redirectToRoute('MineSeekerBundle_2fa_setup');
|
||||
}
|
||||
|
||||
$backupCodes = $this->generateBackupCodes();
|
||||
$user->setBackupCodes($backupCodes);
|
||||
$user->backupCodes = $backupCodes;
|
||||
$this->em->flush();
|
||||
|
||||
$request->getSession()->remove('totp_pending_secret');
|
||||
@@ -187,8 +187,8 @@ class TwoFactorController extends AbstractController
|
||||
|
||||
/** @var User $user */
|
||||
$user = $this->getUser();
|
||||
$user->setTotpSecret(null);
|
||||
$user->setBackupCodes([]);
|
||||
$user->totpSecret = null;
|
||||
$user->backupCodes = [];
|
||||
$this->em->flush();
|
||||
|
||||
$this->addFlash('success', 'Two-factor authentication has been disabled.');
|
||||
@@ -196,7 +196,11 @@ class TwoFactorController extends AbstractController
|
||||
}
|
||||
|
||||
/** Regenerate backup codes for the current user. */
|
||||
#[Route('/profile/security/2fa/backup-codes/regenerate', name: 'MineSeekerBundle_2fa_backup_regenerate', methods: ['POST'])]
|
||||
#[Route(
|
||||
'/profile/security/2fa/backup-codes/regenerate',
|
||||
name: 'MineSeekerBundle_2fa_backup_regenerate',
|
||||
methods: ['POST'],
|
||||
)]
|
||||
public function regenerateBackupCodes(Request $request): Response
|
||||
{
|
||||
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
|
||||
@@ -213,7 +217,7 @@ class TwoFactorController extends AbstractController
|
||||
}
|
||||
|
||||
$backupCodes = $this->generateBackupCodes();
|
||||
$user->setBackupCodes($backupCodes);
|
||||
$user->backupCodes = $backupCodes;
|
||||
$this->em->flush();
|
||||
|
||||
$this->addFlash('2fa_backup_codes', $backupCodes);
|
||||
|
||||
@@ -13,6 +13,7 @@ namespace App\Controller;
|
||||
use App\Entity\User;
|
||||
use App\Security\PasskeyToken;
|
||||
use App\Service\WebAuthnService;
|
||||
use Exception;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -25,6 +26,7 @@ use Webauthn\PublicKeyCredentialCreationOptions;
|
||||
use Webauthn\PublicKeyCredentialParameters;
|
||||
use Webauthn\PublicKeyCredentialRpEntity;
|
||||
use Webauthn\PublicKeyCredentialUserEntity;
|
||||
use function random_bytes;
|
||||
|
||||
/**
|
||||
* Class WebAuthnController
|
||||
@@ -64,7 +66,7 @@ class WebAuthnController extends AbstractController
|
||||
|
||||
$userEntity = new PublicKeyCredentialUserEntity(
|
||||
$user->getUserIdentifier(),
|
||||
(string)$user->getId(),
|
||||
(string)$user->id,
|
||||
$user->getUsername(),
|
||||
);
|
||||
|
||||
@@ -78,7 +80,7 @@ class WebAuthnController extends AbstractController
|
||||
$creationOptions = PublicKeyCredentialCreationOptions::create(
|
||||
$rpEntity,
|
||||
$userEntity,
|
||||
\random_bytes(32),
|
||||
random_bytes(32),
|
||||
$credentialParameters,
|
||||
$authenticatorSelectionCriteria,
|
||||
PublicKeyCredentialCreationOptions::ATTESTATION_CONVEYANCE_PREFERENCE_DIRECT
|
||||
@@ -113,7 +115,7 @@ class WebAuthnController extends AbstractController
|
||||
];
|
||||
|
||||
return new JsonResponse($response);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new JsonResponse(
|
||||
['error' => $e->getMessage()],
|
||||
Response::HTTP_BAD_REQUEST
|
||||
@@ -141,7 +143,7 @@ class WebAuthnController extends AbstractController
|
||||
}
|
||||
|
||||
/** Store the credential with user ID for later retrieval during authentication */
|
||||
$credentialJson['userId'] = $user->getId();
|
||||
$credentialJson['userId'] = $user->id;
|
||||
$credentialJson['username'] = $user->getUsername();
|
||||
|
||||
/** Save the credential data directly */
|
||||
@@ -155,7 +157,7 @@ class WebAuthnController extends AbstractController
|
||||
$request->getSession()->remove('webauthn_credential_name');
|
||||
|
||||
return new JsonResponse(['success' => true]);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new JsonResponse(
|
||||
['error' => 'Registration failed: ' . $e->getMessage()],
|
||||
Response::HTTP_BAD_REQUEST
|
||||
@@ -173,12 +175,12 @@ class WebAuthnController extends AbstractController
|
||||
$credentials = $this->webAuthnService->getCredentialsForUser($user);
|
||||
|
||||
return new JsonResponse(array_map(fn($credential) => [
|
||||
'id' => $credential->getId(),
|
||||
'name' => $credential->getCredentialName(),
|
||||
'createdAt' => $credential->getCreatedAt()?->format('Y-m-d H:i:s'),
|
||||
'lastUsedAt' => $credential->getLastUsedAt()?->format('Y-m-d H:i:s'),
|
||||
'isBackupEligible' => $credential->isBackupEligible(),
|
||||
'isBackupAuthenticated' => $credential->isBackupAuthenticated(),
|
||||
'id' => $credential->id,
|
||||
'name' => $credential->credentialName,
|
||||
'createdAt' => $credential->createdAt?->format('Y-m-d H:i:s'),
|
||||
'lastUsedAt' => $credential->lastUsedAt?->format('Y-m-d H:i:s'),
|
||||
'isBackupEligible' => $credential->isBackupEligible,
|
||||
'isBackupAuthenticated' => $credential->isBackupAuthenticated,
|
||||
], $credentials));
|
||||
}
|
||||
|
||||
@@ -219,7 +221,7 @@ class WebAuthnController extends AbstractController
|
||||
}
|
||||
|
||||
return new JsonResponse(['error' => 'Credential not found'], Response::HTTP_NOT_FOUND);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new JsonResponse(
|
||||
['error' => $e->getMessage()],
|
||||
Response::HTTP_BAD_REQUEST
|
||||
@@ -232,7 +234,7 @@ class WebAuthnController extends AbstractController
|
||||
{
|
||||
try {
|
||||
/** Generate challenge */
|
||||
$challenge = \random_bytes(32);
|
||||
$challenge = random_bytes(32);
|
||||
|
||||
/** Store in session for verification later */
|
||||
$request->getSession()->set('webauthn_request_challenge', $challenge);
|
||||
@@ -250,7 +252,7 @@ class WebAuthnController extends AbstractController
|
||||
];
|
||||
|
||||
return new JsonResponse($response);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new JsonResponse(
|
||||
['error' => $e->getMessage()],
|
||||
Response::HTTP_BAD_REQUEST
|
||||
@@ -304,7 +306,7 @@ class WebAuthnController extends AbstractController
|
||||
'redirect' => '/',
|
||||
'message' => 'Successfully authenticated with passkey',
|
||||
]);
|
||||
} catch (\Exception $e) {
|
||||
} catch (Exception $e) {
|
||||
return new JsonResponse(
|
||||
['error' => $e->getMessage()],
|
||||
Response::HTTP_BAD_REQUEST
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2024 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and licence information, please view the LICENCE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Doctrine;
|
||||
|
||||
use Doctrine\Bundle\DoctrineBundle\Attribute\AsDoctrineListener;
|
||||
use Doctrine\DBAL\Exception;
|
||||
use Doctrine\DBAL\Schema\PostgreSQLSchemaManager;
|
||||
use Doctrine\DBAL\Schema\SchemaException;
|
||||
use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
|
||||
use Doctrine\ORM\Tools\ToolEvents;
|
||||
use RuntimeException;
|
||||
|
||||
/**
|
||||
* Class FixPostgreMigrationDefaultSchemaListener
|
||||
*
|
||||
* @package App\Doctrine
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2023. 02. 28.
|
||||
*
|
||||
* @see https://github.com/doctrine/dbal/issues/1110
|
||||
* There is a recent bug when you create new migration, it creates a new schema even if there is no any
|
||||
* changes.
|
||||
*/
|
||||
#[AsDoctrineListener(event: ToolEvents::postGenerateSchema, priority: 500, connection: 'default')]
|
||||
final class FixPostgreMigrationDefaultSchemaListener
|
||||
{
|
||||
public function postGenerateSchema(GenerateSchemaEventArgs $args): void
|
||||
{
|
||||
try {
|
||||
$schemaManager = $args
|
||||
->getEntityManager()
|
||||
->getConnection()
|
||||
->createSchemaManager();
|
||||
|
||||
if (!$schemaManager instanceof PostgreSqlSchemaManager) {
|
||||
return;
|
||||
}
|
||||
|
||||
$schema = $args->getSchema();
|
||||
|
||||
foreach ($schemaManager->getExistingSchemaSearchPaths() as $namespace) {
|
||||
if ($schema->hasNamespace($namespace)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$schema->createNamespace($namespace);
|
||||
}
|
||||
} catch (SchemaException|Exception $e) {
|
||||
throw new RuntimeException($e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
105
src/Dto/BattleShareDto.php
Normal file
105
src/Dto/BattleShareDto.php
Normal file
@@ -0,0 +1,105 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use App\Entity\PlayedGame;
|
||||
|
||||
/**
|
||||
* Class BattleShareDto
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class BattleShareDto
|
||||
{
|
||||
public function __construct(
|
||||
public PlayedGame $game,
|
||||
public string $redName,
|
||||
public string $blueName,
|
||||
public ?int $redPts,
|
||||
public ?int $bluePts,
|
||||
public ?string $resign,
|
||||
public ?string $redAvatar,
|
||||
public ?string $blueAvatar,
|
||||
public float $redBonusPoints,
|
||||
public float $blueBonusPoints,
|
||||
public array $redBonusStats,
|
||||
public array $blueBonusStats,
|
||||
public string $ogTitle,
|
||||
public string $ogDesc,
|
||||
) {
|
||||
}
|
||||
|
||||
public static function fromPlayedGame(PlayedGame $game): self
|
||||
{
|
||||
$redName = $game->red?->getUsername() ?? ($game->redAnon !== null ? 'Anonymous' : 'Guest');
|
||||
$blueName = $game->blue?->getUsername() ?? ($game->blueAnon !== null ? 'Anonymous' : 'Guest');
|
||||
$redPts = $game->redPoints;
|
||||
$bluePts = $game->bluePoints;
|
||||
$resign = $game->resign;
|
||||
|
||||
$summary = self::buildSummary($redName, $blueName, $redPts, $bluePts, $resign);
|
||||
|
||||
return new self(
|
||||
game: $game,
|
||||
redName: $redName,
|
||||
blueName: $blueName,
|
||||
redPts: $redPts,
|
||||
bluePts: $bluePts,
|
||||
resign: $resign,
|
||||
redAvatar: $game->red?->avatarPath,
|
||||
blueAvatar: $game->blue?->avatarPath,
|
||||
redBonusPoints: (float)($game->redBonusPoints ?? 0),
|
||||
blueBonusPoints: (float)($game->blueBonusPoints ?? 0),
|
||||
redBonusStats: $game->redBonusStats ?? [],
|
||||
blueBonusStats: $game->blueBonusStats ?? [],
|
||||
ogTitle: "MineSeeker · $summary",
|
||||
ogDesc: "Watch the battle replay: $summary — played on MineSeeker, the multiplayer minesweeper.",
|
||||
);
|
||||
}
|
||||
|
||||
private static function buildSummary(
|
||||
string $redName,
|
||||
string $blueName,
|
||||
?int $redPts,
|
||||
?int $bluePts,
|
||||
?string $resign,
|
||||
): string {
|
||||
if ($resign === 'red') {
|
||||
return "$redName resigned — $blueName wins";
|
||||
}
|
||||
|
||||
if ($resign === 'blue') {
|
||||
return "$blueName resigned — $redName wins";
|
||||
}
|
||||
|
||||
if ($redPts !== null && $bluePts !== null) {
|
||||
if ($redPts > $bluePts) {
|
||||
return "$redName defeated $blueName ($redPts – $bluePts)";
|
||||
}
|
||||
if ($bluePts > $redPts) {
|
||||
return "$blueName defeated $redName ($bluePts – $redPts)";
|
||||
}
|
||||
return "$redName and $blueName drew ($redPts – $bluePts)";
|
||||
}
|
||||
|
||||
return "$redName vs $blueName";
|
||||
}
|
||||
|
||||
public function toTemplateContext(): array
|
||||
{
|
||||
return get_object_vars($this);
|
||||
}
|
||||
}
|
||||
43
src/Dto/ProfileChartDataDto.php
Normal file
43
src/Dto/ProfileChartDataDto.php
Normal file
@@ -0,0 +1,43 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use JsonSerializable;
|
||||
|
||||
/**
|
||||
* Class ProfileChartDataDto
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class ProfileChartDataDto implements JsonSerializable
|
||||
{
|
||||
public function __construct(
|
||||
public array $months,
|
||||
public array $wins,
|
||||
public array $losses,
|
||||
public array $draws,
|
||||
public int $pieWins,
|
||||
public int $pieLosses,
|
||||
public int $pieDraws,
|
||||
public array $recentGames,
|
||||
) {
|
||||
}
|
||||
|
||||
public function jsonSerialize(): array
|
||||
{
|
||||
return get_object_vars($this);
|
||||
}
|
||||
}
|
||||
111
src/Dto/ProfileChartDataFactory.php
Normal file
111
src/Dto/ProfileChartDataFactory.php
Normal file
@@ -0,0 +1,111 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use App\Entity\User;
|
||||
use App\Repository\PlayedGameRepository;
|
||||
use DateTime;
|
||||
|
||||
/**
|
||||
* Class ProfileChartDataFactory
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
readonly final class ProfileChartDataFactory
|
||||
{
|
||||
public function __construct(private PlayedGameRepository $repo) { }
|
||||
|
||||
public function buildChartData(User $user, int $userId, ProfileStatsDto $stats): ProfileChartDataDto
|
||||
{
|
||||
$monthlyData = $this->buildMonthlyData($user, $userId);
|
||||
|
||||
return new ProfileChartDataDto(
|
||||
months: array_column(array_values($monthlyData), 'label'),
|
||||
wins: array_column(array_values($monthlyData), 'wins'),
|
||||
losses: array_column(array_values($monthlyData), 'losses'),
|
||||
draws: array_column(array_values($monthlyData), 'draws'),
|
||||
pieWins: $stats->wins,
|
||||
pieLosses: $stats->losses,
|
||||
pieDraws: $stats->draws,
|
||||
recentGames: $this->buildRecentGamesSeries($user, $userId),
|
||||
);
|
||||
}
|
||||
|
||||
private function buildMonthlyData(User $user, int $userId): array
|
||||
{
|
||||
$monthlyData = [];
|
||||
|
||||
for ($i = 5; $i >= 0; $i--) {
|
||||
$dt = new DateTime("first day of -$i months midnight");
|
||||
$key = $dt->format('Y-m');
|
||||
$monthlyData[$key] = ['label' => $dt->format('M'), 'wins' => 0, 'losses' => 0, 'draws' => 0];
|
||||
}
|
||||
|
||||
$since = new DateTime('first day of -5 months midnight');
|
||||
$recentGames = $this->repo->findFinishedForUserSince($user, $since);
|
||||
|
||||
foreach ($recentGames as $game) {
|
||||
if (!$game->updated) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$month = $game->updated->format('Y-m');
|
||||
if (!isset($monthlyData[$month])) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$isRed = $game->red?->id === $userId;
|
||||
$myPts = $isRed ? $game->redPoints : $game->bluePoints;
|
||||
$oppPts = $isRed ? $game->bluePoints : $game->redPoints;
|
||||
$resign = $game->resign;
|
||||
$myColor = $isRed ? 'red' : 'blue';
|
||||
$oppColor = $isRed ? 'blue' : 'red';
|
||||
|
||||
$result = 'draws';
|
||||
if ($resign === $myColor) {
|
||||
$result = 'losses';
|
||||
} elseif ($resign === $oppColor) {
|
||||
$result = 'wins';
|
||||
} elseif ($myPts !== null && $oppPts !== null) {
|
||||
if ($myPts > $oppPts) $result = 'wins';
|
||||
elseif ($myPts < $oppPts) $result = 'losses';
|
||||
}
|
||||
|
||||
$monthlyData[$month][$result]++;
|
||||
}
|
||||
|
||||
return $monthlyData;
|
||||
}
|
||||
|
||||
private function buildRecentGamesSeries(User $user, int $userId): array
|
||||
{
|
||||
$recent = $this->repo->findRecentFinishedForUser($user, 15);
|
||||
$recent = array_reverse($recent);
|
||||
|
||||
$labels = [];
|
||||
$mines = [];
|
||||
$bonus = [];
|
||||
|
||||
foreach ($recent as $i => $game) {
|
||||
$isRed = $game->red?->id === $userId;
|
||||
$labels[] = '#' . ($i + 1);
|
||||
$mines[] = (int)($isRed ? $game->redPoints : $game->bluePoints);
|
||||
$bonus[] = (float)($isRed ? $game->redBonusPoints : $game->blueBonusPoints) ?: 0;
|
||||
}
|
||||
|
||||
return ['labels' => $labels, 'mines' => $mines, 'bonus' => $bonus];
|
||||
}
|
||||
}
|
||||
57
src/Dto/ProfileGameDto.php
Normal file
57
src/Dto/ProfileGameDto.php
Normal file
@@ -0,0 +1,57 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use JsonSerializable;
|
||||
|
||||
/**
|
||||
* Class ProfileGameDto
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class ProfileGameDto implements JsonSerializable
|
||||
{
|
||||
public function __construct(
|
||||
public ?int $id,
|
||||
public ?string $uuid,
|
||||
public string $redName,
|
||||
public string $blueName,
|
||||
public ?string $redAvatar,
|
||||
public ?string $blueAvatar,
|
||||
public ?int $redPoints,
|
||||
public ?int $bluePoints,
|
||||
public ?bool $redExplodedBomb,
|
||||
public ?bool $blueExplodedBomb,
|
||||
public ?string $resign,
|
||||
public ?string $created,
|
||||
public ?string $date,
|
||||
public bool $isRed,
|
||||
public string $result,
|
||||
public ?int $myPoints,
|
||||
public ?int $oppPoints,
|
||||
public float $redBonusPoints,
|
||||
public float $blueBonusPoints,
|
||||
public array $redBonusStats,
|
||||
public array $blueBonusStats,
|
||||
public bool $bothRegistered,
|
||||
) {
|
||||
}
|
||||
|
||||
public function jsonSerialize(): array
|
||||
{
|
||||
return get_object_vars($this);
|
||||
}
|
||||
}
|
||||
136
src/Dto/ProfileGameDtoFactory.php
Normal file
136
src/Dto/ProfileGameDtoFactory.php
Normal file
@@ -0,0 +1,136 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use App\Entity\PlayedGame;
|
||||
use App\Entity\RecentBattle;
|
||||
use Liip\ImagineBundle\Imagine\Cache\CacheManager;
|
||||
|
||||
/**
|
||||
* Class ProfileGameDtoFactory
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class ProfileGameDtoFactory
|
||||
{
|
||||
public function __construct(private CacheManager $cacheManager) { }
|
||||
|
||||
public function create(PlayedGame $game, int $userId): ProfileGameDto
|
||||
{
|
||||
$isRed = $game->red?->id === $userId;
|
||||
$resign = $game->resign;
|
||||
$myColor = $isRed ? 'red' : 'blue';
|
||||
$oppColor = $isRed ? 'blue' : 'red';
|
||||
$myPts = $isRed ? $game->redPoints : $game->bluePoints;
|
||||
$oppPts = $isRed ? $game->bluePoints : $game->redPoints;
|
||||
|
||||
$redAvatarPath = $game->red?->avatarPath;
|
||||
$blueAvatarPath = $game->blue?->avatarPath;
|
||||
|
||||
return new ProfileGameDto(
|
||||
id: $game->id,
|
||||
uuid: $game->uuid?->toRfc4122(),
|
||||
redName: $game->red?->getUsername() ?? $game->redAnon?->userName ?? 'Guest',
|
||||
blueName: $game->blue?->getUsername() ?? $game->blueAnon?->userName ?? 'Guest',
|
||||
redAvatar: $redAvatarPath ? $this->cacheManager->generateUrl($redAvatarPath, 'avatar_thumb') : null,
|
||||
blueAvatar: $blueAvatarPath ? $this->cacheManager->generateUrl($blueAvatarPath, 'avatar_thumb') : null,
|
||||
redPoints: $game->redPoints,
|
||||
bluePoints: $game->bluePoints,
|
||||
redExplodedBomb: $game->redExplodedBomb,
|
||||
blueExplodedBomb: $game->blueExplodedBomb,
|
||||
resign: $resign,
|
||||
created: $game->created?->format('Y-m-d H:i'),
|
||||
date: $game->updated?->format('Y-m-d H:i'),
|
||||
isRed: $isRed,
|
||||
result: $this->resolveResult($resign, $myColor, $oppColor, $myPts, $oppPts),
|
||||
myPoints: $myPts,
|
||||
oppPoints: $oppPts,
|
||||
redBonusPoints: $game->redBonusPoints ?? 0.0,
|
||||
blueBonusPoints: $game->blueBonusPoints ?? 0.0,
|
||||
redBonusStats: $game->redBonusStats ?? [],
|
||||
blueBonusStats: $game->blueBonusStats ?? [],
|
||||
bothRegistered: $game->red !== null && $game->blue !== null,
|
||||
);
|
||||
}
|
||||
|
||||
private function resolveResult(
|
||||
?string $resign,
|
||||
string $myColor,
|
||||
string $oppColor,
|
||||
?int $myPts,
|
||||
?int $oppPts,
|
||||
): string {
|
||||
if ($resign === $myColor) {
|
||||
return 'loss';
|
||||
}
|
||||
|
||||
if ($resign === $oppColor) {
|
||||
return 'win';
|
||||
}
|
||||
|
||||
if ($myPts !== null && $oppPts !== null) {
|
||||
if ($myPts > $oppPts) {
|
||||
return 'win';
|
||||
}
|
||||
|
||||
if ($myPts < $oppPts) {
|
||||
return 'loss';
|
||||
}
|
||||
}
|
||||
|
||||
return 'draw';
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a ProfileGameDto directly from the recent_battles materialized view row.
|
||||
* Avatar paths are still resolved via LiipImagine (they are stored as storage paths).
|
||||
*/
|
||||
public function createFromRecentBattle(RecentBattle $battle): ProfileGameDto
|
||||
{
|
||||
$myPts = $battle->isRed ? $battle->redPoints : $battle->bluePoints;
|
||||
$oppPts = $battle->isRed ? $battle->bluePoints : $battle->redPoints;
|
||||
|
||||
return new ProfileGameDto(
|
||||
id: $battle->gameId,
|
||||
uuid: $battle->uuid,
|
||||
redName: $battle->redName,
|
||||
blueName: $battle->blueName,
|
||||
redAvatar: $battle->redAvatarPath
|
||||
? $this->cacheManager->generateUrl($battle->redAvatarPath, 'avatar_thumb')
|
||||
: null,
|
||||
blueAvatar: $battle->blueAvatarPath
|
||||
? $this->cacheManager->generateUrl($battle->blueAvatarPath, 'avatar_thumb')
|
||||
: null,
|
||||
redPoints: $battle->redPoints,
|
||||
bluePoints: $battle->bluePoints,
|
||||
redExplodedBomb: $battle->redExplodedBomb,
|
||||
blueExplodedBomb: $battle->blueExplodedBomb,
|
||||
resign: $battle->resign,
|
||||
created: $battle->created?->format('Y-m-d H:i'),
|
||||
date: $battle->updated?->format('Y-m-d H:i'),
|
||||
isRed: $battle->isRed,
|
||||
result: $battle->result,
|
||||
myPoints: $myPts,
|
||||
oppPoints: $oppPts,
|
||||
redBonusPoints: $battle->redBonusPoints,
|
||||
blueBonusPoints: $battle->blueBonusPoints,
|
||||
redBonusStats: $battle->redBonusStats,
|
||||
blueBonusStats: $battle->blueBonusStats,
|
||||
bothRegistered: !$battle->oppIsGuest,
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
82
src/Dto/ProfileStatsDto.php
Normal file
82
src/Dto/ProfileStatsDto.php
Normal file
@@ -0,0 +1,82 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
use App\Entity\UserStats;
|
||||
|
||||
/**
|
||||
* Class ProfileStatsDto
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class ProfileStatsDto
|
||||
{
|
||||
public function __construct(
|
||||
public int $total,
|
||||
public int $wins,
|
||||
public int $losses,
|
||||
public int $draws,
|
||||
public int $minesHit,
|
||||
public int $winRate,
|
||||
public int $avgScore,
|
||||
public float $bonusPoints,
|
||||
public float $avgBonus,
|
||||
public int $bestChain,
|
||||
public int $blindHits,
|
||||
public int $edgeMines,
|
||||
) {
|
||||
}
|
||||
|
||||
public static function fromUserStats(?UserStats $stats): self
|
||||
{
|
||||
if ($stats === null) {
|
||||
return self::empty();
|
||||
}
|
||||
|
||||
return new self(
|
||||
total: $stats->totalGames,
|
||||
wins: $stats->wins,
|
||||
losses: $stats->losses,
|
||||
draws: $stats->draws,
|
||||
minesHit: $stats->totalMines,
|
||||
winRate: $stats->getWinRate(),
|
||||
avgScore: $stats->getAvgScore(),
|
||||
bonusPoints: (float)$stats->totalBonusPoints,
|
||||
avgBonus: (float)$stats->avgBonus,
|
||||
bestChain: $stats->bestChain,
|
||||
blindHits: $stats->blindHits,
|
||||
edgeMines: $stats->edgeMines,
|
||||
);
|
||||
}
|
||||
|
||||
public static function empty(): self
|
||||
{
|
||||
return new self(
|
||||
total: 0,
|
||||
wins: 0,
|
||||
losses: 0,
|
||||
draws: 0,
|
||||
minesHit: 0,
|
||||
winRate: 0,
|
||||
avgScore: 0,
|
||||
bonusPoints: 0.0,
|
||||
avgBonus: 0.0,
|
||||
bestChain: 0,
|
||||
blindHits: 0,
|
||||
edgeMines: 0,
|
||||
);
|
||||
}
|
||||
}
|
||||
37
src/Dto/ProfileViewDto.php
Normal file
37
src/Dto/ProfileViewDto.php
Normal file
@@ -0,0 +1,37 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
/**
|
||||
* Class ProfileViewDto
|
||||
*
|
||||
* @package App\Dto
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final readonly class ProfileViewDto
|
||||
{
|
||||
public function __construct(
|
||||
public ProfileStatsDto $stats,
|
||||
public array $recent,
|
||||
public array $gamesData,
|
||||
public ProfileChartDataDto $chartData,
|
||||
) {
|
||||
}
|
||||
|
||||
public function toTemplateContext(): array
|
||||
{
|
||||
return get_object_vars($this);
|
||||
}
|
||||
}
|
||||
@@ -29,100 +29,33 @@ use Doctrine\ORM\Mapping\Table;
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 15.
|
||||
*/
|
||||
#[Entity(repositoryClass: ContactMessageRepository::class)]
|
||||
#[Table(name: 'contact_messages')]
|
||||
#[Entity(repositoryClass: ContactMessageRepository::class), Table(name: 'contact_messages')]
|
||||
class ContactMessage
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[Column]
|
||||
private string $name;
|
||||
public string $name;
|
||||
|
||||
#[Column]
|
||||
private string $email;
|
||||
public string $email;
|
||||
|
||||
#[Column(type: Types::TEXT)]
|
||||
private string $content;
|
||||
public string $content;
|
||||
|
||||
#[Column]
|
||||
private bool $consent = false;
|
||||
public bool $consent = false;
|
||||
|
||||
#[Column]
|
||||
private DateTimeImmutable $createdAt;
|
||||
public private(set) DateTimeImmutable $createdAt;
|
||||
|
||||
#[Column(length: 45, nullable: true)]
|
||||
private ?string $ipAddress = null;
|
||||
public ?string $ipAddress = null;
|
||||
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->createdAt = new DateTimeImmutable();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getName(): string
|
||||
{
|
||||
return $this->name;
|
||||
}
|
||||
|
||||
public function setName(string $name): self
|
||||
{
|
||||
$this->name = $name;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getEmail(): string
|
||||
{
|
||||
return $this->email;
|
||||
}
|
||||
|
||||
public function setEmail(string $email): self
|
||||
{
|
||||
$this->email = $email;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getContent(): string
|
||||
{
|
||||
return $this->content;
|
||||
}
|
||||
|
||||
public function setContent(string $content): self
|
||||
{
|
||||
$this->content = $content;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isConsent(): bool
|
||||
{
|
||||
return $this->consent;
|
||||
}
|
||||
|
||||
public function setConsent(bool $consent): self
|
||||
{
|
||||
$this->consent = $consent;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCreatedAt(): DateTimeImmutable
|
||||
{
|
||||
return $this->createdAt;
|
||||
}
|
||||
|
||||
public function getIpAddress(): ?string
|
||||
{
|
||||
return $this->ipAddress;
|
||||
}
|
||||
|
||||
public function setIpAddress(?string $ipAddress): self
|
||||
{
|
||||
$this->ipAddress = $ipAddress;
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -26,82 +26,26 @@ use Doctrine\ORM\Mapping\Id;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[Entity(repositoryClass: GamerRepository::class)]
|
||||
class Gamer
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[Column(length: 100)]
|
||||
private ?string $userName = null;
|
||||
public ?string $userName = null;
|
||||
|
||||
#[Column(length: 20, nullable: true)]
|
||||
private ?string $ip = null;
|
||||
public ?string $ip = null;
|
||||
|
||||
#[Column(length: 100, nullable: true)]
|
||||
private ?string $country = null;
|
||||
public ?string $country = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?string $userAgent = null;
|
||||
public ?string $userAgent = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE)]
|
||||
private ?DateTime $connTimestamp = null;
|
||||
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getUserName(): ?string
|
||||
{
|
||||
return $this->userName;
|
||||
}
|
||||
|
||||
public function setUserName(?string $userName): void
|
||||
{
|
||||
$this->userName = $userName;
|
||||
}
|
||||
|
||||
public function getIp(): ?string
|
||||
{
|
||||
return $this->ip;
|
||||
}
|
||||
|
||||
public function setIp(?string $ip): void
|
||||
{
|
||||
$this->ip = $ip;
|
||||
}
|
||||
|
||||
public function getCountry(): ?string
|
||||
{
|
||||
return $this->country;
|
||||
}
|
||||
|
||||
public function setCountry(?string $country): void
|
||||
{
|
||||
$this->country = $country;
|
||||
}
|
||||
|
||||
public function getUserAgent(): ?string
|
||||
{
|
||||
return $this->userAgent;
|
||||
}
|
||||
|
||||
public function setUserAgent(?string $userAgent): void
|
||||
{
|
||||
$this->userAgent = $userAgent;
|
||||
}
|
||||
|
||||
public function getConnTimestamp(): ?DateTime
|
||||
{
|
||||
return $this->connTimestamp;
|
||||
}
|
||||
|
||||
public function setConnTimestamp(?DateTime $connTimestamp): void
|
||||
{
|
||||
$this->connTimestamp = $connTimestamp;
|
||||
}
|
||||
public ?DateTime $connTimestamp = null;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -29,20 +29,20 @@ use Doctrine\ORM\Mapping\OneToOne;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[Entity(repositoryClass: GridRepository::class)]
|
||||
class Grid
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[OneToOne(inversedBy: 'grid', cascade: ['persist'])]
|
||||
private ?PlayedGame $playedGame = null;
|
||||
public ?PlayedGame $playedGame = null;
|
||||
|
||||
#[OneToMany(mappedBy: 'grid', targetEntity: GridRow::class, cascade: ['persist'])]
|
||||
#[OneToMany(targetEntity: GridRow::class, mappedBy: 'grid', cascade: ['persist'])]
|
||||
#[JoinColumn(name: 'grid_row', referencedColumnName: 'id', onDelete: 'CASCADE')]
|
||||
private Collection $gridRow;
|
||||
public private(set) Collection $gridRow;
|
||||
|
||||
|
||||
public function __construct()
|
||||
@@ -50,30 +50,10 @@ class Grid
|
||||
$this->gridRow = new ArrayCollection();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getPlayedGame(): ?PlayedGame
|
||||
{
|
||||
return $this->playedGame;
|
||||
}
|
||||
|
||||
public function setPlayedGame(?PlayedGame $playedGame): void
|
||||
{
|
||||
$this->playedGame = $playedGame;
|
||||
}
|
||||
|
||||
public function getGridRow(): Collection
|
||||
{
|
||||
return $this->gridRow;
|
||||
}
|
||||
|
||||
public function addGridRow(GridRow $gridRow): void
|
||||
{
|
||||
$this->gridRow->add($gridRow);
|
||||
$gridRow->setGrid($this);
|
||||
$gridRow->grid = $this;
|
||||
}
|
||||
|
||||
public function removeGridRow(GridRow $gridRow): void
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -27,44 +27,18 @@ use Doctrine\ORM\Mapping\ManyToOne;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[Entity(repositoryClass: GridRowRepository::class)]
|
||||
class GridRow
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[ManyToOne(cascade: ['persist'], inversedBy: 'gridRow')]
|
||||
#[JoinColumn(name: 'grid', referencedColumnName: 'id', onDelete: 'CASCADE')]
|
||||
private ?Grid $grid = null;
|
||||
public ?Grid $grid = null;
|
||||
|
||||
#[Column(name: 'grid_col', type: Types::JSON, nullable: false)]
|
||||
private ?array $gridCol = null;
|
||||
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getGrid(): ?Grid
|
||||
{
|
||||
return $this->grid;
|
||||
}
|
||||
|
||||
public function setGrid(?Grid $grid): void
|
||||
{
|
||||
$this->grid = $grid;
|
||||
}
|
||||
|
||||
public function getGridCol(): ?array
|
||||
{
|
||||
return $this->gridCol;
|
||||
}
|
||||
|
||||
public function setGridCol(?array $gridCol): void
|
||||
{
|
||||
$this->gridCol = $gridCol;
|
||||
}
|
||||
public ?array $gridCol = null;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -33,74 +33,74 @@ use Symfony\Component\Uid\Uuid;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[Entity(repositoryClass: PlayedGameRepository::class)]
|
||||
class PlayedGame
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[Column(type: 'uuid', unique: true)]
|
||||
private ?Uuid $uuid = null;
|
||||
public ?Uuid $uuid = null;
|
||||
|
||||
#[Column(length: 50)]
|
||||
private ?string $gameAssoc = null;
|
||||
public ?string $gameAssoc = null;
|
||||
|
||||
#[Column(length: 5, nullable: true)]
|
||||
private ?int $redPoints = null;
|
||||
public ?int $redPoints = null;
|
||||
|
||||
#[Column(length: 5, nullable: true)]
|
||||
private ?int $bluePoints = null;
|
||||
public ?int $bluePoints = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?bool $redExplodedBomb = null;
|
||||
public ?bool $redExplodedBomb = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?bool $blueExplodedBomb = null;
|
||||
public ?bool $blueExplodedBomb = null;
|
||||
|
||||
#[Column(length: 7, nullable: true)]
|
||||
private ?string $resign = null;
|
||||
public ?string $resign = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?float $redBonusPoints = null;
|
||||
public ?float $redBonusPoints = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?float $blueBonusPoints = null;
|
||||
public ?float $blueBonusPoints = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?array $redBonusStats = null;
|
||||
public ?array $redBonusStats = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?array $blueBonusStats = null;
|
||||
public ?array $blueBonusStats = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
private ?DateTime $created = null;
|
||||
public ?DateTime $created = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
private ?DateTime $updated = null;
|
||||
public ?DateTime $updated = null;
|
||||
|
||||
#[OneToOne(mappedBy: 'playedGame', cascade: ['persist'])]
|
||||
private ?Grid $grid = null;
|
||||
public ?Grid $grid = null;
|
||||
|
||||
#[ManyToOne]
|
||||
#[JoinColumn(name: 'red_id', referencedColumnName: 'id', nullable: true)]
|
||||
private ?User $red = null;
|
||||
public ?User $red = null;
|
||||
|
||||
#[ManyToOne]
|
||||
#[JoinColumn(name: 'red_anon', referencedColumnName: 'id', nullable: true)]
|
||||
private ?Gamer $redAnon = null;
|
||||
public ?Gamer $redAnon = null;
|
||||
|
||||
#[ManyToOne]
|
||||
#[JoinColumn(name: 'blue_id', referencedColumnName: 'id', nullable: true)]
|
||||
private ?User $blue = null;
|
||||
public ?User $blue = null;
|
||||
|
||||
#[ManyToOne]
|
||||
#[JoinColumn(name: 'blue_anon', referencedColumnName: 'id', nullable: true)]
|
||||
private ?Gamer $blueAnon = null;
|
||||
public ?Gamer $blueAnon = null;
|
||||
|
||||
#[OneToMany(mappedBy: 'playedGame', targetEntity: Step::class)]
|
||||
private Collection $steps;
|
||||
public private(set) Collection $steps;
|
||||
|
||||
|
||||
public function __construct()
|
||||
@@ -108,196 +108,4 @@ class PlayedGame
|
||||
$this->steps = new ArrayCollection();
|
||||
$this->uuid = Uuid::v4();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getUuid(): ?Uuid
|
||||
{
|
||||
return $this->uuid;
|
||||
}
|
||||
|
||||
public function setUuid(?Uuid $uuid): void
|
||||
{
|
||||
$this->uuid = $uuid;
|
||||
}
|
||||
|
||||
public function getGameAssoc(): ?string
|
||||
{
|
||||
return $this->gameAssoc;
|
||||
}
|
||||
|
||||
public function setGameAssoc(?string $gameAssoc): void
|
||||
{
|
||||
$this->gameAssoc = $gameAssoc;
|
||||
}
|
||||
|
||||
public function getGrid(): ?Grid
|
||||
{
|
||||
return $this->grid;
|
||||
}
|
||||
|
||||
public function setGrid(?Grid $grid): void
|
||||
{
|
||||
$this->grid = $grid;
|
||||
}
|
||||
|
||||
public function getRed(): ?User
|
||||
{
|
||||
return $this->red;
|
||||
}
|
||||
|
||||
public function setRed(?User $red): void
|
||||
{
|
||||
$this->red = $red;
|
||||
}
|
||||
|
||||
public function getRedAnon(): ?Gamer
|
||||
{
|
||||
return $this->redAnon;
|
||||
}
|
||||
|
||||
public function setRedAnon(?Gamer $redAnon): void
|
||||
{
|
||||
$this->redAnon = $redAnon;
|
||||
}
|
||||
|
||||
public function getBlue(): ?User
|
||||
{
|
||||
return $this->blue;
|
||||
}
|
||||
|
||||
public function setBlue(?User $blue): void
|
||||
{
|
||||
$this->blue = $blue;
|
||||
}
|
||||
|
||||
public function getBlueAnon(): ?Gamer
|
||||
{
|
||||
return $this->blueAnon;
|
||||
}
|
||||
|
||||
public function setBlueAnon(?Gamer $blueAnon): void
|
||||
{
|
||||
$this->blueAnon = $blueAnon;
|
||||
}
|
||||
|
||||
public function getRedPoints(): ?int
|
||||
{
|
||||
return $this->redPoints;
|
||||
}
|
||||
|
||||
public function setRedPoints(?int $redPoints): void
|
||||
{
|
||||
$this->redPoints = $redPoints;
|
||||
}
|
||||
|
||||
public function getBluePoints(): ?int
|
||||
{
|
||||
return $this->bluePoints;
|
||||
}
|
||||
|
||||
public function setBluePoints(?int $bluePoints): void
|
||||
{
|
||||
$this->bluePoints = $bluePoints;
|
||||
}
|
||||
|
||||
public function getRedExplodedBomb(): ?bool
|
||||
{
|
||||
return $this->redExplodedBomb;
|
||||
}
|
||||
|
||||
public function setRedExplodedBomb(?bool $redExplodedBomb): void
|
||||
{
|
||||
$this->redExplodedBomb = $redExplodedBomb;
|
||||
}
|
||||
|
||||
public function getBlueExplodedBomb(): ?bool
|
||||
{
|
||||
return $this->blueExplodedBomb;
|
||||
}
|
||||
|
||||
public function setBlueExplodedBomb(?bool $blueExplodedBomb): void
|
||||
{
|
||||
$this->blueExplodedBomb = $blueExplodedBomb;
|
||||
}
|
||||
|
||||
public function getResign(): ?string
|
||||
{
|
||||
return $this->resign;
|
||||
}
|
||||
|
||||
public function setResign(?string $resign): void
|
||||
{
|
||||
$this->resign = $resign;
|
||||
}
|
||||
|
||||
public function getRedBonusPoints(): ?float
|
||||
{
|
||||
return $this->redBonusPoints;
|
||||
}
|
||||
|
||||
public function setRedBonusPoints(?float $redBonusPoints): void
|
||||
{
|
||||
$this->redBonusPoints = $redBonusPoints;
|
||||
}
|
||||
|
||||
public function getBlueBonusPoints(): ?float
|
||||
{
|
||||
return $this->blueBonusPoints;
|
||||
}
|
||||
|
||||
public function setBlueBonusPoints(?float $blueBonusPoints): void
|
||||
{
|
||||
$this->blueBonusPoints = $blueBonusPoints;
|
||||
}
|
||||
|
||||
public function getRedBonusStats(): ?array
|
||||
{
|
||||
return $this->redBonusStats;
|
||||
}
|
||||
|
||||
public function setRedBonusStats(?array $redBonusStats): void
|
||||
{
|
||||
$this->redBonusStats = $redBonusStats;
|
||||
}
|
||||
|
||||
public function getBlueBonusStats(): ?array
|
||||
{
|
||||
return $this->blueBonusStats;
|
||||
}
|
||||
|
||||
public function setBlueBonusStats(?array $blueBonusStats): void
|
||||
{
|
||||
$this->blueBonusStats = $blueBonusStats;
|
||||
}
|
||||
|
||||
public function getCreated(): ?DateTime
|
||||
{
|
||||
return $this->created;
|
||||
}
|
||||
|
||||
public function setCreated(?DateTime $created): void
|
||||
{
|
||||
$this->created = $created;
|
||||
}
|
||||
|
||||
public function getUpdated(): ?DateTime
|
||||
{
|
||||
return $this->updated;
|
||||
}
|
||||
|
||||
public function setUpdated(?DateTime $updated): void
|
||||
{
|
||||
$this->updated = $updated;
|
||||
}
|
||||
|
||||
public function getSteps(): Collection
|
||||
{
|
||||
return $this->steps;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
100
src/Entity/RecentBattle.php
Normal file
100
src/Entity/RecentBattle.php
Normal file
@@ -0,0 +1,100 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use App\Repository\RecentBattleRepository;
|
||||
use DateTime;
|
||||
use Doctrine\DBAL\Types\Types;
|
||||
use Doctrine\ORM\Mapping\Column;
|
||||
use Doctrine\ORM\Mapping\Entity;
|
||||
use Doctrine\ORM\Mapping\Id;
|
||||
use Doctrine\ORM\Mapping\Table;
|
||||
|
||||
/**
|
||||
* Class RecentBattle
|
||||
*
|
||||
* Read-only entity mapped to the recent_battles materialized view.
|
||||
* Each row represents one game from the perspective of a single user.
|
||||
*
|
||||
* @package App\Entity
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
#[Entity(repositoryClass: RecentBattleRepository::class, readOnly: true), Table(name: 'recent_battles')]
|
||||
class RecentBattle
|
||||
{
|
||||
/** Composite PK: (user_id, game_id) — mapped via the unique index. */
|
||||
#[Id, Column]
|
||||
public int $userId = 0;
|
||||
|
||||
#[Id, Column]
|
||||
public int $gameId = 0;
|
||||
|
||||
#[Column(name: 'uuid')]
|
||||
public string $uuid = '';
|
||||
|
||||
#[Column]
|
||||
public bool $isRed = false;
|
||||
|
||||
#[Column]
|
||||
public string $redName = '';
|
||||
|
||||
#[Column]
|
||||
public string $blueName = '';
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?string $redAvatarPath = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?string $blueAvatarPath = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?int $redPoints = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?int $bluePoints = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?bool $redExplodedBomb = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?bool $blueExplodedBomb = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
public ?string $resign = null;
|
||||
|
||||
#[Column]
|
||||
public float $redBonusPoints = 0.0;
|
||||
|
||||
#[Column]
|
||||
public float $blueBonusPoints = 0.0;
|
||||
|
||||
#[Column(type: Types::JSON)]
|
||||
public array $redBonusStats = [];
|
||||
|
||||
#[Column(type: Types::JSON)]
|
||||
public array $blueBonusStats = [];
|
||||
|
||||
#[Column]
|
||||
public string $result = 'draw';
|
||||
|
||||
#[Column]
|
||||
public bool $oppIsGuest = false;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
public ?DateTime $created = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
public ?DateTime $updated = null;
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
<?php declare(strict_types=1);
|
||||
/*
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
* Copyright (c) 2019 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -27,108 +27,32 @@ use Doctrine\ORM\Mapping\ManyToOne;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
#[Entity(repositoryClass: StepRepository::class)]
|
||||
class Step
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[Column(length: 3)]
|
||||
private ?int $row = null;
|
||||
public ?int $row = null;
|
||||
|
||||
#[Column(length: 3)]
|
||||
private ?int $col = null;
|
||||
public ?int $col = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?bool $wBomb = null;
|
||||
public ?bool $wBomb = null;
|
||||
|
||||
#[Column(length: 10, nullable: true)]
|
||||
private ?string $player = null;
|
||||
public ?string $player = null;
|
||||
|
||||
#[Column(type: Types::JSON, nullable: true)]
|
||||
private ?array $revealedCells = null;
|
||||
public ?array $revealedCells = null;
|
||||
|
||||
#[ManyToOne(inversedBy: 'steps')]
|
||||
private ?PlayedGame $playedGame = null;
|
||||
public ?PlayedGame $playedGame = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
private ?DateTime $created = null;
|
||||
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getRow(): ?int
|
||||
{
|
||||
return $this->row;
|
||||
}
|
||||
|
||||
public function setRow(?int $row): void
|
||||
{
|
||||
$this->row = $row;
|
||||
}
|
||||
|
||||
public function getCol(): ?int
|
||||
{
|
||||
return $this->col;
|
||||
}
|
||||
|
||||
public function setCol(?int $col): void
|
||||
{
|
||||
$this->col = $col;
|
||||
}
|
||||
|
||||
public function getWBomb(): ?bool
|
||||
{
|
||||
return $this->wBomb;
|
||||
}
|
||||
|
||||
public function setWBomb(?bool $wBomb): void
|
||||
{
|
||||
$this->wBomb = $wBomb;
|
||||
}
|
||||
|
||||
public function getPlayer(): ?string
|
||||
{
|
||||
return $this->player;
|
||||
}
|
||||
|
||||
public function setPlayer(?string $player): void
|
||||
{
|
||||
$this->player = $player;
|
||||
}
|
||||
|
||||
public function getRevealedCells(): ?array
|
||||
{
|
||||
return $this->revealedCells;
|
||||
}
|
||||
|
||||
public function setRevealedCells(?array $revealedCells): void
|
||||
{
|
||||
$this->revealedCells = $revealedCells;
|
||||
}
|
||||
|
||||
public function getPlayedGame(): ?PlayedGame
|
||||
{
|
||||
return $this->playedGame;
|
||||
}
|
||||
|
||||
public function setPlayedGame(?PlayedGame $playedGame): void
|
||||
{
|
||||
$this->playedGame = $playedGame;
|
||||
}
|
||||
|
||||
public function getCreated(): ?DateTime
|
||||
{
|
||||
return $this->created;
|
||||
}
|
||||
|
||||
public function setCreated(?DateTime $created): void
|
||||
{
|
||||
$this->created = $created;
|
||||
}
|
||||
public ?DateTime $created = null;
|
||||
}
|
||||
|
||||
@@ -36,68 +36,59 @@ use Symfony\Component\Security\Core\User\UserInterface;
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
*/
|
||||
#[Table(name: 'app_user')]
|
||||
#[Entity(repositoryClass: UserRepository::class)]
|
||||
#[Entity(repositoryClass: UserRepository::class), Table(name: 'app_user')]
|
||||
#[UniqueEntity(fields: ['username'], message: 'This username is already taken.')]
|
||||
#[UniqueEntity(fields: ['email'], message: 'This email address is already registered.')]
|
||||
class User implements UserInterface, PasswordAuthenticatedUserInterface, TotpTwoFactorInterface, BackupCodeInterface
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[Column(length: 180, unique: true)]
|
||||
private ?string $username = null;
|
||||
public ?string $username = null;
|
||||
|
||||
#[Column]
|
||||
private array $roles = [];
|
||||
public array $roles = [];
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?string $password = null;
|
||||
public ?string $password = null;
|
||||
|
||||
#[Column(length: 254, unique: true, nullable: true)]
|
||||
private ?string $email = null;
|
||||
public ?string $email = null;
|
||||
|
||||
#[Column]
|
||||
private bool $isVerified = false;
|
||||
public bool $isVerified = false;
|
||||
|
||||
#[Column(length: 64, nullable: true)]
|
||||
private ?string $verificationToken = null;
|
||||
public ?string $verificationToken = null;
|
||||
|
||||
#[Column(length: 64, nullable: true)]
|
||||
private ?string $resetToken = null;
|
||||
public ?string $resetToken = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
private ?DateTime $resetTokenExpiresAt = null;
|
||||
public ?DateTime $resetTokenExpiresAt = null;
|
||||
|
||||
#[Column(length: 255, nullable: true)]
|
||||
private ?string $totpSecret = null;
|
||||
public ?string $totpSecret = null;
|
||||
|
||||
/** Stored as nullable JSON; the get hook always exposes a non-null array. */
|
||||
#[Column(type: Types::JSON, nullable: true)]
|
||||
private ?array $backupCodes = [];
|
||||
public ?array $backupCodes = [] {
|
||||
get => $this->backupCodes ?? [];
|
||||
}
|
||||
|
||||
#[Column(length: 255, nullable: true)]
|
||||
private ?string $avatarPath = null;
|
||||
public ?string $avatarPath = null;
|
||||
|
||||
#[Column(nullable: true)]
|
||||
private ?bool $consentGiven = null;
|
||||
public ?bool $consentGiven = null;
|
||||
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getUsername(): ?string
|
||||
{
|
||||
return $this->username;
|
||||
}
|
||||
|
||||
public function setUsername(string $username): self
|
||||
{
|
||||
$this->username = $username;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getUserIdentifier(): string
|
||||
{
|
||||
return (string)$this->username;
|
||||
@@ -105,15 +96,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, TotpTwo
|
||||
|
||||
public function getRoles(): array
|
||||
{
|
||||
$roles = $this->roles;
|
||||
$roles[] = 'ROLE_USER';
|
||||
return array_unique($roles);
|
||||
}
|
||||
|
||||
public function setRoles(array $roles): self
|
||||
{
|
||||
$this->roles = $roles;
|
||||
return $this;
|
||||
return array_unique([...$this->roles, 'ROLE_USER']);
|
||||
}
|
||||
|
||||
public function getPassword(): ?string
|
||||
@@ -121,82 +104,10 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, TotpTwo
|
||||
return $this->password;
|
||||
}
|
||||
|
||||
public function setPassword(?string $password): self
|
||||
{
|
||||
$this->password = $password;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function eraseCredentials(): void
|
||||
{
|
||||
}
|
||||
|
||||
public function getEmail(): ?string
|
||||
{
|
||||
return $this->email;
|
||||
}
|
||||
|
||||
public function setEmail(?string $email): self
|
||||
{
|
||||
$this->email = $email;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isVerified(): bool
|
||||
{
|
||||
return $this->isVerified;
|
||||
}
|
||||
|
||||
public function setIsVerified(bool $isVerified): self
|
||||
{
|
||||
$this->isVerified = $isVerified;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getVerificationToken(): ?string
|
||||
{
|
||||
return $this->verificationToken;
|
||||
}
|
||||
|
||||
public function setVerificationToken(?string $verificationToken): self
|
||||
{
|
||||
$this->verificationToken = $verificationToken;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getResetToken(): ?string
|
||||
{
|
||||
return $this->resetToken;
|
||||
}
|
||||
|
||||
public function setResetToken(?string $resetToken): self
|
||||
{
|
||||
$this->resetToken = $resetToken;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getResetTokenExpiresAt(): ?DateTime
|
||||
{
|
||||
return $this->resetTokenExpiresAt;
|
||||
}
|
||||
|
||||
public function setResetTokenExpiresAt(?DateTime $resetTokenExpiresAt): self
|
||||
{
|
||||
$this->resetTokenExpiresAt = $resetTokenExpiresAt;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getAvatarPath(): ?string
|
||||
{
|
||||
return $this->avatarPath;
|
||||
}
|
||||
|
||||
public function setAvatarPath(?string $avatarPath): self
|
||||
{
|
||||
$this->avatarPath = $avatarPath;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isTotpAuthenticationEnabled(): bool
|
||||
{
|
||||
return null !== $this->totpSecret;
|
||||
@@ -215,46 +126,13 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, TotpTwo
|
||||
return new TotpConfiguration($this->totpSecret, TotpConfiguration::ALGORITHM_SHA1, 30, 6);
|
||||
}
|
||||
|
||||
public function getTotpSecret(): ?string
|
||||
{
|
||||
return $this->totpSecret;
|
||||
}
|
||||
|
||||
public function setTotpSecret(?string $totpSecret): self
|
||||
{
|
||||
$this->totpSecret = $totpSecret;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isBackupCode(string $code): bool
|
||||
{
|
||||
return \in_array($code, $this->backupCodes ?? [], true);
|
||||
return \in_array($code, $this->backupCodes, true);
|
||||
}
|
||||
|
||||
public function invalidateBackupCode(string $code): void
|
||||
{
|
||||
$this->backupCodes = array_values(array_filter($this->backupCodes ?? [], fn($c) => $c !== $code));
|
||||
}
|
||||
|
||||
public function getBackupCodes(): array
|
||||
{
|
||||
return $this->backupCodes ?? [];
|
||||
}
|
||||
|
||||
public function setBackupCodes(array $backupCodes): self
|
||||
{
|
||||
$this->backupCodes = $backupCodes;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isConsentGiven(): ?bool
|
||||
{
|
||||
return $this->consentGiven;
|
||||
}
|
||||
|
||||
public function setConsentGiven(?bool $consentGiven): self
|
||||
{
|
||||
$this->consentGiven = $consentGiven;
|
||||
return $this;
|
||||
$this->backupCodes = array_values(array_filter($this->backupCodes, fn($c) => $c !== $code));
|
||||
}
|
||||
}
|
||||
|
||||
89
src/Entity/UserStats.php
Normal file
89
src/Entity/UserStats.php
Normal file
@@ -0,0 +1,89 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Entity;
|
||||
|
||||
use App\Repository\UserStatsRepository;
|
||||
use DateTime;
|
||||
use Doctrine\DBAL\Types\Types;
|
||||
use Doctrine\ORM\Mapping\Column;
|
||||
use Doctrine\ORM\Mapping\Entity;
|
||||
use Doctrine\ORM\Mapping\Id;
|
||||
use Doctrine\ORM\Mapping\Table;
|
||||
|
||||
/**
|
||||
* Class UserStats
|
||||
*
|
||||
* Read-only entity mapped to the user_stats materialized view.
|
||||
*
|
||||
* @package App\Entity
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
#[Entity(repositoryClass: UserStatsRepository::class, readOnly: true)]
|
||||
class UserStats
|
||||
{
|
||||
#[Id, Column(name: 'user_id')]
|
||||
public int $userId = 0;
|
||||
|
||||
#[Column]
|
||||
public int $totalGames = 0;
|
||||
|
||||
#[Column]
|
||||
public int $wins = 0;
|
||||
|
||||
#[Column]
|
||||
public int $losses = 0;
|
||||
|
||||
#[Column]
|
||||
public int $draws = 0;
|
||||
|
||||
#[Column]
|
||||
public int $totalMines = 0;
|
||||
|
||||
#[Column(type: Types::DECIMAL, precision: 10, scale: 1)]
|
||||
public string $totalBonusPoints = '0.0';
|
||||
|
||||
#[Column(type: Types::DECIMAL, precision: 10, scale: 1)]
|
||||
public string $avgBonus = '0.0';
|
||||
|
||||
#[Column]
|
||||
public int $bestChain = 0;
|
||||
|
||||
#[Column]
|
||||
public int $blindHits = 0;
|
||||
|
||||
#[Column]
|
||||
public int $edgeMines = 0;
|
||||
|
||||
#[Column]
|
||||
public int $gamesWithScores = 0;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
public ?DateTime $lastGameAt = null;
|
||||
|
||||
|
||||
public function getWinRate(): int
|
||||
{
|
||||
return $this->gamesWithScores > 0
|
||||
? (int)round($this->wins / $this->gamesWithScores * 100)
|
||||
: 0;
|
||||
}
|
||||
|
||||
public function getAvgScore(): int
|
||||
{
|
||||
return $this->gamesWithScores > 0
|
||||
? (int)round($this->totalMines / $this->gamesWithScores)
|
||||
: 0;
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,8 @@ use Doctrine\ORM\Mapping\Id;
|
||||
use Doctrine\ORM\Mapping\JoinColumn;
|
||||
use Doctrine\ORM\Mapping\ManyToOne;
|
||||
use Doctrine\ORM\Mapping\Table;
|
||||
use JsonException;
|
||||
use RuntimeException;
|
||||
|
||||
/**
|
||||
* Class WebAuthnCredential
|
||||
@@ -31,34 +33,33 @@ use Doctrine\ORM\Mapping\Table;
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 12.
|
||||
*/
|
||||
#[Table(name: 'app_webauthn_credential')]
|
||||
#[Entity(repositoryClass: WebAuthnCredentialRepository::class)]
|
||||
#[Entity(repositoryClass: WebAuthnCredentialRepository::class), Table(name: 'app_webauthn_credential')]
|
||||
class WebAuthnCredential
|
||||
{
|
||||
#[Id, GeneratedValue, Column]
|
||||
private ?int $id = null;
|
||||
public private(set) ?int $id = null;
|
||||
|
||||
#[ManyToOne(targetEntity: User::class)]
|
||||
#[JoinColumn(nullable: false, onDelete: 'CASCADE')]
|
||||
private ?User $user = null;
|
||||
public ?User $user = null;
|
||||
|
||||
#[Column(type: Types::TEXT)]
|
||||
private ?string $credentialData = null;
|
||||
public ?string $credentialData = null;
|
||||
|
||||
#[Column(length: 255)]
|
||||
private ?string $credentialName = null;
|
||||
public ?string $credentialName = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE)]
|
||||
private ?DateTime $createdAt = null;
|
||||
public ?DateTime $createdAt = null;
|
||||
|
||||
#[Column(type: Types::DATETIME_MUTABLE, nullable: true)]
|
||||
private ?DateTime $lastUsedAt = null;
|
||||
public ?DateTime $lastUsedAt = null;
|
||||
|
||||
#[Column]
|
||||
private bool $isBackupEligible = false;
|
||||
public bool $isBackupEligible = false;
|
||||
|
||||
#[Column]
|
||||
private bool $isBackupAuthenticated = false;
|
||||
public bool $isBackupAuthenticated = false;
|
||||
|
||||
|
||||
public function __construct()
|
||||
@@ -66,106 +67,27 @@ class WebAuthnCredential
|
||||
$this->createdAt = new DateTime();
|
||||
}
|
||||
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
||||
public function getUser(): ?User
|
||||
{
|
||||
return $this->user;
|
||||
}
|
||||
|
||||
public function setUser(?User $user): self
|
||||
{
|
||||
$this->user = $user;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCredentialData(): ?string
|
||||
{
|
||||
return $this->credentialData;
|
||||
}
|
||||
|
||||
public function setCredentialData(?string $credentialData): self
|
||||
{
|
||||
$this->credentialData = $credentialData;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCredentialName(): ?string
|
||||
{
|
||||
return $this->credentialName;
|
||||
}
|
||||
|
||||
public function setCredentialName(?string $credentialName): self
|
||||
{
|
||||
$this->credentialName = $credentialName;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getCreatedAt(): ?DateTime
|
||||
{
|
||||
return $this->createdAt;
|
||||
}
|
||||
|
||||
public function setCreatedAt(?DateTime $createdAt): self
|
||||
{
|
||||
$this->createdAt = $createdAt;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getLastUsedAt(): ?DateTime
|
||||
{
|
||||
return $this->lastUsedAt;
|
||||
}
|
||||
|
||||
public function setLastUsedAt(?DateTime $lastUsedAt): self
|
||||
{
|
||||
$this->lastUsedAt = $lastUsedAt;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isBackupEligible(): bool
|
||||
{
|
||||
return $this->isBackupEligible;
|
||||
}
|
||||
|
||||
public function setBackupEligible(bool $isBackupEligible): self
|
||||
{
|
||||
$this->isBackupEligible = $isBackupEligible;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function isBackupAuthenticated(): bool
|
||||
{
|
||||
return $this->isBackupAuthenticated;
|
||||
}
|
||||
|
||||
public function setBackupAuthenticated(bool $isBackupAuthenticated): self
|
||||
{
|
||||
$this->isBackupAuthenticated = $isBackupAuthenticated;
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function getPublicKeyCredentialSource()
|
||||
{
|
||||
// Return the raw credential data (JSON decoded)
|
||||
if ($this->credentialData === null) {
|
||||
return null;
|
||||
}
|
||||
return json_decode($this->credentialData, true);
|
||||
|
||||
try {
|
||||
return json_decode($this->credentialData, true, 512, JSON_THROW_ON_ERROR);
|
||||
} catch (JsonException $e) {
|
||||
throw new RuntimeException("Unable to parse JSON: {$e->getMessage()}");
|
||||
}
|
||||
}
|
||||
|
||||
public function setPublicKeyCredentialSource($source): self
|
||||
{
|
||||
// Handle both array and object input
|
||||
if (is_array($source)) {
|
||||
$this->credentialData = json_encode($source);
|
||||
} else {
|
||||
$this->credentialData = (string)$source;
|
||||
try {
|
||||
$this->credentialData = is_array($source) ? json_encode($source, JSON_THROW_ON_ERROR) : (string)$source;
|
||||
} catch (JsonException $e) {
|
||||
throw new RuntimeException("Unable to encode JSON: {$e->getMessage()}");
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
63
src/Migrations/2026/04/Version20260419195925.php
Normal file
63
src/Migrations/2026/04/Version20260419195925.php
Normal file
@@ -0,0 +1,63 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Class Version20260419195925
|
||||
*
|
||||
* @package App\Migrations
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 19.
|
||||
*/
|
||||
final class Version20260419195925 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return <<<OUT
|
||||
Upgrade all primary keys to use IDENTITY generation strategy, and add comments to some columns.
|
||||
This is \'cause the Doctrine updgrade.
|
||||
OUT;
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE app_user ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('ALTER TABLE app_webauthn_credential ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('ALTER TABLE contact_messages ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('COMMENT ON COLUMN contact_messages.created_at IS \'\'');
|
||||
$this->addSql('ALTER TABLE gamer ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('ALTER TABLE grid ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('ALTER TABLE grid_row ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('ALTER TABLE played_game ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
$this->addSql('COMMENT ON COLUMN played_game.uuid IS \'\'');
|
||||
$this->addSql('ALTER TABLE step ALTER id ADD GENERATED BY DEFAULT AS IDENTITY');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('ALTER TABLE app_user ALTER id DROP IDENTITY');
|
||||
$this->addSql('ALTER TABLE app_webauthn_credential ALTER id DROP IDENTITY');
|
||||
$this->addSql('ALTER TABLE contact_messages ALTER id DROP IDENTITY');
|
||||
$this->addSql('COMMENT ON COLUMN contact_messages.created_at IS \'(DC2Type:datetime_immutable)\'');
|
||||
$this->addSql('ALTER TABLE gamer ALTER id DROP IDENTITY');
|
||||
$this->addSql('ALTER TABLE grid ALTER id DROP IDENTITY');
|
||||
$this->addSql('ALTER TABLE grid_row ALTER id DROP IDENTITY');
|
||||
$this->addSql('ALTER TABLE played_game ALTER id DROP IDENTITY');
|
||||
$this->addSql('COMMENT ON COLUMN played_game.uuid IS \'(DC2Type:uuid)\'');
|
||||
$this->addSql('ALTER TABLE step ALTER id DROP IDENTITY');
|
||||
}
|
||||
}
|
||||
66
src/Migrations/2026/04/Version20260420064216.php
Normal file
66
src/Migrations/2026/04/Version20260420064216.php
Normal file
@@ -0,0 +1,66 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Class Version20260420064216
|
||||
*
|
||||
* Realign each PostgreSQL IDENTITY counter to MAX(id)+1.
|
||||
*
|
||||
* Required because Version20260419195925 converted the ID columns from sequences to
|
||||
* GENERATED BY DEFAULT AS IDENTITY (DBAL 4 / ORM 3 default), but PostgreSQL starts
|
||||
* the new IDENTITY counter at 1 instead of inheriting the old sequence's last_value.
|
||||
* The first INSERT on every table thus produced a duplicate-key collision.
|
||||
*
|
||||
* @package App\Migrations
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final class Version20260420064216 extends AbstractMigration
|
||||
{
|
||||
private const TABLES = [
|
||||
'played_game',
|
||||
'grid',
|
||||
'grid_row',
|
||||
'step',
|
||||
'app_user',
|
||||
'app_webauthn_credential',
|
||||
'gamer',
|
||||
'contact_messages',
|
||||
];
|
||||
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Realign IDENTITY counters to MAX(id)+1 after the sequence-to-identity conversion.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
foreach (self::TABLES as $table) {
|
||||
$this->addSql(sprintf(
|
||||
"SELECT setval(pg_get_serial_sequence('%s', 'id'), COALESCE((SELECT MAX(id) FROM %s), 0) + 1, false)",
|
||||
$table,
|
||||
$table,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->throwIrreversibleMigrationException('Identity counter realignment cannot be reversed safely.');
|
||||
}
|
||||
}
|
||||
117
src/Migrations/2026/04/Version20260420120000.php
Normal file
117
src/Migrations/2026/04/Version20260420120000.php
Normal file
@@ -0,0 +1,117 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Class Version20260420120000
|
||||
*
|
||||
* Creates user_stats materialized view for ProfileController optimization.
|
||||
*
|
||||
* @package App\Migrations
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final class Version20260420120000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Create user_stats materialized view for profile statistics.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('
|
||||
CREATE MATERIALIZED VIEW user_stats AS
|
||||
SELECT
|
||||
u.id AS user_id,
|
||||
COUNT(CASE WHEN pg.red_id = u.id OR pg.blue_id = u.id THEN 1 END) AS total_games,
|
||||
COUNT(CASE WHEN
|
||||
pg.red_id = u.id AND (pg.red_points > pg.blue_points AND pg.resign IS NULL)
|
||||
OR pg.blue_id = u.id AND (pg.blue_points > pg.red_points AND pg.resign IS NULL)
|
||||
OR pg.red_id = u.id AND pg.resign = \'blue\'
|
||||
OR pg.blue_id = u.id AND pg.resign = \'red\'
|
||||
THEN 1 END) AS wins,
|
||||
COUNT(CASE WHEN
|
||||
pg.red_id = u.id AND (pg.blue_points > pg.red_points AND pg.resign IS NULL)
|
||||
OR pg.blue_id = u.id AND (pg.red_points > pg.blue_points AND pg.resign IS NULL)
|
||||
OR pg.red_id = u.id AND pg.resign = \'red\'
|
||||
OR pg.blue_id = u.id AND pg.resign = \'blue\'
|
||||
THEN 1 END) AS losses,
|
||||
COUNT(CASE WHEN
|
||||
(pg.red_id = u.id OR pg.blue_id = u.id)
|
||||
AND pg.red_points IS NOT NULL
|
||||
AND pg.blue_points IS NOT NULL
|
||||
AND pg.resign IS NULL
|
||||
AND pg.red_points = pg.blue_points
|
||||
THEN 1 END) AS draws,
|
||||
COALESCE(SUM(
|
||||
CASE WHEN pg.red_id = u.id THEN pg.red_points ELSE pg.blue_points END
|
||||
), 0) AS total_mines,
|
||||
COALESCE(SUM(
|
||||
CASE WHEN pg.red_id = u.id THEN pg.red_bonus_points ELSE pg.blue_bonus_points END
|
||||
), 0)::numeric(10,1) AS total_bonus_points,
|
||||
COALESCE(AVG(
|
||||
CASE WHEN pg.red_id = u.id THEN pg.red_bonus_points ELSE pg.blue_bonus_points END
|
||||
), 0)::numeric(10,1) AS avg_bonus,
|
||||
COALESCE(MAX(
|
||||
CASE WHEN pg.red_id = u.id THEN (pg.red_bonus_stats->>\'chainBest\')::int ELSE (pg.blue_bonus_stats->>\'chainBest\')::int END
|
||||
), 0) AS best_chain,
|
||||
COALESCE(SUM(
|
||||
CASE WHEN pg.red_id = u.id THEN (pg.red_bonus_stats->>\'blindHits\')::int ELSE (pg.blue_bonus_stats->>\'blindHits\')::int END
|
||||
), 0) AS blind_hits,
|
||||
COALESCE(SUM(
|
||||
CASE WHEN pg.red_id = u.id THEN (pg.red_bonus_stats->>\'edgeMines\')::int ELSE (pg.blue_bonus_stats->>\'edgeMines\')::int END
|
||||
), 0) AS edge_mines,
|
||||
COUNT(CASE WHEN
|
||||
pg.red_id = u.id AND pg.red_points IS NOT NULL
|
||||
OR pg.blue_id = u.id AND pg.blue_points IS NOT NULL
|
||||
THEN 1 END) AS games_with_scores,
|
||||
MAX(pg.updated) AS last_game_at
|
||||
FROM app_user u
|
||||
LEFT JOIN played_game pg ON (pg.red_id = u.id OR pg.blue_id = u.id)
|
||||
AND (pg.red_points IS NOT NULL OR pg.blue_points IS NOT NULL OR pg.resign IS NOT NULL)
|
||||
GROUP BY u.id
|
||||
');
|
||||
|
||||
$this->addSql('CREATE UNIQUE INDEX idx_user_stats_user_id ON user_stats (user_id)');
|
||||
$this->addSql('CREATE INDEX idx_user_stats_last_game_at ON user_stats (last_game_at DESC)');
|
||||
|
||||
$this->addSql('
|
||||
CREATE OR REPLACE FUNCTION refresh_user_stats()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
REFRESH MATERIALIZED VIEW CONCURRENTLY user_stats;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql
|
||||
');
|
||||
|
||||
$this->addSql('
|
||||
CREATE TRIGGER trigger_refresh_user_stats
|
||||
AFTER INSERT OR UPDATE OR DELETE ON played_game
|
||||
FOR EACH STATEMENT
|
||||
EXECUTE FUNCTION refresh_user_stats()
|
||||
');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('DROP TRIGGER IF EXISTS trigger_refresh_user_stats ON played_game');
|
||||
$this->addSql('DROP FUNCTION IF EXISTS refresh_user_stats()');
|
||||
$this->addSql('DROP MATERIALIZED VIEW IF EXISTS user_stats');
|
||||
}
|
||||
}
|
||||
124
src/Migrations/2026/04/Version20260420130000.php
Normal file
124
src/Migrations/2026/04/Version20260420130000.php
Normal file
@@ -0,0 +1,124 @@
|
||||
<?php declare(strict_types=1);
|
||||
/**
|
||||
* This file is part of the SplendidBear Websites' projects.
|
||||
*
|
||||
* Copyright (c) 2026 @ www.splendidbear.org
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace App\Migrations;
|
||||
|
||||
use Doctrine\DBAL\Schema\Schema;
|
||||
use Doctrine\Migrations\AbstractMigration;
|
||||
|
||||
/**
|
||||
* Class Version20260420130000
|
||||
*
|
||||
* Creates recent_battles materialized view for ProfileController optimization.
|
||||
*
|
||||
* @package App\Migrations
|
||||
* @author Lang <https://www.splendidbear.org>
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 20.
|
||||
*/
|
||||
final class Version20260420130000 extends AbstractMigration
|
||||
{
|
||||
public function getDescription(): string
|
||||
{
|
||||
return 'Create recent_battles materialized view for profile recent games list.';
|
||||
}
|
||||
|
||||
public function up(Schema $schema): void
|
||||
{
|
||||
$this->addSql('
|
||||
CREATE MATERIALIZED VIEW recent_battles AS
|
||||
SELECT
|
||||
pg.id AS game_id,
|
||||
pg.uuid::text AS uuid,
|
||||
u.id AS user_id,
|
||||
CASE WHEN pg.red_id = u.id THEN true ELSE false END AS is_red,
|
||||
|
||||
COALESCE(ru.username, ra.user_name, \'Guest\') AS red_name,
|
||||
COALESCE(bu.username, ba.user_name, \'Guest\') AS blue_name,
|
||||
|
||||
ru.avatar_path AS red_avatar_path,
|
||||
bu.avatar_path AS blue_avatar_path,
|
||||
|
||||
pg.red_points,
|
||||
pg.blue_points,
|
||||
pg.red_exploded_bomb,
|
||||
pg.blue_exploded_bomb,
|
||||
pg.resign,
|
||||
|
||||
COALESCE(pg.red_bonus_points, 0.0) AS red_bonus_points,
|
||||
COALESCE(pg.blue_bonus_points, 0.0) AS blue_bonus_points,
|
||||
COALESCE(pg.red_bonus_stats, \'[]\'::json) AS red_bonus_stats,
|
||||
COALESCE(pg.blue_bonus_stats, \'[]\'::json) AS blue_bonus_stats,
|
||||
|
||||
CASE
|
||||
WHEN pg.red_id = u.id AND pg.resign = \'red\' THEN \'loss\'
|
||||
WHEN pg.blue_id = u.id AND pg.resign = \'blue\' THEN \'loss\'
|
||||
WHEN pg.red_id = u.id AND pg.resign = \'blue\' THEN \'win\'
|
||||
WHEN pg.blue_id = u.id AND pg.resign = \'red\' THEN \'win\'
|
||||
WHEN pg.red_id = u.id AND pg.red_points IS NOT NULL AND pg.blue_points IS NOT NULL
|
||||
AND pg.red_points > pg.blue_points THEN \'win\'
|
||||
WHEN pg.blue_id = u.id AND pg.blue_points IS NOT NULL AND pg.red_points IS NOT NULL
|
||||
AND pg.blue_points > pg.red_points THEN \'win\'
|
||||
WHEN pg.red_id = u.id AND pg.red_points IS NOT NULL AND pg.blue_points IS NOT NULL
|
||||
AND pg.red_points < pg.blue_points THEN \'loss\'
|
||||
WHEN pg.blue_id = u.id AND pg.blue_points IS NOT NULL AND pg.red_points IS NOT NULL
|
||||
AND pg.blue_points < pg.red_points THEN \'loss\'
|
||||
ELSE \'draw\'
|
||||
END AS result,
|
||||
|
||||
-- Whether the opponent in this game is an anonymous guest (no app_user account)
|
||||
CASE
|
||||
WHEN pg.red_id = u.id AND pg.blue_id IS NULL THEN true
|
||||
WHEN pg.blue_id = u.id AND pg.red_id IS NULL THEN true
|
||||
ELSE false
|
||||
END AS opp_is_guest,
|
||||
|
||||
pg.created,
|
||||
pg.updated
|
||||
FROM app_user u
|
||||
JOIN played_game pg
|
||||
ON pg.red_id = u.id
|
||||
OR pg.blue_id = u.id
|
||||
LEFT JOIN app_user ru ON ru.id = pg.red_id
|
||||
LEFT JOIN app_user bu ON bu.id = pg.blue_id
|
||||
LEFT JOIN gamer ra ON ra.id = pg.red_anon
|
||||
LEFT JOIN gamer ba ON ba.id = pg.blue_anon
|
||||
');
|
||||
|
||||
$this->addSql('CREATE UNIQUE INDEX idx_recent_battles_pk ON recent_battles (user_id, game_id)');
|
||||
$this->addSql('CREATE INDEX idx_recent_battles_user_upd ON recent_battles (user_id, updated DESC)');
|
||||
|
||||
$this->addSql('
|
||||
CREATE OR REPLACE FUNCTION refresh_recent_battles()
|
||||
RETURNS TRIGGER AS $$
|
||||
BEGIN
|
||||
REFRESH MATERIALIZED VIEW CONCURRENTLY recent_battles;
|
||||
RETURN NULL;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql
|
||||
');
|
||||
|
||||
$this->addSql('
|
||||
CREATE TRIGGER trigger_refresh_recent_battles
|
||||
AFTER INSERT OR UPDATE OR DELETE ON played_game
|
||||
FOR EACH STATEMENT
|
||||
EXECUTE FUNCTION refresh_recent_battles()
|
||||
');
|
||||
}
|
||||
|
||||
public function down(Schema $schema): void
|
||||
{
|
||||
$this->addSql('DROP TRIGGER IF EXISTS trigger_refresh_recent_battles ON played_game');
|
||||
$this->addSql('DROP FUNCTION IF EXISTS refresh_recent_battles()');
|
||||
$this->addSql('DROP MATERIALIZED VIEW IF EXISTS recent_battles');
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,7 @@ use Doctrine\Persistence\ManagerRegistry;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*/
|
||||
class GamerRepository extends ServiceEntityRepository
|
||||
{
|
||||
|
||||
@@ -22,7 +22,7 @@ use Doctrine\Persistence\ManagerRegistry;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*
|
||||
* @method Grid|null find($id, $lockMode = null, $lockVersion = null)
|
||||
* @method Grid|null findOneBy(array $criteria, array $orderBy = null)
|
||||
|
||||
@@ -22,7 +22,7 @@ use Doctrine\Persistence\ManagerRegistry;
|
||||
* @category Class
|
||||
* @license https://www.gnu.org/licenses/lgpl-3.0.en.html GNU Lesser General Public License
|
||||
* @link www.splendidbear.org
|
||||
* @since 2026. 04. 09.
|
||||
* @since 2019. 10. 27.
|
||||
*
|
||||
* @method GridRow|null find($id, $lockMode = null, $lockVersion = null)
|
||||
* @method GridRow|null findOneBy(array $criteria, array $orderBy = null)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user