Skip to content

Global increment score + some CSS tweaks #45

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

Open
S4-K1 wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Global increment score + some CSS tweaks #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d24f05d
First commit
S4-K1 Nov 9, 2022
65bec5b
Boop
S4-K1 Nov 9, 2022
6a7d35f
Moved incrementbutton to components
Dexyboiiii Nov 9, 2022
ece7a62
Moved incrementbutton to components
Dexyboiiii Nov 9, 2022
47e3937
Importing usestate
Dexyboiiii Nov 9, 2022
111f904
Remove excess
S4-K1 Nov 9, 2022
40605e5
Added global count
Dexyboiiii Nov 9, 2022
f1dfaa4
Merge branch 'feature/S4-K1/currentScorePlusCSS' of https://github.co…
Dexyboiiii Nov 9, 2022
a892db2
Score updates between button components
Dexyboiiii Nov 9, 2022
1df356d
increaseCount added
S4-K1 Nov 9, 2022
d152708
Merge fix
S4-K1 Nov 9, 2022
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
4 changes: 3 additions & 1 deletion web/src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
}
}

.card {
.dualColumns {
Copy link
Contributor

@JavaRip JavaRip Nov 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logo-spin is hyphen case but this is camel, should be one or the other, I vote hyphen case for css

padding: 2em;
display: flex;
align-items: center;
}
19 changes: 0 additions & 19 deletions web/src/IncrementButton.tsx
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions web/src/components/IncrementButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Dispatch } from 'react';

function IncrementButton(props: { countIncrease: Dispatch<number>, incrementBy: number}) {
return (
<div>
<button onClick={() => props.countIncrease(props.incrementBy)}>
This button increments by {props.incrementBy}
</button>
</div>
);
}

export default IncrementButton;
34 changes: 23 additions & 11 deletions web/src/components/SnakeScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
import IncrementButton from '../IncrementButton';
import IncrementButton from './IncrementButton';
import CanvasBoard from './CanvasBoard';
import { useState } from 'react';

function SnakeScreen() {
return (
<div className='App'>
<div className='logo snake'>🐍</div>
<h1>GDSC Snake</h1>
<div className="card">
<IncrementButton incrementBy={1} />
<IncrementButton incrementBy={2} />
<CanvasBoard height={200} width={400}/>
</div>
const [count, setCount] = useState(0);

function increaseCount(incrementNum: number) {
setCount(count + incrementNum);
}

return (
<div className='App'>
<div className='logo snake'>🐍</div>
<h1>GDSC Snake</h1>
<div className='dualColumns'>
<div>
<CanvasBoard height={200} width={400}/>
</div>
<div>
<h2>Current score: {count}</h2>
<IncrementButton countIncrease={increaseCount} incrementBy={1} />
<IncrementButton countIncrease={increaseCount} incrementBy={2} />
</div>
);
</div>
</div>
);
}

export default SnakeScreen;