From e81bd2d374d42ec2d3e39739cf7f36084ce7547e Mon Sep 17 00:00:00 2001 From: Tom <392513+tborychowski@users.noreply.github.com> Date: Mon, 5 Oct 2020 15:03:44 +0100 Subject: [PATCH 1/3] enforce app to stay in the grid cell --- assets/css/styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index 18b3b02..338fc5f 100755 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -228,6 +228,8 @@ table a{ display: flex; flex-direction: column; justify-content: center; + flex: 1; + overflow: hidden; } .apps_text a{ @@ -553,4 +555,4 @@ table a{ #app-address { display: none; } -} \ No newline at end of file +} From 1a65698c413234c9a2c0b57f3459050ff4576c9a Mon Sep 17 00:00:00 2001 From: Tom <392513+tborychowski@users.noreply.github.com> Date: Mon, 5 Oct 2020 15:15:41 +0100 Subject: [PATCH 2/3] fetch bookmarks every time; de-duplicate code --- assets/js/data.js | 60 ++++++++++------------------------------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/assets/js/data.js b/assets/js/data.js index cf8b9c9..5f45926 100755 --- a/assets/js/data.js +++ b/assets/js/data.js @@ -1,50 +1,16 @@ -var data_links = "links.json"; -var bookmarks = JSON.parse(localStorage.getItem("links")); - -function handleLinks(data) { - var mysource = document.getElementById("links-template").innerHTML; - var mytemplate = Handlebars.compile(mysource); - var myresult = mytemplate(data) - document.getElementById("links").innerHTML = myresult; +function fetchAndRender (name) { + fetch(name + '.json') + .then(response => response.json()) + .then(data => { + const mysource = document.getElementById(name + '-template').innerHTML; + const mytemplate = Handlebars.compile(mysource); + const myresult = mytemplate(data); + document.getElementById(name).innerHTML = myresult; + }); } -document.addEventListener("DOMContentLoaded", function () { - if (!bookmarks) { - fetch(data_links) - .then(response => response.json()) - .then(function (data) { - handleLinks(data); - localStorage.setItem("links", JSON.stringify(data)); - }); - } else { - handleLinks(bookmarks); - } +document.addEventListener('DOMContentLoaded', () => { + fetchAndRender('apps'); + fetchAndRender('links'); + fetchAndRender('providers'); }); - -var data_apps = "apps.json"; - -document.addEventListener("DOMContentLoaded", function () { - fetch(data_apps) - .then( response => response.json()) - .then( - function (data) { - var mysource = document.getElementById("apps-template").innerHTML; - var mytemplate = Handlebars.compile(mysource); - var myresult = mytemplate(data) - document.getElementById("apps").innerHTML = myresult; - }); -}); - -var data_providers = "providers.json"; - -document.addEventListener("DOMContentLoaded", function () { - fetch(data_providers) - .then( response => response.json()) - .then( - function (data) { - var mysource = document.getElementById("providers-template").innerHTML; - var mytemplate = Handlebars.compile(mysource); - var myresult = mytemplate(data) - document.getElementById("providers").innerHTML = myresult; - }); -}); \ No newline at end of file From 4fb8a8ab22806754c571f12ec78d5318dd20fac9 Mon Sep 17 00:00:00 2001 From: Tom <392513+tborychowski@users.noreply.github.com> Date: Mon, 5 Oct 2020 15:19:57 +0100 Subject: [PATCH 3/3] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 01ee37b..761c273 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - 4000:80 volumes: - - ./:/usr/share/nginx/html + - ./:/opt/html networks: nginx-proxy: