diff options
| -rw-r--r-- | pug/options/general/general.pug | 194 | ||||
| -rw-r--r-- | pug/widgets/head.pug | 5 | ||||
| -rw-r--r-- | pug/widgets/links.pug | 87 | ||||
| -rw-r--r-- | script.sh | 1 | ||||
| -rw-r--r-- | src/assets/images/librespeed-icon.svg | 497 | ||||
| -rw-r--r-- | src/assets/javascripts/helpers/speedtest.js | 173 | ||||
| -rw-r--r-- | src/assets/javascripts/helpers/twitter.js | 2 | ||||
| -rw-r--r-- | src/pages/options/general/general.html | 399 | ||||
| -rw-r--r-- | src/pages/options/general/general.js | 4 | ||||
| -rw-r--r-- | src/pages/options/speedtest/speedtest.html | 220 | ||||
| -rw-r--r-- | src/pages/options/speedtest/speedtest.js | 59 | ||||
| -rw-r--r-- | src/pages/stylesheets/styles.css | 8 |
12 files changed, 1376 insertions, 273 deletions
diff --git a/pug/options/general/general.pug b/pug/options/general/general.pug new file mode 100644 index 00000000..5f38822f --- /dev/null +++ b/pug/options/general/general.pug @@ -0,0 +1,194 @@ +doctype html +html(lang="en") + include ../../widgets/head.pug + title Document +body.option(dir="auto") + include ../../widgets/links.pug + + section.option-block + .some-block.option-block + h4(data-localise="__MSG_theme__") Theme + select#theme + option(value="DEFAULT" data-localise="__MSG_system__") System + option(value="light" data-localise="__MSG_light__") Light + option(value="dark" data-localise="__MSG_dark__") Dark + + .some-block.option-block + h4(data-localise="__MSG_applyTheme__") Apply Theme to sites + input#apply-theme-to-sites(type="checkbox") + + .some-block.option-block + h4(data-localise="__MSG_alwaysPref__") Always use Preferred Instances + input#always-use-preferred(type="checkbox") + + .some-block.option-block + h4(data-localise="__MSG_autoRedirect__") Auto Redirect of offline instances + input#auto-redirect(type="checkbox") + + .some-block.option-block + h4(data-localise="__MSG_exceptions__") Exceptions + + form#custom-exceptions-instance-form + .some-block.option-block + .some-block(style="padding:0;") + input#exceptions-custom-instance(placeholder="https://www.google.com" type="url") + | + select#exceptions-custom-instance-type + option(value="url") URL + option(value="regex") Regex + | + button#exceptions-add-instance.add(type="submit") + svg(xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor") + path(d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z") + + #exceptions-custom-checklist.checklist + + .buttons.buttons-inline + a#update-instances.button.button-inline + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z") + x(data-localise="__MSG_updateInstances__") Update Instances + + | + + label.button.button-inline(for="import-settings") + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z") + | + x(data-localise="__MSG_importSettings__") Import Settings + input#import-settings.button.button-inline(type="file" style="display:none;") + + | + + a#export-settings.button.button-inline + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z") + | + x(data-localise="__MSG_exportSettings__") Export Settings + + | + + a#reset-settings.button.button-inline + svg(xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z") + path(d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z") + x(data-localise="__MSG_resetSettings__") Reset Settings + hr + + .some-block.option-block + h4(data-localise="__MSG_customPopup__") Customize Popup + + #popup-frontends-checklist.checklist-popup + div + div + img(src="../../../assets/images/youtube-icon.png") + |YouTube + input#youtube(type="checkbox") + div + div + img(src="../../../assets/images/youtube-music-icon.png") + |YoutubeMusic + input#youtubeMusic(type="checkbox") + div + div + img(src="../../../assets/images/twitter-icon.png") + |Twitter + input#twitter(type="checkbox") + + div + div + img(src="../../../assets/images/instagram-icon.png") + |Instagram + input#instagram(type="checkbox") + + div + div + img(src="../../../assets/images/tiktok-icon.png") + |TikTok + input#tikTok(type="checkbox") + + div + div + img(src="../../../assets/images/imgur-icon.png") + |Imgur + input#imgur(type="checkbox") + + div + div + img(src="../../../assets/images/reddit-icon.png") + |Reddit + input#reddit(type="checkbox") + + div + div + img(src="../../../assets/images/pixiv-icon.svg") + |Pixiv + input#pixiv(type="checkbox") + + div + div + img(src="../../../assets/images/spotify-icon.png") + |Spotify + input#spotify(type="checkbox") + + div + div + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor") + path(d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z") + |Search + input#search(type="checkbox") + + div + div + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor") + path(d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z") + |Translate + input#translate(type="checkbox") + + div + div + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor") + path(d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z") + |Maps + input#maps(type="checkbox") + + div + div + img(src="../../../assets/images/wikipedia-icon.svg") + |Wikipedia + input#wikipedia(type="checkbox") + + div + div + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor") + circle(cx="500" cy="500" r="500") + ellipse(ry="475" rx="250" cy="501" cx="1296") + ellipse(cx="1682" cy="502" rx="88" ry="424") + |Medium + input#medium(type="checkbox") + + div + div + img(src="../../../assets/images/peertube-icon.svg") + |Peertube + input#peertube(type="checkbox") + + div + div + img(src="../../../assets/images/lbry-icon.png") + |LBRY/Odysee + input#lbry(type="checkbox") + + div + div + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z") + |Send Files + input#sendTargets(type="checkbox") + + hr + + + script(type="module" src="../init.js") + script(type="module" src="./general.js") + script(type="module" src="../../../assets/javascripts/localise.js") \ No newline at end of file diff --git a/pug/widgets/head.pug b/pug/widgets/head.pug new file mode 100644 index 00000000..53de42d3 --- /dev/null +++ b/pug/widgets/head.pug @@ -0,0 +1,5 @@ +head + meta(charset='utf-8') + meta(name="viewport" content="width=device-width, initial-scale=1") + link(rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg") + link(href="../../stylesheets/styles.css" rel="stylesheet") \ No newline at end of file diff --git a/pug/widgets/links.pug b/pug/widgets/links.pug new file mode 100644 index 00000000..ddd139b3 --- /dev/null +++ b/pug/widgets/links.pug @@ -0,0 +1,87 @@ +section.links + .title + svg(xmlns="http://www.w3.org/2000/svg" + enable-background="new 0 0 24 24" + height="26px" viewBox="0 0 24 24" + width="26px" fill="currentColor") + path(d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z") + a(href="../general/general.html" data-localise="__MSG_general__") General + + .title + img(src="../../../assets/images/youtube-icon.png") + a(href="../youtube/youtube.html" data-localise="__MSG_youtube__") YouTube + + .title + img(src="../../../assets/images/youtube-music-icon.png") + a(href="../youtubeMusic/youtubeMusic.html" data-localise="__MSG_ytmusic__") YT Music + + .title + img(src="../../../assets/images/twitter-icon.png") + a(href="../twitter/twitter.html" data-localise="__MSG_twitter__") Twitter + + .title + img(src="../../../assets/images/instagram-icon.png") + a(href="../instagram/instagram.html" data-localise="__MSG_instagram__") Instagram + + .title + img(src="../../../assets/images/tiktok-icon.png") + a(href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__") TikTok + + .title + img(src="../../../assets/images/reddit-icon.png") + a(href="../reddit/reddit.html" data-localise="__MSG_reddit__") Reddit + + .title + img(src="../../../assets/images/imgur-icon.png") + a(href="../imgur/imgur.html" data-localise="__MSG_imgur__") Imgur + + .title + img(src="../../../assets/images/pixiv-icon.svg") + a(href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__") Pixiv + + .title + img(src="../../../assets/images/librespeed-icon.svg") + a(href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__") Speedtest + + .title + img(src="../../../assets/images/spotify-icon.png") + a(href="../spotify/spotify.html" data-localise="__MSG_spotify__") Spotify + + .title + img(src="../../../assets/images/wikipedia-icon.svg") + a(href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__") Wikipedia + + .title + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor") + circle(cx="500" cy="500" r="500") + ellipse(ry="475" rx="250" cy="501" cx="1296") + ellipse(cx="1682" cy="502" rx="88" ry="424") + a(href="../medium/medium.html" data-localise="__MSG_medium__") Medium + + .title + img(src="../../../assets/images/peertube-icon.svg") + a(href="../peertube/peertube.html" data-localise="__MSG_peertube__") Peertube + + .title + img(src="../../../assets/images/lbry-icon.png") + a(href="../lbry/lbry.html" data-localise="__MSG_lbry__") LBRY/Odysee + + .title + svg(xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor") + path(d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z") + a(href="../search/search.html" data-localise="__MSG_search__") Search + + .title + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z") + a(href="../translate/translate.html" data-localise="__MSG_translate__") Translate + + .title + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z") + a(href="../maps/maps.html" data-localise="__MSG_maps__") Maps + + .title + svg(xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor") + path(d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z") + a(href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__") Send Files \ No newline at end of file diff --git a/script.sh b/script.sh new file mode 100644 index 00000000..10746503 --- /dev/null +++ b/script.sh @@ -0,0 +1 @@ +pug ./pug/options/ -o ./src/pages/options/ -P -w \ No newline at end of file diff --git a/src/assets/images/librespeed-icon.svg b/src/assets/images/librespeed-icon.svg new file mode 100644 index 00000000..8691d7a3 --- /dev/null +++ b/src/assets/images/librespeed-icon.svg @@ -0,0 +1,497 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 23.0.6, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + version="1.1" + id="Layer_1" + x="0px" + y="0px" + viewBox="0 0 192.28403 192.28403" + xml:space="preserve" + sodipodi:docname="librespeed-icon.svg" + width="192.28403" + height="192.28403" + inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><defs + id="defs3049" /><sodipodi:namedview + id="namedview3047" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + showgrid="false" + inkscape:zoom="4.5997653" + inkscape:cx="151.96428" + inkscape:cy="68.590456" + inkscape:window-width="1888" + inkscape:window-height="1060" + inkscape:window-x="32" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="g1581" /> +<style + type="text/css" + id="style2"> + .st0{fill:none;stroke:#000000;stroke-miterlimit:10;} + .st1{fill:#E6E7E8;} + .st2{fill:#EF3828;} + .st3{fill:#F7941D;} + .st4{fill:#939598;} + .st5{fill:#BCBEC0;} + .st6{fill:#D1D3D4;} + .st7{fill:#ED1C24;} + .st8{fill:#BE1E2D;} + .st9{fill:#F15A29;} + .st10{fill:#2E3192;} + .st11{fill:url(#SVGID_1_);} + .st12{fill:url(#SVGID_2_);} + .st13{fill:#DBF1F9;} + .st14{fill:#EF4136;} + .st15{fill:url(#SVGID_3_);} + .st16{fill:url(#SVGID_4_);} + .st17{fill:url(#SVGID_5_);} + .st18{fill:url(#SVGID_6_);} + .st19{fill:url(#SVGID_7_);} + .st20{fill:url(#SVGID_8_);} + .st21{fill:#FFFFFF;} + .st22{fill:url(#SVGID_9_);} + .st23{fill:url(#SVGID_10_);} + .st24{fill:url(#SVGID_11_);} + .st25{fill:url(#SVGID_12_);} + .st26{fill:url(#SVGID_13_);} + .st27{fill:url(#SVGID_14_);} + .st28{fill:#00AEEF;} + .st29{fill:url(#SVGID_15_);} + .st30{fill:url(#SVGID_16_);} + .st31{fill:url(#SVGID_17_);} + .st32{fill:#00A79D;} + .st33{fill:url(#SVGID_18_);} + .st34{fill:url(#SVGID_19_);} + .st35{fill:url(#SVGID_20_);} + .st36{fill:url(#SVGID_21_);} + .st37{fill:#A97C50;} + .st38{fill:url(#SVGID_22_);} + .st39{fill:url(#SVGID_23_);} + .st40{fill:url(#SVGID_24_);} + .st41{fill:url(#SVGID_25_);} + .st42{fill:url(#SVGID_26_);} + .st43{fill:url(#SVGID_27_);} + .st44{fill:url(#SVGID_28_);} + .st45{fill:url(#SVGID_29_);} + .st46{fill:url(#SVGID_30_);} + .st47{fill:url(#SVGID_31_);} + .st48{fill:url(#SVGID_32_);} + .st49{font-family:'Roboto-Regular';} + .st50{font-size:45px;} +</style> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<g + id="XMLID_24_" + transform="translate(3006.892,-1312.308)"> + <g + id="g1581"> + + <path + d="m -2814.7,1404.3 c 2.3,53 -38.8,97.9 -91.9,100.2 -53,2.3 -97.9,-38.8 -100.2,-91.9 -2.3,-53 38.8,-97.9 91.9,-100.2 53,-2.3 97.9,38.8 100.2,91.9 z m -92.5,83.8 c 44,-1.9 78.1,-39.1 76.2,-83.1 -1.9,-44 -39.1,-78.1 -83.1,-76.2 -44,1.9 -78.1,39.1 -76.2,83.1 1.8,44 39.1,78.1 83.1,76.2 z" + id="path1543" /> + <path + d="m -2841.9,1398.6 c 0.8,6 0.8,12.1 0,18.1 l -10.7,-1.4 c 0.7,-5.1 0.7,-10.2 0,-15.3 z" + id="path1545" /> + <path + d="m -2853.5,1420.3 10.5,2.3 c -1.3,5.9 -3.4,11.6 -6.2,17 l -9.6,-5 c 2.4,-4.5 4.2,-9.3 5.3,-14.3 z" + id="path1547" /> + <path + d="m -2843,1392.6 -10.5,2.3 c -1.1,-5 -2.8,-9.8 -5.2,-14.4 l 9.6,-5 c 2.8,5.5 4.8,11.3 6.1,17.1 z" + id="path1549" /> + <path + d="m -2852.2,1370.4 -9.1,5.8 c -2.7,-4.2 -6,-8.2 -9.8,-11.7 l 7.3,-8 c 4.5,4.2 8.4,8.9 11.6,13.9 z" + id="path1551" /> + <path + d="m -2868.5,1352.6 -6.6,8.6 c -4.1,-3.2 -8.6,-5.7 -13.2,-7.7 l 4.1,-10 c 5.5,2.3 10.8,5.3 15.7,9.1 z" + id="path1553" /> + <rect + x="-2890.3999" + y="1449.9" + width="8.1000004" + height="8.1000004" + id="rect1555" /> + <path + d="m -2889.9,1341.5 -3.2,10.3 c -4.6,-1.4 -9.4,-2.3 -14.1,-2.6 l -0.7,-4.9 0.3,-5.9 c 5.9,0.2 11.9,1.2 17.7,3.1 z" + id="path1557" /> + <rect + x="-2906.7" + y="1449.9" + width="8.1000004" + height="8.1000004" + id="rect1559" /> + <path + d="m -2901.4,1401.6 0.9,6 c 0,8.1 -4.6,14.7 -10.2,14.7 -5.6,0 -10.2,-6.6 -10.2,-14.7 l 0.9,-5.9 9.3,-63.3 z" + id="path1561" /> + + <path + d="m -2913.8,1338.3 0.3,6.2 -0.7,4.7 c -4.8,0.3 -9.6,1.2 -14.2,2.6 l -3.2,-10.3 c 5.8,-1.9 11.8,-2.9 17.8,-3.2 z" + id="path1565" /> + <rect + x="-2922.8999" + y="1449.9" + width="8.1000004" + height="8.1000004" + id="rect1567" /> + <rect + x="-2939.2" + y="1449.9" + width="8.1000004" + height="8.1000004" + id="rect1569" /> + <path + d="m -2937.3,1343.5 4.1,10 c -4.7,1.9 -9.1,4.5 -13.2,7.7 l -6.6,-8.6 c 4.9,-3.8 10.2,-6.8 15.7,-9.1 z" + id="path1571" /> + <path + d="m -2957.6,1356.5 7.3,8 c -1.3,1.1 -2.5,2.3 -3.6,3.6 -2.3,2.6 -4.4,5.3 -6.2,8.1 l -9.1,-5.8 c 2.1,-3.3 4.6,-6.6 7.4,-9.6 1.2,-1.5 2.7,-3 4.2,-4.3 z" + id="path1573" /> + <path + d="m -2972.3,1375.6 9.6,5 c -2.4,4.6 -4.1,9.4 -5.2,14.4 l -10.5,-2.3 c 1.2,-5.9 3.2,-11.7 6.1,-17.1 z" + id="path1575" /> + <path + d="m -2962.8,1434.7 -9.6,5 c -2.8,-5.4 -4.9,-11.2 -6.2,-17 l 10.5,-2.3 c 1.2,4.9 2.9,9.7 5.3,14.3 z" + id="path1577" /> + <path + d="m -2979.6,1398.6 10.7,1.4 c -0.7,5.1 -0.7,10.2 0,15.3 l -10.7,1.4 c -0.8,-6 -0.8,-12.1 0,-18.1 z" + id="path1579" /> + </g> + <g + id="g1583"> + </g> +</g> +<path + class="st21" + d="m 100.69201,96.09201 c 0,2.5 -2,4.5 -4.5,4.5 -2.5,0 -4.5,-2 -4.5,-4.5 0,-2.5 2,-4.5 4.5,-4.5 2.5,0 4.5,2 4.5,4.5 z" + id="path1586" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +</svg> diff --git a/src/assets/javascripts/helpers/speedtest.js b/src/assets/javascripts/helpers/speedtest.js new file mode 100644 index 00000000..1e2fddeb --- /dev/null +++ b/src/assets/javascripts/helpers/speedtest.js @@ -0,0 +1,173 @@ +window.browser = window.browser || window.chrome; + +import commonHelper from './common.js' + +const targets = [ + /^https?:\/{2}(www\.|)speedtest\.net\/$/ +]; + +let redirects = { + "librespeed": { + "normal": [ + "https://librespeed.org" + ], + "tor": [] + } +} + +const getRedirects = () => redirects; +const getCustomRedirects = function () { + return { + "librespeed": { + "normal": [...librespeedNormalRedirectsChecks, ...librespeedNormalCustomRedirects], + "tor": [] + }, + }; +}; + +function setRedirects(val) { + redirects.librespeed = val; + browser.storage.local.set({ speedtestRedirects: redirects }) + console.log("speedtestRedirects: ", val) + for (const item of librespeedNormalRedirectsChecks) + if (!redirects.librespeed.normal.includes(item)) { + var index = librespeedNormalRedirectsChecks.indexOf(item); + if (index !== -1) librespeedNormalRedirectsChecks.splice(index, 1); + } + setLibrespeedNormalRedirectsChecks(librespeedNormalRedirectsChecks); + + for (const item of librespeedTorRedirectsChecks) + if (!redirects.librespeed.normal.includes(item)) { + var index = librespeedTorRedirectsChecks.indexOf(item); + if (index !== -1) librespeedTorRedirectsChecks.splice(index, 1); + } + setLibrespeedTorRedirectsChecks(librespeedTorRedirectsChecks); +} + +let librespeedNormalRedirectsChecks; +const getLibrespeedNormalRedirectsChecks = () => librespeedNormalRedirectsChecks; +function setLibrespeedNormalRedirectsChecks(val) { + librespeedNormalRedirectsChecks = val; + browser.storage.local.set({ librespeedNormalRedirectsChecks }) + console.log("librespeedNormalRedirectsChecks: ", val) +} + +let librespeedTorRedirectsChecks; +const getLibrespeedTorRedirectsChecks = () => librespeedTorRedirectsChecks; +function setLibrespeedTorRedirectsChecks(val) { + librespeedTorRedirectsChecks = val; + browser.storage.local.set({ librespeedTorRedirectsChecks }) + console.log("librespeedTorRedirectsChecks: ", val) +} + +let librespeedNormalCustomRedirects = []; +const getLibrespeedNormalCustomRedirects = () => librespeedNormalCustomRedirects; +function setLibrespeedNormalCustomRedirects(val) { + librespeedNormalCustomRedirects = val; + browser.storage.local.set({ librespeedNormalCustomRedirects }) + console.log("librespeedNormalCustomRedirects: ", val) +} + +let librespeedTorCustomRedirects = []; +const getLibrespeedTorCustomRedirects = () => librespeedTorCustomRedirects; +function setLibrespeedTorCustomRedirects(val) { + librespeedTorCustomRedirects = val; + browser.storage.local.set({ librespeedTorCustomRedirects }) + console.log("librespeedTorCustomRedirects: ", val) +} + +let disable; +const getDisable = () => disable; +function setDisable(val) { + disable = val; + browser.storage.local.set({ disableSpeedtest: disable }) + console.log("disableSpeedtest", val); +} + +let protocol; +const getProtocol = () => protocol; +function setProtocol(val) { + protocol = val; + browser.storage.local.set({ speedtestProtocol: val }) + console.log("speedtestProtocol: ", val) +} + +function redirect(url, type, initiator) { + if (disable) return null; + if (initiator && ([...redirects.librespeed.normal, ...librespeedNormalCustomRedirects].includes(initiator.origin) || targets.includes(initiator.host))) return null; + if (!targets.some(rx => rx.test(url.href))) return null; + console.log("Librespeed!!"); + + if (type != "main_frame" && type != "sub_frame") return null; + + let instancesList; + if (protocol == 'normal') instancesList = [...librespeedNormalRedirectsChecks, ...librespeedNormalCustomRedirects]; + if (protocol == 'tor') instancesList = [...librespeedTorRedirectsChecks, ...librespeedTorCustomRedirects]; + if (instancesList.length === 0) return null; + let randomInstance = commonHelper.getRandomInstance(instancesList); + + return `${randomInstance}`; +} + +async function init() { + return new Promise(resolve => { + fetch('/instances/data.json').then(response => response.text()).then(data => { + let dataJson = JSON.parse(data); + browser.storage.local.get( + [ + "disableSpeedtest", + "speedtestRedirects", + + "librespeedNormalRedirectsChecks", + "librespeedNormalCustomRedirects", + + "librespeedTorRedirectsChecks", + "librespeedTorCustomRedirects", + + "speedtestProtocol" + ], + r => { + disable = r.disableSpeedtest ?? true; + + protocol = r.speedtestProtocol ?? "normal"; + + if (r.speedtestRedirects) redirects = r.speedtestRedirects; + + librespeedNormalRedirectsChecks = r.librespeedNormalRedirectsChecks ?? [...redirects.librespeed.normal]; + librespeedNormalCustomRedirects = r.librespeedNormalCustomRedirects ?? []; + + librespeedTorRedirectsChecks = r.librespeedTorRedirectsChecks ?? [...redirects.librespeed.tor]; + librespeedTorCustomRedirects = r.librespeedTorCustomRedirects ?? []; + + resolve(); + } + ) + }); + }); +} + +export default { + + getRedirects, + getCustomRedirects, + setRedirects, + + getDisable, + setDisable, + + getProtocol, + setProtocol, + + getLibrespeedNormalRedirectsChecks, + setLibrespeedNormalRedirectsChecks, + getLibrespeedTorRedirectsChecks, + setLibrespeedTorRedirectsChecks, + + getLibrespeedTorCustomRedirects, + setLibrespeedTorCustomRedirects, + getLibrespeedNormalCustomRedirects, + setLibrespeedNormalCustomRedirects, + + redirect, + init, +}; diff --git a/src/assets/javascripts/helpers/twitter.js b/src/assets/javascripts/helpers/twitter.js index a333777d..e58af78b 100644 --- a/src/assets/javascripts/helpers/twitter.js +++ b/src/assets/javascripts/helpers/twitter.js @@ -277,7 +277,6 @@ function isNitter(url, type) { ].includes(protocolHost); } -let applyThemeToSites; function initNitterCookies() { if (enableCustomSettings) { let allInstances = [...redirects.nitter.normal, ...redirects.nitter.tor, ...nitterNormalCustomRedirects, ...nitterTorCustomRedirects] @@ -410,7 +409,6 @@ async function init() { alwaysUsePreferred = r.alwaysUsePreferred ?? false; theme = r.theme ?? 'DEFAULT'; - applyThemeToSites = r.applyThemeToSites ?? false; redirects.nitter = dataJson.nitter; if (r.twitterRedirects) redirects = r.twitterRedirects; 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 @@ <!DOCTYPE html> -<html> - -<head> - <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1" /> - <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> - <link href="../../stylesheets/styles.css" rel="stylesheet" /> - <title data-localise="__MSG_libOptions__">LibRedirect Options</title> -</head> - -<body dir="auto" class="option"> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg"> + <link href="../../stylesheets/styles.css" rel="stylesheet"> + <title>Document</title> + </head> +</html> +<body class="option" dir="auto"> <section class="links"> <div class="title"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" - width="26px" fill="currentColor"> - <path - d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z" /> - </svg> - <a href="../general/general.html" class="selected" data-localise="__MSG_general__">General</a> - </div> - <div class="title"> - <img src="../../../assets/images/youtube-icon.png" /> - <a href="../youtube/youtube.html" data-localise="__MSG_youtube__">YouTube</a> - </div> - <div class="title"> - <img src="../../../assets/images/youtube-music-icon.png" /> - <a href="../youtubeMusic/youtubeMusic.html" data-localise="__MSG_ytmusic__">YT Music</a> - </div> - <div class="title"> - <img src="../../../assets/images/twitter-icon.png" /> - <a href="../twitter/twitter.html" data-localise="__MSG_twitter__">Twitter</a> - </div> - <div class="title"> - <img src="../../../assets/images/instagram-icon.png" /> - <a href="../instagram/instagram.html" data-localise="__MSG_instagram__">Instagram</a> - </div> - <div class="title"> - <img src="../../../assets/images/tiktok-icon.png" /> - <a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a> - </div> - <div class="title"> - <img src="../../../assets/images/reddit-icon.png" /> - <a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a> - </div> - <div class="title"> - <img src="../../../assets/images/imgur-icon.png" /> - <a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a> - </div> - <div class="title"> - <img src="../../../assets/images/pixiv-icon.svg" /> - <a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a> - </div> - <div class="title"> - <img src="../../../assets/images/spotify-icon.png" /> - <a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a> - </div> - <div class="title"> - <img src="../../../assets/images/wikipedia-icon.svg" /> - <a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a> - </div> - <div class="title"> - <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor"> + <path d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z"></path> + </svg><a href="../general/general.html" data-localise="__MSG_general__">General</a> + </div> + <div class="title"> <img src="../../../assets/images/youtube-icon.png"><a href="../youtube/youtube.html" data-localise="__MSG_youtube__">YouTube</a></div> + <div class="title"> <img src="../../../assets/images/youtube-music-icon.png"><a href="../youtubeMusic/youtubeMusic.html" data-localise="__MSG_ytmusic__">YT Music</a></div> + <div class="title"> <img src="../../../assets/images/twitter-icon.png"><a href="../twitter/twitter.html" data-localise="__MSG_twitter__">Twitter</a></div> + <div class="title"> <img src="../../../assets/images/instagram-icon.png"><a href="../instagram/instagram.html" data-localise="__MSG_instagram__">Instagram</a></div> + <div class="title"> <img src="../../../assets/images/tiktok-icon.png"><a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a></div> + <div class="title"> <img src="../../../assets/images/reddit-icon.png"><a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a></div> + <div class="title"> <img src="../../../assets/images/imgur-icon.png"><a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a></div> + <div class="title"> <img src="../../../assets/images/pixiv-icon.svg"><a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a></div> + <div class="title"> <img src="../../../assets/images/librespeed-icon.svg"><a href="../speedtest/speedtest.html" data-localise="__MSG_speedtest__">Speedtest</a></div> + <div class="title"> <img src="../../../assets/images/spotify-icon.png"><a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a></div> + <div class="title"> <img src="../../../assets/images/wikipedia-icon.svg"><a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a></div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> - <circle cx="500" cy="500" r="500" /> - <ellipse ry="475" rx="250" cy="501" cx="1296" /> - <ellipse cx="1682" cy="502" rx="88" ry="424" /> - </svg> - <a href="../medium/medium.html" data-localise="__MSG_medium__">Medium</a> - </div> - <div class="title"> - <img src="../../../assets/images/peertube-icon.svg" /> - <a href="../peertube/peertube.html" data-localise="__MSG_peertube__">Peertube</a> - </div> - <div class="title"> - <img src="../../../assets/images/lbry-icon.png" /> - <a href="../lbry/lbry.html" data-localise="__MSG_lbry__">LBRY/Odysee</a> - </div> - <div class="title"> + <circle cx="500" cy="500" r="500"></circle> + <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse> + <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse> + </svg><a href="../medium/medium.html" data-localise="__MSG_medium__">Medium</a> + </div> + <div class="title"> <img src="../../../assets/images/peertube-icon.svg"><a href="../peertube/peertube.html" data-localise="__MSG_peertube__">Peertube</a></div> + <div class="title"> <img src="../../../assets/images/lbry-icon.png"><a href="../lbry/lbry.html" data-localise="__MSG_lbry__">LBRY/Odysee</a></div> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> - </svg> - <a href="../search/search.html" data-localise="__MSG_search__">Search</a> + <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path> + </svg><a href="../search/search.html" data-localise="__MSG_search__">Search</a> </div> - <div class="title"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> - </svg> - <a href="../translate/translate.html" data-localise="__MSG_translate__">Translate</a> + <path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"></path> + </svg><a href="../translate/translate.html" data-localise="__MSG_translate__">Translate</a> </div> - <div class="title"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path - d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" /> - </svg> - <a href="../maps/maps.html" data-localise="__MSG_maps__">Maps</a> + <path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"></path> + </svg><a href="../maps/maps.html" data-localise="__MSG_maps__">Maps</a> </div> - <div class="title"> + <div class="title"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path - d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" /> - </svg> - <a href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__">Send Files</a> + <path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path> + </svg><a href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__">Send Files</a> </div> </section> - <section class="option-block"> <div class="some-block option-block"> <h4 data-localise="__MSG_theme__">Theme</h4> @@ -117,244 +65,159 @@ <option value="dark" data-localise="__MSG_dark__">Dark</option> </select> </div> - <div class="some-block option-block"> <h4 data-localise="__MSG_applyTheme__">Apply Theme to sites</h4> - <input id="apply-theme-to-sites" type="checkbox" checked /> + <input id="apply-theme-to-sites" type="checkbox"> </div> - <div class="some-block option-block"> <h4 data-localise="__MSG_alwaysPref__">Always use Preferred Instances</h4> - <input id="always-use-preferred" type="checkbox" checked /> + <input id="always-use-preferred" type="checkbox"> </div> - <div class="some-block option-block"> <h4 data-localise="__MSG_autoRedirect__">Auto Redirect of offline instances</h4> - <input id="auto-redirect" type="checkbox" checked /> + <input id="auto-redirect" type="checkbox"> </div> - <div class="some-block option-block"> <h4 data-localise="__MSG_exceptions__">Exceptions</h4> </div> - <form id="custom-exceptions-instance-form"> <div class="some-block option-block"> <div class="some-block" style="padding:0;"> - <input id="exceptions-custom-instance" placeholder="https://www.google.com" type="url" /> - + <input id="exceptions-custom-instance" placeholder="https://www.google.com" type="url"> <select id="exceptions-custom-instance-type"> <option value="url">URL</option> <option value="regex">Regex</option> - </select> - + </select> </div> - <button type="submit" class="add" id="exceptions-add-instance"> + <button class="add" id="exceptions-add-instance" type="submit"> <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"></path> </svg> </button> </div> </form> <div class="checklist" id="exceptions-custom-checklist"></div> - - <div class="buttons buttons-inline"> - <a class="button button-inline" id="update-instances"> + <div class="buttons buttons-inline"><a class="button button-inline" id="update-instances"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" /> + <path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z"></path> </svg> - <x data-localise="__MSG_updateInstances__">Update Instances</x> - </a> - - <label for="import-settings" class="button button-inline"> + <x data-localise="__MSG_updateInstances__">Update Instances</x></a> + <label class="button button-inline" for="import-settings"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path - d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z" /> + <path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path> </svg> <x data-localise="__MSG_importSettings__">Import Settings</x> - <input type="file" class="button button-inline" style="display:none;" id="import-settings"> - </label> - - <a class="button button-inline" id="export-settings"> + <input class="button button-inline" id="import-settings" type="file" style="display:none;"> + </label> <a class="button button-inline" id="export-settings"> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path - d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z" /> + <path d="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"></path> </svg> - <x data-localise="__MSG_exportSettings__">Export Settings</x> - </a> - - <a class="button button-inline" id="reset-settings"> - <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" - width="24px" fill="currentColor"> - <g> - <g> - <path - d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z" /> - <path - d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z" /> - </g> - </g> + <x data-localise="__MSG_exportSettings__">Export Settings</x></a> <a class="button button-inline" id="reset-settings"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M12,5V2L8,6l4,4V7c3.31,0,6,2.69,6,6c0,2.97-2.17,5.43-5,5.91v2.02c3.95-0.49,7-3.85,7-7.93C20,8.58,16.42,5,12,5z"></path> + <path d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z"></path> </svg> - <x data-localise="__MSG_resetSettings__">Reset Settings</x> - </a> + <x data-localise="__MSG_resetSettings__">Reset Settings</x></a> </div> - <hr> - <div class="some-block option-block"> <h4 data-localise="__MSG_customPopup__">Customize Popup</h4> </div> - <div class="checklist-popup" id="popup-frontends-checklist"> <div> - <div> - <img src="../../../assets/images/youtube-icon.png"> - YouTube - </div> - <input type="checkbox" id="youtube" /> + <div><img src="../../../assets/images/youtube-icon.png">YouTube</div> + <input id="youtube" type="checkbox"> </div> <div> - <div> - <img src="../../../assets/images/youtube-music-icon.png"> - YoutubeMusic - </div> - <input type="checkbox" id="youtubeMusic" /> + <div><img src="../../../assets/images/youtube-music-icon.png">YoutubeMusic</div> + <input id="youtubeMusic" type="checkbox"> </div> <div> - <div> - <img src="../../../assets/images/twitter-icon.png"> - Twitter - </div> - <input type="checkbox" id="twitter" /> + <div><img src="../../../assets/images/twitter-icon.png">Twitter</div> + <input id="twitter" type="checkbox"> </div> <div> - <div> - <img src="../../../assets/images/instagram-icon.png"> - Instagram - </div> - <input type="checkbox" id="instagram" /> + <div> <img src="../../../assets/images/instagram-icon.png">Instagram</div> + <input id="instagram" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/tiktok-icon.png"> - TikTok - </div> - <input type="checkbox" id="tikTok" /> + <div> + <div> <img src="../../../assets/images/tiktok-icon.png">TikTok</div> + <input id="tikTok" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/imgur-icon.png"> - Imgur - </div> - <input type="checkbox" id="imgur" /> + <div> + <div> <img src="../../../assets/images/imgur-icon.png">Imgur</div> + <input id="imgur" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/reddit-icon.png"> - Reddit - </div> - <input type="checkbox" id="reddit" /> + <div> + <div> <img src="../../../assets/images/reddit-icon.png">Reddit</div> + <input id="reddit" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/pixiv-icon.svg"> - Pixiv - </div> - <input type="checkbox" id="pixiv" /> + <div> + <div> <img src="../../../assets/images/pixiv-icon.svg">Pixiv</div> + <input id="pixiv" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/spotify-icon.png"> - Spotify - </div> - <input type="checkbox" id="spotify" /> + <div> + <div> <img src="../../../assets/images/spotify-icon.png">Spotify</div> + <input id="spotify" type="checkbox"> </div> - <div> - <div> + <div> + <div> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> - </svg> - <x data-localise="__MSG_search__">Search</x> + <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path> + </svg>Search </div> - <input type="checkbox" id="search" /> + <input id="search" type="checkbox"> </div> - <div> - <div> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> - </svg> - <x data-localise="__MSG_translate__">Translate</x> + <div> + <div> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"></path> + </svg>Translate </div> - <input type="checkbox" id="translate" /> + <input id="translate" type="checkbox"> </div> - <div> - <div> - <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path d="M0 0h24v24H0V0z" fill="none" /> - <path - d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z" /> - </svg> - <x data-localise="__MSG_maps__">Maps</x> + <div> + <div> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z"></path> + </svg>Maps </div> - <input type="checkbox" id="maps" /> + <input id="maps" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/wikipedia-icon.svg"> - Wikipedia - </div> - <input type="checkbox" id="wikipedia" /> + <div> + <div> <img src="../../../assets/images/wikipedia-icon.svg">Wikipedia</div> + <input id="wikipedia" type="checkbox"> </div> - <div> - <div> - <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> + <div> + <div> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> - <circle cx="500" cy="500" r="500" /> - <ellipse ry="475" rx="250" cy="501" cx="1296" /> - <ellipse cx="1682" cy="502" rx="88" ry="424" /> - </svg> - Medium + <circle cx="500" cy="500" r="500"></circle> + <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse> + <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse> + </svg>Medium </div> - <input type="checkbox" id="medium" /> + <input id="medium" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/peertube-icon.svg"> - Peertube - </div> - <input type="checkbox" id="peertube" /> + <div> + <div> <img src="../../../assets/images/peertube-icon.svg">Peertube</div> + <input id="peertube" type="checkbox"> </div> - <div> - <div> - <img src="../../../assets/images/lbry-icon.png"> - LBRY/Odysee - </div> - <input type="checkbox" id="lbry" /> + <div> + <div> <img src="../../../assets/images/lbry-icon.png">LBRY/Odysee</div> + <input id="lbry" type="checkbox"> </div> - <div> - <div> - <div> + <div> + <div> <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> - <path - d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" /> - </svg> - </div> - Send Files + <path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path> + </svg>Send Files </div> - <input type="checkbox" id="sendTargets" /> + <input id="sendTargets" type="checkbox"> </div> + <hr> </div> - <hr> - + <script type="module" src="../init.js"></script> + <script type="module" src="./general.js"></script> + <script type="module" src="../../../assets/javascripts/localise.js"></script> </section> - - <script type="module" src="../init.js"></script> - <script type="module" src="./general.js"></script> - <script type="module" src="../../../assets/javascripts/localise.js"></script> -</body> - -</html> +</body> \ 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 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="UTF-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg" /> + <link href="../../stylesheets/styles.css" rel="stylesheet" /> + <title>LibRedirect: Speedtest</title> +</head> + +<body dir="auto" class="option"> + <section class="links"> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="26px" viewBox="0 0 24 24" + width="26px" fill="currentColor"> + <path + d="M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z" /> + </svg> + <a href="../general/general.html" data-localise="__MSG_general__">General</a> + </div> + + <div class="title"> + <img src="../../../assets/images/youtube-icon.png" /> + <a href="../youtube/youtube.html" data-localise="__MSG_youtube__">YouTube</a> + </div> + + <div class="title"> + <img src="../../../assets/images/youtube-music-icon.png" /> + <a href="../youtubeMusic/youtubeMusic.html" data-localise="__MSG_ytmusic__">YT Music</a> + </div> + + <div class="title"> + <img src="../../../assets/images/twitter-icon.png" /> + <a href="../twitter/twitter.html" data-localise="__MSG_twitter__">Twitter</a> + </div> + + <div class="title"> + <img src="../../../assets/images/instagram-icon.png" /> + <a href="../instagram/instagram.html" data-localise="__MSG_instagram__">Instagram</a> + </div> + + <div class="title"> + <img src="../../../assets/images/tiktok-icon.png" /> + <a href="../tiktok/tiktok.html" data-localise="__MSG_tiktok__">TikTok</a> + </div> + + <div class="title"> + <img src="../../../assets/images/reddit-icon.png" /> + <a href="../reddit/reddit.html" data-localise="__MSG_reddit__">Reddit</a> + </div> + + <div class="title"> + <img src="../../../assets/images/imgur-icon.png" /> + <a href="../imgur/imgur.html" data-localise="__MSG_imgur__">Imgur</a> + </div> + + <div class="title"> + <img src="../../../assets/images/pixiv-icon.svg" /> + <a href="../pixiv/pixiv.html" data-localise="__MSG_pixiv__">Pixiv</a> + </div> + + <div class="title"> + <img src="../../../assets/images/speedtest-icon.svg" /> + <a href="../speedtest/speedtest.html" class="selected" data-localise="__MSG_pixiv__">Speedtest</a> + </div> + + <div class="title"> + <img src="../../../assets/images/spotify-icon.png" /> + <a href="../spotify/spotify.html" data-localise="__MSG_spotify__">Spotify</a> + </div> + + <div class="title"> + <img src="../../../assets/images/wikipedia-icon.svg" /> + <a href="../wikipedia/wikipedia.html" data-localise="__MSG_wikipedia__">Wikipedia</a> + </div> + + <div class="title"> + <!-- https://markentier.tech/posts/2020/10/medium-icon-svg/ --> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor"> + <circle cx="500" cy="500" r="500" /> + <ellipse ry="475" rx="250" cy="501" cx="1296" /> + <ellipse cx="1682" cy="502" rx="88" ry="424" /> + </svg> + <a href="../medium/medium.html" data-localise="__MSG_medium__">Medium</a> + </div> + + <div class="title"> + <img src="../../../assets/images/peertube-icon.svg" /> + <a href="../peertube/peertube.html" data-localise="__MSG_peertube__">Peertube</a> + </div> + + <div class="title"> + <img src="../../../assets/images/lbry-icon.png" /> + <a href="../lbry/lbry.html" data-localise="__MSG_lbry__">LBRY/Odysee</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> + </svg> + <a href="../search/search.html" data-localise="__MSG_search__">Search</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path + d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z" /> + </svg> + <a href="../translate/translate.html" data-localise="__MSG_translate__">Translate</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path + d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z" /> + </svg> + <a href="../maps/maps.html" data-localise="__MSG_maps__">Maps</a> + </div> + + <div class="title"> + <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor"> + <path + d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z" /> + </svg> + <a href="../sendTargets/sendTargets.html" data-localise="__MSG_sendFiles__">Send Files</a> + </div> + + </section> + + <section class="option-block"> + <div class="some-block option-block"> + <h4 data-localise="__MSG_enable__">Enable</h4> + <input id="disable-speedtest" type="checkbox" checked /> + </div> + + <div class="some-block option-block"> + <h4> + <x data-localise="__MSG_frontend__">Frontend</x>: <span style="color:red;" + data-localise="__MSG_notFullyPrivate__">This isn't a fully private frontend</span> + </h4> + <select id="maps-frontend"> + <option value="librespeed" data-localise="__MSG_pixivMoe__">pixiv萌え</option> + </select> + </div> + + <hr> + + <div class="some-block option-block"> + <h4 data-localise="__MSG_protocol__">Protocol</h4> + <select id="protocol"> + <option value="normal" data-localise="__MSG_normal__">Normal</option> + <option value="tor" data-localise="__MSG_tor__">Tor</option> + </select> + </div> + + <hr> + + <div id="librespeed"> + <div class="normal"> + <div class="some-block option-block"> + <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4> + </div> + <div class="checklist checklist"></div> + <hr> + <div class="some-block option-block"> + <h4 data-localise="__MSG_customInstances__">Custom Instances</h4> + </div> + <form class="custom-instance-form"> + <div class="some-block option-block"> + <input class="custom-instance" placeholder="https://librespeed.com" type="url" /> + <button type="submit" class="add add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" + fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist custom-checklist"></div> + </div> + <div class="tor"> + <div class="some-block option-block"> + <h4 data-localise="__MSG_defaultInstances__">Default Instances</h4> + </div> + <div class="checklist checklist"></div> + <hr> + <div class="some-block option-block"> + <h4 data-localise="__MSG_customInstances__">Custom Instances</h4> + </div> + <form class="custom-instance-form"> + <div class="some-block option-block"> + <input class="custom-instance" placeholder="http://librespeed.onion" type="url" /> + <button type="submit" class="add add-instance"> + <svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" + fill="currentColor"> + <path d="M0 0h24v24H0V0z" fill="none" /> + <path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> + </svg> + </button> + </div> + </form> + <div class="checklist custom-checklist"></div> + </div> + </div> + </section> + + + <script type="module" src="../init.js"></script> + <script type="module" src="./speedtest.js"></script> + <script type="module" src="../../../assets/javascripts/localise.js"></script> +</body> + +</html> 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; } |
