diff --git a/config/bootstrap.js b/config/bootstrap.js new file mode 100644 index 0000000000..c7845e061c --- /dev/null +++ b/config/bootstrap.js @@ -0,0 +1,22 @@ +var mongoose = require('mongoose'); +var secrets = require('./secrets'); +mongoose.connect(secrets.db); +mongoose.connection.on('error', function() { + console.error('MongoDB Connection Error. Make sure MongoDB is running.'); +}); + +var courses = require('../seed_data/courses.json'); +var challenges = require('../seed_data/challenges.json'); + +Challenge = require ('./../models/Challenge'); +Course = require ('./../models/Course'); + +Course.create(courses, function(err, data) { + if (err) console.log(err); + else console.log('Saved ', data ); +}); + +Challenge.create(challenges, function(err, data) { + if (err) console.log(err); + else console.log('Saved ', data ); +}); \ No newline at end of file diff --git a/controllers/course.js b/controllers/course.js index 7b377e9368..278b335499 100644 --- a/controllers/course.js +++ b/controllers/course.js @@ -2,9 +2,13 @@ * GET / * Home page. */ +var Course = require('./../models/Course') exports.index = function(req, res) { - res.render('course/course', { - title: 'Curriculum', + Course.find(function(err, courses){ + res.render('course/course', { + title: 'Curriculum', + courses: courses + }); }); -}; \ No newline at end of file +}; diff --git a/controllers/curriculum.js b/controllers/curriculum.js index 4955e5f06e..7b28c41910 100644 --- a/controllers/curriculum.js +++ b/controllers/curriculum.js @@ -3,8 +3,13 @@ * Home page. */ +var Course = require('./../models/Course') + exports.index = function(req, res) { - res.render('curriculum/curriculum', { - title: 'Curriculum', + Course.find(function(err, courses){ + res.render('curriculum/curriculum', { + title: 'Curriculum', + courses: courses + }); }); -}; \ No newline at end of file +}; diff --git a/models/Challenge.js b/models/Challenge.js index 7adb98a5c9..cfccba3bc1 100644 --- a/models/Challenge.js +++ b/models/Challenge.js @@ -1,8 +1,5 @@ var mongoose = require('mongoose'); var secrets = require('../config/secrets'); -var bcrypt = require('bcrypt-nodejs'); -var crypto = require('crypto'); -var challenges = require('../seed_data/challenges.json'); var challengeSchema = new mongoose.Schema({ name: { type: String, unique: true }, @@ -14,13 +11,4 @@ var challengeSchema = new mongoose.Schema({ directions: Array }); -var Challenge = module.exports = mongoose.model('Challenge', challengeSchema); - -if (require.main === module) { - mongoose.connect(secrets.db); - Challenge.create(challenges, function(err, data) { - if (err) console.log(err); - else console.log('Saved ', data ); - process.exit(0); - }); -} \ No newline at end of file +var Challenge = module.exports = mongoose.model('Challenge', challengeSchema); \ No newline at end of file diff --git a/models/Course.js b/models/Course.js index 4d8aec48b7..916bb9bdc4 100644 --- a/models/Course.js +++ b/models/Course.js @@ -1,10 +1,5 @@ var mongoose = require('mongoose'); var secrets = require('../config/secrets'); -var bcrypt = require('bcrypt-nodejs'); -var crypto = require('crypto'); -var courses = require('../seed_data/courses.json'); - -console.log(courses); var courseSchema = new mongoose.Schema({ name: { type: String, unique: true }, @@ -14,13 +9,4 @@ var courseSchema = new mongoose.Schema({ directions: Array }); -var Courses = module.exports = mongoose.model('Course', courseSchema); - -if (require.main === module) { - mongoose.connect(secrets.db); - Courses.create(courses, function(err, data) { - if (err) console.log(err); - else console.log('Saved ', data ); - process.exit(0); - }); -} \ No newline at end of file +var Courses = module.exports = mongoose.model('Course', courseSchema); \ No newline at end of file diff --git a/views/curriculum/curriculum.jade b/views/curriculum/curriculum.jade index 2837c04541..239ab2f2a9 100644 --- a/views/curriculum/curriculum.jade +++ b/views/curriculum/curriculum.jade @@ -3,18 +3,20 @@ extends ../layout block content .page-header h3 Your Curriculum - ul.pages - li.chat.page - div.chatArea - ul.messages - input.inputMessage(placeholder='Type here...') - li.login.page - div.form - h3.title What's your nickname? - input.usernameInput(type='text', maxlength='14') h1= title + ul + each course in courses + li= course.name - +//ul.pages +// li.chat.page +// div.chatArea +// ul.messages +// input.inputMessage(placeholder='Type here...') +// li.login.page +// div.form +// h3.title What's your nickname? +// input.usernameInput(type='text', maxlength='14') // for course in courses @@ -30,4 +32,5 @@ block content // input.usernameInput(placeholder='Nickanem', type='text', maxlength='14') // .col-sm-9 // input.inputMessage(placeholder='Type here...') -// \ No newline at end of file +// +