updated files

evanjmg · Aug 29, 2015 · 1df7863 · 1df7863
1 parent 9c1f808
commit 1df7863
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 190 deletions.
diff --git a/.elasticbeanstalk/config.yml b/.elasticbeanstalk/config.yml
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,2 @@
 /node_modules
-# Elastic Beanstalk Files
-.elasticbeanstalk/*
-!.elasticbeanstalk/*.cfg.yml
-!.elasticbeanstalk/*.global.yml
+
diff --git a/.sass-cache/62399a64454269352b2be9cd16cc9dc4a40915a1/app.scssc b/.sass-cache/62399a64454269352b2be9cd16cc9dc4a40915a1/app.scssc
diff --git a/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/font-awesome.min.scssc b/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/font-awesome.min.scssc
diff --git a/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/foundation.scssc b/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/foundation.scssc
diff --git a/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/jtinder.scssc b/.sass-cache/9f1c8e25638368bb2ad151ca765ea24b4a16941e/jtinder.scssc
diff --git a/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/events.scssc b/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/events.scssc
diff --git a/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/linkedin_button.scssc b/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/linkedin_button.scssc
diff --git a/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/style.scssc b/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/style.scssc
diff --git a/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/tinderslide-overrides.scssc b/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/tinderslide-overrides.scssc
diff --git a/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/userIndex.scssc b/.sass-cache/d5524b188b61ab74cce34b76d926c63474549d22/userIndex.scssc
diff --git a/app.js b/app.js
@@ -23,18 +23,17 @@ app.set('view engine', 'ejs');
 // Setup SASS directories
 var path = require('path');
 
-app.use(sassMiddleware({
-    src: path.join(__dirname + '/sass'), 
-    dest: path.join(__dirname + '/public/stylesheets'), 
-    debug: true,
-    force: true,
-    prefix: '/stylesheets',
-    outputStyle: 'compressed',
-    outputStyle: 'expanded' 
-  }),
+// app.use(sassMiddleware({
+//     src: path.join(__dirname + '/sass'), 
+//     dest: path.join(__dirname + '/public/stylesheets'), 
+//     debug: true,
+//     force: true,
+//     prefix: '/stylesheets',
+//     outputStyle: 'compressed'
+//   }),
   // The static middleware must come after the sass middleware
-  express.static(path.join(__dirname, 'public'))
-)
+  app.use(express.static(__dirname + '/public'));
+
 
 var databaseURL = process.env.MONGOLAB_URI ||'mongodb://localhost/welunch';
 mongoose.connect(databaseURL);

diff --git a/awscli-bundle.zip b/awscli-bundle.zip
diff --git a/awscli-bundle/install b/awscli-bundle/install
diff --git a/awscli-bundle/packages/argparse-1.2.1.tar.gz b/awscli-bundle/packages/argparse-1.2.1.tar.gz
diff --git a/awscli-bundle/packages/awscli-1.8.0.tar.gz b/awscli-bundle/packages/awscli-1.8.0.tar.gz
diff --git a/awscli-bundle/packages/botocore-1.1.11.tar.gz b/awscli-bundle/packages/botocore-1.1.11.tar.gz
diff --git a/awscli-bundle/packages/colorama-0.3.3.tar.gz b/awscli-bundle/packages/colorama-0.3.3.tar.gz
diff --git a/awscli-bundle/packages/docutils-0.12.tar.gz b/awscli-bundle/packages/docutils-0.12.tar.gz
diff --git a/awscli-bundle/packages/jmespath-0.7.1.tar.gz b/awscli-bundle/packages/jmespath-0.7.1.tar.gz
diff --git a/awscli-bundle/packages/ordereddict-1.1.tar.gz b/awscli-bundle/packages/ordereddict-1.1.tar.gz
diff --git a/awscli-bundle/packages/pyasn1-0.1.8.tar.gz b/awscli-bundle/packages/pyasn1-0.1.8.tar.gz
diff --git a/awscli-bundle/packages/python-dateutil-2.4.2.tar.gz b/awscli-bundle/packages/python-dateutil-2.4.2.tar.gz
diff --git a/awscli-bundle/packages/rsa-3.1.4.tar.gz b/awscli-bundle/packages/rsa-3.1.4.tar.gz
diff --git a/awscli-bundle/packages/simplejson-3.3.0.tar.gz b/awscli-bundle/packages/simplejson-3.3.0.tar.gz
diff --git a/awscli-bundle/packages/six-1.9.0.tar.gz b/awscli-bundle/packages/six-1.9.0.tar.gz
diff --git a/awscli-bundle/packages/virtualenv-13.0.3.tar.gz b/awscli-bundle/packages/virtualenv-13.0.3.tar.gz
diff --git a/config/passport.js b/config/passport.js
@@ -76,7 +76,7 @@ module.exports = function(passport, app){
   passport.use('linkedin', new LinkedInStrategy({
   	clientID: process.env.LINKEDIN_API_KEY,
   	clientSecret: process.env.LINKEDIN_SECRET_KEY,
-  	callbackURL: "http://localhost:8000/api/users/auth/linkedin/callback",
+  	callbackURL: "/api/users/auth/linkedin/callback",
     scope: ['r_emailaddress', 'r_basicprofile'],
     state: true
   	// profileFields   : ['id','emails', 'location', 'industry']

diff --git a/npm-debug.log b/npm-debug.log