format and verified
continuous-integration/drone/push Build is passing Details

pull/84/head
Maël DAIM 1 year ago
parent dcf118d12b
commit fafe4a1ff4

@ -198,7 +198,6 @@ function EditorView({
<div id="main-div"> <div id="main-div">
<div id="topbar-div"> <div id="topbar-div">
<div id="topbar-left"> <div id="topbar-left">
<SavingState state={saveState} /> <SavingState state={saveState} />
</div> </div>
<div id="title-input-div"> <div id="title-input-div">

@ -36,7 +36,7 @@ class APITacticController {
"name" => [Validators::lenBetween(1, 50), Validators::nameWithSpaces()], "name" => [Validators::lenBetween(1, 50), Validators::nameWithSpaces()],
], function (HttpRequest $request) use ($tactic_id, $account) { ], function (HttpRequest $request) use ($tactic_id, $account) {
$failures = $this->model->updateName($tactic_id, $request["name"], $account->getId()); $failures = $this->model->updateName($tactic_id, $request["name"], $account->getUser()->getId());
if (!empty($failures)) { if (!empty($failures)) {
//TODO find a system to handle Unauthorized error codes more easily from failures. //TODO find a system to handle Unauthorized error codes more easily from failures.

@ -127,14 +127,15 @@ class TeamController {
return ViewHttpResponse::twig('error.html.twig', [ return ViewHttpResponse::twig('error.html.twig', [
'failures' => [ValidationFail::unauthorized("Vous n'avez pas accès à cette équipe.")], 'failures' => [ValidationFail::unauthorized("Vous n'avez pas accès à cette équipe.")],
], HttpCodes::FORBIDDEN); ], HttpCodes::FORBIDDEN);
} } else {
else{
$role = $this->model->isCoach($id, $session->getAccount()->getUser()->getEmail()); $role = $this->model->isCoach($id, $session->getAccount()->getUser()->getEmail());
return ViewHttpResponse::react('views/TeamPanel.tsx', [ return ViewHttpResponse::react(
'views/TeamPanel.tsx',
[
'team' => [ 'team' => [
"info" => $result->getInfo(), "info" => $result->getInfo(),
"members" => $result->listMembers() "members" => $result->listMembers(),
], ],
'isCoach' => $role, 'isCoach' => $role,
'currentUserId' => $session->getAccount()->getUser()->getId()] 'currentUserId' => $session->getAccount()->getUser()->getId()]
@ -214,7 +215,7 @@ class TeamController {
/** /**
* @param int $idTeam * @param int $idTeam
* @param array $request * @param array<string,mixed> $request
* @param SessionHandle $session * @param SessionHandle $session
* @return HttpResponse * @return HttpResponse
*/ */

@ -8,7 +8,6 @@ namespace IQBall\Core\Data;
* to share to other users, or non-needed public information * to share to other users, or non-needed public information
*/ */
class Account { class Account {
/** /**
* @var string string token * @var string string token
*/ */

@ -6,7 +6,6 @@ namespace IQBall\Core\Data;
* information about a team member * information about a team member
*/ */
class Member implements \JsonSerializable { class Member implements \JsonSerializable {
private User $user; private User $user;
/** /**

@ -5,7 +5,6 @@ namespace IQBall\Core\Data;
use _PHPStan_4c4f22f13\Nette\Utils\Json; use _PHPStan_4c4f22f13\Nette\Utils\Json;
class User implements \JsonSerializable { class User implements \JsonSerializable {
/** /**
* @var string $email user's mail address * @var string $email user's mail address
*/ */

@ -23,7 +23,7 @@ class AccountGateway {
':hash' => [$hash, PDO::PARAM_STR], ':hash' => [$hash, PDO::PARAM_STR],
':email' => [$email, PDO::PARAM_STR], ':email' => [$email, PDO::PARAM_STR],
':token' => [$token, PDO::PARAM_STR], ':token' => [$token, PDO::PARAM_STR],
':profilePic' => [$profilePicture, PDO::PARAM_STR] ':profilePic' => [$profilePicture, PDO::PARAM_STR],
]); ]);
return intval($this->con->lastInsertId()); return intval($this->con->lastInsertId());
} }

@ -75,7 +75,7 @@ class MemberGateway {
"SELECT role FROM Member WHERE id_team=:team AND id_user = (SELECT id FROM Account WHERE email=:email)", "SELECT role FROM Member WHERE id_team=:team AND id_user = (SELECT id FROM Account WHERE email=:email)",
[ [
"team" => [$idTeam, PDO::PARAM_INT], "team" => [$idTeam, PDO::PARAM_INT],
"email" => [$email, PDO::PARAM_STR] "email" => [$email, PDO::PARAM_STR],
] ]
)[0]['role']; )[0]['role'];
@ -92,7 +92,7 @@ class MemberGateway {
"SELECT id_user FROM Member WHERE id_team = :team AND id_user = :user", "SELECT id_user FROM Member WHERE id_team = :team AND id_user = :user",
[ [
"team" => [$idTeam, PDO::PARAM_INT], "team" => [$idTeam, PDO::PARAM_INT],
"user" => [$idCurrentUser, PDO::PARAM_INT] "user" => [$idCurrentUser, PDO::PARAM_INT],
] ]
); );
return !empty($result); return !empty($result);

@ -44,7 +44,7 @@ class TeamGateway {
"SELECT t.* FROM team t, Member m WHERE t.name LIKE '%' || :name || '%' AND t.id=m.id_team AND m.id_user=:id", "SELECT t.* FROM team t, Member m WHERE t.name LIKE '%' || :name || '%' AND t.id=m.id_team AND m.id_user=:id",
[ [
":name" => [$name, PDO::PARAM_STR], ":name" => [$name, PDO::PARAM_STR],
"id" => [$id, PDO::PARAM_INT] "id" => [$id, PDO::PARAM_INT],
] ]
); );
return array_map(fn($row) => new TeamInfo($row['id'], $row['name'], $row['picture'], Color::from($row['main_color']), Color::from($row['second_color'])), $result); return array_map(fn($row) => new TeamInfo($row['id'], $row['name'], $row['picture'], Color::from($row['main_color']), Color::from($row['second_color'])), $result);
@ -87,13 +87,13 @@ class TeamGateway {
$this->con->exec( $this->con->exec(
"DELETE FROM Member WHERE id_team=:team", "DELETE FROM Member WHERE id_team=:team",
[ [
"team" => [$idTeam, PDO::PARAM_INT] "team" => [$idTeam, PDO::PARAM_INT],
] ]
); );
$this->con->exec( $this->con->exec(
"DELETE FROM TEAM WHERE id=:team", "DELETE FROM TEAM WHERE id=:team",
[ [
"team" => [$idTeam, PDO::PARAM_INT] "team" => [$idTeam, PDO::PARAM_INT],
] ]
); );
} }

Loading…
Cancel
Save