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

Jump to bottom

Dev #6

Open
wants to merge 47 commits into
base: main
Choose a base branch
from
Open

Dev #6

wants to merge 47 commits into from

Conversation

caseywar
Copy link
Collaborator

@caseywar caseywar commented Feb 1, 2021

No description provided.

caseywar and others added 30 commits February 1, 2021 13:27
@caseywar
cleared css
b219cf0
@caseywar
removing css
eec5792
@sorayamajdolashrafi
stand in card designs for six cards and the back
38ff309
create basic utility functions
d4821cf
@sorayamajdolashrafi
cardDeck array created for a deck of 12
66b20b9
add createUser() and updateSavedUser()
824d4b9
@caseywar
added html pages and nav bar
495f581
@sorayamajdolashrafi
Merge pull request #5 from KatrinaCloyd/data
5b8c07e 
Data
@caseywar
nav bar fix
aa98234
event listener for home page to set initial user to local storage
df40449
@caseywar
Merge branch 'dev' of https://github.com/KatrinaCloyd/MemoryCardGame …
b916974 
…into dev
@KatrinaCloyd
Merge pull request #7 from KatrinaCloyd/utilFunctions
84b10e0 
Add util functions and event listener to add user data to storage
@caseywar
added form to home page
a928721
@caseywar
Merge branch 'dev' of https://github.com/KatrinaCloyd/MemoryCardGame …
168fe14 
…into dev
@sorayamajdolashrafi
very very very basic css
38aa410
@sorayamajdolashrafi
Merge pull request #8 from KatrinaCloyd/css
66c2e70 
very very very basic css
@caseywar
added html to game page. fixed relative paths
05ce9bb
user saves to local storage
f2047b5
@KatrinaCloyd
Merge pull request #10 from KatrinaCloyd/utilFunctions
6fca183 
user saves to local storage
add makeGameBoard()
1c3bebc
function fixed to create user in storage
d135492
@sorayamajdolashrafi
basic style css, and home page css
aba9bbf
@KatrinaCloyd
Merge pull request #11 from KatrinaCloyd/utilFunctions
dfb44f4 
function fixed to create user in storage
@sorayamajdolashrafi
Merge pull request #12 from KatrinaCloyd/css
61d309e 
basic style css, and home page css
@bperard
Merge branch 'dev' into game_functions
7dae582
@bperard
Merge pull request #13 from KatrinaCloyd/game_functions
dd5533d 
Game functions
fix button redirect
c052ec9
@KatrinaCloyd
Merge pull request #15 from KatrinaCloyd/utilFunctions
cadeb3b 
fix button redirect
@caseywar
added game board div
4faee2a
@caseywar
fixed nav bar
e68a175
Brandon Perard and others added 2 commits February 1, 2021 14:00
@bperard
Merge pull request #17 from KatrinaCloyd/game_functions
9343d24 
update makeGameBoard() for proper functionality
Brandon Perard and others added 2 commits February 1, 2021 14:41
add click handler functions to card img elements and update game.css …
e2a0946 
…for hide functionality
@bperard
Merge pull request #22 from KatrinaCloyd/game_functions
7272690 
add click handler functions to card img elements and update game.css …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@caseywar @sorayamajdolashrafi @KatrinaCloyd @bperard