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

Formatting #77

Open
wants to merge 87 commits into
base: master
Choose a base branch
from
Open

Formatting #77

wants to merge 87 commits into from

Conversation

TheBeege
Copy link
Member

@TheBeege TheBeege commented Dec 9, 2017

No description provided.

TheBeege and others added 30 commits October 30, 2017 15:47
@TheBeege
Added IntelliJ ignores to .gitignore. Added lock file.
82207d5
@TheBeege
Added IntelliJ ignores to .gitignore. Added lock file.
084c3b5
@TheBeege
Updated readme. Updated package files
ee984e5
@TheBeege
Updated readme. Updated package files
afd051a
@TheBeege
Fixed formatting
d589199
@TheBeege
Fixed formatting
7e347e0
@TheBeege
Added description of current state
b93e98d
@TheBeege
Added description of current state
fbabeb7
@TheBeege
Reformatted models files
14baee1
@TheBeege
Added hashing on save and password method to user model
88f3214
@TheBeege
Reformatted user model tests
c75c5e0
@TheBeege
Fixed model destruction test
6823dc2
@TheBeege
Fixed model creation tests
12e6457
@TheBeege
Removed unnecessary requires in create and destroy tests
09313e8
@TheBeege
Fixed tests to show errors properly. Added name as required to User
9cc9a40
@mepda
Merge pull request #57 from LearnTeachCodeSeoul/update_readme
468e2dc 
Update readme
@mepda
Merge pull request #57 from LearnTeachCodeSeoul/update_readme
630898b 
Update readme
@TheBeege
Fixed a test. Still investigating remaining tests. Using 'expect' sem…
6fac74a 
…antics instead of 'should' semantics.
@TheBeege
Changed formatting in userRepository. Minor fix in test
e21203a
@TheBeege
Passed another test. userRepository needed to set password. Tests are…
f35460e 
… good, friends
@TheBeege
Tests pass with required password field added to user.
21c3537
@TheBeege
Intermediate commit. May not currently be working
205c1d8
@TheBeege
Updated name field to username. Added name field
d5df26e
@TheBeege
Login and sessions work
24c6f4c
@TheBeege
Put pages behind auth wall
e821181
@TheBeege
Hid edit and create buttons based on permissions. Need to check more
6c8b557
@TheBeege
Updated gitignore. Added package lock
ec04bd7
@TheBeege
Fixed readme. Recreated package-lock. Completed merge
5f8d586
@TheBeege
Some changes were missing from merge. Added here
94cc27e
@TheBeege
Fixes for editing users
3769400
TheBeege and others added 29 commits November 9, 2017 13:58
@TheBeege
Trying to configure bookshelf for testing, but the helper isn't running
2bca14f
@TheBeege
Required helper manually in each test file. Now to fix tests
6ca9946
@TheBeege
Tests run properly but most are failing
f21862a
@TheBeege
All hooks work except for test 28
240e09e
@TheBeege
Event model create tests pass. Removed unnecessary logging elsewhere
c8a0ab4
@TheBeege
Event model destroy works
6f9baa5
@TheBeege
Event model update is good
d034478
@TheBeege
Fixes to ensure database cleanup
d143667
@TheBeege
Was fixing tests. Found bug in initialize method of User model. Event…
d7558cd 
… name for saving was incorrect, and passwords were not being hashed on save
@TheBeege
Test still failing. Troubleshooting. Made a minor fix on CheckIn model
f88b713
@jhazelton1
add gulp
6ac1210
@jhazelton1
add parsley validation
288047a
@jhazelton1
add parsley field validation on course create
4d95b81
@jhazelton1
update field validations on course create
71bbf3b
@jhazelton1
add field validation on users signup
44b66b7
@jhazelton1
remove parsleyjs validation to use bootstrap built-in validation
6b380b8
Fixed update checkIns test
ad5fb04
@TheBeege
Fixed user model update
e47388f
@TheBeege
Progress on passing tests
c1cfc12
@TheBeege
Fixed test and attribute-setting styles. Added default value handler …
c427ad1 
…to User model
@TheBeege
Fixed user destroy model test
4faa807
@TheBeege
Fixed user checkin test
da4ad00
@TheBeege
Fixed last broken test. Updated repositories appropriately
c791099
@TheBeege
Merge remote-tracking branch 'origin/add_request_badge_page' into add…
40ecc0c 
…_passport_authentication

# Conflicts:
#	package-lock.json
#	package.json
#	public/stylesheets/style.css
#	routes/users.js
#	views/users/show.pug
@TheBeege
Updated README for sqlite-based system. Updated package-lock.json. Fi…
efdb2e1 
…xed database config template
@TheBeege
Updated config for Travis
656a506
@TheBeege
Merge remote-tracking branch 'origin/field_validation' into add_passp…
2870f52 
…ort_authentication

# Conflicts:
#	package-lock.json
#	package.json
#	views/layout.pug
#	views/users/signup.pug
@TheBeege
Updated package lock file
c007f39
@TheBeege
Renamed files. Minor fixes
b30cb2e 
Renamed model files to use camel case. Converted vars to const/let. Added missing semicolons. Removed extra semicolons. Did other formatting and clean-up work
@TheBeege
Copy link
Member Author

TheBeege commented Dec 9, 2017

Also fixes #70

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.
3 participants
@TheBeege @mepda @jhazelton1