From 364f79818f1d1a27826c5459b06a1799de034ab8 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 6 Oct 2015 23:26:15 -0700 Subject: [PATCH 1/4] Fix dynamic commit link --- server/views/commit/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index 52528046f0..f050211e35 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -45,7 +45,7 @@ block content .spacer .row .col-xs-12.col-sm-6.col-sm-offset-3.text-center - a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href='https://www.girldevelopit.com/donate' target='_blank') Commit (and open donate page) + a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page) .button-spacer .spacer if pledge From 3273593b9c0e956704bad1bc90d5988c44a7f515 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 6 Oct 2015 23:32:31 -0700 Subject: [PATCH 2/4] Change order of edit buttons on profile --- server/views/account/show.jade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/views/account/show.jade b/server/views/account/show.jade index 267d281b20..9b11ef7778 100644 --- a/server/views/account/show.jade +++ b/server/views/account/show.jade @@ -161,6 +161,10 @@ block content .panel.panel-info .panel-heading.text-center Manage Your Account .panel-body + .col-xs-12 + a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') + span.ion-android-exit + | Sign me out of Free Code Camp .col-xs-12 a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='mailto:team@freecodecamp.com') span.ion-email @@ -177,12 +181,8 @@ block content | Let other people see all my solutions .col-xs-12 a.btn.btn-lg.btn-block.btn-success.btn-link-social(href='/commit') - span.ion-android-exit + span.ion-edit | Edit my pledge - .col-xs-12 - a.btn.btn-lg.btn-block.btn-warning.btn-link-social(href='/logout') - span.ion-android-exit - | Sign me out of Free Code Camp .col-xs-12 a.btn.btn-lg.btn-block.btn-danger.btn-link-social.confirm-deletion span.ion-trash-b From f5966c0959bc88c3e8e03e86f99b9915b85f5354 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Tue, 6 Oct 2015 23:33:17 -0700 Subject: [PATCH 3/4] Change redirect and text on commit --- server/boot/commit.js | 2 +- server/views/commit/index.jade | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/server/boot/commit.js b/server/boot/commit.js index 4b04950c63..b34d9716a0 100644 --- a/server/boot/commit.js +++ b/server/boot/commit.js @@ -204,7 +204,7 @@ export default function commit(app) { msg = `No pledge found for user ${user.username}.`; } req.flash('errors', { msg }); - return res.redirect('/commit'); + return res.redirect(`/${user.username}`); }, next ); diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index f050211e35..179afd92cd 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -47,15 +47,13 @@ block content .col-xs-12.col-sm-6.col-sm-offset-3.text-center a#commit-btn-submit.btn.btn-block.btn-lg.signup-btn(href=donateUrl target='_blank') Commit (and open donate page) .button-spacer - .spacer if pledge form.row(name='stop-pledge' action='/commit/stop-commitment' method='post') .col-xs-12.col-sm-6.col-sm-offset-3.text-center button.btn.btn-sm.btn-danger(name='submit' type='submit') Stop my pledge - .spacer else .row - .col-xs-12.col-sm-6.col-sm-offset-3.text-center + h4.col-xs-12.col-sm-6.col-sm-offset-3.text-center a(href='/') Maybe later .spacer script. From 92b9f7153251c21808b7e7a7864ecb4a1bba8e45 Mon Sep 17 00:00:00 2001 From: Berkeley Martinez Date: Wed, 7 Oct 2015 00:05:26 -0700 Subject: [PATCH 4/4] Add commit directory page --- server/boot/commit.js | 12 ++++++++++++ server/views/commit/directory.jade | 21 +++++++++++++++++++++ server/views/commit/index.jade | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 server/views/commit/directory.jade diff --git a/server/boot/commit.js b/server/boot/commit.js index b34d9716a0..9a48ea5236 100644 --- a/server/boot/commit.js +++ b/server/boot/commit.js @@ -56,6 +56,11 @@ export default function commit(app) { pledge ); + router.get( + '/commit/directory', + renderDirectory + ); + router.post( '/commit/stop-commitment', sendNonUserToCommit, @@ -167,6 +172,13 @@ export default function commit(app) { ); } + function renderDirectory(req, res) { + res.render('commit/directory', { + title: 'Commit Directory', + nonprofits + }); + } + function completeCommitment(req, res, next) { const { user } = req; diff --git a/server/views/commit/directory.jade b/server/views/commit/directory.jade new file mode 100644 index 0000000000..5ae6aadf4d --- /dev/null +++ b/server/views/commit/directory.jade @@ -0,0 +1,21 @@ +extends ../layout +block content + .panel.panel-info + .panel-heading.text-center Commit to one of these nonprofits + .panel-body + .row + .col-xs-12.col-sm-6.col-sm-offset-3 + for nonprofit in nonprofits + .spacer + .row + .text-center + h2= nonprofit.displayName + .row + .col-xs-12.col-sm-8.col-sm-offset-2 + img.img-responsive.img-center(src=nonprofit.imgUrl) + p= nonprofit.description + .row + .col-xs-12.col-sm-8.col-sm-offset-2 + a.text-center.btn.btn-primary.btn-lg.btn-block(href='/commit?nonprofit=#{nonprofit.name}') Go to #{nonprofit.displayName} + .spacer + diff --git a/server/views/commit/index.jade b/server/views/commit/index.jade index 179afd92cd..8d7a065f33 100644 --- a/server/views/commit/index.jade +++ b/server/views/commit/index.jade @@ -13,7 +13,7 @@ block content a(href='#{imgUrl}' data-lightbox='img-enlarge' alt='#{imgAlt}') img.img-responsive(src='#{imgUrl}' alt='#{imgAlt}') p= description - a or browse our directory + a(href='/commit/directory') or browse our directory .spacer form.form(name='commit') .hidden