From 26d84a21e067e5b55b340833a71b7fcbb61025eb Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 22 Apr 2015 15:50:11 -0700 Subject: [PATCH] fix issues with unauthenticated field guide browsing --- controllers/fieldGuide.js | 6 +++++- seed_data/field-guides.json | 2 +- views/field-guide/show.jade | 11 +++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/controllers/fieldGuide.js b/controllers/fieldGuide.js index 49b79e6bd6..1f19adf467 100644 --- a/controllers/fieldGuide.js +++ b/controllers/fieldGuide.js @@ -39,7 +39,11 @@ exports.showAllFieldGuides = function(req, res) { var data = {}; data.fieldGuideList = resources.allFieldGuideNames(); data.fieldGuideIds = resources.allFieldGuideIds(); - data.completedFieldGuides = req.user.completedFieldGuides; + if (req.user && req.user.completedFieldGuides) { + data.completedFieldGuides = req.user.completedFieldGuides; + } else { + data.completedFieldGuides = [] + } res.send(data); }; diff --git a/seed_data/field-guides.json b/seed_data/field-guides.json index f5f96e1c23..0d72f30919 100644 --- a/seed_data/field-guides.json +++ b/seed_data/field-guides.json @@ -5,7 +5,7 @@ "description": [ "
", "

This guide will answer many of your questions about learning to code and getting a coding job.

", - "

You can click the \"Next article\" button to go to your next article.

", + "

If you're logged in, you can click the \"Next article\" button to go to your next article.

", "

You can also click the \"Show me all articles\" button to browse all the questions we answer.

", "
" ] diff --git a/views/field-guide/show.jade b/views/field-guide/show.jade index 574abeffe8..cf78f27c39 100644 --- a/views/field-guide/show.jade +++ b/views/field-guide/show.jade @@ -15,14 +15,13 @@ block content .spacer .col-xs-12.col-sm-6.col-sm-offset-3 .text-center - .next-field-guide-button.btn.btn-primary.btn-big.btn-block Next article (ctrl + enter) - .ten-pixel-break + if user + .next-field-guide-button.btn.btn-primary.btn-big.btn-block Next article (ctrl + enter) + .ten-pixel-break #showAllButton.btn.btn-info.btn-big.btn-block Show me all articles - .spacer - .row - .col-xs-12.text-center if !user - a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free) + .ten-pixel-break + a.btn.btn-big.signup-btn.btn-block(href="/login") Start learning to code (it's free) .spacer #show-all-dialog.modal(tabindex='-1') .modal-dialog.animated.fadeInUp.fast-animation