feat(landing page design): users should see landing page

- Redesign the landing page Create css style for the landing page [Deliver #156882158]
andela · May 7, 2018 · 7697c8d · 7697c8d
2 parents 919c33e + dbe3cc1
commit 7697c8d
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 259 deletions.
diff --git a/app/models/user.js b/app/models/user.js
@@ -26,7 +26,6 @@ const UserSchema = new Schema({
   hashed_password: String,
   facebook: {},
   twitter: {},
-  github: {},
   google: {}
 });
 

diff --git a/app/views/users/auth.jade b/app/views/users/auth.jade
@@ -5,8 +5,6 @@ block content
     .offset1.span5
       a(href="/auth/facebook")
         img(src="/img/icons/facebook.png")
-      a(href="/auth/github")
-        img(src="/img/icons/github.png")
       a(href="/auth/twitter")
         img(src="/img/icons/twitter.png")
       a(href="/auth/google")

diff --git a/config/config.js b/config/config.js
@@ -4,6 +4,6 @@ import _ from 'underscore';
 // Load app configuration
 
 module.exports = _.extend(
-  require(`${__dirname}/../config/env/all.js`), 
-  require(`${__dirname}/../config/env/${process.env.NODE_ENV}.json`) || {}
+  require('../config/env/all.js'), 
+  require(`./env/${process.env.NODE_ENV}`) || {}
 );
diff --git a/config/env/development.js b/config/env/development.js
@@ -0,0 +1,16 @@
+require('dotenv').config();
+
+module.exports = {
+  app: {
+    name: 'Cards for Humanity - Development'
+  },
+  facebook: {
+    callbackURL: process.env.FB_CALLBACK
+  },
+  twitter: {
+    callbackURL: process.env.TWITTER_CALLBACK
+  },
+  google: {
+    callbackURL: process.env.GOOGLE_CALLBACK
+  }
+};
diff --git a/config/env/development.json b/config/env/development.json
diff --git a/config/env/production.js b/config/env/production.js
@@ -0,0 +1,16 @@
+require('dotenv').config();
+
+module.exports = {
+  app: {
+    name: 'Cards for Humanity - Development'
+  },
+  facebook: {
+    callbackURL: process.env.FB_CALLBACK
+  },
+  twitter: {
+    callbackURL: process.env.TWITTER_CALLBACK
+  },
+  google: {
+    callbackURL: process.env.GOOGLE_CALLBACK
+  }
+};
diff --git a/config/env/production.json b/config/env/production.json
diff --git a/config/env/test.js b/config/env/test.js
@@ -0,0 +1,23 @@
+require('dotenv').config();
+
+module.exports = {
+  port: 3001,
+  app: {
+    name: 'Cards for Humanity - Test'
+  },
+  facebook: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://localhost:3000/auth/facebook/callback'
+  },
+  twitter: {
+    clientID: 'CONSUMER_KEY',
+    clientSecret: 'CONSUMER_SECRET',
+    callbackURL: 'http://localhost:3000/auth/twitter/callback'
+  },
+  google: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://localhost:3000/auth/google/callback'
+  }
+};
diff --git a/config/env/test.json b/config/env/test.json
diff --git a/config/env/travis.js b/config/env/travis.js
@@ -0,0 +1,24 @@
+require('dotenv').config();
+
+module.exports = {
+  port: 3001,
+  app: {
+    name: 'Cards for Humanity - Test on travis'
+  },
+  facebook: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://localhost:3000/auth/facebook/callback'
+  },
+  twitter: {
+    clientID: 'CONSUMER_KEY',
+    clientSecret: 'CONSUMER_SECRET',
+    callbackURL: 'http://localhost:3000/auth/twitter/callback'
+  },
+
+  google: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://localhost:3000/auth/google/callback'
+  }
+};
diff --git a/config/env/travis.json b/config/env/travis.json