Skip to content

Commit 0a97d08

Browse files
author
Joel Taylor
committed
Merge pull request #288 from codeschool/revert-277-change_root_page
Revert "Change root page"
2 parents 83d2f3f + 4bd0d98 commit 0a97d08

File tree

10 files changed

+27
-57
lines changed

10 files changed

+27
-57
lines changed

‎client/stylesheets/components/_button.sass

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@
7878

7979
// ----- Sizes ----- //
8080
81-
.btn--s
82-
font-size: $b-fontSize-s
83-
8481
.btn--l
8582
font-size: $b-fontSize-l
8683

‎client/stylesheets/structures/_header.sass

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
// Scaffolding
2525
// -------------------------------------
2626
27-
// ----- Button ----- //
28-
29-
.header-btn
30-
position: relative
31-
z-index: 1
32-
3327
// ----- Link ----- //
3428
3529
.header-link

‎server/routes/index.js

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,16 @@ var router = express.Router();
33
var path = require('path');
44
var bodyParser = require('body-parser');
55
var parseForm = bodyParser.urlencoded({ extended: false });
6-
var Articles = require(path.join(__dirname, '..', 'services', 'articles'));
7-
var Users = require(path.join(__dirname, '..', 'services', 'users'));
8-
var Comments = require(path.join(__dirname, '..', 'services', 'comments'));
9-
var moment = require('moment');
10-
var _ = require('lodash');
116
var mcapi = require('mailchimp-api');
127

138
mc = new mcapi.Mailchimp(process.env.MAILCHIMP_API);
149

1510
/* GET home page. */
16-
router.get('/', parseForm, function(req, res) {
17-
var offset = req.query.page;
18-
var more;
19-
if (offset) {
20-
Articles.paginated(offset, function(all) {
21-
Articles.totalPublished(function(total) {
22-
more = (all.length == (total[0].count - offset )) ? false : true;
23-
res.json({flow: all, more: more});
24-
});
25-
});
26-
}else{
27-
Articles.recent(function(all) {
28-
Articles.totalPublished(function(total) {
29-
var flow = [], news = [];
30-
all.map(function(item){
31-
if (item.news){
32-
news.push(item);
33-
}else{
34-
flow.push(item);
35-
}
36-
});
37-
more = (flow.length === parseInt(total[0].count)) ? false : true;
38-
res.render('news/index', {flow_collection: flow, news_collection: news, more: more});
39-
});
40-
});
41-
}
11+
router.get('/', function(req, res, next) {
12+
res.render('index');
4213
});
4314

44-
/* POST subscribe an email to JS6 list. */
15+
/* POST subscribe an email to JS5 list. */
4516
router.post('/subscribe', parseForm, function(req, res) {
4617
mc.lists.subscribe(
4718
{

‎server/routes/news.js

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ router.
121121
// TODO: Fetch image and save it to S3
122122
// req.user['_json']['avatar_url']
123123
// req.user['_json']['login']
124-
res.redirect(req.session.returnTo || '/');
124+
res.redirect(req.session.returnTo || '/news');
125125
}).
126126
get('/signout', function(req, res){
127127
req.logout();
128-
res.redirect('/');
128+
res.redirect('/news');
129129
}).
130130

131131
get('/', parseForm, function(req, res) {
@@ -139,7 +139,20 @@ router.
139139
});
140140
});
141141
}else{
142-
res.redirect('/');
142+
Articles.recent(function(all) {
143+
Articles.totalPublished(function(total) {
144+
var flow = [], news = [];
145+
all.map(function(item){
146+
if (item.news){
147+
news.push(item);
148+
}else{
149+
flow.push(item);
150+
}
151+
});
152+
more = (flow.length === parseInt(total[0].count)) ? false : true;
153+
res.render('news/index', {flow_collection: flow, news_collection: news, more: more});
154+
});
155+
});
143156
}
144157
}).
145158

@@ -287,3 +300,4 @@ router.
287300
});
288301

289302
module.exports = router;
303+

‎server/views/guidelines/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ block content
2121
h2 Submitting a Story
2222
p
2323
| To add a story, simply click the “New Post” button on the
24-
a(href='/') News page
24+
a(href='/news') News page
2525
| .
2626
| You’ll need to authenticate with GitHub before you can add a post (if
2727
| you don’t have a GitHub profile yet,

‎server/views/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ block content
4141

4242
p.tfh
4343
| Head over to our
44-
a(href='/') news feed
44+
a(href='/news') news feed
4545
| or subscribe below to receive the latest updates from the 5 Minutes
4646
| of JavaScript newsletter and podcast.
4747

‎server/views/layouts/layout-course.jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ html.courseLayout.js-courseLayout(lang='en')
2121
nav.split-cell(role='navigation')
2222
a.underline.header-link(href='/news') News
2323
a.underline.header-link(href='/resources') Resources
24-
a.btn.btn--s.header-btn(href='/try') Learn JavaScript
2524

2625
button.courseLayout-header-toggle.js-courseLayout-toggle Toggle Navigation
2726

‎server/views/news/pending.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ block content
1818
We need to review it for spelling and grammar before it's published,
1919
but we’ll update you on its status soon.
2020

21-
a.btn(href='/') View More News
21+
a.btn(href='/news') View More News

‎server/views/partials/_footer.jade

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,9 @@ footer.row.footer(role='contentinfo')
2828
- iconPartial = { name: 'rss', size: 16 }
2929
include /views/partials/_icon
3030

31-
ul.list.list--inline.list--inline--dotted.footer-text
32-
li.list-item
33-
| Sponsored by
34-
a.link.link--inverted(href='https://www.codeschool.com') Code School
35-
li.list-item
36-
| Hosted by
37-
a.link.link--inverted(href='https://www.digitalocean.com') DigitalOcean
31+
p.footer-text.mtf.pts
32+
| Hosted by
33+
a.link.link--inverted(href='https://www.digitalocean.com') DigitalOcean
3834

3935
script.
4036
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

‎server/views/partials/_header.jade

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- headerPartial = headerPartial || {}
22
- headerPartial.bleed = headerPartial.bleed || false
3-
- menu = { 'News' : '/', 'Resources' : '/resources' }
3+
- menu = { 'News' : '/news', 'Resources' : '/resources' }
44

55
block current_nav
66

@@ -19,4 +19,3 @@ header.row.header(class=(headerPartial.bleed ? 'bc-regent' : '' ) role='banner')
1919
a.underline.header-link.is-active(href=url class=(headerPartial.bleed ? 'underline--alt' : '' ))= title
2020
else
2121
a.underline.header-link(href=url class=(headerPartial.bleed ? 'underline--alt' : '' ))= title
22-
a.btn.btn--s.header-btn(href='/try') Learn JavaScript

0 commit comments

Comments
 (0)