From f6ecfeb50211cb95a53c19541ad186f3fd3f539b Mon Sep 17 00:00:00 2001 From: Beyluta Date: Sun, 18 Sep 2022 18:07:27 +0200 Subject: [PATCH 1/7] update frontend UI --- Assets/index.html | 2 +- Assets/style.css | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Assets/index.html b/Assets/index.html index 613278e..73c8a4c 100644 --- a/Assets/index.html +++ b/Assets/index.html @@ -246,7 +246,7 @@

4- Open WinWidgets and choose your widget

Native Keycapture API

- Define the function + Define the function onNativeKeyEvents (key) in your front-end JavaScript code and receive global keypresses from your computer.

diff --git a/Assets/style.css b/Assets/style.css index a2bcd5d..3a4c40b 100644 --- a/Assets/style.css +++ b/Assets/style.css @@ -16,7 +16,7 @@ html { margin: 0; padding: 0; overflow-y: hidden; - font-family: "Jaldi", sans-serif; + font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; color: var(--black); } @@ -144,10 +144,10 @@ svg { justify-content: space-between; align-items: center; width: 100%; - box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2); - border-radius: 15px; + border-radius: 4px; height: 50px; margin-top: 20px; + border: solid 1px rgba(1, 1, 1, 0.08); } .search { @@ -170,7 +170,8 @@ svg { } .folder { - margin-right: 25px; + margin: 0 25px 0 0; + height: 20px; } .updates { @@ -179,13 +180,13 @@ svg { } .update { - box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2); max-width: 100%; padding: 50px 0 50px 0; width: 100%; - border-radius: 20px; + border-radius: 4px; justify-content: center; align-items: center; + border: solid 1px rgba(1, 1, 1, 0.08); } .update > svg { @@ -234,17 +235,20 @@ svg { .setting { align-items: center; gap: 15px; + flex-direction: row-reverse; + justify-content: space-between; } .switch { - width: 50px; - height: 20px; + width: 39px; + height: 23px; border-radius: 20px; background-color: var(--darkgray); justify-content: flex-start; align-items: center; transition: all 0.2s ease-in-out; cursor: pointer; + padding: 0 5px; } .switchon { @@ -253,20 +257,20 @@ svg { } .circle { - width: 25px; - height: 25px; + width: 15px; + height: 15px; border-radius: 100%; - background-color: var(--lightgray); + background-color: white; z-index: 999; } .settingscard { - box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2); width: max-content; padding: 10px 30px; - border-radius: 25px; + border-radius: 4px; flex-grow: 1; height: max-content; + border: solid 1px rgba(1, 1, 1, 0.08); } .development { @@ -296,8 +300,9 @@ svg { } .code-blocks > .code { - background-color: var(--lightgray); + width: calc(100% - 50px); color: var(--black); padding: 10px; border-radius: 4px; + border: solid 1px rgba(1, 1, 1, 0.08); } From 9872b575ed383e491d2fd1ef77e1494c03cffc08 Mon Sep 17 00:00:00 2001 From: Beyluta Date: Sun, 18 Sep 2022 18:16:03 +0200 Subject: [PATCH 2/7] update widget style --- Assets/style.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/style.css b/Assets/style.css index 3a4c40b..74f55fc 100644 --- a/Assets/style.css +++ b/Assets/style.css @@ -2,7 +2,7 @@ :root { --black: #323232; - --lightgray: #e0e0e0; + --lightgray: #f1f1f1; --gray: #b9b9b9; --darkgray: #b8b8b8; --blue: #18a8fa; @@ -88,13 +88,13 @@ svg { @keyframes loadingwidget { 0% { - background: var(--gray); + background: var(white); } 50% { background: var(--lightgray); } 100% { - background: var(--gray); + background: var(white); } } @@ -113,14 +113,13 @@ svg { width: 300px; height: 200px; flex-grow: 1; - background-color: var(--gray); - border-radius: 20px; + border-radius: 4px; animation: loadingwidget 2s linear infinite; justify-content: center; align-items: center; cursor: pointer; - box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.2); transition: all 0.2s ease-in-out; + border: solid 1px rgba(1, 1, 1, 0.08); } .widget:hover { From 520067415e0830e716f759ff4152ce5b51da41a1 Mon Sep 17 00:00:00 2001 From: Beyluta Date: Sun, 18 Sep 2022 18:23:44 +0200 Subject: [PATCH 3/7] remove dedicated update section --- Assets/index.html | 44 +++++++++++++------------------------------- Assets/script.js | 37 +++++++++++-------------------------- 2 files changed, 24 insertions(+), 57 deletions(-) diff --git a/Assets/index.html b/Assets/index.html index 73c8a4c..f683ecf 100644 --- a/Assets/index.html +++ b/Assets/index.html @@ -58,21 +58,6 @@ />
- -
- - - -
@@ -122,22 +107,6 @@

Browse Widgets

-
-

Application

-
-
-
-
-

Run the application on startup

-
-
-
- -
Newer versions of this software exists

Update now

+
+

Application

+
+
+
+
+

Run the application on startup

+
+
diff --git a/Assets/script.js b/Assets/script.js index 78a4132..4f54f3f 100644 --- a/Assets/script.js +++ b/Assets/script.js @@ -24,17 +24,14 @@ function changeText(id, text) { function changeTab(element) { const dashboard = document.getElementById("dashboard"); const settings = document.getElementById("settings"); - const update = document.getElementById("update"); const development = document.getElementById("development"); dashboard.style.fill = "var(--gray)"; settings.style.fill = "var(--gray)"; - update.style.fill = "var(--gray)"; development.style.fill = "var(--gray)"; element.style.fill = "var(--black)"; switch (element.getAttribute("tab")) { case "dashboard": - document.getElementById("updates").style.display = "none"; document.getElementById("widgets").style.display = "flex"; document.getElementById("options").style.display = "none"; document.getElementById("searchcontainer").style.display = "flex"; @@ -43,13 +40,21 @@ function changeTab(element) { document.getElementById("development-container").style.display = "none"; break; - case "update": - document.getElementById("updates").style.display = "flex"; + case "development": document.getElementById("widgets").style.display = "none"; document.getElementById("options").style.display = "none"; document.getElementById("searchcontainer").style.display = "none"; document.getElementById("nextwindowtitle").style.display = "none"; - document.getElementById("windowtitle").innerHTML = "Check for updates"; + document.getElementById("windowtitle").innerHTML = "Development"; + document.getElementById("development-container").style.display = "flex"; + break; + + case "settings": + document.getElementById("widgets").style.display = "none"; + document.getElementById("options").style.display = "flex"; + document.getElementById("searchcontainer").style.display = "none"; + document.getElementById("nextwindowtitle").style.display = "none"; + document.getElementById("windowtitle").innerHTML = "Settings"; document.getElementById("development-container").style.display = "none"; if (isUpToDate) { @@ -74,26 +79,6 @@ function changeTab(element) { }; } break; - - case "development": - document.getElementById("updates").style.display = "none"; - document.getElementById("widgets").style.display = "none"; - document.getElementById("options").style.display = "none"; - document.getElementById("searchcontainer").style.display = "none"; - document.getElementById("nextwindowtitle").style.display = "none"; - document.getElementById("windowtitle").innerHTML = "Development"; - document.getElementById("development-container").style.display = "flex"; - break; - - case "settings": - document.getElementById("updates").style.display = "none"; - document.getElementById("widgets").style.display = "none"; - document.getElementById("options").style.display = "flex"; - document.getElementById("searchcontainer").style.display = "none"; - document.getElementById("nextwindowtitle").style.display = "none"; - document.getElementById("windowtitle").innerHTML = "Settings"; - document.getElementById("development-container").style.display = "none"; - break; } } From ad01a95805c9f41c2cec8c0986eca8ab5a733587 Mon Sep 17 00:00:00 2001 From: Beyluta Date: Sun, 18 Sep 2022 18:31:59 +0200 Subject: [PATCH 4/7] fix style mismatch --- Assets/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/style.css b/Assets/style.css index a2bcd5d..a8e5e63 100644 --- a/Assets/style.css +++ b/Assets/style.css @@ -46,7 +46,7 @@ svg { width: 100%; justify-content: space-between; align-items: center; - border-right: solid 1px var(--lightgray); + border-right: solid 1px rgba(1, 1, 1, 0.08); gap: 80px; } @@ -57,7 +57,7 @@ svg { .logo { padding-top: 30px; - border-bottom: solid 1px var(--lightgray); + border-bottom: solid 1px rgba(1, 1, 1, 0.08); padding-bottom: 15px; } From 865aaca98169accb71430a765d65acd4fb27525c Mon Sep 17 00:00:00 2001 From: Beyluta Date: Mon, 19 Sep 2022 20:32:57 +0200 Subject: [PATCH 5/7] rename js functions --- Assets/index.html | 2 +- Assets/script.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/index.html b/Assets/index.html index f683ecf..67bcdc0 100644 --- a/Assets/index.html +++ b/Assets/index.html @@ -151,7 +151,7 @@

Application

diff --git a/Assets/script.js b/Assets/script.js index 4f54f3f..95b83d2 100644 --- a/Assets/script.js +++ b/Assets/script.js @@ -82,13 +82,16 @@ function changeTab(element) { } } -function changeSwitch(element) { +function setSwitchState(element) { if (element.classList.contains("switchon")) { element.classList.remove("switchon"); } else { element.classList.add("switchon"); } +} +function changeStartup(element) { + setSwitchState(element); CefSharp.PostMessage(element.getAttribute("setting")); } From bc7a7778e2504feda0d5f45261600b4bdcd5aedc Mon Sep 17 00:00:00 2001 From: Beyluta Date: Tue, 20 Sep 2022 20:46:39 +0200 Subject: [PATCH 6/7] update versioning --- Assets/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/config.json b/Assets/config.json index b190b10..2b1ec8b 100644 --- a/Assets/config.json +++ b/Assets/config.json @@ -1,4 +1,4 @@ { - "version": "1.1.4", + "version": "1.1.5", "remoteResources": "https://7xdeveloper.com/api/AccessEndpoint.php?endpoint=getappconfigs&id=resources" } From 809610d2437d8d5847e64d71808211636e3d5cd3 Mon Sep 17 00:00:00 2001 From: Beyluta Date: Tue, 20 Sep 2022 20:49:25 +0200 Subject: [PATCH 7/7] update versioning and missing acknowledgment --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4affdb5..8adc060 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- WinWidgets version + WinWidgets version

@@ -119,3 +119,4 @@ Many thanks to these projects for their super useful resources 😄 - [HTML Agility Pack](https://html-agility-pack.net/) - [Chromium](https://www.chromium.org/) - [CefSharp](https://cefsharp.github.io/) +- [Json.NET](https://www.newtonsoft.com/json)