From 8c01be5d7f0026136c045432172289b735207cbc Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Mon, 8 May 2023 14:49:13 +0200 Subject: [PATCH 01/14] Added reading last tool --- Frontend/assets/css/frame.css | 2 +- Frontend/assets/scripts/dyn_host.js | 6 +++- Frontend/assets/scripts/frame.js | 51 +++++++++++++++++++++++++++++ Frontend/index.html | 4 +-- 4 files changed, 59 insertions(+), 4 deletions(-) diff --git a/Frontend/assets/css/frame.css b/Frontend/assets/css/frame.css index 70d0b07..c6a6ba2 100644 --- a/Frontend/assets/css/frame.css +++ b/Frontend/assets/css/frame.css @@ -41,7 +41,7 @@ div#header { grid-column: 1; } -iframe#frame { +iframe#iframe { flex-grow: 1; background-color: #FFFFFF; } diff --git a/Frontend/assets/scripts/dyn_host.js b/Frontend/assets/scripts/dyn_host.js index efdc4c1..dbb3655 100644 --- a/Frontend/assets/scripts/dyn_host.js +++ b/Frontend/assets/scripts/dyn_host.js @@ -3,4 +3,8 @@ $(document).ready( function() { window.location.protocol + "//" + window.location.hostname + ":8097"; }); - \ No newline at end of file + + +function getMockHost() { + return window.location.protocol + "//" + window.location.hostname + ":8097"; +} \ No newline at end of file diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index 15cd0fa..b0575b1 100644 --- a/Frontend/assets/scripts/frame.js +++ b/Frontend/assets/scripts/frame.js @@ -1,5 +1,45 @@ + + +const tools = new Map(); + + + + +/** + * This functions imports other js file. I hate this solution, but other didn't work. + * + * @function + * @name importScript + * @kind function + * @param {any} url + * @returns {void} + */ +function importScript(url) { + var script = document.createElement("script"); // create a script DOM node + script.src = url; // set its src to the provided URL + document.head.appendChild(script); +} + +/** + * Function called after page is loaded + * + * @function + * @name init + * @kind function + * @returns {void} + */ function init() { + importScript("/assets/scripts/dyn_host.js"); + + tools.set("xpath", "tools/xpath.html"); + tools.set("xsd", "tools/xsd.html"); + tools.set("xslt", "tools/xslt.html"); + tools.set("xmlform", "tools/xmlFormatter.html"); + tools.set("jsonform", "tools/jsonFormatter.html"); + tools.set("mock", getMockHost()); + + loadLastPage(); changeActiveTools('xmlTool', 'XML'); } @@ -34,4 +74,15 @@ function changeActiveTools(activeClass, activeCategoryButton) { categories[i].classList.remove("active") } } +} + +function changeTool(tool) { + const url = tools.get(tool); + localStorage.setItem("lastPage", tool); + document.getElementById("iframe").src = tools.get(lastPage); +} + +function loadLastPage() { + const lastPage = localStorage.getItem("lastPage"); + document.getElementById("iframe").src = tools.get(lastPage); } \ No newline at end of file diff --git a/Frontend/index.html b/Frontend/index.html index abb8dbe..5cc53de 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -4,8 +4,8 @@ - + @@ -53,7 +53,7 @@ Found a bug? - + -- 2.51.0 From 82a548c1789b8469cd98117f625d662ff9851930 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Mon, 8 May 2023 15:02:28 +0200 Subject: [PATCH 02/14] Last page is now saved --- Frontend/assets/scripts/frame.js | 19 +++++++++++-------- Frontend/index.html | 14 ++++++++------ 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Frontend/assets/scripts/frame.js b/Frontend/assets/scripts/frame.js index b0575b1..16e6b1f 100644 --- a/Frontend/assets/scripts/frame.js +++ b/Frontend/assets/scripts/frame.js @@ -1,11 +1,5 @@ - - - const tools = new Map(); - - - /** * This functions imports other js file. I hate this solution, but other didn't work. * @@ -39,8 +33,8 @@ function init() { tools.set("jsonform", "tools/jsonFormatter.html"); tools.set("mock", getMockHost()); - loadLastPage(); changeActiveTools('xmlTool', 'XML'); + loadLastPage(); } /** @@ -79,10 +73,19 @@ function changeActiveTools(activeClass, activeCategoryButton) { function changeTool(tool) { const url = tools.get(tool); localStorage.setItem("lastPage", tool); - document.getElementById("iframe").src = tools.get(lastPage); + document.getElementById("iframe").src = url; } function loadLastPage() { const lastPage = localStorage.getItem("lastPage"); + switch (lastPage) { + case "jsonform": + changeActiveTools('jsonTool', 'JSON'); + break; + case "mock": + changeActiveTools('restTool', 'REST'); + break; + + } document.getElementById("iframe").src = tools.get(lastPage); } \ No newline at end of file diff --git a/Frontend/index.html b/Frontend/index.html index 5cc53de..0002e0f 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -35,13 +35,15 @@