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
pull/81/head
DahmaneYanis 1 year ago
parent 3310078ab5
commit 1d995eba88
14 changed files with 251 additions and 206 deletions
Show Stats Download Patch File Download Diff File

5
front/style/home.css
Unescape View File

@ -64,13 +64,13 @@ body {
margin-top: 5%; margin-top: 5%;
} }
#img-account { #img-account {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
} }
#header-right, #header-left { #header-right,
#header-left {
width: 10%; width: 10%;
/* border: yellow 2px solid; */ /* border: yellow 2px solid; */
} }
@ -112,4 +112,3 @@ body {
#img-account { #img-account {
width: 100%; width: 100%;
} }

16
front/views/Editor.tsx
Unescape View File

@ -13,7 +13,6 @@ import { BasketCourt } from "../components/editor/BasketCourt"
import plainCourt from "../assets/court/full_court.svg" import plainCourt from "../assets/court/full_court.svg"
import halfCourt from "../assets/court/half_court.svg" import halfCourt from "../assets/court/half_court.svg"
import { BallPiece } from "../components/editor/BallPiece" import { BallPiece } from "../components/editor/BallPiece"
import { Rack } from "../components/Rack" import { Rack } from "../components/Rack"
@ -30,8 +29,7 @@ import SavingState, {
SaveStates, SaveStates,
} from "../components/editor/SavingState" } from "../components/editor/SavingState"
import {CourtObject} from "../tactic/CourtObjects"; import { CourtObject } from "../tactic/CourtObjects"
const ERROR_STYLE: CSSProperties = { const ERROR_STYLE: CSSProperties = {
borderColor: "red", borderColor: "red",
@ -64,14 +62,7 @@ interface RackedPlayer {
type RackedCourtObject = { key: "ball" } type RackedCourtObject = { key: "ball" }
export default function Editor({ id, name, courtType, content }: EditorProps) {
export default function Editor({
id,
name,
courtType,
content,
}: EditorProps) {
const isInGuestMode = id == -1 const isInGuestMode = id == -1
const storage_content = localStorage.getItem(GUEST_MODE_CONTENT_STORAGE_KEY) const storage_content = localStorage.getItem(GUEST_MODE_CONTENT_STORAGE_KEY)
@ -143,7 +134,6 @@ function EditorView({
const courtDivContentRef = useRef<HTMLDivElement>(null) const courtDivContentRef = useRef<HTMLDivElement>(null)
const isBoundsOnCourt = (bounds: DOMRect) => { const isBoundsOnCourt = (bounds: DOMRect) => {
const courtBounds = courtDivContentRef.current!.getBoundingClientRect() const courtBounds = courtDivContentRef.current!.getBoundingClientRect()
@ -359,9 +349,7 @@ 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">
<TitleInput <TitleInput

218
front/views/Home.tsx
Unescape View File

@ -18,29 +18,54 @@ interface Team {
second_color: string second_color: string
} }
export default function Home({ lastTactics, allTactics, teams, username } : { lastTactics : Tactic[] , allTactics : Tactic[], teams : Team[], username : string}) { export default function Home({
lastTactics,
allTactics,
teams,
username,
}: {
lastTactics: Tactic[]
allTactics: Tactic[]
teams: Team[]
username: string
}) {
return ( return (
<div id="main"> <div id="main">
<Title username={username} /> <Title username={username} />
<Body lastTactics={lastTactics} allTactics={allTactics} teams={teams}/> <Body
lastTactics={lastTactics}
allTactics={allTactics}
teams={teams}
/>
</div> </div>
) )
} }
export function Title({ username }: { username: string }) { export function Title({ username }: { username: string }) {
return ( return (
<div id="header"> <div id="header">
<div id="header-left"> <div id="header-left"></div>
</div>
<div id="header-center"> <div id="header-center">
<h1 id="IQBall" className="clickable" onClick={() => {location.pathname="/"}}><span id="IQ">IQ</span><span id="Ball">Ball</span></h1> <h1
id="IQBall"
className="clickable"
onClick={() => {
location.pathname = "/"
}}>
<span id="IQ">IQ</span>
<span id="Ball">Ball</span>
</h1>
</div> </div>
<div id="header-right"> <div id="header-right">
<div className="clickable" id="clickable-header-right"> <div className="clickable" id="clickable-header-right">
{/* <AccountSvg id="img-account" /> */} {/* <AccountSvg id="img-account" /> */}
<img id="img-account" src="account.svg" onClick={() => {location.pathname="/settings"}} /> <img
id="img-account"
src="account.svg"
onClick={() => {
location.pathname = "/settings"
}}
/>
<p id="username">{username}</p> <p id="username">{username}</p>
</div> </div>
</div> </div>
@ -48,20 +73,42 @@ export function Title({username} : {username : string}) {
) )
} }
export function Body({ lastTactics, allTactics, teams } : { lastTactics : Tactic[], allTactics : Tactic[], teams : Team[]}) { export function Body({
const widthPersonalSpace = 78; lastTactics,
allTactics,
teams,
}: {
lastTactics: Tactic[]
allTactics: Tactic[]
teams: Team[]
}) {
const widthPersonalSpace = 78
const widthSideMenu = 100 - widthPersonalSpace const widthSideMenu = 100 - widthPersonalSpace
return ( return (
<div id="body"> <div id="body">
<PersonalSpace width={widthPersonalSpace} allTactics={allTactics} /> <PersonalSpace width={widthPersonalSpace} allTactics={allTactics} />
<SideMenu width = {widthSideMenu} lastTactics={lastTactics} teams={teams} /> <SideMenu
width={widthSideMenu}
lastTactics={lastTactics}
teams={teams}
/>
</div> </div>
) )
} }
export function SideMenu({ width, lastTactics, teams } : { width : number, lastTactics : Tactic[], teams : Team[]}) { export function SideMenu({
width,
lastTactics,
teams,
}: {
width: number
lastTactics: Tactic[]
teams: Team[]
}) {
return ( return (
<div id="sideMenu" style={{ <div
id="sideMenu"
style={{
width: width + "%", width: width + "%",
}}> }}>
<div id="sideMenuContent"> <div id="sideMenuContent">
@ -72,9 +119,17 @@ export function SideMenu({ width, lastTactics, teams } : { width : number, lastT
) )
} }
export function PersonalSpace({ width, allTactics }: { width : number, allTactics : Tactic[] }) { export function PersonalSpace({
width,
allTactics,
}: {
width: number
allTactics: Tactic[]
}) {
return ( return (
<div id="personal-space" style={{ <div
id="personal-space"
style={{
width: width + "%", width: width + "%",
}}> }}>
<TitlePersonalSpace /> <TitlePersonalSpace />
@ -92,82 +147,85 @@ function TitlePersonalSpace() {
} }
function TableData({ allTactics }: { allTactics: Tactic[] }) { function TableData({ allTactics }: { allTactics: Tactic[] }) {
const nbRow = Math.floor(allTactics.length/3)+1; const nbRow = Math.floor(allTactics.length / 3) + 1
let listTactic = Array(nbRow); let listTactic = Array(nbRow)
for (let i = 0; i < nbRow; i++) { for (let i = 0; i < nbRow; i++) {
listTactic[i] = Array(0); listTactic[i] = Array(0)
} }
let i = 0; let i = 0
let j = 0; let j = 0
allTactics.forEach(tactic => { allTactics.forEach((tactic) => {
listTactic[i].push(tactic); listTactic[i].push(tactic)
j++; j++
if (j === 3) { if (j === 3) {
i++; i++
j = 0; j = 0
} }
}) })
i = 0; i = 0
while (i < nbRow) { while (i < nbRow) {
listTactic[i] = listTactic[i].map((tactic : Tactic) => listTactic[i] = listTactic[i].map((tactic: Tactic) => (
<td key={tactic.id} className="data" onClick={() => {location.pathname="/tactic/"+tactic.id+"/edit"}}>{troncName(tactic.name, 25)}</td> <td
); key={tactic.id}
i++; className="data"
onClick={() => {
location.pathname = "/tactic/" + tactic.id + "/edit"
}}>
{troncName(tactic.name, 25)}
</td>
))
i++
} }
if (nbRow == 1) { if (nbRow == 1) {
if (listTactic[0].length < 3) { if (listTactic[0].length < 3) {
for (let i = 0; i <= 3 - listTactic[0].length; i++) { for (let i = 0; i <= 3 - listTactic[0].length; i++) {
listTactic[0].push(<td key={"tdNone"+i}></td>); listTactic[0].push(<td key={"tdNone" + i}></td>)
} }
} }
} }
const data = listTactic.map((tactic, rowIndex) => const data = listTactic.map((tactic, rowIndex) => (
<tr key={rowIndex+"row"}> <tr key={rowIndex + "row"}>{tactic}</tr>
{tactic} ))
</tr> return data
);
return data;
} }
function BodyPersonalSpace({ allTactics }: { allTactics: Tactic[] }) { function BodyPersonalSpace({ allTactics }: { allTactics: Tactic[] }) {
let data; let data
if (allTactics.length == 0) { if (allTactics.length == 0) {
data = ( data = <p>Aucune tactique créé !</p>
<p>Aucune tactique créé !</p> } else {
); data = <TableData allTactics={allTactics} />
}
else {
data = (<TableData allTactics={allTactics}/>);
} }
return ( return (
<div id="bodyPersonalSpace"> <div id="bodyPersonalSpace">
<table> <table>
<tbody key="tbody"> <tbody key="tbody">{data}</tbody>
{data}
</tbody>
</table> </table>
</div> </div>
) )
} }
export function Team({ teams }: { teams: Team[] }) { export function Team({ teams }: { teams: Team[] }) {
const listTeam = teams.map((team, rowIndex) => const listTeam = teams.map((team, rowIndex) => (
<li <li key={"team" + rowIndex}>
key={"team" + rowIndex}
>
{team.name} {team.name}
<button onClick={() => location.pathname="/team/"+team.id}>open</button> <button onClick={() => (location.pathname = "/team/" + team.id)}>
open
</button>
</li> </li>
); ))
return ( return (
<div id="teams"> <div id="teams">
<div className="titreSideMenu"> <div className="titreSideMenu">
<h2 className="title">Mes équipes</h2> <h2 className="title">Mes équipes</h2>
<button className="new" onClick={() => location.pathname="/team/new"}>+</button> <button
className="new"
onClick={() => (location.pathname = "/team/new")}>
+
</button>
</div> </div>
<SetButtonTeam teams={teams} /> <SetButtonTeam teams={teams} />
</div> </div>
@ -179,45 +237,40 @@ export function Tactic({lastTactics} : { lastTactics : Tactic[]}) {
<div id="tactic"> <div id="tactic">
<div className="titreSideMenu"> <div className="titreSideMenu">
<h2 className="title">Mes dernières stratégies</h2> <h2 className="title">Mes dernières stratégies</h2>
<button className="new" id="createTactic" onClick={() => (location.pathname = "/tactic/new")}>+</button> <button
className="new"
id="createTactic"
onClick={() => (location.pathname = "/tactic/new")}>
+
</button>
</div> </div>
<SetButtonTactic tactics={lastTactics} /> <SetButtonTactic tactics={lastTactics} />
</div> </div>
) )
} }
function SetButtonTactic({ tactics }: { tactics: Tactic[] }) { function SetButtonTactic({ tactics }: { tactics: Tactic[] }) {
const lastTactics = tactics.map(tactic => const lastTactics = tactics.map((tactic) => (
<ButtonLastTactic tactic={tactic} /> <ButtonLastTactic tactic={tactic} />
); ))
return ( return <div className="SetButton">{lastTactics}</div>
<div className="SetButton">
{lastTactics}
</div>
);
} }
function SetButtonTeam({ teams }: { teams: Team[] }) { function SetButtonTeam({ teams }: { teams: Team[] }) {
const listTeam = teams.map(teams => const listTeam = teams.map((teams) => <ButtonTeam team={teams} />)
<ButtonTeam team={teams} /> return <div className="SetButton">{listTeam}</div>
);
return (
<div className="SetButton">
{listTeam}
</div>
);
} }
function ButtonTeam({ team }: { team: Team }) { function ButtonTeam({ team }: { team: Team }) {
const name = troncName(team.name, 20); const name = troncName(team.name, 20)
return ( return (
<div> <div>
<div <div
id={"ButtonTeam" + team.id} id={"ButtonTeam" + team.id}
className="buttonSideMenu data" className="buttonSideMenu data"
onClick={() => {location.pathname="/team/"+team.id}} onClick={() => {
> location.pathname = "/team/" + team.id
}}>
{name} {name}
</div> </div>
</div> </div>
@ -225,23 +278,24 @@ function ButtonTeam ({team} : {team : Team}) {
} }
function ButtonLastTactic({ tactic }: { tactic: Tactic }) { function ButtonLastTactic({ tactic }: { tactic: Tactic }) {
const name = troncName(tactic.name, 20); const name = troncName(tactic.name, 20)
return ( return (
<div <div
id={"Button" + tactic.id} id={"Button" + tactic.id}
className="buttonSideMenu data" className="buttonSideMenu data"
onClick={() => {location.pathname="/tactic/"+tactic.id+"/edit"}} onClick={() => {
> location.pathname = "/tactic/" + tactic.id + "/edit"
}}>
{name} {name}
</div> </div>
); )
} }
function troncName(name: string, limit: number): string { function troncName(name: string, limit: number): string {
if (name.length > limit) { if (name.length > limit) {
name = name.substring(0, limit) + "..."; name = name.substring(0, limit) + "..."
} else { } else {
name = name; name = name
} }
return name; return name
} }

1
front/views/ProfilPage.tsx
Unescape View File

@ -1 +0,0 @@

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

@ -17,7 +17,7 @@ class UserController {
/** /**
* @param TacticModel $tactics * @param TacticModel $tactics
*/ */
public function __construct(TacticModel $tactics, ?TeamModel $teams = NULL) { public function __construct(TacticModel $tactics, ?TeamModel $teams = null) {
$this->tactics = $tactics; $this->tactics = $tactics;
$this->teams = $teams; $this->teams = $teams;
} }
@ -33,10 +33,9 @@ class UserController {
$name = $session->getAccount()->getName(); $name = $session->getAccount()->getName();
//TODO //TODO
if ($this->teams != NULL) { if ($this->teams != null) {
$teams = $this->teams->getAll($session->getAccount()->getId()); $teams = $this->teams->getAll($session->getAccount()->getId());
} } else {
else {
$teams = []; $teams = [];
} }
@ -44,7 +43,7 @@ class UserController {
"lastTactics" => $lastTactics, "lastTactics" => $lastTactics,
"allTactics" => $allTactics, "allTactics" => $allTactics,
"teams" => $teams, "teams" => $teams,
"username" => $name "username" => $name,
]); ]);
// return ViewHttpResponse::react("views/Home.tsx", []); // return ViewHttpResponse::react("views/Home.tsx", []);
} }

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

@ -53,7 +53,7 @@ class TacticInfoGateway {
ORDER BY creation_date DESC ORDER BY creation_date DESC
LIMIT :nb", LIMIT :nb",
[ [
":ownerId" => [$ownerId, PDO::PARAM_INT],":nb" => [$nb, PDO::PARAM_INT] ":ownerId" => [$ownerId, PDO::PARAM_INT],":nb" => [$nb, PDO::PARAM_INT],
] ]
); );
if (count($res) == 0) { if (count($res) == 0) {
@ -74,7 +74,7 @@ class TacticInfoGateway {
WHERE owner = :ownerId WHERE owner = :ownerId
ORDER BY name DESC", ORDER BY name DESC",
[ [
":ownerId" => [$ownerId, PDO::PARAM_INT] ":ownerId" => [$ownerId, PDO::PARAM_INT],
] ]
); );
if (count($res) == 0) { if (count($res) == 0) {

6
src/Core/Gateway/TeamGateway.php
Unescape View File

@ -81,6 +81,12 @@ class TeamGateway {
)[0]['id'] ?? null; )[0]['id'] ?? null;
} }
/**
* Undocumented function
*
* @param integer $user
* @return array<Team>
*/
public function getAll(int $user): array { public function getAll(int $user): array {
return $this->con->fetch("SELECT * FROM Team", []); return $this->con->fetch("SELECT * FROM Team", []);
} }

2
src/Core/Model/TacticModel.php
Unescape View File

@ -62,7 +62,7 @@ class TacticModel {
/** /**
* Return the nb last tactics * Return the nb last tactics
*/ */
public function getLast(int $nb, int $ownerId): ?array { public function getLast(int $nb, int $ownerId): array {
return $this->tactics->getLast($nb, $ownerId); return $this->tactics->getLast($nb, $ownerId);
} }

Write Preview
Loading…
Cancel
Save