Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into jbranch3
Browse files Browse the repository at this point in the history
  • Loading branch information
justinstoner2 committed Apr 28, 2024
2 parents 55cda77 + 84d4876 commit 8134eea
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 52 deletions.
1 change: 1 addition & 0 deletions trivia-forge/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ openai-env
*.sln
*.sw?
.env
__pycache__
15 changes: 15 additions & 0 deletions trivia-forge/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions trivia-forge/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"react": "^18.2.0",
"react-bootstrap": "^2.10.2",
"react-dom": "^18.2.0",
"react-icons": "^5.1.0",
"react-router-dom": "^6.22.3"
},
"devDependencies": {
Expand Down
12 changes: 12 additions & 0 deletions trivia-forge/frontend/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,16 @@ footer {
bottom: 0;
text-align: center;
width: 100%;
}

.homepage-container .row {
justify-content: center;
}

.homepage-container .col {
margin: 10px;
}

.homepage-container .button {
background-color: #e0d6b7;
}
123 changes: 71 additions & 52 deletions trivia-forge/frontend/src/Pages/HomePage.jsx
Original file line number Diff line number Diff line change
@@ -1,59 +1,78 @@
import React from "react";
import { Button, Container, Row, Col} from 'react-bootstrap';
import '../App.css';
import { FaRegFolderOpen } from "react-icons/fa";

function Home() {
return (
<div id="test">
<h2 class="mt-5 mb-3">Customize Your Game!</h2>
<div class="container">
<div class="justify-content-center d-flex text-start">
<form class="border rounded-4 p-5 col-5" id="customForm">
<label class="form-label">Game Name</label>
<input type="text" class="form-control" required></input>
<label class="form-label mt-3">Catgeories</label>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">History</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Science</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Geography</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Sports</label>
</div>
<div class="form-check">
<input type="checkbox" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Art and Literature</label>
</div>
<label class="form-label mt-3">Number of Questions</label>
<input type="number" class="form-control" min="1"></input>
<label class="form-label mt-3">Difficulty</label>
<div class="form-check">
<input type="radio" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Easy</label>
</div>
<div class="form-check">
<input type="radio" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Medium</label>
</div>
<div class="form-check mb-3">
<input type="radio" class="form-check-input" name="category"></input>
<label class="form-check-label" for="category">Hard</label>
</div>
<div class="text-center">
<button type="submit" class="btn btn-warning">Submit</button>
</div>
</form>
</div>
</div>
</div>
<Container className="homepage-container">
<Row>
<Col>
<h1>Trivia Forge</h1>
</Col>
</Row>
<Row >
<Col>
<Button variant="primary"> <FaRegFolderOpen /> My Trivia Games </Button>
</Col>
</Row>
<Row>
<Col>
<Button variant="primary">Create New Game </Button>
</Col>
</Row>
</Container>
);
};
export default Home;

}
export default Home;
{/* // <div id="test">
// <h2 class="mt-5 mb-3">Customize Your Game!</h2>
// <div class="container">
// <div class="justify-content-center d-flex text-start">
// <form class="border rounded-4 p-5 col-5" id="customForm">
// <label class="form-label">Game Name</label>
// <input type="text" class="form-control" required></input>
// <label class="form-label mt-3">Catgeories</label>
// <div class="form-check">
// <input type="checkbox" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">History</label>
// </div>
// <div class="form-check">
// <input type="checkbox" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Science</label>
// </div>
// <div class="form-check">
// <input type="checkbox" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Geography</label>
// </div>
// <div class="form-check">
// <input type="checkbox" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Sports</label>
// </div>
// <div class="form-check">
// <input type="checkbox" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Art and Literature</label>
// </div>
// <label class="form-label mt-3">Number of Questions</label>
// <input type="number" class="form-control" min="1"></input>
// <label class="form-label mt-3">Difficulty</label>
// <div class="form-check">
// <input type="radio" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Easy</label>
// </div>
// <div class="form-check">
// <input type="radio" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Medium</label>
// </div>
// <div class="form-check mb-3">
// <input type="radio" class="form-check-input" name="category"></input>
// <label class="form-check-label" for="category">Hard</label>
// </div>
// <div class="text-center">
// <button type="submit" class="btn btn-warning">Submit</button>
// </div>
// </form>
// </div>
// </div>
// </div> */}

0 comments on commit 8134eea

Please sign in to comment.