From 689bc85a620ae6e69296eb5913df0f324dee2d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 8 Aug 2018 22:21:53 +0200 Subject: [PATCH] Started work on fetching frontpage-lists at the same time as sending the html --- server/public/assets/css/style.css | 4 -- server/public/assets/js/frontpage.js | 4 +- .../partials/frontpage/channel.handlebars | 57 ++++++++++-------- .../partials/frontpage/channels.handlebars | 6 +- .../partials/frontpage/header.handlebars | 5 +- server/routing/client/router.js | 59 ++++++++++++++++++- 6 files changed, 99 insertions(+), 36 deletions(-) diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index 1a2ae0d5..7726ec47 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -899,10 +899,6 @@ nav .zbrand{ height: 120px; } -#channels{ - display: none; -} - .white-bg{ background-color:white !important; } diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index 2a5a736f..9fe17e5a 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -269,7 +269,7 @@ var Frontpage = { if(window.location.hostname == "fb.zoff.me") { add = "https://zoff.me"; } - Helper.ajax({ + /*Helper.ajax({ url: add + "/api/frontpages", method: "get", success: function(response){ @@ -282,7 +282,7 @@ var Frontpage = { Frontpage.get_frontpage_lists(); }, 3000); }, - }); + });*/ }, start_snowfall: function() { diff --git a/server/public/partials/frontpage/channel.handlebars b/server/public/partials/frontpage/channel.handlebars index 4bec4a5e..7ba97e27 100644 --- a/server/public/partials/frontpage/channel.handlebars +++ b/server/public/partials/frontpage/channel.handlebars @@ -1,26 +1,31 @@ -
  • - -
  • + +
  • + +
  • diff --git a/server/public/partials/frontpage/channels.handlebars b/server/public/partials/frontpage/channels.handlebars index 2aaadd3c..b2f53965 100644 --- a/server/public/partials/frontpage/channels.handlebars +++ b/server/public/partials/frontpage/channels.handlebars @@ -1,5 +1,9 @@
    diff --git a/server/public/partials/frontpage/header.handlebars b/server/public/partials/frontpage/header.handlebars index cc576944..08948e9c 100644 --- a/server/public/partials/frontpage/header.handlebars +++ b/server/public/partials/frontpage/header.handlebars @@ -4,7 +4,10 @@ -
    +
    + visibility + {{viewers}} +