From 4f7233c05dfcaace52ae7af66d0ff05dff0d59fe Mon Sep 17 00:00:00 2001 From: Green! <81369743+GreenyDEV@users.noreply.github.com> Date: Tue, 7 Jun 2022 18:20:17 -0400 Subject: [PATCH] added front end for proxy switcher --- .DS_Store | Bin 0 -> 6148 bytes static/.DS_Store | Bin 0 -> 6148 bytes static/index.html | 10 +- static/mobile/index.html | 6 +- static/mobile/resources/deviceHandler.js | 1 + static/mobile/resources/form.js | 5 +- static/mobile/style/main.css | 5 - static/mobile/style/master.css | 5 - static/mobile/style/options.css | 5 - static/mobile/sw.js | 3 - static/options/index.html | 17 +-- static/resources/deviceHandler.js | 5 +- static/resources/form.js | 84 +++++++-------- static/resources/options.js | 32 +++++- static/style/main.css | 15 --- static/style/master.css | 7 +- static/style/options.css | 127 +++++++++++++++++++---- static/sw.js | 5 - 18 files changed, 195 insertions(+), 137 deletions(-) create mode 100644 .DS_Store create mode 100644 static/.DS_Store create mode 100644 static/mobile/resources/deviceHandler.js diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a533515eaa11f88b13397dcb2f4960bcac199f75 GIT binary patch literal 6148 zcmeHK%}T>S5Z-NTn^J@v6nb3nTCuiO5HF$D7cim+m718M!I&*gY7V84v%Zi|;`2DO zyEy~{-bCyS%zm@;vzz@O`@W!^t%W7F2>&|_WnVWj)G8ub|8|+<58Tp0n z`B&jAo7y{PGETiPo-I^C7|bB$_BxCMnT_Q#4iZ)C>VVa@+Ecr`TJ4X9Juw^{t$Sj1 zGU)fj=ykxNJn5Cg;j zF|c_In6tp@Y~Ipo#l!$H@B;(5KL}7n$6&5eZ5`0y^%>(0L=>>`ErBQuItFu%5CP%3 z6i}CP^Tgn~9Q?xMIRvj%?^H{(iwL&QcDaF17!y4x@+V4e-6J) zNszs;XVd z9>>|)jVG}k6OkEj=Ql(N5ydEs(EwG8@qI20>q!rjjf=6Mx4XQUWqFY`ytP9WPz4T6 z0iL^kTG2C2X-W0@n|#;IJ^HBXOBSpgJ=5B}Z{rQ%wWc{Te9|>N(gqpx%39IJN!mC8 zIs3>_P=+WuEjn_Is=fg^&XC~+qgeshohn?^y#w-`(<{Fn@V98qc6d{lO-4YzQ{>vv z*AB`Je?0@^f8a}a>eP(mi)TRm9&~!|c;_+u1jIbFxx4T47#|=W?i)z?s(>nRbPDkL zU{M%T!P28!I#9VI05C$gGqm}af;m<&6)ZjC4$OEe&{K^ZF^s39--=% - @@ -23,9 +21,9 @@
-

Proxy NEW

+

Proxy NEW

Choose the proxy that fits you!

- - - + + + + +
diff --git a/static/resources/deviceHandler.js b/static/resources/deviceHandler.js index 2fcd5d9..0d0ec91 100644 --- a/static/resources/deviceHandler.js +++ b/static/resources/deviceHandler.js @@ -1,4 +1 @@ -// Copyright Nebula Services 2021 - Present -// All Rights Reserved - -(function(a, b) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) window.location = b })(navigator.userAgent || navigator.vendor || window.opera, '/mobile'); \ No newline at end of file +(function(a,b){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))window.location=b})(navigator.userAgent||navigator.vendor||window.opera,'/mobile'); \ No newline at end of file diff --git a/static/resources/form.js b/static/resources/form.js index 1fd4a37..5b84a09 100644 --- a/static/resources/form.js +++ b/static/resources/form.js @@ -1,13 +1,10 @@ -// Copyright Nebula Services 2021 - Present -// All Rights Reserved - var option = localStorage.getItem('nogg'); window.addEventListener('load', () => { - - + + function isUrl(val = '') { if (/^http(s?):\/\//.test(val) || val.includes('.') && val.substr(0, 1) !== ' ') return true; return false; @@ -34,48 +31,47 @@ window.addEventListener('load', () => { if (!(url.startsWith('https://') || url.startsWith('http://'))) url = 'http://' + url; const redirectTo = __uv$config.prefix + __uv$config.encodeUrl(url); const option = localStorage.getItem('nogg'); - if (option === 'on') { + if (option === 'on') { stealthEngine(redirectTo); - } else location.href = redirectTo; + } else location.href = redirectTo; }); }); - // NoGG Engine - function stealthEngine(encodedURL) { - // The URL must be encoded ^ - let inFrame +// NoGG Engine +function stealthEngine(encodedURL){ + // The URL must be encoded ^ + let inFrame + + try { + inFrame = window !== top + } catch (e) { + inFrame = true + } + + if (!inFrame && !navigator.userAgent.includes("Firefox")) { + const popup = open("about:blank", "_blank") + if (!popup || popup.closed) { + alert("Popups are disabled!") + } else { + const doc = popup.document + const iframe = doc.createElement("iframe") + const style = iframe.style + const img = doc.createElement("link") + const link = location.href + img.rel = "icon" + img.href = "https://ssl.gstatic.com/images/branding/product/1x/drive_2020q4_32dp.png" + doc.title = "Google Drive" + + var currentLink = link.slice(0, link.length - 1); - try { - inFrame = window !== top - } catch (e) { - inFrame = true - } + iframe.src = currentLink + encodedURL - if (!inFrame && !navigator.userAgent.includes("Firefox")) { - const popup = open("about:blank", "_blank") - if (!popup || popup.closed) { - alert("Popups are disabled!") - } else { - const doc = popup.document - const iframe = doc.createElement("iframe") - const style = iframe.style - const img = doc.createElement("link") - const link = location.href - img.rel = "icon" - img.href = "https://ssl.gstatic.com/images/branding/product/1x/drive_2020q4_32dp.png" - doc.title = "Google Drive" - - var currentLink = link.slice(0, link.length - 1); - - iframe.src = currentLink + encodedURL - - style.position = "fixed" - style.top = style.bottom = style.left = style.right = 0 - style.border = style.outline = "none" - style.width = style.height = "100%" - - doc.body.appendChild(iframe) - } - } - } -}); \ No newline at end of file + style.position = "fixed" + style.top = style.bottom = style.left = style.right = 0 + style.border = style.outline = "none" + style.width = style.height = "100%" + + doc.body.appendChild(iframe) + } + } +}}); \ No newline at end of file diff --git a/static/resources/options.js b/static/resources/options.js index 2f76113..4d2a78c 100644 --- a/static/resources/options.js +++ b/static/resources/options.js @@ -1,6 +1,3 @@ -// Copyright Nebula Services 2021 - Present -// All Rights Reserved - // Set the option var option = localStorage.getItem('nogg') @@ -24,7 +21,7 @@ function saveIc() { var notification = `
- Success: Your settings have been saved! + Success! Your settings have been saved!
`; @@ -35,6 +32,20 @@ function saveIc() { }, 2000); }; +function unsavedChanges() { + var notification = ` +
+
+ Danger! You have unsaved changes! +
+
+ `; + document.getElementById('navbar').innerHTML = notification + setTimeout(() => { + var NotificationOBJ = document.getElementById('notif') + + }, 2000); +}; // Update the CheckBox to match the settings window.onload = function() { @@ -48,4 +59,15 @@ window.onload = function() { }, 600); } -}; \ No newline at end of file +}; + + + +function switchProxy() { + var selecter = document.getElementById("proxySwitcher"); + var selectedOption = selecter.value + localStorage.setItem("proxy", selectedOption); + var storedChoice = localStorage.getItem('proxy'); + console.log(selectedOption) + +} \ No newline at end of file diff --git a/static/style/main.css b/static/style/main.css index 28bce30..dbec71a 100644 --- a/static/style/main.css +++ b/static/style/main.css @@ -1,8 +1,3 @@ -/* -Copyright Nebula Services 2021 - Present -All Rights Reserved -*/ - :root { --background-primary: #191724; --navbar-color: #26233a; @@ -175,17 +170,7 @@ ul li ul:hover { animation-duration: 2s; } - -/* - --input-text-color: #e0def4; - --input-placeholder-color: #6e6a86; - --input-background-color: #1f1d2e; - --input-border-color: #eb6f92; - --input-border-size: 0.1em; - */ - #content input:focus { - /* outline: 1.3px solid #eb6f9; !important;*/ outline: none; box-shadow: none !important; } diff --git a/static/style/master.css b/static/style/master.css index c890f02..0085c3a 100644 --- a/static/style/master.css +++ b/static/style/master.css @@ -1,8 +1,3 @@ -/* -Copyright Nebula Services 2021 - Present -All Rights Reserved -*/ - @import url("https://fonts.googleapis.com/css2?family=Dongle&family=Roboto:wght@100&display=swap"); :root { --background-primary: #191724; @@ -37,7 +32,7 @@ body { body { background-color: var(--background-primary); color: var(--text-color-primary); - animation: fadeInAnimation ease 3s; + animation: fadeInAnimation ease 1s; animation-iteration-count: 1; animation-fill-mode: forwards; } diff --git a/static/style/options.css b/static/style/options.css index 0e07059..11a911f 100644 --- a/static/style/options.css +++ b/static/style/options.css @@ -1,8 +1,3 @@ -/* -Copyright Nebula Services 2021 - Present -All Rights Reserved -*/ - @import url("https://fonts.googleapis.com/css2?family=Work+Sans:wght@300&display=swap"); :root { --background-primary: #191724; @@ -33,8 +28,8 @@ body { }*/ #sidebar { - animation: fadeIn 750ms ease-in 300ms forwards; - -webkit-animation: fadeIn 750ms ease-in 300ms forwards; + animation: fadeIn 700ms ease-in 30ms forwards; + -webkit-animation: fadeIn 700ms ease-in 300ms forwards; position: absolute; top: var(--header-height); left: 0; @@ -267,15 +262,6 @@ ul li { background-color: #f55145; } -@keyframes fade-in { - 0% { - opacity: 0; - } - 100% { - opacity: 0.8; - } -} - .stamp { text-align: left; position: fixed; @@ -309,6 +295,7 @@ ul li { left: 22.88px; } +@import url('https://fonts.googleapis.com/css2?family=Ubuntu:wght@300&display=swap'); .settings-cont { box-sizing: border-box; width: 300px; @@ -321,14 +308,116 @@ ul li { .name { color: var(--text-color-primary); - font-size: 2vmax; + font-size: 27px; margin: 0; - font-family: var(--setting-name-font); + font-family: 'Ubuntu', sans-serif; + font-weight: 700; + font-style: bold; } .description { color: var(--text-color-secondary); margin: 0; font-size: 17px; - font-family: var(--setting-desc-font); + font-family: 'Ubuntu', sans-serif; + font-weight: 300; + font-style: Italic; +} + +@import url('https://fonts.googleapis.com/css2?family=Oxygen:wght@700&display=swap'); +.new-tag { + font-size: 16px; + color: rgb(226, 68, 68); + font-family: 'Oxygen', sans-serif; +} + +.square { + width: .7em; + height: .7em; + margin: .5em; + display: inline-block; +} + + +/* Custom dropdown */ + +.custom-dropdown { + position: relative; + display: inline-block; + vertical-align: middle; + margin: 10px; + /* demo only */ +} + +.custom-dropdown select { + background-color: #1abc9c; + color: #fff; + font-size: inherit; + padding: .5em; + padding-right: 2.5em; + border: 0; + margin: 0; + border-radius: 3px; + text-indent: 0.01px; + text-overflow: ''; + -webkit-appearance: button; + /* hide default arrow in chrome OSX */ +} + +.custom-dropdown::before, +.custom-dropdown::after { + content: ""; + position: absolute; + pointer-events: none; +} + +.custom-dropdown::after { + /* Custom dropdown arrow */ + content: "\25BC"; + height: 1em; + font-size: .625em; + line-height: 1; + right: 1.2em; + top: 50%; + margin-top: -.5em; +} + +.custom-dropdown::before { + /* Custom dropdown arrow cover */ + width: 2em; + right: 0; + top: 0; + bottom: 0; + border-radius: 0 3px 3px 0; +} + +.custom-dropdown select[disabled] { + color: rgba(0, 0, 0, .3); +} + +.custom-dropdown select[disabled]::after { + color: rgba(0, 0, 0, .1); +} + +.custom-dropdown::before { + background-color: rgba(0, 0, 0, .15); +} + +.custom-dropdown::after { + color: rgba(0, 0, 0, .4); +} + +.button-save { + background-color: #1abc9c; + color: #fff; + font-size: inherit; + padding: 0.5em; + padding-right: -0.5em; + border: 0; + margin: 0; + border-radius: 3px; + text-indent: 0.01px; + text-overflow: ''; + -webkit-appearance: button; + cursor: pointer; } \ No newline at end of file diff --git a/static/sw.js b/static/sw.js index 933cc17..89ac6a7 100644 --- a/static/sw.js +++ b/static/sw.js @@ -1,8 +1,3 @@ -/* -Copyright Nebula Services 2021 - Present -All Rights Reserved -*/ - importScripts('./uv/uv.sw.js'); const sw = new UVServiceWorker();