From 0f30806ef56ecee5d33694514b65e69b2caf252c Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Thu, 14 Apr 2022 17:13:41 +0300 Subject: Adding speedtest #170. Adding Pug templates structure Signed-off-by: ManeraKai --- src/pages/options/general/general.html | 399 ++++++++++------------------- src/pages/options/general/general.js | 4 +- src/pages/options/speedtest/speedtest.html | 220 ++++++++++++++++ src/pages/options/speedtest/speedtest.js | 59 +++++ src/pages/stylesheets/styles.css | 8 +- 5 files changed, 419 insertions(+), 271 deletions(-) create mode 100644 src/pages/options/speedtest/speedtest.html create mode 100644 src/pages/options/speedtest/speedtest.js (limited to 'src/pages') diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html index a72c1fb3..415d6480 100644 --- a/src/pages/options/general/general.html +++ b/src/pages/options/general/general.html @@ -1,113 +1,61 @@ - - - - - - - - LibRedirect Options - - - + + + + + + + Document + + +
- - - - General -
-
- - YouTube -
-
- - YT Music -
-
- - Twitter -
-
- - Instagram -
-
- - TikTok -
-
- - Reddit -
-
- - Imgur -
-
- - Pixiv -
-
- - Spotify -
-
- - Wikipedia -
-
- + + + General +
+
YouTube
+
YT Music
+
Twitter
+
Instagram
+
TikTok
+
Reddit
+
Imgur
+
Pixiv
+
Speedtest
+
Spotify
+
Wikipedia
+
- - - - - Medium -
-
- - Peertube -
-
- - LBRY/Odysee -
-
+ + + + Medium +
+
Peertube
+
LBRY/Odysee
+
- - - - Search + + Search
-
+
- - - - Translate + + Translate
-
+
- - - Maps + + Maps
-
+
- - - Send Files + + Send Files
-

Theme

@@ -117,244 +65,159 @@
-

Apply Theme to sites

- +
-

Always use Preferred Instances

- +
-

Auto Redirect of offline instances

- +
-

Exceptions

-
- -   +   -   +  
-
- -
- +
- + - Update Instances - -     -     - +   - Export Settings - -     - - - - - - - - + Export Settings    + + + - Reset Settings - + Reset Settings
-
-

Customize Popup

-
- - - - - - - + \ No newline at end of file diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js index c737759f..3b939477 100644 --- a/src/pages/options/general/general.js +++ b/src/pages/options/general/general.js @@ -109,7 +109,7 @@ generalHelper.init().then(() => { } else if (instanceType == 'regex') { nameCustomInstanceInput.setAttribute("type", "text"); - nameCustomInstanceInput.setAttribute("placeholder", "https?:\/\/(www\.|music|)youtube\.com\/watch\?v\=..*"); + nameCustomInstanceInput.setAttribute("placeholder", "https?:\/\/(www\.|)youtube\.com\/"); } } ) @@ -170,6 +170,6 @@ generalHelper.init().then(() => { }) popupFrontends = generalHelper.getPopupFrontends(); - for (const frontend of generalHelper.allPopupFrontends) + for (const frontend of generalHelper.allPopupFrontends) document.getElementById(frontend).checked = popupFrontends.includes(frontend); }) \ No newline at end of file diff --git a/src/pages/options/speedtest/speedtest.html b/src/pages/options/speedtest/speedtest.html new file mode 100644 index 00000000..41d69989 --- /dev/null +++ b/src/pages/options/speedtest/speedtest.html @@ -0,0 +1,220 @@ + + + + + + + + + + LibRedirect: Speedtest + + + +
+ +
+ + + + General +
+ +
+ + YouTube +
+ +
+ + YT Music +
+ +
+ + Twitter +
+ +
+ + Instagram +
+ +
+ + TikTok +
+ +
+ + Reddit +
+ +
+ + Imgur +
+ +
+ + Pixiv +
+ +
+ + Speedtest +
+ +
+ + Spotify +
+ +
+ + Wikipedia +
+ +
+ + + + + + + Medium +
+ +
+ + Peertube +
+ +
+ + LBRY/Odysee +
+ +
+ + + + + Search +
+ +
+ + + + + Translate +
+ +
+ + + + Maps +
+ +
+ + + + Send Files +
+ +
+ +
+
+

Enable

+ +
+ +
+

+ Frontend: This isn't a fully private frontend +

+ +
+ +
+ +
+

Protocol

+ +
+ +
+ +
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+
+
+
+ + + + + + + + diff --git a/src/pages/options/speedtest/speedtest.js b/src/pages/options/speedtest/speedtest.js new file mode 100644 index 00000000..a9a11e18 --- /dev/null +++ b/src/pages/options/speedtest/speedtest.js @@ -0,0 +1,59 @@ +import pixivHelper from "../../../assets/javascripts/helpers/pixiv.js"; +import commonHelper from "../../../assets/javascripts/helpers/common.js"; + +let disablePixivElement = document.getElementById("disable-pixiv"); +disablePixivElement.addEventListener("change", + (event) => pixivHelper.setDisable(!event.target.checked) +); + +let protocolElement = document.getElementById("protocol") +protocolElement.addEventListener("change", + (event) => { + let protocol = event.target.options[protocolElement.selectedIndex].value + pixivHelper.setProtocol(protocol); + changeProtocolSettings(protocol); + } +); + +function changeProtocolSettings(protocol) { + let normalDiv = document.getElementsByClassName("normal")[0]; + let torDiv = document.getElementsByClassName("tor")[0]; + if (protocol == 'normal') { + normalDiv.style.display = 'block'; + torDiv.style.display = 'none'; + } + else if (protocol == 'tor') { + normalDiv.style.display = 'none'; + torDiv.style.display = 'block'; + } +} + +pixivHelper.init().then(() => { + disablePixivElement.checked = !pixivHelper.getDisable(); + + let protocol = pixivHelper.getProtocol(); + protocolElement.value = protocol; + changeProtocolSettings(protocol); + + commonHelper.processDefaultCustomInstances( + 'pixivMoe', + 'normal', + pixivHelper, + document, + pixivHelper.getPixivMoeNormalRedirectsChecks, + pixivHelper.setPixivMoeNormalRedirectsChecks, + pixivHelper.getPixivMoeNormalCustomRedirects, + pixivHelper.setPixivMoeNormalCustomRedirects + ); + + commonHelper.processDefaultCustomInstances( + 'pixivMoe', + 'tor', + pixivHelper, + document, + pixivHelper.getPixivMoeTorRedirectsChecks, + pixivHelper.setPixivMoeTorRedirectsChecks, + pixivHelper.getPixivMoeTorCustomRedirects, + pixivHelper.setPixivMoeTorCustomRedirects + ) +}) \ No newline at end of file diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index a98adc29..01a3d89d 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -94,6 +94,11 @@ select { border-radius: 3px; } +input[type="url"], +input[type="text"] { + width: 400px; +} + input:invalid { color: var(--danger); border-color: var(--danger); @@ -108,7 +113,8 @@ section.option-block { width: 700px; margin: 0 50px; } -section.option-block h2{ + +section.option-block h2 { margin: 0; } -- cgit 1.4.1