Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mike #9

Merged
merged 2 commits into from
Mar 11, 2021
Merged

Mike #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67ca51
Roughed out ActiveGame.js
Mar 11, 2021
80d5739
ActiveGame.js revisation
Mar 11, 2021
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
Next Next commit
Roughed out ActiveGame.js
  • Loading branch information
Mike authored and Mike committed Mar 11, 2021
commit c67ca51a3ff624f479b5156972335298db56a557
21 changes: 19 additions & 2 deletions client/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const App = () => {

{
// If the user is not logged in, then direct the user to the login page. Other wise, take them to the page requested page.
true ? <WaitingRoom/> :
true ? <ActiveGame/> :
activeUser === null ? (
loginDisplay
? <Login {...{logUserIn, setLoginDisplay}}/>
Expand Down
23 changes: 23 additions & 0 deletions client/src/pages/ActiveGame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,29 @@ const ActiveGame = () => {
return (
<main>
<h2>Active Game</h2>
<div className="container">

<h3>THE WORD</h3>

<h3>ROUND X OF 10</h3>

<h3>TIME REMAINING:</h3>

</div>

<div className="container">

<h3>DRAWING AREA</h3>

</div>

<div className="container">

<h3>CALL CHAT HERE</h3>

</div>


<Canvas width={500} height={500} active={true}/>
</main>
)
Expand Down
Loading