From df647b978400c568b1a8043eec1787333877342f Mon Sep 17 00:00:00 2001 From: Nicolai Safai Date: Mon, 5 Nov 2018 17:55:36 -0800 Subject: [PATCH] fixed res.render issue so url always stays at / --- public/stylesheets/style.css | 12 ++++++++---- public/stylesheets/style.css.map | 2 +- public/stylesheets/style.scss | 20 +++++++++++++++----- routes/index.js | 18 ++++++++++++++---- routes/users.js | 11 ++++++----- views/index.hbs | 31 +++++++++++++++++-------------- 6 files changed, 61 insertions(+), 33 deletions(-) diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 4456c6d..37e070e 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -55,6 +55,9 @@ body .container .top p { font-size: 0.93rem; margin-bottom: 0.8rem; } +body .container .top .subheader-description { + max-width: 800px; +} body .container .top .switch { position: relative; display: inline-block; @@ -183,6 +186,7 @@ body .container .all-props-container .card-deck .pros-and-cons-container .card-c color: white; padding: 0.4em 0.25em; width: 100%; + border: none; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card .prop-voted { background-color: #5cb85c; @@ -191,21 +195,21 @@ body .container .all-props-container .card-deck .pros-and-cons-container .card-c border: 2px solid #636e72; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card.card__pros .card-header { - text-align: right; + text-align: center; padding-right: 1em; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card.card__pros .card-body { - padding: 0.25em 0em 0.25em 0.25em; + padding: 0.5em; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card.card__cons { border: 2px solid #636e72; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card.card__cons .card-header { - text-align: left; + text-align: center; padding-left: 1em; } body .container .all-props-container .card-deck .pros-and-cons-container .card-container .card.card__cons .card-body { - padding: 0.25em 0.25em 0.25em 0; + padding: 0.5em; } /*# sourceMappingURL=style.css.map */ diff --git a/public/stylesheets/style.css.map b/public/stylesheets/style.css.map index d5c041d..81fe107 100644 --- a/public/stylesheets/style.css.map +++ b/public/stylesheets/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["variables.scss","style.scss"],"names":[],"mappings":"AAOA;EACE;EACA;EACA;EACA;;;ACTF;EACE;;;AAGF;EACE;EACA,kBDNS;;ACQT;EACE,kBDXI;;ACaJ;EACE;EACA;;AAGF;EACE,ODhBM;;ACmBR;AAAA;EAEE,ODtBK;;ACyBP;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;AA8DA;;AA5DA;AAAA;EAEE,OD7CA;;ACgDF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE,kBDvFA;;AC0FF;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA,kBD9HF;EC+HE,OD5HE;EC6HF;EACA;EACA;;AAGF;EACE,kBDlIF;;ACuIJ;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA,ODrJF;ECsJE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE,ODzKC;;AC4KH;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIA;EAEE;EACA;;AAIJ;EACE;EACA,kBD7MR;EC8MQ;EACA;EACA;;AAGF;EAEE,kBDjNR;;ACqNI;EACE;;AAEA;EACE;EACA;;AAGF;EAEE;;AAIJ;EACE;;AAEA;EACE;EACA;;AAGF;EAEE","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["variables.scss","style.scss"],"names":[],"mappings":"AAOA;EACE;EACA;EACA;EACA;;;ACTF;EACE;;;AAGF;EACE;EACA,kBDNS;;ACQT;EACE,kBDXI;;ACaJ;EACE;EACA;;AAGF;EACE,ODhBM;;ACmBR;AAAA;EAEE,ODtBK;;ACyBP;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;AAsEA;;AApEA;AAAA;EAEE,OD7CA;;ACgDF;EACE;EACA;;AAGF;EACE;EACA;EACA;;AAGF;EACE;;AAOF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE,kBD/FA;;ACkGF;EACE;;AAGF;EACE;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA,kBDvIF;ECwIE,ODrIE;ECsIF;EACA;EACA;;AAGF;EACE,kBD3IF;;ACgJJ;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA,OD9JF;EC+JE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE,ODlLC;;ACqLH;EACE;;AAIJ;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIA;EAEE;EACA;;AAIJ;EACE;EACA,kBDtNR;ECuNQ;EACA;EACA;EACA;;AAGF;EAEE,kBD3NR;;AC+NI;EACE;;AAEA;EACE;EACA;;AAGF;EAEE;;AAIJ;EACE;;AAEA;EACE;EACA;;AAGF;EAEE","file":"style.css"} \ No newline at end of file diff --git a/public/stylesheets/style.scss b/public/stylesheets/style.scss index bf09f76..cd86fbb 100644 --- a/public/stylesheets/style.scss +++ b/public/stylesheets/style.scss @@ -57,6 +57,14 @@ body { margin-bottom: 0.8rem; } + .subheader-description { + max-width:800px; + } + + .profile-settings { + // border: 2px solid $light-grey; + } + .switch { position: relative; display: inline-block; @@ -120,8 +128,9 @@ body { width: 40%; #code-name { - width:100%; + width: 100%; } + .copy-btn { border-radius: 0.2em; background-color: $black; @@ -207,6 +216,7 @@ body { color: white; padding: 0.4em 0.25em; width: 100%; + border:none; } .prop-voted { @@ -219,13 +229,13 @@ body { border: 2px solid $light-grey; .card-header { - text-align: right; + text-align: center; padding-right: 1em; } .card-body { // no padding on the right side - padding: 0.25em 0.0em 0.25em 0.25em; + padding: 0.5em; } } @@ -233,13 +243,13 @@ body { border: 2px solid $light-grey; .card-header { - text-align: left; + text-align: center; padding-left: 1em; } .card-body { // no padding on the left side - padding: 0.25em 0.25em 0.25em 0; + padding: 0.5em; } } } diff --git a/routes/index.js b/routes/index.js index 55039a3..e481171 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,7 +1,7 @@ var express = require('express'); var router = express.Router(); const auth = require('./helpers/auth'); - +const User = require('../models/user'); const Proposition = require('../models/proposition'); // set layout variables @@ -15,13 +15,23 @@ router.use(function(req, res, next) { /* GET home page. */ router.get('/', function(req, res, next) { + // console.log(req); Proposition.find({}, function(err, props) { if (err) { console.error(err); } else { - res.render('index', { - props: props - }); + if (res.locals.user) { + User.findById(res.locals.user._id, function (err, user) { + res.render('index', { + props: props, + user: user + }); + }); + } else { + res.render('index', { + props: props + }); + } } }) }); diff --git a/routes/users.js b/routes/users.js index 34aa9fe..3ae7a37 100644 --- a/routes/users.js +++ b/routes/users.js @@ -132,11 +132,12 @@ router.post('/save-vote', auth.requireLogin, function(req, res, next) { if (err) { console.error(err); } else { - User.findById(res.locals.user._id, function (err, updatedUser) { - res.render('index', { - props: props, - user: updatedUser - }); + User.findById(res.locals.user._id, function (err, user) { + // res.render('index', { + // props: props, + // user: user + // }); + res.redirect('/'); }); } }) diff --git a/views/index.hbs b/views/index.hbs index 1f01858..e45e719 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,20 +1,23 @@

{{title}}

-

People are busy. People often don't vote for propositions - because they don't know what they're about. We've synthesized - the important information below.

+

For SF Residents

+

People are busy. People often skip voting for propositions + because they don't know enough about them. We've synthesized the important information below. + If you log in, you can save your votes and share them with others.

{{#if user}} -
- Private - - Public -
-