Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions PTG/src/About.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
flex-direction: column;
align-items: center;
margin: 0 15vw;
min-height: calc(89.5vh - 60px);
}

.footer-pin{
position: relative;
bottom: 0;
left: 0;
}

p{
Expand Down
8 changes: 6 additions & 2 deletions PTG/src/About.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Header from "./Header.tsx";
import Footer from "./Footer.tsx";
import "./About.css";

export default function About(){
Expand All @@ -18,11 +19,14 @@ export default function About(){
<p>
This website is made by students, and is made for training reasons,
also for lazy people not wanting to pick a team themselves. Contact information
can be found at the footer of the home page. Any feedback will be deeply appreciated,
can be found at the footer of the home page and this page. Any feedback will be deeply appreciated,
as it will be used as a tool to sharpen our skills and improve our work in the
second project.
</p>
</div>
<div className="footer-pin">
<Footer />
</div>
</>
);
}
}
9 changes: 9 additions & 0 deletions PTG/src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.content{
min-height: calc(100vh - 60px);
}

.footer-pin{
position: relative;
bottom: 0;
left: 0;
}
43 changes: 24 additions & 19 deletions PTG/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useState } from "react";
import Header from "./Header.tsx"
import Footer from "./Footer.tsx"
import "./App.css"
import ChoosePokemon from "./ChoosePokemon.tsx";
import Team from "./Team.tsx";
import PokemonGrid from "./PokemonGrid.tsx";
Expand All @@ -20,25 +21,29 @@ export default function App(){

return(
<div>
<Header />
<ChoosePokemon
selectedGame={selectedGame}
selectedType={selectedType}
selectedName={selectedName}
onGameChange={setSelectedGame}
onTypeChange={setSelectedType}
onNameChange={setSelectedName}
/>
<Team
team={team}
pokemonById={pokemonById}
typeMap={typeMap}
allFavourited={allFavourited}
generateTeam={generateTeam}
toggleFavourite={toggleFavourite}
/>
<PokemonGrid selectedGame={selectedGame} selectedType={selectedType} selectedName={selectedName} />
<Footer/>
<div className="content">
<Header />
<ChoosePokemon
selectedGame={selectedGame}
selectedType={selectedType}
selectedName={selectedName}
onGameChange={setSelectedGame}
onTypeChange={setSelectedType}
onNameChange={setSelectedName}
/>
<Team
team={team}
pokemonById={pokemonById}
typeMap={typeMap}
allFavourited={allFavourited}
generateTeam={generateTeam}
toggleFavourite={toggleFavourite}
/>
<PokemonGrid selectedGame={selectedGame} selectedType={selectedType} selectedName={selectedName} />
</div>
<div className="footer-pin">
<Footer/>
</div>
</div>

);
Expand Down