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

Home page fonctionnelle

Browse Source
pull/81/head
DahmaneYanis 1 year ago committed by d_yanis
parent a9948ba767
commit 60dfd4771c
3 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File

8
front/style/home.css
Unescape View File

@ -5,7 +5,8 @@
border : solid 2px purple; border : solid 2px purple;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-family: Helvetica,; font-family: Helvetica;
height: 100%;
} }
.new { .new {
@ -22,7 +23,8 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
border : solid 10px violet; border : solid 10px violet;
margin:0px margin:0px;
height: 100%;
} }
#personal-space { #personal-space {
@ -52,7 +54,7 @@
} }
#sideMenu .title { #sideMenu .title {
font-size: 13px; font-size: 12px;
font-weight: bold; font-weight: bold;
color : #FFFFFF; color : #FFFFFF;
letter-spacing: 1px; letter-spacing: 1px;

46
front/views/Home.tsx
Unescape View File

@ -7,11 +7,20 @@ interface Tactic {
creation_date : string creation_date : string
} }
export default function Home({ lastTactics, allTactics } : { lastTactics : Tactic[] , allTactics : Tactic[]}) { interface Team {
id : number
name : string
picture : string
main_color : string
second_color : string
}
export default function Home({ lastTactics, allTactics, teams } : { lastTactics : Tactic[] , allTactics : Tactic[], teams : Team[]}) {
console.log(teams);
return ( return (
<div id="main"> <div id="main">
<Title/> <Title/>
<Body lastTactics={lastTactics} allTactics={allTactics}/> <Body lastTactics={lastTactics} allTactics={allTactics} teams={teams}/>
</div> </div>
) )
} }
@ -24,25 +33,25 @@ export function Title() {
) )
} }
export function Body({ lastTactics, allTactics } : { lastTactics : Tactic[], allTactics : Tactic[]}) { export function Body({ lastTactics, allTactics, teams } : { lastTactics : Tactic[], allTactics : Tactic[], teams : Team[]}) {
const widthPersonalSpace = 67.5; const widthPersonalSpace = 80;
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} /> <SideMenu width = {widthSideMenu} lastTactics={lastTactics} teams={teams} />
</div> </div>
) )
} }
export function SideMenu({ width, lastTactics } : { width : number, lastTactics : Tactic[] }) { 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 + "%",
}}> }}>
<Team/> <Team teams={teams}/>
<Tactic lastTactics={lastTactics}/> <Tactic lastTactics={lastTactics}/>
</div> </div>
) )
@ -110,11 +119,24 @@ function BodyPersonalSpace({ allTactics } : { allTactics : Tactic[]}) {
) )
} }
export function Team() { export function Team({teams} : {teams : Team[]}) {
const listTeam = teams.map((team, rowIndex) =>
<li
key={"team" + rowIndex}
>
{team.name}
<button onClick={() => location.pathname="/team/"+team.id}>open</button>
</li>
);
return ( return (
<div className="titreSideMenu"> <div id="teams">
<h2 className="title">Mes équipes</h2> <div className="titreSideMenu">
<button className="new" onClick={() => location.pathname="/tactic/new"}>+</button> <h2 className="title">Mes équipes</h2>
<button className="new" onClick={() => location.pathname="/team/new"}>+</button>
</div>
<ul>
{listTeam}
</ul>
</div> </div>
) )
} }
@ -132,7 +154,7 @@ export function Tactic({lastTactics} : { lastTactics : Tactic[]}) {
return ( return (
<div id="tactic"> <div id="tactic">
<div className="titreSideMenu"> <div className="titreSideMenu">
<h2 className="title">Mes cinq 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>
<ul> <ul>

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

@ -35,10 +35,14 @@ class UserController {
if ($this->teams != NULL) { if ($this->teams != NULL) {
$teams = $this->teams->getAll($session->getAccount()->getId()); $teams = $this->teams->getAll($session->getAccount()->getId());
} }
else {
$teams = [];
}
return ViewHttpResponse::react("views/Home.tsx", [ return ViewHttpResponse::react("views/Home.tsx", [
"lastTactics" => $lastTactics, "lastTactics" => $lastTactics,
"allTactics" => $allTactics "allTactics" => $allTactics,
"teams" => $teams
]); ]);
// return ViewHttpResponse::react("views/Home.tsx", []); // return ViewHttpResponse::react("views/Home.tsx", []);
} }

Write Preview
Loading…
Cancel
Save