Upstream
/
Plan
mirror of https://github.com/plan-player-analytics/Plan.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

5.5.1969

This commit is contained in:
AuroraLS3 2022-09-25 08:31:21 +00:00
parent 8b85936912
commit 5d0d34ba7e
5 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plan/src/main/resources/assets/plan/plan/web/login.html
View File

@ -37,7 +37,7 @@
if (user.length > 50) {
return displayError('Username can be up to 50 characters, yours is ' + user.length);
}
const password = $('#inputPassword').val();
const password = $('#inputPass').val();
if (!password || password.length < 1) {
return displayError('You need to specify a Password');
}
@ -46,7 +46,7 @@
if (error.includes("HTTP 403")) {
location.reload();
}
$('#inputPassword').val("");
$('#inputPass').val("");
return displayError('Login failed: ' + error);
}
if (json && json.success) {
@ -93,7 +93,7 @@
</div>
<div class="mb-3">
<input autocomplete="current-password" class="form-control form-control-user"
id="inputPassword" placeholder="Password"
id="inputPass" placeholder="Password"
type="password">
</div>
<button class="btn bg-plan btn-user w-100" href="#" id="login-button">

4
Plan/src/main/resources/assets/plan/plan/web/register.html
View File

@ -58,7 +58,7 @@
</div>
<div class="mb-3">
<input autocomplete="new-password" class="form-control form-control-user"
id="inputPassword" placeholder="Password" type="password">
id="inputPass" placeholder="Password" type="password">
<div class="form-text" id="passwordHelpBlock">
Password should be more than 8 characters, but there are no limitations.
</div>
@ -216,7 +216,7 @@
if (user.length > 50) {
return displayError('Username can be up to 50 characters, yours is ' + user.length);
}
const password = $('#inputPassword').val();
const password = $('#inputPass').val();
if (!password || password.length < 1) {
return displayError('You need to specify a Password');
}

8
react/dashboard/dashboard/package.json
View File

@ -26,19 +26,19 @@
"highcharts": "^10.2.1",
"i18next": "^21.9.1",
"i18next-chained-backend": "^3.1.0",
"i18next-http-backend": "^1.4.1",
"i18next-http-backend": "^1.4.4",
"i18next-localstorage-backend": "^3.1.3",
"masonry-layout": "^4.2.2",
"react": "^17.0.2",
"react-bootstrap-v5": "^1.4.0",
"react-dom": "^17.0.2",
"react-i18next": "^11.18.5",
"react-i18next": "^11.18.6",
"react-router-dom": "6",
"react-scripts": "5.0.1",
"sass": "^1.54.9",
"source-map-explorer": "^2.5.2",
"swagger-ui": "^4.14.0",
"web-vitals": "^3.0.1"
"swagger-ui": "^4.14.1",
"web-vitals": "^3.0.2"
},
"scripts": {
"start": "react-scripts start",

5
react/dashboard/dashboard/src/components/cards/common/PlayerListCard.js
View File

@ -5,6 +5,7 @@ import React, {useEffect, useState} from "react";
import {faUsers} from "@fortawesome/free-solid-svg-icons";
import DataTablesTable from "../../table/DataTablesTable";
import {CardLoader} from "../../navigation/Loader";
import {baseAddress} from "../../../service/backendConfiguration";
const PlayerListCard = ({data}) => {
const {t} = useTranslation();
@ -13,7 +14,9 @@ const PlayerListCard = ({data}) => {
useEffect(() => {
if (!data) return;
for (const row of data.data) {
row.name = row.name.replace('../player/', '../../player/');
row.name = row.name
.replace('../player/', baseAddress + '/player/')
.replace('./player/', baseAddress + '/player/');
}
setOptions({

32
react/dashboard/dashboard/yarn.lock
View File

@ -5041,10 +5041,10 @@ i18next-chained-backend@^3.1.0:
dependencies:
"@babel/runtime" "^7.18.9"
i18next-http-backend@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.1.tgz#d8d308e7d8c5b89988446d0b83f469361e051bc0"
integrity sha512-s4Q9hK2jS29iyhniMP82z+yYY8riGTrWbnyvsSzi5TaF7Le4E7b5deTmtuaRuab9fdDcYXtcwdBgawZG+JCEjA==
i18next-http-backend@^1.4.4:
version "1.4.4"
resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-1.4.4.tgz#9f372f704975a5e96ce74e4247698bcbd00d148f"
integrity sha512-M4gLPe6JKZ2p1UmE6t4rzWV/sAxgrLThW7ztXAsTpFwFqXoyzhTzX8eYxVv9KjpCQh4K9nwxnEjEi+74C4Thbg==
dependencies:
cross-fetch "3.1.5"
@ -7649,10 +7649,10 @@ react-error-overlay@^6.0.11:
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
react-i18next@^11.18.5:
version "11.18.5"
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.5.tgz#985e87bc66ed1316381b464a4ecfd35a2c951357"
integrity sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==
react-i18next@^11.18.6:
version "11.18.6"
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.18.6.tgz#e159c2960c718c1314f1e8fcaa282d1c8b167887"
integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
dependencies:
"@babel/runtime" "^7.14.5"
html-parse-stringify "^3.0.1"
@ -8725,10 +8725,10 @@ swagger-client@^3.18.5:
traverse "~0.6.6"
url "~0.11.0"
swagger-ui@^4.14.0:
version "4.14.0"
resolved "https://registry.yarnpkg.com/swagger-ui/-/swagger-ui-4.14.0.tgz#7fe6defc408ecd628eb9bd808d97374efcb9915f"
integrity sha512-XQgIw9AK6ZXTXBrSAKiEb/v+xjvgmIWxCBIYr4a0Hr0G2LwV9a024eO38aFCjftug/Jbobfd0JsENVzPIYywyA==
swagger-ui@^4.14.1:
version "4.14.1"
resolved "https://registry.yarnpkg.com/swagger-ui/-/swagger-ui-4.14.1.tgz#09eb93c12ef273cf993a24a14f9623227cbab15b"
integrity sha512-E+szZmG9lBB5jCOXUrh2ip6bysiDcJ+3UbIPfOhN8e70H867Xy8kVDo2F2nXbufACi9ONxtVh3lc4bFy4CLXXA==
dependencies:
"@babel/runtime-corejs3" "^7.18.9"
"@braintree/sanitize-url" "=6.0.0"
@ -9225,10 +9225,10 @@ web-streams-polyfill@4.0.0-beta.1:
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==
web-vitals@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-3.0.1.tgz#7129668af2d1598ff4a574535a46b1432af337c8"
integrity sha512-n8LgBynM5BU4C8ZMiTWPu6zbv31AfPnuNXEjWClvPWD5g8h2WkcecR0EtAiQaiMcj1iG0LADyHndR+MKYu5Zog==
web-vitals@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-3.0.2.tgz#a484109dc5d64bc4924f174267ce20e7cd4c7934"
integrity sha512-YygzeCdGpNrCHIjW14AI4SxMX2IcONhDvwhHc9KswCIixfSeVl08WdKDfzZaypq2ynRIG3lzGO3CO5dXYzc9+w==
webidl-conversions@^3.0.0:
version "3.0.1"