Final touches

README.md

@@ -1,22 +1,6 @@
-# Horizons Hackathon Template.
+# BookSwap
+Julia Klugherz and Reed Feldman
 
-## Steps 1: Get your project set-up
-You have two ways of working on your project: Local and Gomix.
+## Overview
 
-### Local development
-1. Clone the repo.
-1. Create a `env.sh` file that contains:
-
-    ```
-    export MONGODB_URI='YOUR URI';
-    export SECRET='YOUR SECRET'
-    ```
-
-1. Run `source .env`, and you are good to go!
-
-### Glitch Development
-
-1. Go to https://glitch.com/edit/#!/horizons-hackathon and click
-  `Remix this 🎤`
-1. Select `.env` on the left panel, add your `MONGODB_URI` and `SECRET`
-1. Click `Show` at the top to preview your app!
+This is a simple template for a college textbook-exchange app.

app.js

@@ -9,7 +9,11 @@ var passport = require('passport');
 var LocalStrategy = require('passport-local');
 var mongoose = require('mongoose');
 var connect = process.env.MONGODB_URI;
+var _ = require('underscore');
+var bcrypt = require('bcrypt');
 
+
+//what is secret MONGODB_URI???
 var REQUIRED_ENV = "SECRET MONGODB_URI".split(" ");
 
 REQUIRED_ENV.forEach(function(el) {
@@ -23,7 +27,6 @@ REQUIRED_ENV.forEach(function(el) {
 mongoose.connect(connect);
 
 var models = require('./models');
-
 var routes = require('./routes/routes');
 var auth = require('./routes/auth');
 var app = express();
@@ -75,14 +78,17 @@ passport.use(new LocalStrategy(function(username, password, done) {
       return done(null, false, { message: 'Incorrect username.' });
     }
     // if passwords do not match, auth failed
-    if (user.password !== password) {
-      return done(null, false, { message: 'Incorrect password.' });
-    }
+    bcrypt.compare(password, user.password, function(err, res) {
+     // res == true
+     if (!res) {
+       done(null, false, { message: 'Incorrect password.' });
+       return;
+     }
     // auth has has succeeded
     return done(null, user);
   });
-}
-));
+})
+}));
 
 app.use('/', auth(passport));
 app.use('/', routes);
@@ -121,5 +127,4 @@ app.use(function(err, req, res, next) {
 var port = process.env.PORT || 3000;
 app.listen(port);
 console.log('Express started. Listening on port %s', port);
-
 module.exports = app;

departments.js

@@ -0,0 +1,49 @@
+var depts = [
+  'African American Studies',
+  'American Cultural Studies',
+  'Anthropology',
+  'Art & Visual Culture',
+  'Asian Studies',
+  'Biological Chemistry',
+  'Biology',
+  'Chemistry',
+  'Chinese',
+  'Classical & Medieval Studies',
+  'Dance',
+  'Digital & Computational Studies',
+  'East Asian Studies',
+  'Economics',
+  'Educational Studies',
+  'English',
+  'Environmental Studies',
+  'European Studies',
+  'French & Francophone Studies',
+  'Geology',
+  'German',
+  'Greek',
+  'History',
+  'Interdisciplinary Studies',
+  'Japanese',
+  'Latin',
+  'Latin American Studies',
+  'Mathematics',
+  'Music',
+  'Neuroscience',
+  'Philosophy',
+  'Phyiscal Education',
+  'Physics',
+  'Politics',
+  'Psychology',
+  'Religious Studies',
+  'Rhetoric',
+  'Russian',
+  'Sociology',
+  'Spanish',
+  'Teacher Education',
+  'Theater',
+  "Women & Gender Studies"
+];
+
+module.exports = {
+  depts
+}

models.js

@@ -3,13 +3,25 @@ var mongoose = require('mongoose');
 var userSchema = mongoose.Schema({
   username: String,
   password: String,
+  email: String,
   phone: String
 });
-
-
-
 User = mongoose.model('User', userSchema);
+//after we add a book, I need to add that book to the user scheme via helper function.
+const bookSchema = mongoose.Schema({
+    email: String,
+    owner: {
+      ref: User,
+      type: mongoose.Schema.Types.ObjectId 
+    },
+    title: String,
+    author: String,
+    department: String,
+    price: String,
+});
+const Book = mongoose.model('Book', bookSchema);
 
 module.exports = {
-    User:User
+    User: User,
+    Book: Book
 };

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "doublemessage",
+  "name": "bookswap",
   "version": "0.0.0",
   "private": true,
   "scripts": {
     "start": "node app.js"
   },
   "dependencies": {
+    "bcrypt": "^1.0.2",
     "body-parser": "~1.13.2",
     "connect-mongo": "^1.3.2",
     "cookie-parser": "~1.3.5",
@@ -14,10 +15,13 @@
     "express-handlebars": "^3.0.0",
     "express-session": "^1.13.0",
     "hbs": "~3.1.0",
+    "mailgun": "^0.5.0",
+    "mailgun-js": "^0.12.0",
     "mongoose": "^4.5.1",
     "mongoose-findorcreate": "^0.1.2",
     "morgan": "~1.6.1",
     "multer": "^1.1.0",
+    "nodemon": "^1.11.0",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
     "passport-local": "^1.0.0",

public/stylesheets/style.css

@@ -3,3 +3,33 @@ body {
   padding-top: 6.5rem;
   font: 14px "Open Sans", Helvetica, Arial, sans-serif;
 }
+
+.bates {
+    background-color: #3a3a3a !important;
+}
+
+.batestext {
+    color: #fff !important
+}
+
+.button {
+    margin-bottom: 2em !important
+}
+
+.font {
+    font-family: courier !important
+}
+
+.search {
+    color: #fff !important;
+    background-color: #337ab7 !important;
+
+}
+
+.profile {
+    text-decoration: underline !important;
+}
+
+.container-outer { overflow: scroll; width: 100%; height: 300px; }
+
+.container-inner { width: 5000; }

routes/auth.js

@@ -2,6 +2,9 @@
 var express = require('express');
 var router = express.Router();
 var models = require('../models');
+var _ = require('underscore');
+var bcrypt = require('bcrypt');
+
 
 module.exports = function(passport) {
 
@@ -17,20 +20,33 @@ module.exports = function(passport) {
         error: "Passwords don't match."
       });
     }
-    var u = new models.User({
-      username: req.body.username,
-      password: req.body.password
+    if (req.body.email.substr(req.body.email.length-3) !== 'edu') {
+      return res.render('signup', {
+        error: "Please enter a valid .edu email address."
+      })
+    }
+    //hash
+    var params = _.pick(req.body, ['username', 'password', 'email']);
+    bcrypt.genSalt(10, function(err, salt) {
+      bcrypt.hash(params.password, salt, function(err, hash) {
+        // Store hash in your password DB.
+        params.password = hash;
+        Object.assign(params);
+        models.User.create(params, function(err, user) {
+          if (err) {
+            res.status(400).json({
+              success: false,
+              error: err.message
+            });
+          } else {
+            console.log(user);
+            res.redirect('/login')
+          }
+        });
     });
-    u.save(function(err, user) {
-      if (err) {
-        console.log(err);
-        res.status(500).redirect('/register');
-        return;
-      }
-      console.log(user);
-      res.redirect('/login');
     });
-  });
+});
+
 
   // GET Login page
   router.get('/login', function(req, res) {
@@ -39,7 +55,7 @@ module.exports = function(passport) {
 
   // POST Login page
   router.post('/login', passport.authenticate('local',{
-    successRedirect: '/protected',
+    successRedirect: '/profile',
     failureRedirect: '/login'
   }));