IQBall
/
Application-Web
6
0
Fork 0
Code Issues 49 Pull Requests Packages Projects 5 Releases Wiki Activity

WIP
continuous-integration/drone/push Build is failing Details

Browse Source
DahmaneYanis 1 year ago
parent ad94eef630
commit 7a3774cb81
12 changed files with 122 additions and 29 deletions
Show Stats Download Patch File Download Diff File

9
front/style/settings/settings.css
Unescape View File

@ -15,4 +15,13 @@
width: 85%; width: 85%;
border: 1px yellow solid; border: 1px yellow solid;
height: 100%; height: 100%;
}
.content {
color : var(--main-contrast-color);
}
#account-infos {
width: 50%;
padding-left : 5%;
} }

58
front/views/Settings.tsx
Unescape View File

@ -1,55 +1,75 @@
import "../style/settings/settings.css" import "../style/settings/settings.css"
import 'bootstrap/dist/css/bootstrap.min.css';
import { MainTitle, SecondTitle } from "./component/Title" import { MainTitle, SecondTitle } from "./component/Title"
import {Header} from './template/Header' import {Header} from './template/Header'
import { useState, ChangeEvent } from "react" import { useState, ChangeEvent } from "react"
import { User } from "./model/User" import { User } from "./model/User"
import Button from 'react-bootstrap/Button';
import Form from 'react-bootstrap/Form';
export default function Settings({username} : {username : string}){ export default function Settings({user} : {user : User}){
return ( return (
<div id="main"> <div id="main">
<Header username={username} /> <Header username={user.name} />
<Body/> <Body user={user}/>
</div> </div>
) )
} }
function Body() { function Body({user} : {user : User}) {
return ( return (
<div id="body"> <div id="body">
<div id="content"> <div id="content">
<MainTitle title="Paramètres" id={null}/> <MainTitle title="Paramètres" id={null}/>
<AccountSettings/> <AccountSettings user={user} />
</div> </div>
</div> </div>
) )
} }
function AccountSettings(){ function AccountSettings({user} : {user : User}){
return ( return (
<div id="account"> <div id="account">
<SecondTitle title="Compte personnel" id={null}/> <SecondTitle title="Compte personnel" id={null}/>
<ContentAccountSettings/> <ContentAccountSettings user={user}/>
</div> </div>
); );
} }
function ContentAccountSettings({user} : {user : User}) { function ContentAccountSettings({user} : {user : User}) {
// Utilisez useState pour gérer l'état du champ de saisie // Utilisez useState pour gérer l'état du champ de saisie
const [username, setUsername] = useState({user.username}); // const [username, setUsername] = useState({user.username});
// Fonction pour mettre à jour l'état lorsqu'il y a un changement dans le champ de saisie // // Fonction pour mettre à jour l'état lorsqu'il y a un changement dans le champ de saisie
const handleUsernameChange = (event : ChangeEvent<HTMLInputElement>) => { // const handleUsernameChange = (event : ChangeEvent<HTMLInputElement>) => {
setUsername(event.target.value); // setUsername(event.target.value);
}; // };
// return (
// <form id="account-content">
// <dl>
// <dt>Nom d'utilisateur</dt>
// {/* Utilisez la valeur de l'état et la fonction onChange */}
// <dd><input type="text" value={username} onChange={handleUsernameChange} /></dd>
// </dl>
// </form>
// );
return ( return (
<form id="account-content"> <div id="account-infos">
<dl> <Form>
<dt>Nom d'utilisateur</dt> <Form.Group className="mb-3" controlId="formUsername">
{/* Utilisez la valeur de l'état et la fonction onChange */} <Form.Label className="content">Nom d'utilisateur</Form.Label>
<dd><input type="text" value={username} onChange={handleUsernameChange} /></dd> <Form.Control size="sm" defaultValue={user.name}/>
</dl> </Form.Group>
</form> <Form.Group className="mb-3" controlId="formEmail">
<Form.Label className="content">Adresse mail</Form.Label>
<Form.Control size="sm" defaultValue={user.email} type="email" placeholder="Password" />
</Form.Group>
<Button variant="outline-primary" type="submit">Mettre à jour</Button>
</Form>
</div>
); );
} }

2
front/views/model/User.tsx
Unescape View File

@ -3,4 +3,4 @@ export interface User {
name: string name: string
email: string email: string
profilePicture: string profilePicture: string
} }

2
package.json
Unescape View File

@ -10,7 +10,9 @@
"@types/node": "^16.18.59", "@types/node": "^16.18.59",
"@types/react": "^18.2.31", "@types/react": "^18.2.31",
"@types/react-dom": "^18.2.14", "@types/react-dom": "^18.2.14",
"bootstrap": "^5.3.2",
"react": "^18.2.0", "react": "^18.2.0",
"react-bootstrap": "^2.10.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-draggable": "^4.4.6", "react-draggable": "^4.4.6",
"typescript": "^5.2.2", "typescript": "^5.2.2",

6
public/api/index.php
Unescape View File

@ -8,6 +8,7 @@ require "../../src/index-utils.php";
use IQBall\Api\API; use IQBall\Api\API;
use IQBall\Api\Controller\APIAuthController; use IQBall\Api\Controller\APIAuthController;
use IQBall\Api\Controller\APITacticController; use IQBall\Api\Controller\APITacticController;
use IQBall\Api\Controller\APIUserController;
use IQBall\App\Session\PhpSessionHandle; use IQBall\App\Session\PhpSessionHandle;
use IQBall\Core\Action; use IQBall\Core\Action;
use IQBall\Core\Connection; use IQBall\Core\Connection;
@ -25,6 +26,10 @@ function getAuthController(): APIAuthController {
return new APIAuthController(new AuthModel(new AccountGateway(new Connection(get_database())))); return new APIAuthController(new AuthModel(new AccountGateway(new Connection(get_database()))));
} }
function getAPIUserController(): APIUserController {
return new APIUserController(new AuthModel(new AccountGateway(new Connection(get_database()))));
}
function getRoutes(): AltoRouter { function getRoutes(): AltoRouter {
$router = new AltoRouter(); $router = new AltoRouter();
$router->setBasePath(get_public_path(__DIR__)); $router->setBasePath(get_public_path(__DIR__));
@ -32,6 +37,7 @@ function getRoutes(): AltoRouter {
$router->map("POST", "/auth", Action::noAuth(fn() => getAuthController()->authorize())); $router->map("POST", "/auth", Action::noAuth(fn() => getAuthController()->authorize()));
$router->map("POST", "/tactic/[i:id]/edit/name", Action::auth(fn(int $id, Account $acc) => getTacticController()->updateName($id, $acc))); $router->map("POST", "/tactic/[i:id]/edit/name", Action::auth(fn(int $id, Account $acc) => getTacticController()->updateName($id, $acc)));
$router->map("POST", "/tactic/[i:id]/save", Action::auth(fn(int $id, Account $acc) => getTacticController()->saveContent($id, $acc))); $router->map("POST", "/tactic/[i:id]/save", Action::auth(fn(int $id, Account $acc) => getTacticController()->saveContent($id, $acc)));
$router->map("POST", "/update/profil", Action::auth(fn(Account $acc) => getAPIUserController()->updateProfil($acc)));
return $router; return $router;
} }

4
public/index.php
Unescape View File

@ -85,8 +85,7 @@ function getRoutes(): AltoRouter {
$ar->map("GET", "/home", Action::auth(fn(SessionHandle $s) => getUserController()->home($s))); $ar->map("GET", "/home", Action::auth(fn(SessionHandle $s) => getUserController()->home($s)));
$ar->map("GET", "/settings", Action::auth(fn(SessionHandle $s) => getUserController()->settings($s))); $ar->map("GET", "/settings", Action::auth(fn(SessionHandle $s) => getUserController()->settings($s)));
$ar->map("GET", "/disconnect", Action::auth(fn(MutableSessionHandle $s) => getUserController()->disconnect($s))); $ar->map("GET", "/disconnect", Action::auth(fn(MutableSessionHandle $s) => getUserController()->disconnect($s)));
//tactic-related //tactic-related
$ar->map("GET", "/tactic/[i:id]/view", Action::auth(fn(int $id, SessionHandle $s) => getVisualizerController()->openVisualizer($id, $s))); $ar->map("GET", "/tactic/[i:id]/view", Action::auth(fn(int $id, SessionHandle $s) => getVisualizerController()->openVisualizer($id, $s)));
$ar->map("GET", "/tactic/[i:id]/edit", Action::auth(fn(int $id, SessionHandle $s) => getEditorController()->openEditor($id, $s))); $ar->map("GET", "/tactic/[i:id]/edit", Action::auth(fn(int $id, SessionHandle $s) => getEditorController()->openEditor($id, $s)));
@ -109,7 +108,6 @@ function getRoutes(): AltoRouter {
$ar->map("GET", "/team/[i:id]/edit", Action::auth(fn(int $idTeam, SessionHandle $s) => getTeamController()->displayEditTeam($idTeam, $s))); $ar->map("GET", "/team/[i:id]/edit", Action::auth(fn(int $idTeam, SessionHandle $s) => getTeamController()->displayEditTeam($idTeam, $s)));
$ar->map("POST", "/team/[i:id]/edit", Action::auth(fn(int $idTeam, SessionHandle $s) => getTeamController()->editTeam($idTeam, $_POST, $s))); $ar->map("POST", "/team/[i:id]/edit", Action::auth(fn(int $idTeam, SessionHandle $s) => getTeamController()->editTeam($idTeam, $_POST, $s)));
return $ar; return $ar;
} }

2
sql/setup-tables.sql
Unescape View File

@ -49,4 +49,4 @@ CREATE TABLE Member
role text CHECK (role IN ('COACH', 'PLAYER')) NOT NULL, role text CHECK (role IN ('COACH', 'PLAYER')) NOT NULL,
FOREIGN KEY (id_team) REFERENCES Team (id), FOREIGN KEY (id_team) REFERENCES Team (id),
FOREIGN KEY (id_user) REFERENCES Account (id) FOREIGN KEY (id_user) REFERENCES Account (id)
); );

49
src/Api/Controller/APIUserController.php
Unescape View File

@ -0,0 +1,49 @@
<?php
namespace IQBall\Api\Controller;
use IQBall\App\Control;
use IQBall\Core\Data\Account;
use IQBall\Core\Http\HttpCodes;
use IQBall\Core\Http\HttpRequest;
use IQBall\Core\Http\HttpResponse;
use IQBall\Core\Http\JsonHttpResponse;
use IQBall\Core\Model\AuthModel;
use IQBall\Core\Validation\FieldValidationFail;
use IQBall\Core\Validation\Validator;
use IQBall\Core\Validation\Validators;
/**
* API endpoint related to tactics
*/
class APIUserController {
private AuthModel $model;
/**
* @param AuthModel $model
*/
public function __construct(AuthModel $model) {
$this->model = $model;
}
/**
* @param Account $account
* @return HttpResponse
*/
public function updateProfil(Account $account): HttpResponse {
return Control::runChecked([
"username" => [Validators::name()],
"email" => [Validators::email()]
], function (HttpRequest $request) use ($account) {
$failures = $this->model->updateProfil($request["username"], $request["email"], $account->getUser()->getId());
if (!empty($failures)) {
//TODO find a system to handle Unauthorized error codes more easily from failures.
return new JsonHttpResponse($failures, HttpCodes::BAD_REQUEST);
}
return HttpResponse::fromCode(HttpCodes::OK);
});
}
}

2
src/App/Controller/EditorController.php
Unescape View File

@ -84,4 +84,4 @@ class EditorController {
return $this->openEditorFor($tactic); return $this->openEditorFor($tactic);
} }
} }

8
src/App/Controller/UserController.php
Unescape View File

@ -13,7 +13,6 @@ class UserController {
private TacticModel $tactics; private TacticModel $tactics;
private ?TeamModel $teams; private ?TeamModel $teams;
/** /**
* @param TacticModel $tactics * @param TacticModel $tactics
* @param TeamModel|null $teams * @param TeamModel|null $teams
@ -54,12 +53,13 @@ class UserController {
* @return ViewHttpResponse account settings page * @return ViewHttpResponse account settings page
*/ */
public function settings(SessionHandle $session): ViewHttpResponse { public function settings(SessionHandle $session): ViewHttpResponse {
return ViewHttpResponse::react("views/Settings.tsx", []); return ViewHttpResponse::react("views/Settings.tsx", [
"user" => $session->getAccount()->getUser()
]);
} }
public function disconnect(MutableSessionHandle $session): HttpResponse { public function disconnect(MutableSessionHandle $session): HttpResponse {
$session->destroy(); $session->destroy();
return HttpResponse::redirect("/"); return HttpResponse::redirect("/");
} }
}
}

4
src/Core/Gateway/AccountGateway.php
Unescape View File

@ -82,5 +82,9 @@ class AccountGateway {
return new Account($acc["token"], new User($acc["email"], $acc["username"], $acc["id"], $acc["profilePicture"])); return new Account($acc["token"], new User($acc["email"], $acc["username"], $acc["id"], $acc["profilePicture"]));
} }
public void updateProfil() {
}
} }

5
src/Core/Model/AuthModel.php
Unescape View File

@ -6,6 +6,7 @@ use Exception;
use IQBall\Core\Data\Account; use IQBall\Core\Data\Account;
use IQBall\Core\Data\User; use IQBall\Core\Data\User;
use IQBall\Core\Gateway\AccountGateway; use IQBall\Core\Gateway\AccountGateway;
use IQBall\Core\Http\HttpResponse;
use IQBall\Core\Validation\FieldValidationFail; use IQBall\Core\Validation\FieldValidationFail;
use IQBall\Core\Validation\ValidationFail; use IQBall\Core\Validation\ValidationFail;
@ -50,6 +51,10 @@ class AuthModel {
return new Account($token, new User($email, $username, $accountId, self::DEFAULT_PROFILE_PICTURE)); return new Account($token, new User($email, $username, $accountId, self::DEFAULT_PROFILE_PICTURE));
} }
public function updateProfil(string $username, string $mail, Account $account) {
$gateway->
}
/** /**
* Generate a random base 64 string * Generate a random base 64 string
* @return string * @return string

Write Preview
Loading…
Cancel
Save