-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
26 changed files
with
924 additions
and
524 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 21 additions & 14 deletions
35
...t.min-03d5cec363f763ce07937ee6b695d25f.js → ...t.min-a22b5fd2d0d6d3e497fd7bda45a1f87b.js
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "index": { | ||
| "route": "/", | ||
| "frontPageTemplate": "home" | ||
| }, | ||
| "tag": { | ||
| "route": "/:t_tag/:slug/", | ||
| "postOptions": { | ||
| "filter": "tags:'%s'+tags.visibility:public" | ||
| }, | ||
| "data": { | ||
| "tag": { | ||
| "type": "read", | ||
| "resource": "tags", | ||
| "options": { | ||
| "slug": "%s", | ||
| "visibility": "public" | ||
| } | ||
| } | ||
| }, | ||
| "slugTemplate": true, | ||
| "editRedirect": "#/settings/tags/:slug/" | ||
| }, | ||
| "author": { | ||
| "route": "/:t_author/:slug/", | ||
| "postOptions": { | ||
| "filter": "author:'%s'" | ||
| }, | ||
| "data": { | ||
| "author": { | ||
| "type": "read", | ||
| "resource": "users", | ||
| "options": { | ||
| "slug": "%s" | ||
| } | ||
| } | ||
| }, | ||
| "slugTemplate": true, | ||
| "editRedirect": "#/team/:slug/" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| module.exports.router = require('./router'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| var _ = require('lodash'), | ||
| channels = []; | ||
|
|
||
| function loadConfig() { | ||
| var channelConfig = {}; | ||
|
|
||
| // This is a very dirty temporary hack so that we can test out channels with some Beta testers | ||
| // If you are reading this code, and considering using it, best reach out to us on Slack | ||
| // Definitely don't be angry at us if the structure of the JSON changes or this goes away. | ||
| try { | ||
| channelConfig = require('../../../../config.channels.json'); | ||
| } catch (err) { | ||
| channelConfig = require('./config.channels.json'); | ||
| } | ||
|
|
||
| return channelConfig; | ||
| } | ||
|
|
||
| module.exports.list = function list() { | ||
| _.each(loadConfig(), function (channelConfig, channelName) { | ||
| var channel = _.cloneDeep(channelConfig); | ||
| channel.name = channelName; | ||
| channels.push(channel); | ||
| }); | ||
|
|
||
| return channels; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| var express = require('express'), | ||
| _ = require('lodash'), | ||
| config = require('../../config'), | ||
| errors = require('../../errors'), | ||
| i18n = require('../../i18n'), | ||
| rss = require('../../data/xml/rss'), | ||
| utils = require('../../utils'), | ||
| channelLoader = require('./loader'), | ||
| renderChannel = require('../frontend/render-channel'), | ||
| rssRouter, | ||
| channelsRouter; | ||
|
|
||
| function handlePageParam(req, res, next, page) { | ||
| var pageRegex = new RegExp('/' + config.get('routeKeywords').page + '/(.*)?/'), | ||
| rssRegex = new RegExp('/rss/(.*)?/'); | ||
|
|
||
| page = parseInt(page, 10); | ||
|
|
||
| if (page === 1) { | ||
| // Page 1 is an alias, do a permanent 301 redirect | ||
| if (rssRegex.test(req.url)) { | ||
| return utils.url.redirect301(res, req.originalUrl.replace(rssRegex, '/rss/')); | ||
| } else { | ||
| return utils.url.redirect301(res, req.originalUrl.replace(pageRegex, '/')); | ||
| } | ||
| } else if (page < 1 || isNaN(page)) { | ||
| // Nothing less than 1 is a valid page number, go straight to a 404 | ||
| return next(new errors.NotFoundError({message: i18n.t('errors.errors.pageNotFound')})); | ||
| } else { | ||
| // Set req.params.page to the already parsed number, and continue | ||
| req.params.page = page; | ||
| return next(); | ||
| } | ||
| } | ||
|
|
||
| function rssConfigMiddleware(req, res, next) { | ||
| res.locals.channel.isRSS = true; | ||
| next(); | ||
| } | ||
|
|
||
| function channelConfigMiddleware(channel) { | ||
| return function doChannelConfig(req, res, next) { | ||
| res.locals.channel = _.cloneDeep(channel); | ||
| next(); | ||
| }; | ||
| } | ||
|
|
||
| rssRouter = function rssRouter(channelMiddleware) { | ||
| // @TODO move this to an RSS module | ||
| var router = express.Router({mergeParams: true}), | ||
| baseRoute = '/rss/', | ||
| pageRoute = utils.url.urlJoin(baseRoute, ':page(\\d+)/'); | ||
|
|
||
| // @TODO figure out how to collapse this into a single rule | ||
| router.get(baseRoute, channelMiddleware, rssConfigMiddleware, rss); | ||
| router.get(pageRoute, channelMiddleware, rssConfigMiddleware, rss); | ||
| // Extra redirect rule | ||
| router.get('/feed/', function redirectToRSS(req, res) { | ||
| return utils.url.redirect301(res, utils.url.urlJoin(utils.url.getSubdir(), req.baseUrl, baseRoute)); | ||
| }); | ||
|
|
||
| router.param('page', handlePageParam); | ||
| return router; | ||
| }; | ||
|
|
||
| function buildChannelRouter(channel) { | ||
| var channelRouter = express.Router({mergeParams: true}), | ||
| baseRoute = '/', | ||
| pageRoute = utils.url.urlJoin('/', config.get('routeKeywords').page, ':page(\\d+)/'), | ||
| middleware = [channelConfigMiddleware(channel)]; | ||
|
|
||
| // @TODO figure out how to collapse this into a single rule | ||
| channelRouter.get(baseRoute, middleware, renderChannel); | ||
|
|
||
| // @TODO improve config and add defaults to make this simpler | ||
| if (channel.paged !== false) { | ||
| channelRouter.param('page', handlePageParam); | ||
| channelRouter.get(pageRoute, middleware, renderChannel); | ||
| } | ||
|
|
||
| // @TODO improve config and add defaults to make this simpler | ||
| if (channel.rss !== false) { | ||
| channelRouter.use(rssRouter(middleware)); | ||
| } | ||
|
|
||
| if (channel.editRedirect) { | ||
| channelRouter.get('/edit/', function redirect(req, res) { | ||
| utils.url.redirectToAdmin(302, res, channel.editRedirect.replace(':slug', req.params.slug)); | ||
| }); | ||
| } | ||
|
|
||
| return channelRouter; | ||
| } | ||
|
|
||
| channelsRouter = function router() { | ||
| var channelsRouter = express.Router({mergeParams: true}); | ||
|
|
||
| _.each(channelLoader.list(), function (channel) { | ||
| var channelRoute = channel.route.replace(/:t_([a-zA-Z]+)/, function (fullMatch, keyword) { | ||
| return config.get('routeKeywords')[keyword]; | ||
| }); | ||
|
|
||
| // Mount this channel router on the parent channels router | ||
| channelsRouter.use(channelRoute, buildChannelRouter(channel)); | ||
| }); | ||
|
|
||
| return channelsRouter; | ||
| }; | ||
|
|
||
| module.exports = channelsRouter; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.