From cf7afda7e00558d4e086c34c11dcf2bd098cdc28 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Tue, 1 Nov 2022 19:32:49 +0300 Subject: Improved design of sidebar and customize popup https://github.com/libredirect/libredirect/issues/369 --- src/pages/options/widgets/general.ejs | 185 +++++++++++++++------------------ src/pages/options/widgets/services.ejs | 160 ++++++++++++++-------------- src/pages/stylesheets/styles.css | 17 ++- 3 files changed, 176 insertions(+), 186 deletions(-) (limited to 'src/pages') diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs index e24046db..ca96f1c8 100644 --- a/src/pages/options/widgets/general.ejs +++ b/src/pages/options/widgets/general.ejs @@ -1,102 +1,87 @@
-
-

General

-
-
-
-

Theme

- -
-
-

Network

- -
-
-
-

Fallback to clearnet if no instances are available for the current network

- -
-
-
-

- -
-
-
-

Latency Threshold

- - -
-
-
-

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

Customize Popup

-
- - +
+

General

+
+
+
+

Theme

+ +
+
+

Network

+ +
+
+
+

Fallback to clearnet if no instances are available for the current network

+ +
+
+
+

+ +
+
+
+

Latency Threshold

+ + +
+
+
+

+
+
+
+
+   +   +
+ +
+
+
+
+ + + + + Update Instances    +
+
+ +     + +   Export Settings    + + + + + Reset Settings +
+
diff --git a/src/pages/options/widgets/services.ejs b/src/pages/options/widgets/services.ejs index 44c6a9f3..c3019074 100644 --- a/src/pages/options/widgets/services.ejs +++ b/src/pages/options/widgets/services.ejs @@ -1,86 +1,84 @@ <% for (const service in config.services) { -%>
-
-

<%= config.services[service].name %>

-
-
-
-

Enable

- -
- <% if (Object.keys(config.services[service].frontends).length > 1) { %> -
-

Frontend

- -
- <% if (config.services[service].embeddable) { _%> -
-

Embed Frontend

- -
- <% } _%> - <% } _%> - <% if (config.services[service].embeddable) { _%> -
-

Redirect Type

- -
- <% } _%> -
- <% for (const frontend in config.services[service].frontends) { -%> - <% if (config.services[service].frontends[frontend].instanceList) { _%> -
- <% for (const network in config.networks) { -%> -
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
- <% if (network == "clearnet") { _%> -
- - -
- <% } _%> -
- <% } %> -
- <% } _%> - <% } %> +
+

<%= config.services[service].name %>

+
+
+
+

Enable

+ +
+
+

Show in Popup

+ +
+ <% if (Object.keys(config.services[service].frontends).length> 1) { %> +
+

Frontend

+ +
+ <% if (config.services[service].embeddable) { _%> +
+

Embed Frontend

+ +
+ <% } _%> <% } _%> <% if (config.services[service].embeddable) { _%> +
+

Redirect Type

+ +
+ <% } _%> +
+ <% for (const frontend in config.services[service].frontends) { -%> <% if (config.services[service].frontends[frontend].instanceList) { _%> +
+ <% for (const network in config.networks) { -%> +
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+ <% if (network=="clearnet" ) { _%> +
+ + +
+ <% } _%> +
+ <% } %> +
+ <% } _%> <% } %>
<% } %> diff --git a/src/pages/stylesheets/styles.css b/src/pages/stylesheets/styles.css index 0df2f9fa..5f2871e4 100644 --- a/src/pages/stylesheets/styles.css +++ b/src/pages/stylesheets/styles.css @@ -79,7 +79,6 @@ select { margin: 0; max-width: 500px; border-radius: 3px; - cursor: pointer; } input[type="url"], @@ -110,11 +109,19 @@ section.option-block h2 { body.option { display: flex; padding: 40px; - width: 900px; + width: 1100px; +} + +section.links { + display: flex; + flex-wrap: wrap; + flex-direction: column; + width: 300px; + max-height: 720px; } section.links div { - margin: 20px 0; + margin: 10px; width: max-content; } @@ -458,7 +465,7 @@ body div section { display: none; } -div.about > div { +div.about>div { justify-content: start; width: 520px; } @@ -480,4 +487,4 @@ input:disabled { div.about a { width: 500px; display: inline-block; -} +} \ No newline at end of file -- cgit 1.4.1 From 7bceec8cd4d21441e1da84f155fb5edf7ccd7008 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Tue, 1 Nov 2022 19:59:38 +0300 Subject: Clarified Exceptions https://github.com/libredirect/libredirect/issues/345 --- src/pages/options/widgets/general.ejs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs index ca96f1c8..b3ff930e 100644 --- a/src/pages/options/widgets/general.ejs +++ b/src/pages/options/widgets/general.ejs @@ -36,8 +36,9 @@ +
-

+

Excluded from redirecting

@@ -55,6 +56,7 @@
+
-- cgit 1.4.1 From 72ee64fdb982b30acdbeba0d4e8dad8f7749b5fd Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sat, 12 Nov 2022 11:54:34 +0300 Subject: Fixed not redirecting https://github.com/libredirect/libredirect/issues/525 --- .prettierignore | 9 --------- package.json | 13 +------------ src/assets/javascripts/services.js | 14 +++++++++++--- src/config/config.json | 1 - src/pages/background/background.js | 1 - src/pages/options/widgets/services.js | 34 +++++++++++++++++++--------------- 6 files changed, 31 insertions(+), 41 deletions(-) delete mode 100644 .prettierignore (limited to 'src/pages') diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index d789b742..00000000 --- a/.prettierignore +++ /dev/null @@ -1,9 +0,0 @@ -web-ext-artifacts/ -.DS_Store -nod -node_modules -package-lock.json -src/instances/data.json -src/instances/blacklist.json -src/_locales/ -.vscode diff --git a/package.json b/package.json index 98351dad..ade219b1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build": "web-ext build", "test": "web-ext lint", "instances": "python3 src/instances/get_instances.py && git update-index --assume-unchanged src/instances/blacklist.json src/instances/data.json", - "ejs": "ejs src/pages/options/index.ejs -f src/config/config.json -o src/pages/options/index.html && ejs src/pages/popup/popup.ejs -f src/config/config.json -o src/pages/popup/popup.html && prettier -w src/pages/options/index.html src/pages/popup/popup.html" + "ejs": "ejs src/pages/options/index.ejs -f src/config/config.json -o src/pages/options/index.html && ejs src/pages/popup/popup.ejs -f src/config/config.json -o src/pages/popup/popup.html" }, "repository": { "type": "git", @@ -24,19 +24,8 @@ "homepage": "https://libredirect.codeberg.page", "devDependencies": { "ejs": "^3.1.8", - "prettier": "^2.7.1", "web-ext": "^7.2.0" }, - "prettier": { - "semi": false, - "tabWidth": 2, - "useTabs": true, - "arrowParens": "avoid", - "printWidth": 200, - "bracketSameLine": true, - "endOfLine": "lf", - "singleQuote": false - }, "webExt": { "ignoreFiles": [ "instances/get_instances.py", diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index bcf35822..9d80e17a 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -59,15 +59,17 @@ function regexArray(service, url, config) { } function redirect(url, type, initiator, forceRedirection) { - if (type != "main_frame" && type != "sub_frame") return + if (type != "main_frame" && type != "sub_frame" && type != "image") return let randomInstance let frontend for (const service in config.services) { + if (!forceRedirection && !options[service].enabled) continue + if (config.services[service].embeddable && type != options[service].redirectType && options[service].redirectType != "both") continue if (!config.services[service].embeddable && type != "main_frame") continue - // let targets = new RegExp(config.services[service].targets.join("|"), "i") + // let targets = new RegExp(config.services[service].targets.join("|"), "i") if (!regexArray(service, url, config)) continue // if (initiator) { // console.log(initiator.host) @@ -75,11 +77,17 @@ function redirect(url, type, initiator, forceRedirection) { // //if (all(service, null, options, config, redirects).includes(initiator.origin) && reverse(initiator) == url) return "BYPASSTAB" // } + if (Object.keys(config.services[service].frontends).length > 1) { - if (type == "sub_frame" && config.services[service].embeddable && !config.services[service].frontends[options[service].frontend].embeddable) frontend = options[service].embedFrontend + if ( + type == "sub_frame" && config.services[service].embeddable + && + !config.services[service].frontends[options[service].frontend].embeddable + ) frontend = options[service].embedFrontend else frontend = options[service].frontend } else frontend = Object.keys(config.services[service].frontends)[0] + if (config.services[service].frontends[frontend].instanceList) { let instanceList = [...options[frontend][options.network].enabled, ...options[frontend][options.network].custom] if (instanceList.length === 0 && options.networkFallback) instanceList = [...options[frontend].clearnet.enabled, ...options[frontend].clearnet.custom] diff --git a/src/config/config.json b/src/config/config.json index 7b81d9f2..8b99423a 100644 --- a/src/config/config.json +++ b/src/config/config.json @@ -309,7 +309,6 @@ "frontends": { "rimgo": { "name": "rimgo", - "embeddable": true, "instanceList": true } }, diff --git a/src/pages/background/background.js b/src/pages/background/background.js index 71fff06c..3a695048 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -56,7 +56,6 @@ browser.webRequest.onBeforeRequest.addListener( } catch { return null } - if (tabIdRedirects[details.tabId] == false) return null let newUrl = servicesHelper.redirect(url, details.type, initiator, tabIdRedirects[details.tabId]) diff --git a/src/pages/options/widgets/services.js b/src/pages/options/widgets/services.js index 37385faa..12904130 100644 --- a/src/pages/options/widgets/services.js +++ b/src/pages/options/widgets/services.js @@ -31,28 +31,32 @@ function changeFrontendsSettings(service) { for (const frontend in config.services[service].frontends) { if (config.services[service].frontends[frontend].instanceList) { const frontendDiv = document.getElementById(frontend) - if (frontend == divs[service].frontend.value) { - frontendDiv.style.display = "block" - } else { - frontendDiv.style.display = "none" + if (typeof divs[service].frontend !== "undefined") { + if (frontend == divs[service].frontend.value) { + frontendDiv.style.display = "block" + } else { + frontendDiv.style.display = "none" + } } } } if (config.services[service].embeddable) { - if (!config.services[service].frontends[divs[service].frontend.value].embeddable) { - divs[service].embedFrontend.disabled = false - for (const frontend in config.services[service].frontends) { - if (config.services[service].frontends[frontend].embeddable) { - const frontendDiv = document.getElementById(frontend) - if (frontend == divs[service].embedFrontend.value) { - frontendDiv.style.display = "block" - } else { - frontendDiv.style.display = "none" + if (typeof divs[service].frontend !== "undefined") { + if (!config.services[service].frontends[divs[service].frontend.value].embeddable) { + divs[service].embedFrontend.disabled = false + for (const frontend in config.services[service].frontends) { + if (config.services[service].frontends[frontend].embeddable) { + const frontendDiv = document.getElementById(frontend) + if (frontend == divs[service].embedFrontend.value) { + frontendDiv.style.display = "block" + } else { + frontendDiv.style.display = "none" + } } } - } - } else if (Object.keys(config.services[service].frontends).length > 1) divs[service].embedFrontend.disabled = true + } else if (Object.keys(config.services[service].frontends).length > 1) divs[service].embedFrontend.disabled = true + } } } -- cgit 1.4.1 From 01a9a55f7d1dae2469ee7f933081d065325225b1 Mon Sep 17 00:00:00 2001 From: ManeraKai Date: Sun, 13 Nov 2022 17:48:07 +0300 Subject: Some reformatting and reordering buttons --- src/pages/options/widgets/about.ejs | 59 ++++++----- src/pages/options/widgets/general.ejs | 188 ++++++++++++++++++--------------- src/pages/options/widgets/services.ejs | 161 ++++++++++++++-------------- 3 files changed, 215 insertions(+), 193 deletions(-) (limited to 'src/pages') diff --git a/src/pages/options/widgets/about.ejs b/src/pages/options/widgets/about.ejs index 09cdab1d..a90e8b9e 100644 --- a/src/pages/options/widgets/about.ejs +++ b/src/pages/options/widgets/about.ejs @@ -1,28 +1,37 @@ -
-
-

About

-
-
-
+
+
-

Donate: ♥️

-

https://libredirect.codeberg.page/donate

+

About

-
-

FAQ:

-

https://libredirect.codeberg.page/faq

-
-
-

Docs:

-

https://libredirect.codeberg.page/docs

-
-
-

Source Code:

-

https://libredirect.codeberg.page/source_code

-
-
-

Forked from:

-

Privacy Redirect

+ +
+ +
+ +
+

Donate: ♥️

+

https://libredirect.codeberg.page/donate

+
+ +
+

FAQ:

+

https://libredirect.codeberg.page/faq

+
+ +
+

Docs:

+

https://libredirect.codeberg.page/docs

+
+ +
+

Source Code:

+

https://libredirect.codeberg.page/source_code

+
+ +
+

Forked from:

+

Privacy Redirect

+
+
-
-
+
\ No newline at end of file diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs index b3ff930e..fef052df 100644 --- a/src/pages/options/widgets/general.ejs +++ b/src/pages/options/widgets/general.ejs @@ -1,89 +1,101 @@
-
-

General

-
-
-
-

Theme

- -
-
-

Network

- -
-
-
-

Fallback to clearnet if no instances are available for the current network

- -
-
-
-

- -
-
-
-

Latency Threshold

- - -
-
-
-
-

Excluded from redirecting

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

General

+
+
+ +
+

Theme

+ +
+ +
+

Network

+ +
+ +
+
+

Fallback to clearnet if no instances are available for the current network

+ +
+
+ +
+

+ +
+ +
+
+

Latency Threshold

+ + +
+
+ +
+ +
+

Excluded from redirecting

+
+ +
+
+
+   +   +
+ +
+
+ +
+ +
+ +
+ + + + + Update Instances +     +
+ +
+ +     + + +   Export Settings    + + + + + Reset Settings + +
+ + + \ No newline at end of file diff --git a/src/pages/options/widgets/services.ejs b/src/pages/options/widgets/services.ejs index c3019074..109f6689 100644 --- a/src/pages/options/widgets/services.ejs +++ b/src/pages/options/widgets/services.ejs @@ -1,84 +1,85 @@ <% for (const service in config.services) { -%>
-
-

<%= config.services[service].name %>

-
-
-
-

Enable

- -
-
-

Show in Popup

- -
- <% if (Object.keys(config.services[service].frontends).length> 1) { %> -
-

Frontend

- -
- <% if (config.services[service].embeddable) { _%> -
-

Embed Frontend

- -
- <% } _%> <% } _%> <% if (config.services[service].embeddable) { _%> -
-

Redirect Type

- -
- <% } _%> -
- <% for (const frontend in config.services[service].frontends) { -%> <% if (config.services[service].frontends[frontend].instanceList) { _%> -
- <% for (const network in config.networks) { -%> -
-
-

Default Instances

-
-
-
-
-

Custom Instances

-
-
-
- - -
-
-
- <% if (network=="clearnet" ) { _%> -
- - -
- <% } _%> -
- <% } %> -
- <% } _%> <% } %> +
+

<%= config.services[service].name %>

+
+
+
+

Enable

+ +
+
+

Show in Popup

+ +
+ <% if (Object.keys(config.services[service].frontends).length> 1) { %> +
+

Frontend

+ +
+ <% if (config.services[service].embeddable) { _%> +
+

Embed Frontend

+ +
+ <% } _%> <% } _%> <% if (config.services[service].embeddable) { _%> +
+

Redirect Type

+ +
+ <% } _%> +
+ <% for (const frontend in config.services[service].frontends) { -%> <% if (config.services[service].frontends[frontend].instanceList) { _%> +
+ <% for (const network in config.networks) { -%> +
+ + +
+
+
+

Default Instances

+
+
+
+
+

Custom Instances

+
+
+
+ + +
+
+
+ <% if (network=="clearnet" ) { _%> + <% } _%> +
+ <% } %> +
+ <% } _%> <% } %>
<% } %> - + \ No newline at end of file -- cgit 1.4.1