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.

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

signup and login error #15

Closed
wants to merge 78 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
458c90d
added shapes.ts to define our interfaces, set up environment in other…
sterlingdeng Mar 12, 2019
646156f
Merge pull request #1 from sterlingdeng/master
justnoah Mar 12, 2019
f039759
initial game logic complete
sterlingdeng Mar 13, 2019
1741b4a
Merge pull request #2 from sterlingdeng/master
justnoah Mar 13, 2019
ff95040
backend updates
wisdom161 Mar 13, 2019
610a776
setting up react router
csrudy Mar 13, 2019
8f17563
Merge branch 'master' of http://github.com/justnoah/witwhere
csrudy Mar 13, 2019
319614d
backend update
wisdom161 Mar 13, 2019
83f9443
updated backend
wisdom161 Mar 13, 2019
abfda19
refactored for react router; todo: implement routes, implement thunk …
csrudy Mar 13, 2019
3975ccc
Merge pull request #3 from csrudy/master
justnoah Mar 13, 2019
76a525a
game logic completed. untested because no front end to test with as o…
sterlingdeng Mar 13, 2019
848f709
merged from noah's master
sterlingdeng Mar 13, 2019
a7b7be1
Basic refactoring of FE structure; src.
justnoah Mar 13, 2019
efb4f15
Merge pull request #5 from sterlingdeng/master
justnoah Mar 13, 2019
73e94e1
Resolved merge conflicts; root.
justnoah Mar 13, 2019
1aca3e8
add thunk function for user auth and recieving game state
csrudy Mar 13, 2019
9ae26bd
merge upstream master
csrudy Mar 13, 2019
0367c1b
Merge pull request #6 from csrudy/master
justnoah Mar 13, 2019
5fbbc91
backend updates - cookie, session
wisdom161 Mar 13, 2019
fe7fae9
resolved merge conflict
wisdom161 Mar 13, 2019
397076a
Created AuthContainer with proper routes. Working on hooking up front…
sterlingdeng Mar 13, 2019
0544dee
Merge pull request #7 from sterlingdeng/master
justnoah Mar 13, 2019
c01a61d
authentication finished
wisdom161 Mar 13, 2019
dfa5638
authentication finished
wisdom161 Mar 13, 2019
51320fb
Basic scaffolding for game components; game-components.
justnoah Mar 13, 2019
7559937
Merge branch 'master' of https://github.com/justnoah/witwhere
justnoah Mar 13, 2019
9f2fc83
able to connect websocket with redux store. this is a safe state. yeet
sterlingdeng Mar 13, 2019
b021d77
Added menu and lobby components; components.
justnoah Mar 14, 2019
db9c895
minor socket changes
sterlingdeng Mar 14, 2019
7a2c785
resolved merge conflicts
sterlingdeng Mar 14, 2019
f487d3c
commit db
sterlingdeng Mar 14, 2019
9349a7b
wepback dev server and websockets play nicely together
sterlingdeng Mar 14, 2019
97d0641
Merge pull request #8 from sterlingdeng/master
justnoah Mar 14, 2019
893f2b0
backend with frontend -wisdom
wisdom161 Mar 14, 2019
4b00a26
resolved merge conflicts -wisdom
wisdom161 Mar 14, 2019
8773580
Removed alert; final.jsx.
justnoah Mar 14, 2019
d1f519d
jsx
sterlingdeng Mar 14, 2019
f1cde15
merge conflict resolution
sterlingdeng Mar 14, 2019
0e969f6
Merge pull request #9 from sterlingdeng/master
justnoah Mar 14, 2019
6f549a3
Resolved merge conflicts; root.
justnoah Mar 14, 2019
cff1481
More merge conflicts, yay; root.
justnoah Mar 14, 2019
9dcb793
Implemented LESS and React Router; src.
justnoah Mar 14, 2019
0b84a3f
emit socket to all players in session is working
sterlingdeng Mar 14, 2019
cb4fd42
conflit resolution and pull from master
sterlingdeng Mar 14, 2019
4ddd682
Consolidated routes to top-level; App.jsx.
justnoah Mar 14, 2019
8945f1a
commit to pull
sterlingdeng Mar 14, 2019
ddd60d6
commit
sterlingdeng Mar 14, 2019
7226433
signup and login error
wisdom161 Mar 14, 2019
8fd5587
resolved merge conflict
wisdom161 Mar 14, 2019
defc237
Merge branch 'master' into master
justnoah Mar 14, 2019
7a07bd7
Merge pull request #10 from sterlingdeng/master
justnoah Mar 14, 2019
9caafea
Resolved merge conflicts; root.
wisdom161 Mar 14, 2019
9b8fca8
One
justnoah Mar 14, 2019
08df87e
game logic complete. need front end help
sterlingdeng Mar 14, 2019
1b340ea
game logic cmplete
sterlingdeng Mar 14, 2019
17edd65
the real conflict resolution. use this. not the other commit that say…
sterlingdeng Mar 14, 2019
2c65d61
Deleted legacy stuff; src.
justnoah Mar 14, 2019
29a68af
Merge branch 'master' of https://github.com/sterlingdeng/witwhere; br…
sterlingdeng Mar 14, 2019
2302f3c
refactored signup login errors
wisdom161 Mar 14, 2019
e0b4194
resolved merge conflcits -wisdom
wisdom161 Mar 14, 2019
85f47c7
Merge branch 'master' into master
justnoah Mar 14, 2019
f40b0fe
Merge pull request #11 from sterlingdeng/master
justnoah Mar 14, 2019
14f1ca6
Tail end commit
wisdom161 Mar 14, 2019
e91d765
resolved merge conflicts
wisdom161 Mar 14, 2019
842d471
Clean up; root.
justnoah Mar 14, 2019
afe4035
commit before branching off to remove router
sterlingdeng Mar 14, 2019
7cb55e7
complete auth and main routes
sterlingdeng Mar 15, 2019
6b8627b
Merge pull request #12 from sterlingdeng/master
justnoah Mar 15, 2019
22fa716
CSS
justnoah Mar 15, 2019
66cdad8
Moar CSS
justnoah Mar 15, 2019
55a1e91
Ehh
justnoah Mar 15, 2019
7f2a960
meh
justnoah Mar 15, 2019
f3ddf43
uhh
justnoah Mar 15, 2019
d53a8fe
yo
justnoah Mar 15, 2019
327bba4
blah
justnoah Mar 15, 2019
3cdac52
no
justnoah Mar 15, 2019
b1d7181
beep
justnoah Mar 15, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -67,4 +67,5 @@ typings/
build/

# password
server/controllers/data/greyjoy.js
server/controllers/data/greyjoy.js
server/keys
39 changes: 38 additions & 1 deletion README.md
@@ -1 +1,38 @@
# witwhere
# witwhere

## Front page

Landing page where users can login and register and oath.

if not authenticated go to landing page.

if authenticated, go to sessions page, where they can start a session and join a session.

to handle start session, the user can select how many players in the game. must be greater than 3

join session -> the player joins the particular session. and once the number of players === target players, game will start.

once session starts: randomly pick 2 player (people that provide input).

display prompt

users will both submit input

game will display the submissions.

everyone but the users will vote

tally score, increment the winner

repeat

when score === max score, then game over.

take back to sessions page

once all players have submitted a card.

---

Connection:
http connection to start... and when authenticated, move to session route and initiate websocket.
9 changes: 9 additions & 0 deletions bash.exe.stackdump
@@ -0,0 +1,9 @@
Stack trace:
Frame Function Args
000FFFFA358 0018006021E (00180252DED, 001802340A6, 000FFFFA358, 000FFFF9250)
000FFFFA358 00180048859 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA358 00180048892 (00180252EA9, 000FFFFA208, 000FFFFA358, 00000000000)
000FFFFA358 001800AF0D8 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFA358 001800AF25D (000FFFFA370, 00000000000, 00000000000, 00000000000)
000FFFFA5E0 001800B0673 (000FFFFA370, 00000000000, 00000000000, 00000000000)
End of stack trace
20 changes: 10 additions & 10 deletions index.html
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>WitWhere</title>
</head>
<body>
<!-- react app goes here -->
<div id="contents"></div>
<!-- bundle goes here -->
<script type="text/javascript" src="./build/bundle.js"></script>
</body>
<head>
<meta charset="UTF-8">
<title>Where the wit be.</title>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Press+Start+2P" rel="stylesheet">
</head>
<body>
<div id="contents"></div>
<script type="text/javascript" src="./build/bundle.js"></script>
</body>
</html>