From 36dffffff92e4217bb0fa14e64fdd348e6ba4c7d Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Sun, 28 Nov 2021 17:43:44 -0500 Subject: working on extension ui --- temp/index.html | 46 ++++++++++++++++++++++++ temp/popup.css | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ temp/popup.js | 59 +++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+) create mode 100644 temp/index.html create mode 100644 temp/popup.css create mode 100644 temp/popup.js diff --git a/temp/index.html b/temp/index.html new file mode 100644 index 0000000..b64973c --- /dev/null +++ b/temp/index.html @@ -0,0 +1,46 @@ + + + + + + Return Youtube Dislike + + + + + + +
+ Logo +

Return Youtube Dislike

+

by Dmitrii Selivanov & Community

+ + + + + +
+ + +
+ +
+
+ +
+ + +
+ + + + + \ No newline at end of file diff --git a/temp/popup.css b/temp/popup.css new file mode 100644 index 0000000..772e891 --- /dev/null +++ b/temp/popup.css @@ -0,0 +1,107 @@ +/* Variables */ +:root { + --primary: #ff6666; + --accent: #ffaaaa; + + --background: #111; + --secondary: #272727; + --lightGrey: #999; + --white: #fff; +} + +/* Window Styling */ +html, +body { + background-color: var(--background); + color: var(--white); + width: 300px; + padding: 0.5em; + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; +} + +h1 { + font-size: 26px; +} + +button { + color: var(--white); + background: var(--secondary); + cursor: pointer; + padding: 5px 16px; + border: none; + border-radius: 4px; + font-weight: 500; + box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), 0 1px 10px 0 rgb(0 0 0 / 12%); +} + +#advancedToggle { + margin-top: 1em; + margin-bottom: 2em; +} + +#advancedSettings { + display: none; + border: 2px solid var(--secondary); + border-radius: 4px; + padding: 0.5em; + margin-right: 1em; /* FIREFOX ONLY */ +} + +#ratio_bar_colour { + border: none; + outline: none; + background: none; +} + +/* Switches */ +.switch { + position: relative; + display: inline-block; + width: 30px; + height: 17px; + margin-bottom: 0.5em; +} + +.switch input { + display: none; +} + +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: var(--secondary); + transition: .4s; + border-radius: 34px; +} + +.slider:before { + position: absolute; + content: ''; + height: 13px; + width: 13px; + left: 2px; + bottom: 2px; + background: var(--lightGrey); + transition: .4s; + border-radius: 50%; +} + +input:checked+.slider { + background: var(--accent); +} + +input:checked+.slider:before { + transform: translateX(13px); + background: var(--primary); +} + +.switchLabel { + width: 250px !important; + transform: translateX(35px); + display: inline-block; +} \ No newline at end of file diff --git a/temp/popup.js b/temp/popup.js new file mode 100644 index 0000000..12dd0c3 --- /dev/null +++ b/temp/popup.js @@ -0,0 +1,59 @@ +/* Config */ +const config = { + advanced: false, + showAdvancedMessage: "Show Advanced", + hideAdvancedMessage: "Hide Advanced", + + links: { + website: 'https://returnyoutubedislike.com', + github: 'https://github.com/Anarios/return-youtube-dislike', + discord: 'https://discord.gg/mYnESY4Md5' + }, +}; + +/* Links */ +document.getElementById('link_website').addEventListener('click', () => { + chrome.tabs.create({ + url: config.links.website + }); +}); + +document.getElementById('link_github').addEventListener('click', () => { + chrome.tabs.create({ + url: config.links.github + }); +}); + +document.getElementById('link_discord').addEventListener('click', () => { + chrome.tabs.create({ + url: config.links.discord + }); +}); + +/* Advanced Toggle */ +const advancedToggle = document.getElementById('advancedToggle'); +advancedToggle.addEventListener('click', () => { + const adv = document.getElementById('advancedSettings'); + if (config.advanced) { + adv.style.display = "none"; + advancedToggle.innerHTML = config.showAdvancedMessage; + config.advanced = false; + } else { + adv.style.display = "block"; + advancedToggle.innerHTML = config.hideAdvancedMessage; + config.advanced = true; + } +}); + + + +/* popup-script.js +document.querySelector('#login') +.addEventListener('click', function () { + chrome.runtime.sendMessage({ message: 'get_auth_token' }); +}); + +document.querySelector("#log_off").addEventListener("click", function () { + chrome.runtime.sendMessage({ message: "log_off" }); +}); +*/ \ No newline at end of file -- cgit v1.2.3 From 9cbc0e8c7fbc190f7d51398d4e1f5b5065f2aa66 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 16:46:56 -0500 Subject: :white_circle: Toggle Switches in Advanced + Added themed toggle switches in advanced settings --- Extensions/chrome/popup.css | 57 +++++++++++++++++++++- Extensions/chrome/popup.html | 14 +++++- Extensions/firefox/popup.css | 57 +++++++++++++++++++++- Extensions/firefox/popup.html | 14 +++++- temp/index.html | 46 ------------------ temp/popup.css | 107 ------------------------------------------ temp/popup.js | 59 ----------------------- 7 files changed, 138 insertions(+), 216 deletions(-) delete mode 100644 temp/index.html delete mode 100644 temp/popup.css delete mode 100644 temp/popup.js diff --git a/Extensions/chrome/popup.css b/Extensions/chrome/popup.css index 2f54c1d..cfc556b 100644 --- a/Extensions/chrome/popup.css +++ b/Extensions/chrome/popup.css @@ -1,8 +1,11 @@ /* Variables */ :root { + --primary: #CC2929; + --accent: #581111; + --background: #111; - --primary: #ff4444; --secondary: #272727; + --lightGrey: #999; --white: #fff; } @@ -41,4 +44,56 @@ button { border: 2px solid var(--secondary); border-radius: 4px; padding: 0.5em; +} + +/* Switches */ +.switch { + position: relative; + display: inline-block; + width: 30px; + height: 17px; + margin-bottom: 0.5em; +} + +.switch input { + display: none; +} + +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: var(--secondary); + transition: .4s; + border-radius: 34px; +} + +.slider:before { + position: absolute; + content: ''; + height: 13px; + width: 13px; + left: 2px; + bottom: 2px; + background: var(--lightGrey); + transition: .4s; + border-radius: 50%; +} + +input:checked+.slider { + background: var(--accent); +} + +input:checked+.slider:before { + transform: translateX(13px); + background: var(--primary); +} + +.switchLabel { + width: 250px !important; + transform: translateX(35px); + display: inline-block; } \ No newline at end of file diff --git a/Extensions/chrome/popup.html b/Extensions/chrome/popup.html index 218814e..4cefcd0 100644 --- a/Extensions/chrome/popup.html +++ b/Extensions/chrome/popup.html @@ -23,7 +23,19 @@
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Nemo laboriosam, veritatis sint dolores assumenda harum quidem molestiae ad repellendus aliquid? + +
+ +
+
diff --git a/Extensions/firefox/popup.css b/Extensions/firefox/popup.css index a9b86ad..f5df55f 100644 --- a/Extensions/firefox/popup.css +++ b/Extensions/firefox/popup.css @@ -1,8 +1,11 @@ /* Variables */ :root { + --primary: #CC2929; + --accent: #581111; + --background: #111; - --primary: #ff4444; --secondary: #272727; + --lightGrey: #999; --white: #fff; } @@ -42,4 +45,56 @@ button { border-radius: 4px; padding: 0.5em; margin-right: 1em; /* FIREFOX ONLY */ +} + +/* Switches */ +.switch { + position: relative; + display: inline-block; + width: 30px; + height: 17px; + margin-bottom: 0.5em; +} + +.switch input { + display: none; +} + +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: var(--secondary); + transition: .4s; + border-radius: 34px; +} + +.slider:before { + position: absolute; + content: ''; + height: 13px; + width: 13px; + left: 2px; + bottom: 2px; + background: var(--lightGrey); + transition: .4s; + border-radius: 50%; +} + +input:checked+.slider { + background: var(--accent); +} + +input:checked+.slider:before { + transform: translateX(13px); + background: var(--primary); +} + +.switchLabel { + width: 250px !important; + transform: translateX(35px); + display: inline-block; } \ No newline at end of file diff --git a/Extensions/firefox/popup.html b/Extensions/firefox/popup.html index 218814e..2b70f14 100644 --- a/Extensions/firefox/popup.html +++ b/Extensions/firefox/popup.html @@ -23,7 +23,19 @@
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Nemo laboriosam, veritatis sint dolores assumenda harum quidem molestiae ad repellendus aliquid? + +
+ +
+
diff --git a/temp/index.html b/temp/index.html deleted file mode 100644 index b64973c..0000000 --- a/temp/index.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Return Youtube Dislike - - - - - - -
- Logo -

Return Youtube Dislike

-

by Dmitrii Selivanov & Community

- - - - - -
- - -
- -
-
- -
- - -
- - - - - \ No newline at end of file diff --git a/temp/popup.css b/temp/popup.css deleted file mode 100644 index 772e891..0000000 --- a/temp/popup.css +++ /dev/null @@ -1,107 +0,0 @@ -/* Variables */ -:root { - --primary: #ff6666; - --accent: #ffaaaa; - - --background: #111; - --secondary: #272727; - --lightGrey: #999; - --white: #fff; -} - -/* Window Styling */ -html, -body { - background-color: var(--background); - color: var(--white); - width: 300px; - padding: 0.5em; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; -} - -h1 { - font-size: 26px; -} - -button { - color: var(--white); - background: var(--secondary); - cursor: pointer; - padding: 5px 16px; - border: none; - border-radius: 4px; - font-weight: 500; - box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), 0 1px 10px 0 rgb(0 0 0 / 12%); -} - -#advancedToggle { - margin-top: 1em; - margin-bottom: 2em; -} - -#advancedSettings { - display: none; - border: 2px solid var(--secondary); - border-radius: 4px; - padding: 0.5em; - margin-right: 1em; /* FIREFOX ONLY */ -} - -#ratio_bar_colour { - border: none; - outline: none; - background: none; -} - -/* Switches */ -.switch { - position: relative; - display: inline-block; - width: 30px; - height: 17px; - margin-bottom: 0.5em; -} - -.switch input { - display: none; -} - -.slider { - position: absolute; - cursor: pointer; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: var(--secondary); - transition: .4s; - border-radius: 34px; -} - -.slider:before { - position: absolute; - content: ''; - height: 13px; - width: 13px; - left: 2px; - bottom: 2px; - background: var(--lightGrey); - transition: .4s; - border-radius: 50%; -} - -input:checked+.slider { - background: var(--accent); -} - -input:checked+.slider:before { - transform: translateX(13px); - background: var(--primary); -} - -.switchLabel { - width: 250px !important; - transform: translateX(35px); - display: inline-block; -} \ No newline at end of file diff --git a/temp/popup.js b/temp/popup.js deleted file mode 100644 index 12dd0c3..0000000 --- a/temp/popup.js +++ /dev/null @@ -1,59 +0,0 @@ -/* Config */ -const config = { - advanced: false, - showAdvancedMessage: "Show Advanced", - hideAdvancedMessage: "Hide Advanced", - - links: { - website: 'https://returnyoutubedislike.com', - github: 'https://github.com/Anarios/return-youtube-dislike', - discord: 'https://discord.gg/mYnESY4Md5' - }, -}; - -/* Links */ -document.getElementById('link_website').addEventListener('click', () => { - chrome.tabs.create({ - url: config.links.website - }); -}); - -document.getElementById('link_github').addEventListener('click', () => { - chrome.tabs.create({ - url: config.links.github - }); -}); - -document.getElementById('link_discord').addEventListener('click', () => { - chrome.tabs.create({ - url: config.links.discord - }); -}); - -/* Advanced Toggle */ -const advancedToggle = document.getElementById('advancedToggle'); -advancedToggle.addEventListener('click', () => { - const adv = document.getElementById('advancedSettings'); - if (config.advanced) { - adv.style.display = "none"; - advancedToggle.innerHTML = config.showAdvancedMessage; - config.advanced = false; - } else { - adv.style.display = "block"; - advancedToggle.innerHTML = config.hideAdvancedMessage; - config.advanced = true; - } -}); - - - -/* popup-script.js -document.querySelector('#login') -.addEventListener('click', function () { - chrome.runtime.sendMessage({ message: 'get_auth_token' }); -}); - -document.querySelector("#log_off").addEventListener("click", function () { - chrome.runtime.sendMessage({ message: "log_off" }); -}); -*/ \ No newline at end of file -- cgit v1.2.3 From 895c6e61f921ed92061202207f8fd6d234edb714 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 16:48:19 -0500 Subject: :red_circle: Change "Advanced" to "Settings" --- Extensions/chrome/popup.html | 2 +- Extensions/chrome/popup.js | 4 ++-- Extensions/firefox/popup.html | 2 +- Extensions/firefox/popup.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Extensions/chrome/popup.html b/Extensions/chrome/popup.html index 4cefcd0..617cca9 100644 --- a/Extensions/chrome/popup.html +++ b/Extensions/chrome/popup.html @@ -18,7 +18,7 @@
- + diff --git a/Extensions/chrome/popup.js b/Extensions/chrome/popup.js index 0d3c991..9cde399 100644 --- a/Extensions/chrome/popup.js +++ b/Extensions/chrome/popup.js @@ -1,8 +1,8 @@ /* Config */ const config = { advanced: false, - showAdvancedMessage: "Show Advanced", - hideAdvancedMessage: "Hide Advanced", + showAdvancedMessage: "Show Settings", + hideAdvancedMessage: "Hide Settings", links: { website: 'https://returnyoutubedislike.com', diff --git a/Extensions/firefox/popup.html b/Extensions/firefox/popup.html index 2b70f14..4bba44b 100644 --- a/Extensions/firefox/popup.html +++ b/Extensions/firefox/popup.html @@ -18,7 +18,7 @@
- + diff --git a/Extensions/firefox/popup.js b/Extensions/firefox/popup.js index 0d3c991..9cde399 100644 --- a/Extensions/firefox/popup.js +++ b/Extensions/firefox/popup.js @@ -1,8 +1,8 @@ /* Config */ const config = { advanced: false, - showAdvancedMessage: "Show Advanced", - hideAdvancedMessage: "Hide Advanced", + showAdvancedMessage: "Show Settings", + hideAdvancedMessage: "Hide Settings", links: { website: 'https://returnyoutubedislike.com', -- cgit v1.2.3 From e169913122906918a11d3494b1fac390254cfeef Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:31:28 -0500 Subject: Live Disliking Feature (issue #59, #93) For Chrome --- Extensions/chrome/return-youtube-dislike.script.js | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index d51cc00..199b3c0 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -9,10 +9,13 @@ } function getButtons() { - if (document.getElementById("menu-container").offsetParent === null) { + + //--- If Menu Element Is Displayed: ---// + if (document.getElementById('menu-container').offsetParent === null) { return document.querySelector( "ytd-menu-renderer.ytd-watch-metadata > div" ); + //--- If Menu Element Isnt Displayed: ---// } else { return document .getElementById("menu-container") @@ -44,6 +47,7 @@ return getDislikeButton().classList.contains("style-text"); } + function getState() { if (isVideoLiked()) { return "liked"; @@ -54,14 +58,23 @@ return "neutral"; } + //--- Sets The Likes And Dislikes Values ---// function setLikes(likesCount) { getButtons().children[0].querySelector("#text").innerText = likesCount; } - function setDislikes(dislikesCount) { getButtons().children[1].querySelector("#text").innerText = dislikesCount; } + //--- Gets Current Dislike Value From Local Device ---// + function getDislikes() { + let dislikes = getButtons().children[1].querySelector("#text").innerText; + dislikes = parseInt(dislikes); + return dislikes; + } + + + function setState() { let statsSet = false; chrome.runtime.sendMessage( @@ -110,12 +123,21 @@ } function likeClicked() { - // console.log("like" + getState()); + console.log("Dislike State:",getState()); // setState(); } function dislikeClicked() { - // console.log("dislike" + getState()); + let state = getState(); + + console.log("Dislike State:",state); + + if (state == 'disliked') { + setDislikes(getDislikes() + 1) + } else if (state == 'neutral') { + setDislikes(getDislikes() + -1) + } + // setState(); } -- cgit v1.2.3 From 454be4e41cd6f1ed902cedf839fef11c8a615af0 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:37:09 -0500 Subject: Live Disliking Feature (issue #59, #93) For Firefox --- .../firefox/return-youtube-dislike.script.js | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 293388b..a00ed18 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -8,8 +8,11 @@ function cLog(message, writer) { } function getButtons() { + + //--- If Menu Element Is Displayed: ---// if (document.getElementById("menu-container").offsetParent === null) { return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); + //--- If Menu Element Isnt Displayed: ---// } else { return document .getElementById("menu-container") @@ -51,14 +54,22 @@ function getState() { return "neutral"; } +//--- Sets The Likes And Dislikes Values ---// function setLikes(likesCount) { getButtons().children[0].querySelector("#text").innerText = likesCount; } - function setDislikes(dislikesCount) { getButtons().children[1].querySelector("#text").innerText = dislikesCount; } +//--- Gets Current Dislike Value From Local Device ---// +function getDislikes() { + let dislikes = getButtons().children[1].querySelector("#text").innerText; + dislikes = parseInt(dislikes); + return dislikes; +} + + function setState() { let statsSet = false; browser.runtime.sendMessage( @@ -106,12 +117,21 @@ function setState() { } function likeClicked() { - // console.log("like" + getState()); + console.log("Dislike State:",getState()); // setState(); } function dislikeClicked() { - // console.log("dislike" + getState()); + let state = getState(); + + console.log("Dislike State:",state); + + if (state == 'disliked') { + setDislikes(getDislikes() + 1) + } else if (state == 'neutral') { + setDislikes(getDislikes() + -1) + } + // setState(); } -- cgit v1.2.3 From 1fc81b445fd1571f12118ec79ef1245586df11b9 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Wed, 1 Dec 2021 17:45:24 -0500 Subject: settings label --- Extensions/chrome/popup.css | 139 ++++++++++++++++++++++++------------------- Extensions/chrome/popup.html | 33 +++++----- Extensions/chrome/popup.js | 26 ++++---- 3 files changed, 104 insertions(+), 94 deletions(-) diff --git a/Extensions/chrome/popup.css b/Extensions/chrome/popup.css index cfc556b..fb2dd8a 100644 --- a/Extensions/chrome/popup.css +++ b/Extensions/chrome/popup.css @@ -1,99 +1,116 @@ /* Variables */ :root { - --primary: #CC2929; - --accent: #581111; + --primary: #cc2929; + --accent: #581111; - --background: #111; - --secondary: #272727; - --lightGrey: #999; - --white: #fff; + --background: #111; + --secondary: #272727; + --tertiary: #333333; + --lightGrey: #999; + --white: #fff; } /* Window Styling */ -html,body { - background-color: var(--background); - color: var(--white); - min-width: 300px; - padding: 0.5em; - font-family: Arial, Helvetica, sans-serif; - font-size: 14px; +html, +body { + background-color: var(--background); + color: var(--white); + min-width: 300px; + padding: 0.5em; + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; } h1 { - font-size: 26px; + font-size: 26px; } button { - color: var(--white); - background: var(--secondary); - cursor: pointer; - padding: 5px 16px; - border: none; - border-radius: 4px; - font-weight: 500; - box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), 0 1px 10px 0 rgb(0 0 0 / 12%); + color: var(--white); + background: var(--secondary); + cursor: pointer; + padding: 5px 16px; + border: none; + border-radius: 4px; + font-weight: 500; + box-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), + 0 1px 10px 0 rgb(0 0 0 / 12%); } #advancedToggle { - margin-top: 1em; - margin-bottom: 2em; + margin-top: 1em; + margin-bottom: 2em; } #advancedSettings { - display: none; - border: 2px solid var(--secondary); - border-radius: 4px; - padding: 0.5em; + display: none; + color: var(--tertiary); + border: 2px solid var(--secondary); + border-radius: 1rem; + padding: 1rem; +} + +#andvancedLegend { + color: var(--tertiary) !important; + /* margin: auto; */ /* Center the label */ + /* padding: .25rem .5rem; */ + /* border-radius: .25rem; */ + /* border: .25rem solid var(--secondary); */ } /* Switches */ .switch { - position: relative; - display: inline-block; - width: 30px; - height: 17px; - margin-bottom: 0.5em; + position: relative; + display: inline-block; + width: 30px; + height: 17px; + margin-bottom: 0.5em; +} + +.switch:last-of-time { + margin-bottom: 0; } .switch input { - display: none; + display: none; } .slider { - position: absolute; - cursor: pointer; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: var(--secondary); - transition: .4s; - border-radius: 34px; + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: var(--secondary); + transition: 0.4s; + border-radius: 34px; } .slider:before { - position: absolute; - content: ''; - height: 13px; - width: 13px; - left: 2px; - bottom: 2px; - background: var(--lightGrey); - transition: .4s; - border-radius: 50%; + position: absolute; + content: ""; + height: 13px; + width: 13px; + left: 2px; + bottom: 2px; + background: var(--lightGrey); + transition: 0.4s; + border-radius: 50%; } -input:checked+.slider { - background: var(--accent); +input:checked + .slider { + background: var(--accent); } -input:checked+.slider:before { - transform: translateX(13px); - background: var(--primary); +input:checked + .slider:before { + transform: translateX(13px); + background: var(--primary); } .switchLabel { - width: 250px !important; - transform: translateX(35px); - display: inline-block; -} \ No newline at end of file + margin-left: 0.5rem; + width: 250px !important; + transform: translateX(35px); + display: inline-block; +} diff --git a/Extensions/chrome/popup.html b/Extensions/chrome/popup.html index dd7bfa5..dea7246 100644 --- a/Extensions/chrome/popup.html +++ b/Extensions/chrome/popup.html @@ -1,13 +1,11 @@ - + Return YouTube Dislike - + - -
Logo

Return YouTube Dislike

@@ -17,28 +15,25 @@ -
+
-
-
+
+ Settings
+ + + Lorem ipsum dolor sit amet

- -
- - + + + Lorem ipsum dolor sit amet
+ diff --git a/Extensions/chrome/popup.js b/Extensions/chrome/popup.js index 9cde399..cfc64d5 100644 --- a/Extensions/chrome/popup.js +++ b/Extensions/chrome/popup.js @@ -5,29 +5,29 @@ const config = { hideAdvancedMessage: "Hide Settings", links: { - website: 'https://returnyoutubedislike.com', - github: 'https://github.com/Anarios/return-youtube-dislike', - discord: 'https://discord.gg/mYnESY4Md5' + website: "https://returnyoutubedislike.com", + github: "https://github.com/Anarios/return-youtube-dislike", + discord: "https://discord.gg/mYnESY4Md5", }, }; /* Links */ -document.getElementById('link_website').addEventListener('click', () => { - chrome.tabs.create({url: config.links.website}); +document.getElementById("link_website").addEventListener("click", () => { + chrome.tabs.create({ url: config.links.website }); }); -document.getElementById('link_github').addEventListener('click', () => { - chrome.tabs.create({url: config.links.github}); +document.getElementById("link_github").addEventListener("click", () => { + chrome.tabs.create({ url: config.links.github }); }); -document.getElementById('link_discord').addEventListener('click', () => { - chrome.tabs.create({url: config.links.discord}); +document.getElementById("link_discord").addEventListener("click", () => { + chrome.tabs.create({ url: config.links.discord }); }); /* Advanced Toggle */ -const advancedToggle = document.getElementById('advancedToggle'); -advancedToggle.addEventListener('click', () => { - const adv = document.getElementById('advancedSettings'); +const advancedToggle = document.getElementById("advancedToggle"); +advancedToggle.addEventListener("click", () => { + const adv = document.getElementById("advancedSettings"); if (config.advanced) { adv.style.display = "none"; advancedToggle.innerHTML = config.showAdvancedMessage; @@ -39,8 +39,6 @@ advancedToggle.addEventListener('click', () => { } }); - - /* popup-script.js document.querySelector('#login') .addEventListener('click', function () { -- cgit v1.2.3 From c649f2b5838830084fe81b26e75268ad9d55fed3 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:31:28 -0500 Subject: Live Disliking Feature (issue #59, #93) For Chrome --- Extensions/chrome/return-youtube-dislike.script.js | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index d51cc00..199b3c0 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -9,10 +9,13 @@ } function getButtons() { - if (document.getElementById("menu-container").offsetParent === null) { + + //--- If Menu Element Is Displayed: ---// + if (document.getElementById('menu-container').offsetParent === null) { return document.querySelector( "ytd-menu-renderer.ytd-watch-metadata > div" ); + //--- If Menu Element Isnt Displayed: ---// } else { return document .getElementById("menu-container") @@ -44,6 +47,7 @@ return getDislikeButton().classList.contains("style-text"); } + function getState() { if (isVideoLiked()) { return "liked"; @@ -54,14 +58,23 @@ return "neutral"; } + //--- Sets The Likes And Dislikes Values ---// function setLikes(likesCount) { getButtons().children[0].querySelector("#text").innerText = likesCount; } - function setDislikes(dislikesCount) { getButtons().children[1].querySelector("#text").innerText = dislikesCount; } + //--- Gets Current Dislike Value From Local Device ---// + function getDislikes() { + let dislikes = getButtons().children[1].querySelector("#text").innerText; + dislikes = parseInt(dislikes); + return dislikes; + } + + + function setState() { let statsSet = false; chrome.runtime.sendMessage( @@ -110,12 +123,21 @@ } function likeClicked() { - // console.log("like" + getState()); + console.log("Dislike State:",getState()); // setState(); } function dislikeClicked() { - // console.log("dislike" + getState()); + let state = getState(); + + console.log("Dislike State:",state); + + if (state == 'disliked') { + setDislikes(getDislikes() + 1) + } else if (state == 'neutral') { + setDislikes(getDislikes() + -1) + } + // setState(); } -- cgit v1.2.3 From 287d419c373bc9389c1645b5635b6ea3eeff2534 Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 17:37:09 -0500 Subject: Live Disliking Feature (issue #59, #93) For Firefox --- .../firefox/return-youtube-dislike.script.js | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index 293388b..a00ed18 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -8,8 +8,11 @@ function cLog(message, writer) { } function getButtons() { + + //--- If Menu Element Is Displayed: ---// if (document.getElementById("menu-container").offsetParent === null) { return document.querySelector("ytd-menu-renderer.ytd-watch-metadata > div"); + //--- If Menu Element Isnt Displayed: ---// } else { return document .getElementById("menu-container") @@ -51,14 +54,22 @@ function getState() { return "neutral"; } +//--- Sets The Likes And Dislikes Values ---// function setLikes(likesCount) { getButtons().children[0].querySelector("#text").innerText = likesCount; } - function setDislikes(dislikesCount) { getButtons().children[1].querySelector("#text").innerText = dislikesCount; } +//--- Gets Current Dislike Value From Local Device ---// +function getDislikes() { + let dislikes = getButtons().children[1].querySelector("#text").innerText; + dislikes = parseInt(dislikes); + return dislikes; +} + + function setState() { let statsSet = false; browser.runtime.sendMessage( @@ -106,12 +117,21 @@ function setState() { } function likeClicked() { - // console.log("like" + getState()); + console.log("Dislike State:",getState()); // setState(); } function dislikeClicked() { - // console.log("dislike" + getState()); + let state = getState(); + + console.log("Dislike State:",state); + + if (state == 'disliked') { + setDislikes(getDislikes() + 1) + } else if (state == 'neutral') { + setDislikes(getDislikes() + -1) + } + // setState(); } -- cgit v1.2.3 From 3387d1ed4a1f25ae13beb757597e4dde1b71bf19 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Wed, 1 Dec 2021 17:50:14 -0500 Subject: settingsg label --- Extensions/chrome/popup.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Extensions/chrome/popup.css b/Extensions/chrome/popup.css index fb2dd8a..1f63acb 100644 --- a/Extensions/chrome/popup.css +++ b/Extensions/chrome/popup.css @@ -46,7 +46,7 @@ button { display: none; color: var(--tertiary); border: 2px solid var(--secondary); - border-radius: 1rem; + border-radius: 0.5rem; padding: 1rem; } @@ -64,10 +64,10 @@ button { display: inline-block; width: 30px; height: 17px; - margin-bottom: 0.5em; + margin-bottom: 1rem; } -.switch:last-of-time { +.switch:last-of-type { margin-bottom: 0; } -- cgit v1.2.3 From 1f492b4a076b26fd94d1e439d5d467615dee5dcc Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:04:39 -0500 Subject: fix bug where disliking a video with 1k+ dislikes shows 1 dislike --- Extensions/chrome/return-youtube-dislike.script.js | 16 +++++++--------- Extensions/firefox/firefox.zip | Bin 0 -> 24871 bytes Extensions/firefox/return-youtube-dislike.script.js | 17 ++++++++--------- 3 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 Extensions/firefox/firefox.zip diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index 199b3c0..ad2226b 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -1,4 +1,8 @@ (function (extensionId) { + let storedData = { + dislikes: 0 + }; + function cLog(message, writer) { message = `[return youtube dislike]: ${message}`; if (writer) { @@ -66,13 +70,6 @@ getButtons().children[1].querySelector("#text").innerText = dislikesCount; } - //--- Gets Current Dislike Value From Local Device ---// - function getDislikes() { - let dislikes = getButtons().children[1].querySelector("#text").innerText; - dislikes = parseInt(dislikes); - return dislikes; - } - function setState() { @@ -91,6 +88,7 @@ if (response.likes || response.dislikes) { const formattedDislike = numberFormat(response.dislikes); setDislikes(formattedDislike); + storedData.dislikes = parseInt(response.dislikes); createRateBar(response.likes, response.dislikes); statsSet = true; } @@ -133,9 +131,9 @@ console.log("Dislike State:",state); if (state == 'disliked') { - setDislikes(getDislikes() + 1) + setDislikes(numberFormat(storedData.dislikes)) } else if (state == 'neutral') { - setDislikes(getDislikes() + -1) + setDislikes(numberFormat(storedData.dislikes - 1)) } // setState(); diff --git a/Extensions/firefox/firefox.zip b/Extensions/firefox/firefox.zip new file mode 100644 index 0000000..c5e477e Binary files /dev/null and b/Extensions/firefox/firefox.zip differ diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index a00ed18..a112c0d 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -1,3 +1,7 @@ +let storedData = { + dislikes: 0 +}; + function cLog(message, writer) { message = `[return youtube dislike]: ${message}`; if (writer) { @@ -62,13 +66,6 @@ function setDislikes(dislikesCount) { getButtons().children[1].querySelector("#text").innerText = dislikesCount; } -//--- Gets Current Dislike Value From Local Device ---// -function getDislikes() { - let dislikes = getButtons().children[1].querySelector("#text").innerText; - dislikes = parseInt(dislikes); - return dislikes; -} - function setState() { let statsSet = false; @@ -85,6 +82,7 @@ function setState() { if (response.likes || response.dislikes) { const formattedDislike = numberFormat(response.dislikes); setDislikes(formattedDislike); + storedData.dislikes = parseInt(response.dislikes); createRateBar(response.likes, response.dislikes); statsSet = true; } @@ -106,6 +104,7 @@ function setState() { cLog(JSON.stringify(response)); if (response != undefined && !statsSet) { const formattedDislike = numberFormat(response.dislikes); + storedData.dislikes = response.dislikes; // setLikes(response.likes); console.log(response); setDislikes(formattedDislike); @@ -127,9 +126,9 @@ function dislikeClicked() { console.log("Dislike State:",state); if (state == 'disliked') { - setDislikes(getDislikes() + 1) + setDislikes(numberFormat(storedData.dislikes)) } else if (state == 'neutral') { - setDislikes(getDislikes() + -1) + setDislikes(numberFormat(storedData.dislikes - 1)) } // setState(); -- cgit v1.2.3 From 2b0bfc5471e88c51e6903f2331a97e7b171897f5 Mon Sep 17 00:00:00 2001 From: Nikita Krupin Date: Wed, 1 Dec 2021 18:05:44 -0500 Subject: label color fix --- Extensions/chrome/popup.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Extensions/chrome/popup.css b/Extensions/chrome/popup.css index 1f63acb..a3f88af 100644 --- a/Extensions/chrome/popup.css +++ b/Extensions/chrome/popup.css @@ -44,13 +44,12 @@ button { #advancedSettings { display: none; - color: var(--tertiary); border: 2px solid var(--secondary); border-radius: 0.5rem; padding: 1rem; } -#andvancedLegend { +#advancedLegend { color: var(--tertiary) !important; /* margin: auto; */ /* Center the label */ /* padding: .25rem .5rem; */ -- cgit v1.2.3 From 6262f24f7b8aa608b5a6706a7e2b20b1e3b6870d Mon Sep 17 00:00:00 2001 From: Front <27463495+Frontesque@users.noreply.github.com> Date: Wed, 1 Dec 2021 18:17:59 -0500 Subject: fix bug --- Extensions/chrome/return-youtube-dislike.script.js | 4 ++-- Extensions/firefox/return-youtube-dislike.script.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Extensions/chrome/return-youtube-dislike.script.js b/Extensions/chrome/return-youtube-dislike.script.js index ad2226b..0de7853 100644 --- a/Extensions/chrome/return-youtube-dislike.script.js +++ b/Extensions/chrome/return-youtube-dislike.script.js @@ -131,9 +131,9 @@ console.log("Dislike State:",state); if (state == 'disliked') { - setDislikes(numberFormat(storedData.dislikes)) + setDislikes(numberFormat(storedData.dislikes + 1)) } else if (state == 'neutral') { - setDislikes(numberFormat(storedData.dislikes - 1)) + setDislikes(numberFormat(storedData.dislikes)) } // setState(); diff --git a/Extensions/firefox/return-youtube-dislike.script.js b/Extensions/firefox/return-youtube-dislike.script.js index ee259da..c4f31bc 100644 --- a/Extensions/firefox/return-youtube-dislike.script.js +++ b/Extensions/firefox/return-youtube-dislike.script.js @@ -126,9 +126,9 @@ function dislikeClicked() { console.log("Dislike State:",state); if (state == 'disliked') { - setDislikes(numberFormat(storedData.dislikes)) + setDislikes(numberFormat(storedData.dislikes + 1)) } else if (state == 'neutral') { - setDislikes(numberFormat(storedData.dislikes - 1)) + setDislikes(numberFormat(storedData.dislikes)) } // setState(); -- cgit v1.2.3