From 0a78480ebb301a305faefe035d63cc8172ddd5d5 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 8 Nov 2017 10:24:40 -0800 Subject: [PATCH 1/4] created layout and updated twitter handle --- .gitignore | 4 +++- routes/serve-routes.js | 2 ++ views/layouts/channel.handlebars | 28 ++++++++++++++++++++++++++++ views/layouts/main.handlebars | 3 +-- views/layouts/show.handlebars | 1 - 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 views/layouts/channel.handlebars diff --git a/.gitignore b/.gitignore index 761ac590..a45e5a85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ node_modules .idea -config/config.json \ No newline at end of file +config/config.json +config/sequelizeCliConfig.js +config/speechConfig.js \ No newline at end of file diff --git a/routes/serve-routes.js b/routes/serve-routes.js index 2e2ea652..a0ba9337 100644 --- a/routes/serve-routes.js +++ b/routes/serve-routes.js @@ -185,6 +185,7 @@ module.exports = (app) => { res.status(200).render('noChannel'); } else if (!result.claims) { // channel found, but no claims res.status(200).render('channel', { + layout : 'channel', channelName : result.channelName, longChannelId : result.longChannelId, shortChannelId: result.shortChannelId, @@ -198,6 +199,7 @@ module.exports = (app) => { } else { // channel found, with claims const totalPages = determineTotalPages(result.claims.length); res.status(200).render('channel', { + layout : 'channel', channelName : result.channelName, longChannelId : result.longChannelId, shortChannelId: result.shortChannelId, diff --git a/views/layouts/channel.handlebars b/views/layouts/channel.handlebars new file mode 100644 index 00000000..594ff05f --- /dev/null +++ b/views/layouts/channel.handlebars @@ -0,0 +1,28 @@ + + + + + + + Spee.ch + + + + + + + + + + + + + + + {{ googleAnalytics }} + + + {{> navBar}} + {{{ body }}} + + \ No newline at end of file diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index 790219f7..7c2cef20 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -9,7 +9,7 @@ - + @@ -25,7 +25,6 @@ - diff --git a/views/layouts/show.handlebars b/views/layouts/show.handlebars index 694a4eb8..56739150 100644 --- a/views/layouts/show.handlebars +++ b/views/layouts/show.handlebars @@ -21,7 +21,6 @@ - {{> navBar}} -- 2.45.3 From 9cc6517b2ebac9e130503506ea3a848ef97eef5e Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 8 Nov 2017 10:34:10 -0800 Subject: [PATCH 2/4] updated channel meta tags --- views/layouts/channel.handlebars | 6 +++--- views/layouts/main.handlebars | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/layouts/channel.handlebars b/views/layouts/channel.handlebars index 594ff05f..b4b5ade3 100644 --- a/views/layouts/channel.handlebars +++ b/views/layouts/channel.handlebars @@ -10,12 +10,12 @@ - + - - + + diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index 7c2cef20..e29efb6c 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -15,7 +15,7 @@ - + -- 2.45.3 From ecb36496f54d9c21fdb15b1f6925f7216d61a6d5 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 8 Nov 2017 10:36:55 -0800 Subject: [PATCH 3/4] capitalized site name --- views/layouts/channel.handlebars | 4 ++-- views/layouts/main.handlebars | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/layouts/channel.handlebars b/views/layouts/channel.handlebars index b4b5ade3..df93bf10 100644 --- a/views/layouts/channel.handlebars +++ b/views/layouts/channel.handlebars @@ -10,8 +10,8 @@ - - + + diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index e29efb6c..d796bfb4 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -10,8 +10,8 @@ - - + + -- 2.45.3 From 31d1274e3668a628421c6b259b1fa02cc403eead Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 8 Nov 2017 11:07:03 -0800 Subject: [PATCH 4/4] replaced layout script tags --- views/layouts/channel.handlebars | 2 ++ views/layouts/main.handlebars | 1 + views/layouts/show.handlebars | 2 -- views/partials/publishForm-Channel.handlebars | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/layouts/channel.handlebars b/views/layouts/channel.handlebars index df93bf10..fa14432a 100644 --- a/views/layouts/channel.handlebars +++ b/views/layouts/channel.handlebars @@ -22,6 +22,8 @@ {{ googleAnalytics }} + + {{> navBar}} {{{ body }}} diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index d796bfb4..2966f7de 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -25,6 +25,7 @@ + diff --git a/views/layouts/show.handlebars b/views/layouts/show.handlebars index 56739150..9c645f1d 100644 --- a/views/layouts/show.handlebars +++ b/views/layouts/show.handlebars @@ -20,8 +20,6 @@ - - {{> navBar}} {{{ body }}} diff --git a/views/partials/publishForm-Channel.handlebars b/views/partials/publishForm-Channel.handlebars index 222726b6..10e86604 100644 --- a/views/partials/publishForm-Channel.handlebars +++ b/views/partials/publishForm-Channel.handlebars @@ -40,7 +40,6 @@ -