Commit Graph

711 Commits (bea77c580ec050c5a8e3967c0afe4a00fc7c4778)

Author SHA1 Message Date
Nathan Leniz ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Nathan Leniz 26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Nathan Leniz d886a77858 Refactor random verbs, phrases, and compliments so that only the resources controller is concerned with how to fetch them and how to make them randomly. Remove debug statement from bonfire/show.jade 2015-01-25 10:02:41 -05:00
Michael Q Larson 0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Nathan Leniz 3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00
Michael Q Larson c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Michael Q Larson e115e6da22 Merge branch 'master' into bonfire 2015-01-24 11:29:43 -08:00
Michael Q Larson 1c0799bef0 start adding alternative congradulatory text 2015-01-24 11:28:18 -08:00
Nathan Leniz a7f228c410 Refactor db read/write ops to use find instead of findOne to improve performance 2015-01-24 14:21:44 -05:00
Nathan Leniz 0ca042a1f0 Paired with is now properly saved, bonfire challenge framework is almost ready for release 2015-01-24 13:40:58 -05:00
Nathan Leniz 4128b3b765 Existing username check now working, error box showing and hiding properly, UI tweaks 2015-01-24 12:51:53 -05:00
Nathan Leniz 022b8daddc Adding in existing username checking, NOT WORKING AT THE MOMENT 2015-01-24 04:14:41 -05:00
Nathan Leniz a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz 6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Michael Q Larson d690f976f3 update the complete all the challenges flow and copy 2015-01-23 15:13:36 -08:00
Michael Q Larson 1f6cb10a32 fix a jquery exercise regression and make jquery exercises run in firefox 2015-01-23 00:30:34 -08:00
Nathan Leniz 0e9523ab72 More steps towards integrating the bonfire challenge framework. Importing challnge seed, public tests, private tests, entry point and entry point negator 2015-01-22 15:49:16 -05:00
Nathan Leniz 378277f0e1 More steps towards building the bonfire challenge interface 2015-01-22 13:20:46 -05:00
Nathan Leniz 094b937148 Incremental steps towards building the bonfire challenge views 2015-01-22 11:59:55 -05:00
Nathan Leniz 6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Q Larson 3810b4d9ae Merge branch 'master' into bonfire-improvement
Conflicts:
	views/bonfire/bonfire.jade
2015-01-21 15:42:08 -08:00
Michael Q Larson b1f22ef925 update the title on bonfire.js 2015-01-21 15:38:39 -08:00
Michael Q Larson 6202c03d13 Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement
Conflicts:
	controllers/bonfire.js
2015-01-21 15:37:14 -08:00
Nathan Leniz c422f9474b More improvements, keyboard shortcuts working again, extra protection against fatal errors 2015-01-21 17:17:45 -05:00
Michael Q Larson e5a407eacd make Mark Howard's SEO changes, make navbar look better, hide footer on landing page, update meta tags' 2015-01-21 14:12:19 -08:00
jmcshane 03d635c65f Test evaluation complete, need to hook pre-submit 2015-01-20 23:31:36 -05:00
Michael Q Larson 1e427d723c fix bug that was crashing heroku 2015-01-17 19:07:57 -08:00
Michael Q Larson bae9e41b42 improve bonfire and start adding model and controller 2015-01-17 18:52:58 -08:00
Michael Q Larson 7722c20877 Merge branch 'twitter-auth' of https://github.com/FreeCodeCamp/freecodecamp into one-column-challenges
Conflicts:
	app.js
2015-01-17 17:46:12 -08:00
Michael Q Larson 279df2995c change about path to learn-to-code for SEO purposes and remove learn-to-code view and controller action 2015-01-17 11:27:27 -08:00
webdev adac5f6352 Work on bonfire and make better .jshintrc files 2015-01-16 18:58:27 -05:00
Michael Q Larson 13faedc86e Add email functionality to done-with-first-100-hours page and refactor nonprofit link to be on same controller in same view folder 2015-01-14 13:28:20 -08:00
Michael Q Larson 26c3f265ad update the reset password functionality and make the password reset form consistent with other such forms 2015-01-12 22:02:33 -08:00
Michael Q Larson 3afd05ad85 Merge branch 'passreset' of https://github.com/FreeCodeCamp/freecodecamp 2015-01-12 21:36:38 -08:00
terakilobyte 5765c18def Re-enabling password reset for email signups 2015-01-13 00:35:11 -05:00
Michael Q Larson 4bdc3d34ad Add blogger API to FCC and list 5 most recent blog posts on about page 2015-01-12 21:28:58 -08:00
Michael Q Larson d8929ac72d make bonfire view consistent with other challenge views and make codemirror height larger and result code mirror pane read only with no cursor 2015-01-10 22:59:24 -08:00
terakilobyte 407f2212d0 Smoke rises 2015-01-11 00:45:37 -05:00
terakilobyte b4395e2b59 Cleaning up, enforcing username constraints to match profile page settings. Added uniqueness to profile username. 2015-01-09 22:05:45 -05:00
terakilobyte 11bc776ffb Email signup for angularized, user.js controller modified so that username can be stored upon signup 2015-01-09 21:33:50 -05:00
Michael Q Larson 02eb3b5914 committing what I have for Nathan to continue 2015-01-09 18:09:49 -08:00
Michael Q Larson 3e7da5ae98 start angularizing sign up form 2015-01-09 17:52:19 -08:00
Michael Q Larson 4e91e94463 fix firefox CDN issue and ensure twitter handle, email and username are lowercase 2015-01-09 15:10:34 -08:00
Michael Q Larson 8c9a533758 fix a couple minor issues with the user controller serving the public profile views 2015-01-08 23:33:17 -08:00
Michael Q Larson 9ab523d3f3 Merge branch 'master' into profiles 2015-01-08 22:33:17 -08:00
Michael Q Larson 063f1f3bb2 finish initial public profiles 2015-01-08 22:31:15 -08:00
Michael Q Larson bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson f9337c57ea update profile edit view 2015-01-07 16:10:40 -08:00
Michael Q Larson 3f83f56acc simplify stats page to reduce queries 2015-01-07 10:50:48 -08:00
Michael Q Larson 91638ade81 update about page and move stats into partial that is also displayed on about page. Fix Trello API issue on stats page 2015-01-06 23:08:54 -08:00
terakilobyte 41a1bc37c3 Hooking up Angular to Profile.jade 2015-01-06 00:52:30 -05:00
Michael Q Larson be22449d25 continue work on angular form 2015-01-05 20:09:23 -08:00
Michael Q Larson 41abdae46f further progress on the form and add angular inline 2015-01-05 17:29:37 -08:00
Michael Q Larson db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson f243367774 Remove noisy logs, add new camp counselors and add github auth back in 2015-01-04 12:26:45 -08:00
Michael Q Larson 89858f6604 fix an error introduced when the contact.js controller was refactored 2014-12-31 09:57:48 -08:00
Michael Q Larson a00070e5c5 fix a strange bug caused by an apparent clash in variables introduced this morning by my menu refactor 2014-12-30 22:03:03 -08:00
Michael Q Larson 1dda38eaaa Update challenges to remove SQL challenges. Make minor improvements to challenges.son 2014-12-30 22:02:19 -08:00
Michael Q Larson 8fd648b175 remove unnecessary variable declaration 2014-12-30 20:44:35 -08:00
Michael Q Larson d70bea506a update the navigation to have publicly available menu items 2014-12-30 20:26:12 -08:00
Michael Q Larson 8a9905becf this works, but does not work until I restart the server for some reason 2014-12-30 16:26:25 -08:00
Michael Q Larson 99ebcdd2be fix the pair program with team viewer view 2014-12-26 12:15:24 -08:00
Michael Q Larson a5fa27466c Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes 2014-12-26 00:05:00 -08:00
Michael Q Larson 986d6020fa add CTA buttons to anonymous challenge completion modal and selectively hide and show elements on the show view 2014-12-24 14:34:52 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
Michael Q Larson 6906de7146 update jquery exercises 2014-12-23 23:23:37 -08:00
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Michael Q Larson b4be1f859f minor random post-merge fixes 2014-12-23 13:30:20 -08:00
Michael Q Larson ef2eba7b14 Merge branch 'master' into refactor
Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js
2014-12-23 12:34:09 -08:00
Michael Q Larson 3ac4ecdd08 add twitter social functionality 2014-12-23 12:16:23 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson ca6652a791 refactor views to remove hardcoded challenge data 2014-12-23 08:22:50 -08:00
Michael Q Larson 3eb09ab637 start reworking challenge views 2014-12-22 21:07:50 -08:00
Michael Q Larson 2245aa6818 update the api controller 2014-12-22 14:33:25 -08:00
Michael Q Larson ffddd86022 Merge branch 'master' into helmet
Conflicts:
	controllers/resources.js
	package.json
	views/partials/meta.jade
2014-12-22 11:49:51 -08:00
Michael Q Larson 5497987506 Merge branch 'master' into challenges
Conflicts:
	app.js
2014-12-16 10:45:59 -08:00
Michael Q Larson 059fe5f39b update to automatically redirect based on highest completed challenge hash value 2014-12-16 10:31:19 -08:00
Michael Q Larson 91c829ac19 revise to have both screen hero and team viewer pair programming sections 2014-12-15 21:10:13 -08:00
Michael Q Larson 666953d127 add the livecode and inbox.js routes and stand in text 2014-12-14 22:24:54 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges
Conflicts:
	config/passport.js
	public/css/main.less
2014-12-13 21:09:11 -08:00
Michael Q Larson c72dfb32bd add chromebook promo 2014-12-11 21:24:44 -08:00
Michael Q Larson 21738654e9 start working on integrating helmet plugin 2014-12-10 20:44:33 -08:00
Michael Q Larson 6b7ca4fe70 update landing page with we are Free Code Camp content including masonry for twitter embeds 2014-12-09 22:30:18 -08:00
Michael Q Larson 2777259af9 attempt to add new user mailer 2014-12-07 20:50:53 -08:00
Michael Q Larson 719b4e6c5f fix the FCC email login process 2014-12-07 16:25:43 -08:00
Michael Q Larson bedddde945 make the profile page look better 2014-12-05 23:10:02 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 5fb1cbf217 update usability 2014-12-05 11:58:39 -08:00
Michael Q Larson 704b4e52a3 Revert "update the landing page and add the firelane easter egg"
This reverts commit 06c4ec540cf77b5d7b693a0725c37a90ca4f0fb0.
2014-12-05 11:49:21 -08:00
Michael Q Larson 4a0c724711 update the landing page and add the firelane easter egg 2014-12-05 10:31:04 -08:00
Michael Q Larson 07ba7e4fcb continue work on challengeshash 2014-12-04 12:06:17 -08:00
Michael Q Larson 5c54fddaec Merge branch 'master' into timestamp
Conflicts:
	views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
Michael Q Larson ec5fea2eaa start writing validations 2014-11-30 15:25:00 -08:00
Michael Q Larson 2f424def20 update mailer names 2014-11-30 00:49:55 -08:00
Michael Q Larson 72e2e7af04 update password reset mailer copy 2014-11-30 00:42:00 -08:00
Michael Q Larson abeebb9991 may have fixed email forms 2014-11-30 00:10:21 -08:00
Michael Q Larson 3fb11302d4 add privacy 2014-11-29 23:01:49 -08:00
Michael Q Larson 00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00
Michael Q Larson 79f060951a add jquery exercises 2014-11-29 15:16:47 -08:00
Michael Q Larson 456c845967 reached a stopping point, trying to fix a production bug 2014-11-26 22:00:28 -08:00
Michael Q Larson 06fe5390ba seems to attempt to write timestamp 2014-11-24 18:07:03 -08:00
Michael Q Larson d9502856dc SEO improvements suggested by Mark 2014-11-23 15:08:46 -06:00
Michael Q Larson b63b0af13f update the nonprofit contact form for new address 2014-11-20 09:54:17 -08:00
Michael Q Larson 0f3132a3f0 maybe fix the redirect issue 2014-11-19 15:50:57 -08:00
Michael Q Larson 9f790a34f0 remove useless courses controller 2014-11-19 15:31:36 -08:00
Michael Q Larson e85cf837cd add new relic require to app.js and fix challenges.js 2014-11-17 21:16:32 -08:00
Michael Q Larson cb2ed02493 quick fix to production bug 2014-11-17 19:43:15 -08:00
Michael Q Larson 0fbee8bad3 add new relic and potentially fix the challenges controller 2014-11-17 19:26:55 -08:00
Michael Q Larson fdff7d1691 add learn-to-code 2014-11-11 17:52:03 -08:00
Michael Q Larson d8d2fe694d update h2 text on home page and possibly fix persistant challenge.js bug 2014-11-11 00:58:22 -08:00
Michael Q Larson a0be4387f0 update meta tags 2014-11-11 00:23:15 -08:00
Michael Q Larson 24d57f0eaf possibly prevent app from crashing 2014-11-10 10:29:16 -08:00
Michael Q Larson ce07e9d188 conditionally striking through 2014-11-06 23:20:20 -08:00
Michael Q Larson ca0c71b77f redirects to correct challenge upon authentication 2014-11-06 23:01:01 -08:00
Michael Q Larson 86d433aaba closer to getting ajax to work 2014-11-06 17:38:47 -08:00
Michael Q Larson 944f4d6a1d purge old views and now using simple numeric system 2014-11-06 16:27:18 -08:00
Michael Q Larson 1a4ee74e8f page loads now 2014-11-06 15:26:38 -08:00
Michael Q Larson d21e83eced start making challenge seed data 2014-11-06 13:06:19 -08:00
Michael Q Larson cf9957b07c can redirect authenticated users properly 2014-11-06 12:46:24 -08:00
Michael Q Larson 08ada3d4a0 add team viewer 2014-11-05 22:44:56 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson 86129e3b6f make some minor QA changes 2014-11-03 13:44:48 -08:00
Michael Q Larson b3542862b0 finish initial coding and copy. doing a quick qa cycle 2014-11-03 13:24:30 -08:00
Michael Q Larson 97ddb9bc21 add a lot of content to challenges 2014-11-03 12:32:02 -08:00
Michael Q Larson 5a2de8c47b start grooming the challenges 2014-11-02 12:24:37 -08:00
Michael Q Larson de29af1e8a update views and add routes to app.js 2014-11-02 09:07:40 -08:00
Michael Q Larson ff5f12cda8 update views and remove additional cruft 2014-11-01 18:07:59 -07:00
Michael Q Larson 6cad74866b continue work on moving things over 2014-11-01 16:37:17 -07:00
Michael Q Larson 683d2e75fd started work on challenge controller 2014-11-01 15:37:00 -07:00
Michael Q Larson ed6848cc14 fix floating column issue, add facebook auth back in, update nonprofit mailer title 2014-10-28 15:51:41 -07:00
Michael Q Larson 3bf94e308a fix a typo and remove github and facebook auth for now 2014-10-28 13:43:13 -07:00
Sahat Yalkabov 4cff300afa API code cleanup 2014-10-27 19:58:38 -07:00
Michael Q Larson 029daa816f rename non-profit to nonprofit 2014-10-26 09:32:57 -07:00
Michael Q Larson 2387e00ca8 update non-profit route 2014-10-26 09:22:53 -07:00
Michael Q Larson e9ec492f4e tweak footer and add vimeo links 2014-10-21 11:00:03 -07:00
Michael Q Larson 9de36b6f0b add curriculum copy 2014-10-21 10:35:14 -07:00
Michael Q Larson b78f7fe608 make more progress on improving look and content of app 2014-10-20 21:37:13 -07:00
Michael Q Larson 942b154f70 fix minor problems and use s3 2014-10-20 16:25:24 -07:00
Michael Q Larson fa76554a5b finish setting up layouts 2014-10-20 15:35:42 -07:00
Michael Q Larson 972c52ca47 add named routes to courses 2014-10-20 13:28:23 -07:00
Michael Q Larson 8f3c7b44c5 start creating partials and views 2014-10-20 12:37:48 -07:00
Michael Q Larson a4343ca284 this SHOULD work but it isn't 2014-10-20 08:58:42 -07:00
Sahat Yalkabov a170c660c5 Moved Stripe pkey and skey to secrets.js
Fixes #190
2014-10-18 15:44:55 -07:00
Michael Q Larson 5dbbb935a5 thrashing on the routes a bit 2014-10-18 00:46:30 -07:00
Michael Q Larson 88bc8e14f8 got username in scope in variable 2014-10-16 18:04:32 -07:00
Michael Q Larson 093bc73375 views are wired up 2014-10-16 17:04:28 -07:00
Michael Q Larson 308461d4ec create bootstrap file 2014-10-16 16:18:26 -07:00
Michael Q Larson ac0ab1de37 start fixing chat 2014-10-16 09:07:06 -07:00
Michael Q Larson 4a36e58756 allow access to both production and development databases 2014-10-15 15:57:51 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
Michael Q Larson ad929be410 able to write to the db 2014-10-13 16:01:52 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00
Michael Q Larson 05c31ba15d firechat and firepad installed but not fully working 2014-10-12 01:51:55 -07:00
Sahat Yalkabov ae3dc2b483 Update nodemailer API usage in contact controller 2014-07-15 17:24:28 -04:00
Sahat Yalkabov 5d5a882df8 Upgrade Nodemailer to 1.0 2014-07-15 17:21:09 -04:00
Sahat Yalkabov b05c12d6d4 Replaced _.findWhere with .find function 2014-06-06 16:02:37 -04:00
Sahat Yalkabov 2cbf836041 Switched from underscore to lodash library 2014-06-06 15:43:49 -04:00
Sahat Yalkabov 3c857f5b07 Updated user controller comments 2014-06-06 15:35:16 -04:00
Sahat Yalkabov bebc4aaf5c Added a flash message "your account has been deleted" 2014-06-06 15:30:07 -04:00
Sahat Yalkabov 6e364983e5 Updated last.fm api example 2014-06-05 12:56:06 -04:00
Sahat Yalkabov d6d458635c Updated twilio credentials 2014-06-02 16:16:09 -04:00
Sahat Yalkabov d58ba076af Updated twilio API example
- Added number to text field and message field
- Input validation
2014-06-02 14:47:35 -04:00
Sahat Yalkabov 23c71d80b8 Indentation fix for email providers 2014-05-29 18:40:23 -04:00
Sahat Yalkabov 2e9b1367de Added comment for POST /api/twitter controller 2014-05-29 18:34:03 -04:00
Sahat Yalkabov 0f3eb15d72 Added "Compose New Tweet" form on Twitter API demo 2014-05-29 18:29:16 -04:00
Sahat Yalkabov dcff72cb82 Updated twitter api example.
- top 10 instead of top 50
- node.js term instead of hackathon
- using media-list instead of ul.list-unstyled
2014-05-29 16:44:13 -04:00
Sahat Yalkabov 754789e085 Added yahoo api example 2014-05-13 01:35:46 -04:00
Sahat Yalkabov 244152a619 Fixed instagram API token issue
Fixes #141
2014-04-30 00:17:28 -04:00
Sahat Yalkabov 53c6d2b459 Added instagram my recent media (+ error handler) 2014-04-30 00:12:33 -04:00
Sahat Yalkabov 5ce1cb4444 Removed unused POST route for instagram api example 2014-04-30 00:02:05 -04:00
Sahat Yalkabov 4cf0f654fb Check if email is already taken when creating a new local account 2014-04-25 14:29:54 -04:00
Sahat Yalkabov 3a3a8e97ee Added Instagram API Example 2014-04-22 14:51:35 -04:00
Sahat Yalkabov bfa1eec419 Removed unused paypal logo from img folder 2014-04-15 13:51:41 -04:00
Sahat Yalkabov 05f825d3c8 Removed PayPal API 2014-04-14 17:58:49 -04:00
Sahat Yalkabov 84a911da03 Switched to Stripe.js checkout for ease of use and better security 2014-04-14 17:34:51 -04:00
Sahat Yalkabov b9fee1cb35 Merge branch 'master' of https://github.com/tmcpro/hackathon-starter
# By Tyler McIntyre
# Via Tyler McIntyre
* 'master' of https://github.com/tmcpro/hackathon-starter:
  Added to Readme file
  Stripe API finished
  stripe API added

Conflicts:
	package.json
	views/api/index.jade
2014-04-14 16:15:46 -04:00
Sahat Yalkabov 6a8480da8e Removed commented out mailgun code.
Switched to generator-approach.
2014-04-14 13:44:16 -04:00
Sahat Yalkabov 6b9e7e1517 Renamed API Browser to API Examples 2014-04-13 23:14:58 -04:00
Sahat Yalkabov 3981dd7b19 Updated tumblr blog url 2014-04-13 19:26:17 -04:00
Tyler McIntyre 5c51aab076 Stripe API finished 2014-03-31 17:14:15 -04:00
Tyler McIntyre dfc5a2c435 stripe API added 2014-03-31 16:00:51 -04:00
Sahat Yalkabov 65ae9b18ad PayPal api example refactoring 2014-03-16 14:07:15 -04:00
Sahat Yalkabov 0e30f2f7b3 Updated contact form mail options 2014-03-16 13:46:08 -04:00
Sahat Yalkabov af08279735 Redirect to original URL when users sign-in via Local strategy 2014-03-08 15:01:32 -05:00
Sahat Yalkabov c2cda88433 Merged forgot/reset controllers into user controller 2014-03-07 14:08:56 -05:00
Sahat Yalkabov d4c9786986 Updated TO nodemailer field in reset controller 2014-03-06 02:43:32 -05:00
Sahat Yalkabov e53949cde1 Code refactoring 2014-03-06 02:36:55 -05:00
Sahat Yalkabov f76dbb1679 Updated TO and SUBJECT nodemailer fields on forgot password controller 2014-03-06 02:09:11 -05:00
Sahat Yalkabov 32eb2065e0 Renamed Referer to Referrer 2014-03-05 15:06:17 -05:00
Sahat Yalkabov 10c7f283e9 Code refactoring of redirect to last URL 2014-03-05 14:50:08 -05:00
Precious Jahlom Agboado 9aa923e90e Added a redirection to referrer page 2014-03-04 10:37:19 +00:00
Sahat Yalkabov e7989499ad Updated clockwork sms example code 2014-03-01 03:10:04 -05:00
Sahat Yalkabov e5cb5607db Consolidated clockwork updates 2014-02-27 19:42:07 -05:00
Sahat Yalkabov 007d561d88 Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master
* 'master' of https://github.com/mediaburst/hackathon-starter:
  Update README.md
  Using the newest clockwork npm package
  Removed commentted out lines from clockwork.jade
  Tweak to the clockwork view
  Adding clockwork SMS to the API mix

Conflicts:
	controllers/api.js
	package.json
2014-02-27 19:27:11 -05:00
Sahat Yalkabov 0318c1fa79 Added comments, removed console.log statements, paypal POST route refactoring 2014-02-27 18:05:10 -05:00
Sahat Yalkabov 53f89c355f Code formatting update 2014-02-27 17:39:18 -05:00
Sahat Yalkabov 582cdf4e54 A bunch of improvements to Linkedin API 2014-02-27 17:29:16 -05:00
Sahat Yalkabov c3320f28f2 Added LinkedIn API example that displays connection and your profile information 2014-02-27 16:51:38 -05:00
Sahat Yalkabov f80546bf84 Add LinkedIn API example route and controller 2014-02-27 14:48:09 -05:00
Matt Roberts a76a500d76 Using the newest clockwork npm package 2014-02-27 16:34:45 +00:00
Matt Roberts c78085b73e Merge remote-tracking branch 'upstream/master'
Conflicts:
	package.json
2014-02-27 16:16:13 +00:00
Amit K e08830df35 hack to exclude internal links from the list 2014-02-26 05:26:59 +05:30
Matt Roberts babcdd3afe Adding clockwork SMS to the API mix 2014-02-24 11:25:51 +00:00
Sahat Yalkabov 8aeae3f254 Add success flash notification on successful password reset 2014-02-18 03:46:03 -05:00
Sahat Yalkabov b7b74e70b3 Forgot password token changed to hex instead of base64 to avoid having slashes in the url 2014-02-18 03:33:32 -05:00
Sahat Yalkabov d24045ec49 Merged first and second waterfall steps into one, added var secrets = require('../config/secrets');, and mongoose query now returns a user object instead of an array 2014-02-18 03:29:25 -05:00
Sahat Yalkabov 4d434aef3c Converted reset controller from eventemitter to async.waterfall. 2014-02-18 03:21:05 -05:00
Sahat Yalkabov 6d3bdaeaea Added callback to async.waterfall for error handling via express middleware 2014-02-18 03:13:00 -05:00
Sahat Yalkabov 597f137a2b Update flash message on successful forgot password request 2014-02-18 02:38:31 -05:00
Sahat Yalkabov 71c5d31521 Update POST /forgot description. 2014-02-18 02:20:56 -05:00
Sahat Yalkabov ffb2c7b798 Refactor Forgot controller 2014-02-18 02:15:03 -05:00
Sahat Yalkabov 76a73943f4 Converted workflow/eventemitter code to async.waterfall 2014-02-18 02:09:51 -05:00
Sahat Yalkabov 6549966a16 Update error flash message, redirect to /forgot if no reset token is found or if it has expired 2014-02-18 01:40:03 -05:00
Sahat Yalkabov 58c3db89ed Updated expiration of password token to 1hr, updated flash message when email is sent with password recovery instructions. 2014-02-18 01:16:34 -05:00
Sahat Yalkabov 0777294c98 Updated email template text, removed token salting, changed token to base64 (24bit) 2014-02-17 20:45:29 -05:00
Sahat Yalkabov 7e06b6a161 Add title "Forgot Password" to GET /forgot template 2014-02-17 19:46:37 -05:00
Sahat Yalkabov 27dab8fbf9 Removed redundant check for empty email address field 2014-02-17 19:45:33 -05:00
Sahat Yalkabov de1ee38f8e Swapped Gmail for Sendgrid on Forgot Password Send Email workflow 2014-02-17 18:54:46 -05:00
Dan Stroot 1faf279877 Added complete password reset function 2014-02-17 10:00:43 -08:00
Sahat Yalkabov a987efea4a JavaScript style formatting.
SendGrid as a default service for contact form.
2014-02-11 10:46:39 -05:00
Sahat Yalkabov b6391fccf8 Merge branch 'add-mailgun' of https://github.com/leemunroe/hackathon-starter into leemunroe-add-mailgun
* 'add-mailgun' of https://github.com/leemunroe/hackathon-starter:
  Add Nodemailer and Mailgun option for contact form
2014-02-11 10:32:14 -05:00
Sahat Yalkabov f12422ba1b Removed todo comments 2014-02-11 08:40:33 -05:00
Sahat Yalkabov 6b7c68c1c6 Fixed a typo and added form placeholders 2014-02-11 08:24:04 -05:00
Sahat Yalkabov c5a73443d6 Fixed typo and added payment.target.user to recentPayments table in case User ID was used instead of email or phone # to send a payment 2014-02-11 08:14:50 -05:00
Sahat Yalkabov 241baf179a Add venmo recent payments 2014-02-11 08:04:20 -05:00
Sahat Yalkabov f0b5ad7bf0 Add isNumeric constraint on Venmo phone validation 2014-02-11 07:50:47 -05:00
Sahat Yalkabov d14732e0df Display Venmo error flash message on POST request if statusCode is not 200 2014-02-11 00:06:33 -05:00
Sahat Yalkabov 5275607bdb Add send a payment form, route and controller for Venmo API 2014-02-10 23:55:32 -05:00
Sahat Yalkabov 81d4712ba9 Get profile data in getVenmo controller 2014-02-10 20:59:39 -05:00
Sahat Yalkabov 45613cda0e Add venmo authorize, callback and API urls, and a corresponding Venmo controller 2014-02-10 19:21:54 -05:00
Lee Munroe c46c321978 Add Nodemailer and Mailgun option for contact form 2014-02-10 13:32:38 -08:00
Sahat Yalkabov e357b39700 Changed successful login message to "success" flash instead of "info" 2014-02-10 11:04:36 -05:00
Sahat Yalkabov 0d4f2ae8fd Merge branch 'master' of https://github.com/JahlomP/hackathon-starter into JahlomP-master
* 'master' of https://github.com/JahlomP/hackathon-starter:
  Replaced hardcoded success flash with express-flash
2014-02-10 10:58:31 -05:00
Sahat Yalkabov a456508e60 Update jsdoc strings 2014-02-07 10:21:18 -05:00
Sahat Yalkabov f3bcafb42f Remove mongoose reference 2014-02-07 09:57:05 -05:00
Precious Jahlom Agboado de3d62b66b Replaced hardcoded success flash with express-flash 2014-02-07 08:04:22 +00:00
Sahat Yalkabov 69a52ad3e1 Add comment blocks for twilio get and post controllers 2014-02-06 08:40:14 -05:00
Sahat Yalkabov aec3807d34 Updated docs button group on Twilio page.
Pass err.message instead of error object to the middleware.
2014-02-06 08:33:37 -05:00
Sahat Yalkabov 78a3e681fb Success notification and redirect back to Twilio API page on successful text send. 2014-02-06 08:16:35 -05:00
Sahat Yalkabov a34dabbc68 Added Twilio POST route and controller 2014-02-06 08:09:54 -05:00
Sahat Yalkabov 41cfc59cda Added Twilio API template, controller and route; + twilio library. 2014-02-06 07:46:47 -05:00
Sahat Yalkabov f0422b5dd8 Added error messages when Steam ID is invalid or missing 2014-02-06 04:13:42 -05:00
Sahat Yalkabov f34e5d57dc Changed playerSummaries to playerSummary since i am only getting information a single Steam ID 2014-02-06 03:54:26 -05:00
Sahat Yalkabov 888f4eb86a Include free games in getOwnedGames, added custom thumbnail hover effect 2014-02-06 02:51:16 -05:00
Sahat Yalkabov 0774772dcd Add owned games thumbnails 2014-02-05 23:27:13 -05:00
Sahat Yalkabov 7fa3a401e6 Steam API code refactoring, added ownedGames API call 2014-02-05 19:29:46 -05:00
Karl Jakober 1687440588 removes steam auth, sets up steam api requests in async 2014-02-05 21:04:02 +00:00
Karl Jakober aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
Sahat Yalkabov 1db2daa01a Removed redundant req.assert for empty email
Swapped code order of a few things in app.js to make it more consistent in terms of coding style
2014-02-02 05:38:38 -05:00
Sahat Yalkabov 246b51a793 Removed redundant express-validator validations, notEmpty() 2014-02-01 03:53:50 -05:00
Sahat Yalkabov 7396a6d7ab Changed updatePassword controller validation to use express-validator instead of custom if statements 2014-02-01 03:39:11 -05:00
Sahat Yalkabov fdecdc5b53 Flash notification on OAuth Provider Unlink 2014-02-01 00:04:54 -05:00
Sahat Yalkabov e177ac10de Updated message if user with that email already exists 2014-01-31 22:18:57 -05:00
Sahat Yalkabov 967ab7fe0a Updating email on profile page will correctly update it in the databse. Fixes issue #25 2014-01-30 17:29:06 -05:00
Sahat Yalkabov 666a70a50e Update contact page to work with express-flash 2014-01-28 17:44:25 -05:00
Sahat Yalkabov 45d0c35f9d Update flash notifications on login, profile, signup pages to work with new express-flash 2014-01-28 17:41:13 -05:00
Tim Messerschmidt cdb73bf261 Adds PayPal SDK sample to the API controller 2014-01-27 12:22:12 -08:00
Sahat Yalkabov 940d52bd43 Fix [Object object] displayed on profile update success instead of the actual message text. 2014-01-27 07:58:32 -05:00
Sahat Yalkabov 213e3afead Display error message when Last.fm api key is missing 2014-01-26 21:00:02 -05:00
Sahat Yalkabov f36fa1e0f7 Add error message when NYT API KEY is missing 2014-01-26 20:19:41 -05:00
Sahat Yalkabov 12e456db51 Removed geo-ip, hard-coded NYC coordinates on the foursquare api example 2014-01-26 19:11:04 -05:00
Sahat Yalkabov 11f9c12b1e Add Login route express validations 2014-01-23 22:47:21 -05:00
Sahat Yalkabov be73f9c62f Add express validators to signup page, replaces custom written if statements 2014-01-23 22:39:59 -05:00
Sahat Yalkabov f26940942a Mapped sengrid error message to msg property so it matches express-validator 2014-01-23 22:36:28 -05:00
Sahat Yalkabov 2c351ea6eb Update sendgrid email address 2014-01-23 22:25:13 -05:00
Sahat Yalkabov 76475411d1 Add contact page server side validation assertions using express-validator 2014-01-23 22:19:18 -05:00
Sahat Yalkabov a5eff415f0 POST signup controller updated username to email field during new User creation. 2014-01-18 01:56:55 -05:00
Sahat Yalkabov 3ed327e2e8 Updated jsdoc comments 2014-01-13 04:34:54 -05:00
Sahat Yalkabov 38245ccfb8 Code cleanup, updated jsdoc comments, added missing "next" error middleware to api.js controllers. 2014-01-13 04:24:31 -05:00
Sahat Yalkabov 3dc90ac05b Updated error messages 2014-01-12 15:31:17 -05:00
Sahat Yalkabov bd36575122 Refactoring 2014-01-07 18:15:14 -05:00
Sahat Yalkabov e2184ae4ee Refactoring + improved validation on POST signup 2014-01-07 17:45:42 -05:00
Sahat Yalkabov 5559f2f8a5 Updated token unlinking 2014-01-07 14:35:23 -05:00
Sahat Yalkabov 5d5d546d25 Refactoring 2014-01-07 14:13:35 -05:00
Sahat Yalkabov 7e1db0e455 Top level index layout renamed to home 2014-01-07 13:39:58 -05:00
Sahat Yalkabov 72dd19c6f9 Moved api browser template into api folder, renamed to index.jade 2014-01-07 13:39:25 -05:00
Sahat Yalkabov 41f6b1c5f0 Renamed template account to profile 2014-01-07 13:37:13 -05:00
Sahat Yalkabov 6ad1073f7c Consolidated account login and signup templates under account folder 2014-01-07 13:36:44 -05:00
Sahat Yalkabov f660cd5129 Declared Passport helper middleware so you don't have to explicitly pass user: req.user explicitly to templates 2014-01-03 18:19:11 -05:00
Sahat Yalkabov 85320d216b Fixed hacker news api web scraping example 2014-01-03 05:12:00 -05:00
Sahat Yalkabov 30a610be2c Cleaned up code + simplified 2013-12-20 14:12:29 -05:00
Sahat Yalkabov 36ba87ce09 Code refactoring, renamed token to accessToken in user schema, comment strings for routes, 2013-12-20 13:48:33 -05:00
Sahat Yalkabov 2f0fe0eb27 Add authentication middleware to github route.
Removed old ios7 signup login page for now.
2013-12-20 02:39:51 -05:00
Sahat Yalkabov 6c00a31588 Comments on User controller routes 2013-12-20 01:59:05 -05:00
Sahat Yalkabov a9ac61e063 Renamed config.js to secrets.js to better match the intents of the file 2013-12-20 01:31:16 -05:00
Sahat Yalkabov a6d762b071 Code refactoring 2013-12-20 00:50:44 -05:00
Sahat Yalkabov 010fc0c9fb Error handling via middleware in routes 2013-12-19 20:17:15 -05:00
Sahat Yalkabov 11e8385b77 Error handlers for some routes on users controller 2013-12-19 13:40:43 -05:00
Sahat Yalkabov 7497f36c03 Append Name field to the bottom of email on contact form 2013-12-19 13:31:20 -05:00
Sahat Yalkabov 47e62c39ea Moved Last.fm key/secret into config.js 2013-12-19 13:25:52 -05:00
Sahat Yalkabov 0256770848 refactoring 2013-12-19 13:22:42 -05:00
Sahat Yalkabov efa84dba1b Removed unusued code and images 2013-12-19 13:16:32 -05:00
Sahat Yalkabov b98bf72107 Created username availability controller 2013-12-18 15:00:33 -05:00
Sahat Yalkabov 6e708d2998 Refactoring 2013-12-15 14:11:57 -05:00
Sahat Yalkabov 273bd0afcc Refactoring and code cleanup 2013-12-15 14:02:41 -05:00
Sahat Yalkabov 7175005e2c Google linking and unlinking works successfully now 2013-12-13 01:12:59 -05:00
Sahat Yalkabov 9de1748bc2 Updated URLs 2013-12-13 00:50:37 -05:00
Sahat Yalkabov bedd03c420 Unlink provider: delete its tokens and provider id 2013-12-13 00:49:46 -05:00
Sahat Yalkabov 2da4d4ab1c Remove user's token and provider ID on oauth unlink 2013-12-13 00:27:51 -05:00
Sahat Yalkabov 0555681dd5 Pass user object to aviary, last.fm and NYT api pages 2013-12-12 23:05:44 -05:00
Sahat Yalkabov f0bbf2985c Implemented change password functionality 2013-12-12 21:47:34 -05:00
Sahat Yalkabov debb395326 Switched the order of confirm password and ToS validation, in addition removed logical OR for checking username/password and assigning an empty string if username or password is undefined 2013-12-12 20:57:47 -05:00
Sahat Yalkabov e0bdccbd2c Oauth linking and unlinking controller and route placeholders 2013-12-12 14:05:35 -05:00
Sahat Yalkabov ef967cafda Linked profiles are determined dynamically 2013-12-12 14:01:19 -05:00
Sahat Yalkabov 6870bcc098 Implemented Delete account feature 2013-12-12 12:41:29 -05:00
Sahat Yalkabov 11296bccd4 Added terms of service checkbox validation 2013-12-12 00:26:57 -05:00
Sahat Yalkabov 06b4c3bcd6 Geolocation parameter on tweets 2013-12-10 02:58:03 -05:00
Sahat Yalkabov 2bee6008df Twitter API search tweets by keyword example 2013-12-10 02:14:44 -05:00
Sahat Yalkabov bb577d43ea NYT Bestsellers are now displayed in a sortable table with isbn, author, title and description of each book 2013-12-10 01:27:58 -05:00
Sahat Yalkabov 3bd21d9244 New york times bestsellers api implementation 2013-12-10 01:16:03 -05:00
Sahat Yalkabov 2a9901d2c2 Added top albums images on last.fm page 2013-12-10 00:36:52 -05:00
Sahat Yalkabov b72599151a Async parallel to retrieve artist's top albums as well 2013-12-10 00:32:23 -05:00
Sahat Yalkabov 4d20bf653a Cleanup 2013-12-09 23:53:47 -05:00
Sahat Yalkabov 135550d38d Added similar artists, artist stats 2013-12-09 23:46:10 -05:00
Sahat Yalkabov c5d2513e43 Added artist information on last.fm example with bio, tags, cover image, and stats 2013-12-09 23:11:41 -05:00
Sahat Yalkabov e8f2a6688b Added forms for artist and track retrieval on last.fm page 2013-12-09 21:20:41 -05:00
Sahat Yalkabov d4af82594f Last.fm get artist info example 2013-12-09 19:26:26 -05:00
Sahat Yalkabov 67da9d7f01 Last.fm auth callbacks 2013-12-09 17:14:20 -05:00
Sahat Yalkabov e0c8820e85 Added last-fm package 2013-12-09 16:57:26 -05:00
Sahat Yalkabov 3128b9bb2f Added doc comments to api controllers 2013-12-08 19:07:22 -05:00
Sahat Yalkabov 37392d1fae passport isAuthorized middleware. Fixed headers already sent errors. 2013-12-08 04:30:43 -05:00
Sahat Yalkabov 7b4549b368 Refactoring 2013-12-08 03:58:56 -05:00
Sahat Yalkabov 51001a0497 Created isAuthorized middleware 2013-12-08 02:10:49 -05:00
Sahat Yalkabov 06db58c554 Added aviary api example 2013-12-08 01:49:18 -05:00
Sahat Yalkabov 58805c678d Code cleanup 2013-12-08 01:17:12 -05:00
Sahat Yalkabov ba75d67688 Display just the latest tumblr photo post instead of all posts 2013-12-08 01:02:33 -05:00
Sahat Yalkabov ced190e0af Added Photos on tumblr example api 2013-12-08 00:35:35 -05:00
Sahat Yalkabov 36048fe2f5 User currently logged in user's facebook id instead of hard coding 2013-12-07 22:52:25 -05:00
Sahat Yalkabov 4f9d7727c0 Added facebook friends to fb api example 2013-12-07 22:50:27 -05:00
Sahat Yalkabov eb070884be Added Get current user information from facebook example 2013-12-07 22:33:49 -05:00
Sahat Yalkabov d7f19c483f New github api page with a repo information example
Bootstrap-Well ios7 style
2013-12-07 21:44:26 -05:00
Sahat Yalkabov 44c90b7156 Finished web scraping example with a hacker news top 30 links 2013-12-07 18:53:00 -05:00
Sahat Yalkabov 5b99baa007 Web scraping page 2013-12-07 17:45:20 -05:00
Sahat Yalkabov 2ceb35d036 Rounded user thumbnail in navbar 2013-12-07 14:56:36 -05:00
Sahat Yalkabov ccefcf5107 Removed foursquare callbacks (no longer used) 2013-12-07 12:38:45 -05:00
Sahat Yalkabov 189d142b79 Refactoring 2013-12-07 12:37:59 -05:00
Sahat Yalkabov 3c610a5b18 Fixed signup page exceptions 2013-12-07 03:17:48 -05:00
Sahat Yalkabov 2da4c99cd3 Simple tumblr api demo that displays my blog name 2013-12-07 02:50:07 -05:00
Sahat Yalkabov c03d62da08 Changed tokens from an object of objects to just an array, Tumblr strategy now pushes a new token in addition to tokenSecret as well as token kind 2013-12-07 02:17:46 -05:00
Sahat Yalkabov 388599ac28 Tumblr now also redirects to unauthorized page if no token found 2013-12-07 01:46:49 -05:00
Sahat Yalkabov 2c15e7774c Created a separate page to which user gets redirected if no token is present (foursquare) 2013-12-07 01:39:11 -05:00
Sahat Yalkabov 435b006967 Refactoring tumblr authorization 2013-12-07 00:50:37 -05:00
Sahat Yalkabov c9dcfd6292 code cleanup 2013-12-07 00:34:23 -05:00
Sahat Yalkabov a3af42e529 Added comments indicating which routes each controller corresponds to 2013-12-06 22:22:12 -05:00
Sahat Yalkabov c7d3905fa2 Updated config.js references 2013-12-06 20:18:21 -05:00
Sahat Yalkabov 93abd14e28 Updating gender radio button now correctly updates the database value 2013-12-06 00:25:49 -05:00
Sahat Yalkabov 4d92ad9d16 User profile information is now successfully saved and retrieved back on account profile page 2013-12-05 23:53:14 -05:00
Sahat Yalkabov 44a985f838 Updated email input fields to username id and name 2013-12-05 23:24:12 -05:00