RedCrab/projet-nuitinfo-2024
8
0
Fork 0
generated from lucien/actix-react-template
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compare commits

base: RedCrab:c197e460fb01976e233fa4ca574fa15a2f4eaebc
Branches Tags
RedCrab:main
RedCrab:back_end
RedCrab:chaos_page
RedCrab:main_page
RedCrab:back_end_suicidal
..
compare: RedCrab:6405c6db09a3dda94307787441661b736c8b687d
Branches Tags
RedCrab:main
RedCrab:back_end
RedCrab:chaos_page
RedCrab:main_page
RedCrab:back_end_suicidal

No commits in common. "c197e460fb01976e233fa4ca574fa15a2f4eaebc" and "6405c6db09a3dda94307787441661b736c8b687d" have entirely different histories.
c197e460fb ... 6405c6db09

2 changed files with 6 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

54
front/src/components/FstSection.tsx
View file

@ -1,6 +1,5 @@
import Button from "./Button";
import NavBar from "./NavBar";
import { Link } from "react-router";
export default function FstSection () {
return (
@ -32,55 +31,8 @@ export default function FstSection () {
>Help us to save our oceans</h1><br />
<div style={{display:"flex", justifyContent: "center", gap: "20px"}}>
{/* <Button color="primary" children={"Aller au jeu"} url="/game" />
<Button color="secondary" children={"Lire les articles"} url="/" /> */}
<Link to="/game" style={{
backgroundColor: 'var(--color-yellow)',
borderRadius: '8px',
borderWidth: '0',
color: 'var(--color-black)',
cursor: 'pointer',
display: 'inline-block',
fontFamily: '"Haas Grot Text R Web", "Helvetica Neue", Helvetica, Arial, sans-serif',
fontSize: '20px',
fontWeight: '500',
lineHeight: '20px',
listStyle: 'none',
margin: '0',
padding: '10px 12px',
textAlign: 'center',
transition: 'all 200ms',
verticalAlign: 'baseline',
whiteSpace: 'nowrap',
userSelect: 'none',
WebkitUserSelect: 'none',
touchAction: 'manipulation',
textDecoration: 'none',
}}>Aller au jeu</Link>
<Link to="/articles" style={{
backgroundColor: 'var(--color-darkblue)',
borderRadius: '8px',
borderWidth: '0',
color: 'var(--color-white)',
cursor: 'pointer',
display: 'inline-block',
fontFamily: '"Haas Grot Text R Web", "Helvetica Neue", Helvetica, Arial, sans-serif',
fontSize: '20px',
fontWeight: '500',
lineHeight: '20px',
listStyle: 'none',
margin: '0',
padding: '10px 12px',
textAlign: 'center',
transition: 'all 200ms',
verticalAlign: 'baseline',
whiteSpace: 'nowrap',
userSelect: 'none',
WebkitUserSelect: 'none',
touchAction: 'manipulation',
textDecoration: 'none',
}}>Lire les articles</Link>
<Button color="primary" children={"Aller au jeu"} url="/game" />
<Button color="secondary" children={"Lire les articles"} url="/" />
</div>
</div></div>
)

7
front/src/components/NavBar.tsx
View file

@ -1,4 +1,4 @@
import { Link } from 'react-router';
import ClickableLink from './ClickableLink.tsx';
import RoundButton from './RoundButton.tsx';
export default function NavBar(){
@ -8,9 +8,8 @@ export default function NavBar(){
{/* <LogoButton url="/" logo = "https://archlinux.org/static/hetzner_logo.41114a37d25f.png"/> */}
<span className="material-symbols-outlined"
style={{fontSize: "4em", color: "white", margin: "0.5em"}}>sailing</span>
<Link to="/" style={{ textDecoration: "none", color: "white", fontSize: "1.5em", margin: "0.5em", fontFamily: '"Haas Grot Text R Web", "Helvetica Neue", Helvetica, Arial, sans-serif'}}>Home</Link>
<Link to="/game" style={{ textDecoration: "none", color: "white", fontSize: "1.5em", margin: "0.5em", fontFamily: '"Haas Grot Text R Web", "Helvetica Neue", Helvetica, Arial, sans-serif'}}>Game</Link>
<Link to="/articles" style={{ textDecoration: "none", color: "white", fontSize: "1.5em", margin: "0.5em", fontFamily: '"Haas Grot Text R Web", "Helvetica Neue", Helvetica, Arial, sans-serif'}}>Articles</Link>
<ClickableLink url="/" text = "Accueil" />
<ClickableLink url="/game" text = "Jeu" />
</div>
<div style={{ display : "flex", alignItems: "center", flexDirection: "row"}}>
<RoundButton url="https://archlinux.org" bgcolor="var(--color-white)" text="?"/>