From 295d3ce78df8af753cb17c137e8bbd485f435601 Mon Sep 17 00:00:00 2001 From: Max Beatty Date: Sun, 8 Jan 2017 22:12:13 -0800 Subject: [PATCH] show 'add code snippet' button on edit page --- server/lib/defaults.js | 6 ------ server/web/edit/index.hbs | 2 +- server/web/edit/index.js | 9 ++++++++- server/web/home/index.js | 23 ++++++++++++++++------- test/unit/server/web/edit/index.js | 1 + test/unit/server/web/home/index.js | 1 + 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/server/lib/defaults.js b/server/lib/defaults.js index 258d169b..fe679055 100644 --- a/server/lib/defaults.js +++ b/server/lib/defaults.js @@ -29,12 +29,6 @@ exports.test = { }; exports.testPageContext = { - home: true, - showAtom: { - slug: 'browse' - }, - jsClass: true, - mainJS: true, mediumTextLength: MEDIUM_TEXT_LENGTH, titleError: null, slugError: null, diff --git a/server/web/edit/index.hbs b/server/web/edit/index.hbs index 63361308..464c66e8 100644 --- a/server/web/edit/index.hbs +++ b/server/web/edit/index.hbs @@ -117,7 +117,7 @@ This edit will create a new revision.

Code snippets to compare

{{#each page.test}}
-

Test {{@index}}

+

Code snippet {{inc @index}}

diff --git a/server/web/edit/index.js b/server/web/edit/index.js index fef588d8..a4075699 100644 --- a/server/web/edit/index.js +++ b/server/web/edit/index.js @@ -29,6 +29,7 @@ exports.register = function (server, options, next) { reply.view('edit/index', { headTitle: page.title, benchmark: false, + mainJS: true, showAtom: { slug: request.path.slice(1) // remove slash }, @@ -66,8 +67,14 @@ exports.register = function (server, options, next) { Hoek.merge(page, errObj); reply.view('edit/index', { headTitle: page.title, + benchmark: false, + mainJS: true, + showAtom: { + slug: request.path.slice(1) // remove slash + }, + jsClass: true, page: page, - authorized: true + authorized: request.auth.isAuthenticated }).code(400); }; diff --git a/server/web/home/index.js b/server/web/home/index.js index 05d4e49e..eb1ef4e5 100644 --- a/server/web/home/index.js +++ b/server/web/home/index.js @@ -16,14 +16,15 @@ exports.register = function (server, options, next) { } }, handler: function (request, reply) { - var authorized = false; - - if (request.auth.isAuthenticated) { - authorized = true; - } reply.view('home/index', _assign({}, defaults.testPageContext, { + home: true, + showAtom: { + slug: 'browse' + }, + jsClass: true, + mainJS: true, test: [defaults.test, defaults.test], - authorized: authorized + authorized: request.auth.isAuthenticated })); } }); @@ -39,7 +40,15 @@ exports.register = function (server, options, next) { if (errObj.message) { errObj.genError = errObj.message; } - reply.view('home/index', _assign({}, defaults.testPageContext, request.payload, {authorized: true}, errObj)).code(400); + reply.view('home/index', _assign({}, defaults.testPageContext, request.payload, { + home: true, + showAtom: { + slug: 'browse' + }, + jsClass: true, + mainJS: true, + authorized: request.auth.isAuthenticated + }, errObj)).code(400); }; Joi.validate(request.payload, schema.testPage, function (er, pageWithTests) { diff --git a/test/unit/server/web/edit/index.js b/test/unit/server/web/edit/index.js index 93efd573..2839fd41 100644 --- a/test/unit/server/web/edit/index.js +++ b/test/unit/server/web/edit/index.js @@ -127,6 +127,7 @@ lab.experiment('GET', function () { server.inject(request, function (response) { Code.expect(response.statusCode).to.equal(200); Code.expect(response.payload).to.include('Oh Yea ยท jsPerf'); + Code.expect(response.payload).to.include('