From eb712716a6c1d4ada95dbdd11261f530ce788b27 Mon Sep 17 00:00:00 2001 From: Askill Date: Fri, 1 Nov 2019 16:08:37 +0100 Subject: [PATCH] todo: fom data to json --- Caddyfile | 32 ++++++++++++++--------------- index.html | 30 +++++++++++++++++++++++---- sites.json | 2 +- static/css/main.css | 12 ++++++++--- static/js/main.js | 49 +++++++++++++++++++++++++++++++++++++++------ 5 files changed, 95 insertions(+), 30 deletions(-) diff --git a/Caddyfile b/Caddyfile index f2bff27..7edde9f 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,21 +1,21 @@ - www.jpmatz.de { - proxy link1:80 link/1 - tls dfasfasfsafdsafsd + ares-mon.jopa.dev { + proxy / link1:80 + tls ofj@gmail.com + } + { + proxy + tls + } + { + proxy + tls } www.jpmatz.de { - proxy link1:80 link/1 - tls dfasfasfsafdsafsd + proxy / link1:80 + tls ofj@gmail.com } - www.jpmatz.de { - proxy link1:80 link/1 - tls dfasfasfsafdsafsd - } - www.jpmatz.de { - proxy link1:80 link/1 - tls dfasfasfsafdsafsd - } - www.jpmatz.de { - proxy link1:80 link/1 - tls dfasfasfsafdsafsd + ares.jopa.dev { + proxy /site link1:80 + tls ofj@gmail.com } \ No newline at end of file diff --git a/index.html b/index.html index 1f8f962..89366d1 100644 --- a/index.html +++ b/index.html @@ -14,19 +14,41 @@ - + + - + -
+
+
+ +
+
+
+ +
+ +
+ + +
+
tls: + +
+

+ +

+ +
+
- + diff --git a/sites.json b/sites.json index f7774f1..00e0a1c 100644 --- a/sites.json +++ b/sites.json @@ -1 +1 @@ -{"1":{"id":1,"title":"title 2","description":"desc 3452345235345","domain":"www.jpmatz.de","source":"link1:80","target":"link/1","email":"dfasfasfsafdsafsd"},"2":{"id":2,"title":"title 2","description":"desc 3452345235345","domain":"www.jpmatz.de","source":"link1:80","target":"link/1","email":"dfasfasfsafdsafsd"},"3":{"id":3,"title":"title 2","description":"desc 3452345235345","domain":"www.jpmatz.de","source":"link1:80","target":"link/1","email":"dfasfasfsafdsafsd"},"4":{"id":4,"title":"title 2","description":"desc 3452345235345","domain":"www.jpmatz.de","source":"link1:80","target":"link/1","email":"dfasfasfsafdsafsd"},"5":{"id":5,"title":"title 2","description":"desc 3452345235345","domain":"www.jpmatz.de","source":"link1:80","target":"link/1","email":"dfasfasfsafdsafsd"}} \ No newline at end of file +{"1":{"id":1,"title":"title 1","description":"desc 1","domain":"www.jpmatz.de","source":"/","target":"link1:80","email":"ofj@gmail.com"},"2":{"id":2,"title":"title 2","description":"desc 2","domain":"ares.jopa.dev","source":"/site","target":"link1:80","email":"ofj@gmail.com"},"4":{"id":3,"title":"title 3","description":"desc 3","domain":"ares-mon.jopa.dev","source":"/","target":"link1:80","email":"ofj@gmail.com"},"5":{"id":5,"title":"","description":"","domain":"","source":"","target":"","email":""},"6":{"id":6,"title":"","description":"","domain":"","source":"","target":"","email":""}} \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css index 7de8263..f426a6d 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -1,5 +1,11 @@ .container{ - display: flex; - justify-content: center; - align-items: center; + overflow: contain; +} + +.card{ + display: block !important; + flex: none; + float: left; + margin: 20px; + width: 25% !important; } \ No newline at end of file diff --git a/static/js/main.js b/static/js/main.js index 241241d..134cbd7 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -12,24 +12,61 @@ var getJSON = function(url, callback) { }; xhr.send(); }; +var postJSON = function(url, data, callback) { + var xhr = new XMLHttpRequest(); + xhr.open('POST', url, true); + xhr.responseType = 'json'; + xhr.setRequestHeader('Content-Type', 'application/json'); + xhr.onload = function() { + var status = xhr.status; + if (status === 200) { + callback(null, xhr.response); + } else { + callback(status, xhr.response); + } + }; + xhr.send(data); +}; function loadSites(){ getJSON('http://localhost:8000/api/Sites', function(err, data) { + data = Object.values(data); if (err !== null) { alert('Something went wrong: ' + err); } else { - for (index = 0; index < Object.keys(data).length; index++) { - - renderSite(data[index]); - } + $(".rendered").remove(); + data.forEach (function(site) { + renderSite(site); + }) } } ); } function renderSite(site){ - site = `` + siteString = ` +
+
${site.domain}
+
+

${site.title}

- console.log(site); +
${site.source} -> ${site.target}

+
tls: ${site.email}

+

${site.description}

+
+
+ ` + document.getElementById("main").innerHTML += siteString; +} + +function newSite(){ + let json = {}; + json["domain"] = document.getElementById('domain').value; + json["title"] = document.getElementById('title').value; + json["description"] = document.getElementById('description').value; + json["source"] = document.getElementById('source').value; + json["target"] = document.getElementById('target').value; + json["email"] = document.getElementById('email').value; + postJSON("http://localhost:8000/api/Sites", json, loadSites); } \ No newline at end of file