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

Collecting data #57

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
42eb092
Fix post-data testing
thejoefriel Aug 15, 2018
8733ff5
Fix all current tests
thejoefriel Aug 15, 2018
9c6061d
Change home populate endpoint
thejoefriel Aug 15, 2018
79f6b55
Add test database
thejoefriel Aug 15, 2018
9bdc013
adds toolshare_test database to travis set-up
sima-qian Aug 15, 2018
aad220c
add checkbox > relates #1
sunuwars Aug 15, 2018
2af6861
add class for item table columns
sunuwars Aug 15, 2018
04fde4b
add and populate avail column in item table
sunuwars Aug 15, 2018
6c9b7d0
changes config.env variable names for heroku database implementation
sima-qian Aug 15, 2018
fe0d422
sorts out config.env for heroku
sima-qian Aug 15, 2018
06acafc
Merge pull request #3 from fac-14/testing-and-refactoring
sunuwars Aug 15, 2018
d11ea01
add item name to borrow form title
VirtualDOMinic Aug 15, 2018
1b47f0c
minor column name changes
VirtualDOMinic Aug 15, 2018
b8474b1
Merge branch 'master' into frontend-checkbox-modal
VirtualDOMinic Aug 15, 2018
8584859
Merge pull request #14 from fac-14/frontend-checkbox-modal
thejoefriel Aug 15, 2018
d40edc3
Fix config.env pathway
thejoefriel Aug 15, 2018
868badd
Initial register form and incorrect fields
thejoefriel Aug 16, 2018
c5cab2d
add password hashing function
sima-qian Aug 16, 2018
976598b
add store password in database functionality, remove postData tests a…
sima-qian Aug 16, 2018
3ddc071
front end validation
thejoefriel Aug 16, 2018
35b2f0f
Input validation
thejoefriel Aug 16, 2018
5ddcd79
Merge pull request #16 from fac-14/front-end-validation
VirtualDOMinic Aug 16, 2018
33599a1
add register endpoint route
sima-qian Aug 16, 2018
f9387fe
Merge branch 'master' into password-hashing
sima-qian Aug 16, 2018
292d20b
Merge pull request #17 from fac-14/password-hashing
thejoefriel Aug 16, 2018
4c052b1
Remove console logs
thejoefriel Aug 16, 2018
1e87588
Fix span password input bug
thejoefriel Aug 16, 2018
0e91854
Put in placeholder values for testing
thejoefriel Aug 16, 2018
5fd8df2
Merge pull request #18 from fac-14/few-tweaks
sima-qian Aug 16, 2018
9a60c1f
add name attribute to register form inputs
sima-qian Aug 16, 2018
acddf19
commits rest of file from previous commit
sima-qian Aug 16, 2018
758e7f8
fix merge conflicts
sima-qian Aug 16, 2018
036a7de
fix error in handlers.js
sima-qian Aug 16, 2018
e7b2beb
Merge pull request #19 from fac-14/password-hashing
sunuwars Aug 16, 2018
f4d76b9
replace curly brace with closing parenthesis line 284
VirtualDOMinic Aug 16, 2018
94c3797
querystring parse incoming data and fix minor html bug > relates #15
VirtualDOMinic Aug 16, 2018
d104c36
first sessionID functionality - on registration > relates #20
VirtualDOMinic Aug 16, 2018
33de2e7
hacky/hellish cookie creation with session ID contained > relates #20
VirtualDOMinic Aug 16, 2018
8e74edd
small change: variable rename
VirtualDOMinic Aug 16, 2018
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: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: node_js
node_js :
- "node"
before_script:
- psql -c 'CREATE DATABASE toolshare;' -U postgres
- psql -c 'CREATE DATABASE toolshare_test;' -U postgres
- psql -c "CREATE USER sunuwars WITH PASSWORD 'sunuwars123';" -U postgres
- psql -c 'ALTER DATABASE toolshare OWNER TO sunuwars;' -U postgres
- psql -c 'ALTER DATABASE toolshare_test OWNER TO sunuwars;' -U postgres
after_success: npm run coverage
Loading