Commit Graph

450 Commits

Author SHA1 Message Date
Nathan Leniz
5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05:00
Michael Q Larson
adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
Michael Q Larson
98286e19d1 fix formatting of modals and make them less likely to accidentally wrap the compliment text 2015-02-04 19:00:40 -08:00
Nathan Leniz
d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz
9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz
161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz
26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05:00
Nathan Leniz
c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -05:00
Nathan Leniz
9193ba04e0 Fix pathing bug for users who are not logged in and type /bonfires/ 2015-02-04 00:41:25 -05:00
Michael Q Larson
f1000c3189 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	views/layout.jade
2015-02-02 23:32:46 -08:00
Michael Q Larson
78e473b4d2 another minor change to compliments 2015-02-02 23:03:50 -08:00
Nathan Leniz
43234825cf Removing needless CDN call, optimizing account view for slow page loads 2015-02-03 01:00:12 -05:00
Michael Q Larson
f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Michael Q Larson
0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson
6ece608f01 update compliments 2015-02-01 22:00:19 -08:00
Michael Q Larson
afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Nathan
186c090a20 Merge pull request #66 from FreeCodeCamp/update-url
update bonfire URL on regex match if incomplete url
2015-01-31 17:34:52 -08:00
Michael Q Larson
4c8c346a77 Revert "first commit with working iframe pulling data from code editor"
This reverts commit d7d4727c0f.
2015-01-31 16:56:23 -08:00
Michael Q Larson
0a49890517 Merge branch 'master' into angular-images
Conflicts:
	controllers/user.js
	views/account/account.jade
2015-01-31 16:44:56 -08:00
Michael Q Larson
d26a4efea4 improve angular validation on images and trim input so trailing whitespace is ignored on save 2015-01-31 16:41:33 -08:00
Michael Q Larson
4d49875b8e Revert "start process of updating youtube videos on live-pair-programming"
This reverts commit 7b0b12d348.
2015-01-31 00:07:05 -08:00
Michael Q Larson
a660e832b8 add welcome mailer for email signups and fix an issue with the angular validations 2015-01-31 00:04:35 -08:00
Michael Q Larson
7b0b12d348 start process of updating youtube videos on live-pair-programming 2015-01-30 23:59:21 -08:00
Michael Q Larson
68df7b218e update URL on regex match if incomplete url 2015-01-30 17:27:24 -08:00
Michael Q Larson
d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson
b49846a504 Add some clever new compliment messages 2015-01-29 16:10:49 -08:00
Michael Q Larson
2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Nathan Leniz
9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Nathan Leniz
7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Nathan Leniz
40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz
4fcca641b6 Adding name to passed variables for generated bonfires 2015-01-27 22:46:18 -05:00
Nathan Leniz
5294462e4c Resolving issue with saving to "paired with" user profile 2015-01-27 22:25:48 -05:00
Michael Q Larson
2f0415ecf9 update the congratulatory text a bit 2015-01-27 14:46:05 -08:00
Nathan Leniz
01bdbd8f4d Finishing up pathing issues, writing user object if they haven't visited in a day 2015-01-27 17:39:53 -05:00
Nathan Leniz
f97350ecf3 Fixed challenge ordering 2015-01-27 03:29:17 -05:00
Nathan Leniz
be0cf978f5 Correctly sorting unsolved bonfires 2015-01-27 02:51:59 -05:00
Nathan Leniz
227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz
2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson
f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08:00
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