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

I'm Game #154

Open
wants to merge 163 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
343cd25
Add domain and clientID and set name and email to localStorage
michiang Feb 10, 2017
c19b794
Add auth0 dependencies
michiang Feb 10, 2017
547a1be
Create nickname and email properties to User schema.
michiang Feb 10, 2017
aa9bd16
Merge pull request #27 from michiang/master
michiang Feb 10, 2017
c960341
Create view for someone else's profile
bchasset Feb 10, 2017
8af72eb
Add email and nickname to add user post request. Add view and control…
bchasset Feb 10, 2017
9d5366e
Enter Database url instead of username & password
gwynndp Feb 10, 2017
cba0958
Enter Database url instead of username & password
gwynndp Feb 10, 2017
f5bede4
Revert to username & password;
gwynndp Feb 10, 2017
09a66e2
Update to use ClearDB url
gwynndp Feb 10, 2017
e04102c
Insert GiantBomb API key
gwynndp Feb 10, 2017
50899e0
Add database sync to update tables if schema changes - DEV ONLY
gwynndp Feb 10, 2017
f2693d9
Merge branch 'master' into foreignprofile
danjumamilhaus Feb 10, 2017
1f91eb6
Update giantBombHelpers.js
danjumamilhaus Feb 10, 2017
dd46698
Merge pull request #32 from bchasset/foreignprofile
danjumamilhaus Feb 10, 2017
e86da24
Update giantBombHelpers.js
danjumamilhaus Feb 10, 2017
9fe2adf
Merge pull request #33 from gwynndp/master
danjumamilhaus Feb 10, 2017
ab5b67b
Add button and image container div
danjumamilhaus Feb 10, 2017
ab2f7eb
Fix button in grid view
danjumamilhaus Feb 10, 2017
540aa09
Add button to list view, change css selectors
danjumamilhaus Feb 10, 2017
1562c4c
Added Giant Bomb API key
michiang Feb 10, 2017
fb7d918
Modify user post request to include nickname and email
michiang Feb 10, 2017
fef3f6d
Merge pull request #34 from danjumamilhaus/im-game-button
michiang Feb 10, 2017
4530c75
Change logout href to localhost
michiang Feb 10, 2017
d2bc8d5
Create server endpoint that calls db helper for gameid
michiang Feb 10, 2017
9201d0d
Add imgame field to database
gwynndp Feb 10, 2017
e1f13df
Add database helper to update User imgame value and search for other …
gwynndp Feb 10, 2017
e58ce7e
Merge pull request #35 from gwynndp/master
michiang Feb 10, 2017
946e39a
Merge branch 'master' into master
gwynndp Feb 10, 2017
e6f1453
Merge pull request #36 from michiang/master
gwynndp Feb 10, 2017
a8a3766
Create imgame.html
danjumamilhaus Feb 10, 2017
cff9f5e
Add a route for imgame, create page
danjumamilhaus Feb 10, 2017
7c58684
Add userCollection css selector
danjumamilhaus Feb 10, 2017
41305b1
Create imgame controller file
danjumamilhaus Feb 10, 2017
ed26dd9
Merge pull request #40 from danjumamilhaus/imgame-page
bchasset Feb 10, 2017
abc0539
Create divs/styling and ng-repeat for users in imgame page
danjumamilhaus Feb 11, 2017
89d2867
Fix styling for imgame page
danjumamilhaus Feb 11, 2017
d1f7849
Implement update user with game and find users with game db helper fu…
michiang Feb 11, 2017
682044e
Added imgame attribute to User schema
michiang Feb 11, 2017
6ba53be
Implement post and get requests on server-side for game title
michiang Feb 11, 2017
826286d
Merge pull request #42 from danjumamilhaus/imgame-page
gwynndp Feb 11, 2017
6723fa2
Update server.js
bchasset Feb 11, 2017
c886af5
Merge pull request #43 from michiang/master
bchasset Feb 11, 2017
7e664c8
Implement foreign profile view. But need to modify get request to use…
bchasset Feb 10, 2017
0500ec6
Implement Imgame controller
bchasset Feb 11, 2017
0e7df54
Injected socket into index.html for testing
michiang Feb 11, 2017
0ecdf57
Add socket.io as dependency
michiang Feb 11, 2017
46c731a
Fix syntax errors
michiang Feb 11, 2017
6bd3f60
Attach express app and socket.io server to same HTTP server and liste…
michiang Feb 11, 2017
d95a115
Merge pull request #45 from michiang/master
michiang Feb 11, 2017
b3ad55d
Refine endpoints & new ImGameController
gwynndp Feb 11, 2017
03bbf28
Add basic socket.io chat to index page
gwynndp Feb 11, 2017
efa5ecc
Complete imgame controller
bchasset Feb 11, 2017
b63d790
Merge branch 'master' into foreignprofile
bchasset Feb 11, 2017
3790724
Update giantBombHelpers.js
bchasset Feb 11, 2017
de24d88
Merge pull request #49 from gwynndp/feat/socket
bchasset Feb 11, 2017
5ca0413
Merge pull request #50 from bchasset/foreignprofile
michiang Feb 11, 2017
6694586
Move socket chat to imgame page
gwynndp Feb 11, 2017
08fd40d
Merge pull request #62 from gwynndp/feat/socket
gwynndp Feb 11, 2017
62bc677
Add $destroy listener to imgame controller, open link to profiles in …
bchasset Feb 11, 2017
fb3b3ad
Merge pull request #65 from bchasset/foreignprofile
bchasset Feb 11, 2017
2a9c94d
Change app styling
danjumamilhaus Feb 11, 2017
a9e7cea
Merge pull request #66 from danjumamilhaus/imgame-page
michiang Feb 11, 2017
cd237b5
Add listener for page close to update imgame status
bchasset Feb 11, 2017
2aa5549
giant bomb
michiang Feb 11, 2017
694ad24
Logout href
michiang Feb 11, 2017
c36073c
Merge pull request #68 from bchasset/foreignprofile
bchasset Feb 11, 2017
4674dd7
Design social hub page
michiang Feb 11, 2017
198a47e
Style profile cards on social hub view
michiang Feb 11, 2017
5f33985
Merge pull request #69 from michiang/master
michiang Feb 11, 2017
ae914e9
Fix signout issue
bchasset Feb 11, 2017
48c5852
Merge branch 'master' into foreignprofile
bchasset Feb 11, 2017
3a06a0a
Merge pull request #72 from bchasset/foreignprofile
bchasset Feb 11, 2017
4bc6032
Add 2 about page images, change home page styling
danjumamilhaus Feb 11, 2017
53bb596
Change styling and team details on About page
danjumamilhaus Feb 11, 2017
f9f9ee2
Change navbar/links
danjumamilhaus Feb 11, 2017
aac6a1c
Fix list view styling
danjumamilhaus Feb 11, 2017
f1dc8bf
Update About page styling
danjumamilhaus Feb 11, 2017
fa04e05
Remove comments
danjumamilhaus Feb 11, 2017
6a6e3ca
Merge pull request #75 from danjumamilhaus/styling
danjumamilhaus Feb 11, 2017
4139b81
Make cursor automatically target search box
danjumamilhaus Feb 11, 2017
e895b16
Merge pull request #76 from danjumamilhaus/imgame-page
danjumamilhaus Feb 11, 2017
b6c8d02
Improve functionality for targeting search input box
danjumamilhaus Feb 12, 2017
b9d05e4
Merge pull request #78 from danjumamilhaus/imgame-page
danjumamilhaus Feb 12, 2017
8dd336d
Add instructions for adding game to About page
danjumamilhaus Feb 12, 2017
9faeec3
Merge pull request #79 from danjumamilhaus/styling
danjumamilhaus Feb 12, 2017
adc4e89
Make chat feature room-specific
bchasset Feb 12, 2017
d1316f2
Merge pull request #80 from bchasset/foreignprofile
michiang Feb 12, 2017
c3cb782
Add socket.io chat, Add imgame view, Add user public collection view
gwynndp Feb 11, 2017
5248097
Change socket url to heroku on client/index.html
gwynndp Feb 12, 2017
b930806
Adjust findImGameUsers to return a success callback and chang getUser…
gwynndp Feb 12, 2017
7ae2bf2
Add user card to About page, add styling to user card in social
danjumamilhaus Feb 12, 2017
f85df4f
Merge pull request #83 from danjumamilhaus/styling
danjumamilhaus Feb 12, 2017
0e50560
Add JAWSDB env variable
danjumamilhaus Feb 12, 2017
fb297c8
Merge pull request #85 from danjumamilhaus/db
danjumamilhaus Feb 12, 2017
90e96cb
Fix db sync
danjumamilhaus Feb 12, 2017
8115abf
Merge pull request #88 from danjumamilhaus/db
danjumamilhaus Feb 12, 2017
409ec0c
Update README and documentation
michiang Feb 12, 2017
9a87af3
Change location of press release
michiang Feb 12, 2017
9d550d4
Add social view image
michiang Feb 12, 2017
f7d6b5b
Add new landing page image
michiang Feb 12, 2017
4d583b4
Move README team section
michiang Feb 12, 2017
7beda42
Add name and date to socket chat
gwynndp Feb 11, 2017
84475f1
Add namespace to socket
gwynndp Feb 11, 2017
ae1a71e
Work on socket chat
gwynndp Feb 12, 2017
51297b0
Comment out console.logs
gwynndp Feb 12, 2017
ec7b6f0
Commit so I can rebase
gwynndp Feb 12, 2017
3c2368d
Style the chat, search & the modal
gwynndp Feb 13, 2017
9b27905
Update giantBombHelpers.js
gwynndp Feb 13, 2017
0c5b7c7
Change team member names on About landing page
michiang Feb 13, 2017
37bc755
Fix setInterval to update users on social hub view
michiang Feb 13, 2017
0525f76
Merge pull request #94 from gwynndp/feat/socket
michiang Feb 13, 2017
6fe4e86
Merge branch 'master' into master
michiang Feb 13, 2017
df1629b
Merge pull request #95 from michiang/master
michiang Feb 13, 2017
ea042d9
Fix overlapping imggame-users and remove modal on imgame page
gwynndp Feb 13, 2017
13c18a3
Merge pull request #97 from gwynndp/feat/socket
michiang Feb 13, 2017
a74c5e2
Update social hub view image for feature updates
michiang Feb 13, 2017
4e94275
Update social hub view image for feature updates
michiang Feb 13, 2017
ab05d9a
Implement navUser on navbar to indicate current signed in user
michiang Feb 13, 2017
b7d0859
Merge pull request #98 from michiang/master
michiang Feb 13, 2017
e6bdb2c
Delete social hub view
michiang Feb 13, 2017
d2d4c3c
Change location of social hub view image
michiang Feb 13, 2017
d9c1678
Redirect social view image to assets folder
michiang Feb 13, 2017
b9e5dfe
make post and get request fire asynchronously in imgame.js
bchasset Feb 12, 2017
2d29a19
For pushing to heroku
bchasset Feb 12, 2017
30896a4
Change overflow to auto for search and chat
danjumamilhaus Feb 13, 2017
e4a8397
Merge pull request #99 from danjumamilhaus/styling
gwynndp Feb 13, 2017
9493a6b
Implement reroute to user's homepage if they click on their own profile
bchasset Feb 13, 2017
05ca34a
Fix alignment for view other collections section
danjumamilhaus Feb 13, 2017
7b2d83f
Merge pull request #101 from danjumamilhaus/styling
bchasset Feb 13, 2017
60f8608
Merge pull request #100 from bchasset/foreignprofile
danjumamilhaus Feb 13, 2017
d501272
Comment out local api slot
danjumamilhaus Feb 13, 2017
45d9f53
Merge pull request #102 from danjumamilhaus/db
michiang Feb 13, 2017
0eba642
Update nav links
danjumamilhaus Feb 13, 2017
b85d15c
Delete duplicate db var
danjumamilhaus Feb 13, 2017
b5ece79
Merge pull request #103 from danjumamilhaus/styling
michiang Feb 13, 2017
e0e21d7
Update add/remove buttons to be dynamic
danjumamilhaus Feb 13, 2017
c6fb703
Merge pull request #104 from danjumamilhaus/styling
michiang Feb 13, 2017
c7b3807
Comment out setInterval
danjumamilhaus Feb 13, 2017
3249466
Update setInterval to be operational, remove db brackets
danjumamilhaus Feb 13, 2017
097d33d
Fix view collection bug
danjumamilhaus Feb 13, 2017
b03a482
Merge pull request #105 from danjumamilhaus/master
michiang Feb 13, 2017
7cd69e9
Update PRESS RELEASE, delete POSTMORTEM
danjumamilhaus Feb 14, 2017
d72dcd8
Update PRESS RELEASE
danjumamilhaus Feb 14, 2017
5d82e38
Update PRESS RELEASE
danjumamilhaus Feb 14, 2017
251c1cb
Cleanup comments and console logs, delete unused files
bchasset Feb 14, 2017
e9167fd
Update PRESS-RELEASE.md
bchasset Feb 14, 2017
fd483e8
Merge pull request #106 from danjumamilhaus/doc
bchasset Feb 14, 2017
2d52f90
Merge pull request #107 from bchasset/foreignprofile
michiang Feb 14, 2017
4ab8811
Clean up back end code
bchasset Feb 14, 2017
91b1844
Create POSTMORTEM.md
michiang Feb 14, 2017
2036019
Merge pull request #108 from bchasset/foreignprofile
michiang Feb 14, 2017
07cc8a1
Format POSTMORTEM.md
michiang Feb 14, 2017
d5ee813
Update README
danjumamilhaus Feb 14, 2017
954cd73
Create DOCUMENTATION.md
michiang Feb 14, 2017
ef2cd0c
Merge pull request #109 from danjumamilhaus/doc
michiang Feb 14, 2017
e544721
Update README.md
danjumamilhaus Feb 14, 2017
45157c0
Delete old Documentation
danjumamilhaus Feb 14, 2017
090b0a2
Merge pull request #110 from danjumamilhaus/doc
danjumamilhaus Feb 14, 2017
74463a6
Formats DOCUMENTATION.md
michiang Feb 14, 2017
08710ce
Add socket.io and deployment DOCUMENTATION.md
michiang Feb 14, 2017
b72d669
Update user authentication and file descriptions POSTMORTEM.md
michiang Feb 14, 2017
8ecec3c
Finalize DOCUMENTATION.md
michiang Feb 14, 2017
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
Prev Previous commit
Next Next commit
Add JAWSDB env variable
danjumamilhaus committed Feb 12, 2017

Verified

This commit was signed with the committer’s verified signature.
commit 0e505606d9dc895983f7417e20491b67705575b7
2 changes: 1 addition & 1 deletion server/database/db.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ var Sequelize = require('sequelize');
// });

// THIS IS FOR THE LIVE SERVER ON HEROKU
var db = new Sequelize(process.env.CLEARDB_DATABASE_URL, {
var db = new Sequelize(process.env.JAWSDB_URL, {
define: {
charset: 'utf8mb4'
}