From 29765230b1fa83bc06d44d0b3695ceff1d6519f6 Mon Sep 17 00:00:00 2001
From: Timeraa <29104008+Timeraa@users.noreply.github.com>
Date: Thu, 1 Nov 2018 19:53:24 +0100
Subject: [PATCH] Basically everything for 1.2 :P
---
.gitignore | 5 +-
Extension/_locales/de/messages.json | 74 ------
Extension/_locales/en/messages.json | 68 +++--
Extension/_locales/he/messages.json | 74 ------
Extension/_locales/la/messages.json | 74 ------
Extension/_locales/sv/messages.json | 74 ------
Extension/background.js | 30 ---
Extension/connect.css | 54 ----
Extension/css/inputs.css | 78 ++++++
Extension/css/options.css | 15 ++
Extension/{ => css}/popup.css | 30 ++-
Extension/css/reset.css | 20 ++
Extension/html/popup/options.html | 137 ++++++++++
Extension/{ => html/popup}/popup.html | 18 +-
Extension/{ => html/tabs}/installed.html | 10 +-
Extension/{ => html/tabs}/updated.html | 10 +-
Extension/js/background.js | 62 +++++
Extension/js/options.js | 140 ++++++++++
Extension/js/popup.js | 20 ++
Extension/{ => js}/presences/JKAnime.js | 0
Extension/{ => js}/presences/KissAnime.js | 0
Extension/{ => js}/presences/Netflix.js | 61 +++--
Extension/{ => js}/presences/SoundCloud.js | 0
Extension/{ => js}/presences/Twitch.js | 0
Extension/{ => js}/presences/YouTube.js | 0
Extension/{ => js}/presences/YouTubeMusic.js | 0
Extension/{ => js}/util/jquery-3.3.1.min.js | 0
.../{ => js}/util/socket.io-2.1.1.min.js | 0
Extension/{ => js}/util/socketConnector.js | 0
Extension/manifest.json | 28 +-
README.md | 48 ++--
gitassets/UMU.png | Bin 0 -> 32839 bytes
src/package-lock.json | 244 +++++++++---------
src/package.json | 2 +-
src/util/shortcutHandler.js | 4 +
35 files changed, 778 insertions(+), 602 deletions(-)
delete mode 100644 Extension/_locales/de/messages.json
delete mode 100644 Extension/_locales/he/messages.json
delete mode 100644 Extension/_locales/la/messages.json
delete mode 100644 Extension/_locales/sv/messages.json
delete mode 100644 Extension/background.js
delete mode 100644 Extension/connect.css
create mode 100644 Extension/css/inputs.css
create mode 100644 Extension/css/options.css
rename Extension/{ => css}/popup.css (72%)
create mode 100644 Extension/css/reset.css
create mode 100644 Extension/html/popup/options.html
rename Extension/{ => html/popup}/popup.html (58%)
rename Extension/{ => html/tabs}/installed.html (68%)
rename Extension/{ => html/tabs}/updated.html (63%)
create mode 100644 Extension/js/background.js
create mode 100644 Extension/js/options.js
create mode 100644 Extension/js/popup.js
rename Extension/{ => js}/presences/JKAnime.js (100%)
rename Extension/{ => js}/presences/KissAnime.js (100%)
rename Extension/{ => js}/presences/Netflix.js (62%)
rename Extension/{ => js}/presences/SoundCloud.js (100%)
rename Extension/{ => js}/presences/Twitch.js (100%)
rename Extension/{ => js}/presences/YouTube.js (100%)
rename Extension/{ => js}/presences/YouTubeMusic.js (100%)
rename Extension/{ => js}/util/jquery-3.3.1.min.js (100%)
rename Extension/{ => js}/util/socket.io-2.1.1.min.js (100%)
rename Extension/{ => js}/util/socketConnector.js (100%)
create mode 100644 gitassets/UMU.png
diff --git a/.gitignore b/.gitignore
index b484b50..cb121e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
node_modules
out
-.vscode
dist
-server
\ No newline at end of file
+website
+server
+.vscode
\ No newline at end of file
diff --git a/Extension/_locales/de/messages.json b/Extension/_locales/de/messages.json
deleted file mode 100644
index 9540497..0000000
--- a/Extension/_locales/de/messages.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "appDesc": {
- "message": "PreMiD fügt eine Discord-Rich-Presence-Integration, Kontrolle über Multimediatasten und viele weitere Funktionen zu YouTube/YouTube Music, Twitch etc. hinzu."
- },
- "connected": {
- "message": "Verbunden"
- },
- "disconnected": {
- "message": "Getrennt"
- },
- "installedThanks": {
- "message": "Vielen Dank, für das Installieren von PreMiD"
- },
- "installedApp": {
- "message": "Hast du das Programm bereits installiert?"
- },
- "installedNo": {
- "message": "Nein? Folge dieser Anleitung:"
- },
- "installedStepApp": {
- "message": "Lade die neueste Version von $1 herunter"
- },
- "installedStepAppMyRepository": {
- "message": "meinem GitHub Repository"
- },
- "installedWaitInstalled": {
- "message": "Offne das Installationsprogramm und warte bis die Installation abgeschlossen ist"
- },
- "installedMayWarning": {
- "message": "Möglicherweise bekommst du eine Warnung von deiner FireWall und SmartScreen (Es ist kein Virus. Das verspreche ich dir!)"
- },
- "installedAppAutostart": {
- "message": "Das Programm sollte automatisch starten. Du kannst dies prüfen, indem du auf deine Taskbar (Windows) oder deine Menubar (MacOS) schaust"
- },
- "installedYes": {
- "message": "Ja? Jetzt bist du bereit!"
- },
- "installedStart": {
- "message": "Starte, indem du ein Video auf YouTube, deine Lieblingsstreamer auf Twitch oder vielleicht sogar Netflix schaust... Wer weiß? Oder du hörst dir deine Lieblingslieder auf SoundCloud und YouTube Music an."
- },
- "installedSupportMe": {
- "message": "Unterstütze mich!"
- },
- "updatedYTPUpdated": {
- "message": "PreMiD wurde aktualisiert!"
- },
- "updatedWhatsNew": {
- "message": "Was ist neu?"
- },
- "updatedWhatChanged": {
- "message": "Was hat sich geändert?"
- },
- "updatedAdded0": {
- "message": "Installieren Tab"
- },
- "updatedAdded1": {
- "message": "Update Tab"
- },
- "updatedChanged0": {
- "message": "Kleinere Bugfixes"
- },
- "updatedChanged1": {
- "message": "Erweiterungs Organisierung"
- },
- "updatedAdded2": {
- "message": "Sprachunterstützung"
- },
- "updatedAdded3": {
- "message": "Tab Priorität"
- },
- "updatedChanged2": {
- "message": "YouTube + YouTube Music neugeschrieben"
- }
-}
\ No newline at end of file
diff --git a/Extension/_locales/en/messages.json b/Extension/_locales/en/messages.json
index ef16fe8..57594c6 100644
--- a/Extension/_locales/en/messages.json
+++ b/Extension/_locales/en/messages.json
@@ -36,7 +36,7 @@
"message": "Yes? You are ready to go!"
},
"installedStart": {
- "message": "Start by watching a video on YouTube, watching your loved streamers on Twitch, maybe even Netflix... Who knows? Or you just listen to your favourite songs on SoundCloud and YouTube Music."
+ "message": "Start by watching a video on YouTube, watching your loved streamers on Twitch, Watch your favourite animes on KissAnime or JKAnime, maybe even Netflix... Who knows? Or you just listen to your favourite songs on SoundCloud and YouTube Music. Settings can be found by clicking the PreMiD icon in your browser."
},
"installedSupportMe": {
"message": "Support me!"
@@ -50,31 +50,55 @@
"updatedWhatChanged": {
"message": "What changed?"
},
- "updatedAdded0": {
- "message": "Install tab page"
- },
- "updatedAdded1": {
- "message": "Update tab page"
- },
- "updatedChanged0": {
- "message": "Small bug fixes"
- },
- "updatedChanged1": {
- "message": "Extension organisation"
- },
- "updatedAdded2": {
- "message": "Language support"
- },
- "updatedAdded3": {
- "message": "Tab Priority"
- },
- "updatedChanged2": {
- "message": "YouTube + YouTube Music rewrite"
- },
"playbackPlaying": {
"message": "Playing back"
},
"playbackPaused": {
"message": "Playback paused"
+ },
+ "about": {
+ "message": "About"
+ },
+ "feedback": {
+ "message": "Feedback"
+ },
+ "options": {
+ "message": "Options"
+ },
+ "general": {
+ "message": "General"
+ },
+ "enabled": {
+ "message": "Enabled"
+ },
+ "titleMenubar": {
+ "message": "Title Menubar"
+ },
+ "mediaControls": {
+ "message": "Media Controls"
+ },
+ "checkForUpdates": {
+ "message": "Check for updates"
+ },
+ "systemStartup": {
+ "message": "System startup"
+ },
+ "presences": {
+ "message": "Presences"
+ },
+ "updatedAdded0": {
+ "message": "Support for JKAnime & KissAnime"
+ },
+ "updatedAdded1": {
+ "message": "Extension popup"
+ },
+ "updatedAdded2": {
+ "message": "Settings Sync (Google Account)"
+ },
+ "updatedChanged0": {
+ "message": "A lot and I mean a lot of rewrites!"
+ },
+ "updatedChanged1": {
+ "message": "Huge speed improvements to App"
}
}
diff --git a/Extension/_locales/he/messages.json b/Extension/_locales/he/messages.json
deleted file mode 100644
index 940a68e..0000000
--- a/Extension/_locales/he/messages.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "appDesc": {
- "message": "YT Presence מוסיף Rich Presence שילוב של מדיה, פיקודים ועוד המון דברים לYouTube/YouTube Music, Twitch ועוד.."
- },
- "connected": {
- "message": "מחובר"
- },
- "disconnected": {
- "message": "מנותק"
- },
- "installedThanks": {
- "message": "תודה שהורדת את YT Presence "
- },
- "installedApp": {
- "message": "האם התקנת את התוכנה?"
- },
- "installedNo": {
- "message": "לא? תעקוב אחרי הצעדים הבאים:"
- },
- "installedStepApp": {
- "message": "הורד את הגרסה החדשה ביותר ב1$"
- },
- "installedStepAppMyRepository": {
- "message": "מאגר הGitHub שלי"
- },
- "installedWaitInstalled": {
- "message": "פתח את ההתקנה וחכה על שההתקנה תסתיים"
- },
- "installedMayWarning": {
- "message": "יש סיכוי שתקבל אזהרה על FireWall וSmartScreen (זה לא וירוס, אני מבטיח)"
- },
- "installedAppAutostart": {
- "message": "התוכנה אמורה להתחיל אוטומטית, אתה יכול לבדוק את זה בכך שתסתכל על שורת המשימות שלך (Windows) או בתפריט הבר (MacOS)"
- },
- "installedYes": {
- "message": "כן? אתה מוכן לדרך!"
- },
- "installedStart": {
- "message": "התחל בכך שתצפה בסרטון ביוטיוב, צפה בסטרימרים האהובים עליך בTwitch, אולי אפילו בNetflix... מי יודע? או שאתה רק רוצה להאזין לשירים האהובים עליך בSoundCloud ובYouTube Music"
- },
- "installedSupportMe": {
- "message": "עזור לי!"
- },
- "updatedYTPUpdated": {
- "message": " YT Presence עודכן בהצלחה!"
- },
- "updatedWhatsNew": {
- "message": "מה חדש?"
- },
- "updatedWhatChanged": {
- "message": "מה השתנה?"
- },
- "updatedAdded0": {
- "message": "הורד את לשונית הכרטיסייה"
- },
- "updatedAdded1": {
- "message": "עדכן את דף הכרטיסייה"
- },
- "updatedChanged0": {
- "message": "באגים קטנים תוקנו"
- },
- "updatedChanged1": {
- "message": "ארגון תקינת התוסף"
- },
- "updatedAdded2": {
- "message": "שפת תמיכה"
- },
- "updatedAdded3": {
- "message": ""
- },
- "updatedChanged2": {
- "message": ""
- }
-}
\ No newline at end of file
diff --git a/Extension/_locales/la/messages.json b/Extension/_locales/la/messages.json
deleted file mode 100644
index 81ba31a..0000000
--- a/Extension/_locales/la/messages.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "appDesc": {
- "message": "YT Presence Discord Rich Presence instruens, gubernatio studii et amplius ad YouTube/YouTube Music, Twitch, et cetera addet"
- },
- "connected": {
- "message": "Connexus"
- },
- "disconnected": {
- "message": "Discerptim"
- },
- "installedThanks": {
- "message": "Gratias ago YT Presence instruere"
- },
- "installedApp": {
- "message": "Iamne usum instruxisti"
- },
- "installedNo": {
- "message": "Nonne est? Obtempera ii gradi"
- },
- "installedStepApp": {
- "message": "Instruere suprema forma a $1"
- },
- "installedStepAppMyRepository": {
- "message": "GitHub logium meum"
- },
- "installedWaitInstalled": {
- "message": "Aperi instruens et exspecta dum instruxit"
- },
- "installedMayWarning": {
- "message": "Admonitum super FireWall et SmartScreen accipere potes (Virus non est, promitto)"
- },
- "installedAppAutostart": {
- "message": "Usus statim incipere debet, id per optutu ad regula initii (Windows et MacOS) tua examinare potes"
- },
- "installedYes": {
- "message": "Enimne? Incohare potes!"
- },
- "installedStart": {
- "message": "Incipe per video spectante in YouTube, per streamer amari spectante in Twitch, fortasse etiam Netflix... quis scit? Aut carmina optima in SoundCloud et YouTube Music audis."
- },
- "installedSupportMe": {
- "message": "Adiuva me!"
- },
- "updatedYTPUpdated": {
- "message": "YT Presence corrigam est!"
- },
- "updatedWhatsNew": {
- "message": "Quid nove est?"
- },
- "updatedWhatChanged": {
- "message": "Quid mutatum est?"
- },
- "updatedAdded0": {
- "message": "Instruere pars nova"
- },
- "updatedAdded1": {
- "message": "Corrigere pars"
- },
- "updatedChanged0": {
- "message": "Parvi errores reparatum est"
- },
- "updatedChanged1": {
- "message": "Facies dilatationum"
- },
- "updatedAdded2": {
- "message": "Auxilium linguae"
- },
- "updatedAdded3": {
- "message": ""
- },
- "updatedChanged2": {
- "message": ""
- }
-}
\ No newline at end of file
diff --git a/Extension/_locales/sv/messages.json b/Extension/_locales/sv/messages.json
deleted file mode 100644
index 695ef28..0000000
--- a/Extension/_locales/sv/messages.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
- "appDesc": {
- "message": "YT Presence lägger till Discord Rich Presence Integration, Mediekontroller och mycket mer till YouTube/YouTube Musik, Twitch osv..."
- },
- "connected": {
- "message": "Ansluten"
- },
- "disconnected": {
- "message": "Avkopplad"
- },
- "installedThanks": {
- "message": "Tack för att du har installerat YT Presence"
- },
- "installedApp": {
- "message": "Har du installerat programmet ännu?"
- },
- "installedNo": {
- "message": "Nej? Följ dessa steg:"
- },
- "installedStepApp": {
- "message": "Ladda ner den senaste versionen från $1"
- },
- "installedStepAppMyRepository": {
- "message": "mitt GitHub-förråd"
- },
- "installedWaitInstalled": {
- "message": "Öppna installationsprogrammet och vänta tills det installeras"
- },
- "installedMayWarning": {
- "message": "Du kanske får en varning om brandvägg och Smartscreen (det är inte ett virus jag lovar)"
- },
- "installedAppAutostart": {
- "message": "Applikationen bör starta automatiskt, du kan kontrollera detta genom att titta på ditt aktivitetsfält (Windows) eller menyraden (Mac OS)"
- },
- "installedYes": {
- "message": "Ja? Du är redo att gå!"
- },
- "installedStart": {
- "message": "Börja med att titta på en video på YouTube, titta på dina älskade streamers på Twitch, kanske även Netflix... Vem vet? Eller så lyssnar du bara på dina favoritlåtar på SoundCloud och YouTube Music."
- },
- "installedSupportMe": {
- "message": "Stöd mig!"
- },
- "updatedYTPUpdated": {
- "message": "YT Presence har uppdaterats!"
- },
- "updatedWhatsNew": {
- "message": "Vad är nytt?"
- },
- "updatedWhatChanged": {
- "message": "Vad har förändrats?"
- },
- "updatedAdded0": {
- "message": "Installera fliksidan"
- },
- "updatedAdded1": {
- "message": "Uppdatera fliksidan"
- },
- "updatedChanged0": {
- "message": "Små buggfixar"
- },
- "updatedChanged1": {
- "message": "Tillägg organisation"
- },
- "updatedAdded2": {
- "message": "Språkstöd"
- },
- "updatedAdded3": {
- "message": ""
- },
- "updatedChanged2": {
- "message": ""
- }
-}
\ No newline at end of file
diff --git a/Extension/background.js b/Extension/background.js
deleted file mode 100644
index 738a1fe..0000000
--- a/Extension/background.js
+++ /dev/null
@@ -1,30 +0,0 @@
-chrome.runtime.onInstalled.addListener(function(details) {
- switch(details.reason) {
- case "install": {
- chrome.tabs.create({url: "installed.html"})
- break;
- }
- case "update": {
- //chrome.tabs.create({url: "updated.html"})
- break;
- }
- }
-})
-
-//* Tab Priority
-var lastAllowedTab = null
-setInterval(() => {
- chrome.tabs.getAllInWindow(null, (tabs) => {
- var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "jkanime.net"]
-
- for (var i = 0; i < allowedURL.length; i++) {
- var currentTab = tabs.find(tab => tab.highlighted)
- if(currentTab.url.indexOf(allowedURL[i]) > -1) {
- lastAllowedTab = currentTab.id
- }
- }
- if(lastAllowedTab != null) {
- chrome.tabs.sendMessage(lastAllowedTab, {"high": true})
- }
- })
-}, 500)
\ No newline at end of file
diff --git a/Extension/connect.css b/Extension/connect.css
deleted file mode 100644
index a920c0f..0000000
--- a/Extension/connect.css
+++ /dev/null
@@ -1,54 +0,0 @@
-#ytp-connectinfo {
- position: fixed;
- top: -50px;
- right: 0;
- z-index: 10000;
- min-width: 175px;
- border-bottom-left-radius: 5px;
- height: 50px;
- background-color: rgba(255, 255, 255, 0.5);
- user-select: none;
- animation-name: slideIn;
- animation-duration: 5s;
- animation-timing-function: cubic-bezier(0.19, 1, 0.22, 1);
- color: black;
-}
-
-#ytp-connectinfo * {
- margin: 0;
- padding: 0;
-}
-
-#ytp-connectinfo img {
- float: left;
- margin: 5px;
- width: 40px;
- height: 40px;
-}
-
-#ytp-connectinfo h1 {
- font-size: 20px;
- margin-top: 4px;
-}
-
-#ytp-connectinfo h2 {
- font-size: 17px;
-}
-
-@keyframes slideIn {
- 0% {
- top: -50px;
- }
-
- 10% {
- top: 0;
- }
-
- 90% {
- top: 0;
- }
-
- 100% {
- top: -50px;
- }
-}
diff --git a/Extension/css/inputs.css b/Extension/css/inputs.css
new file mode 100644
index 0000000..49513cc
--- /dev/null
+++ b/Extension/css/inputs.css
@@ -0,0 +1,78 @@
+/* The switch - the box around the slider */
+
+.switch {
+ position: relative;
+ display: inline-block;
+ width: 35px;
+ height: 15px;
+}
+
+/* Hide default HTML checkbox */
+
+.switch input {
+ display: none;
+}
+
+/* The slider */
+
+.slider {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: rgb(255, 75, 75);
+ -webkit-transition: 0.25s;
+ transition: 0.25s;
+}
+
+.slider:before {
+ position: absolute;
+ content: "";
+ height: 17px;
+ width: 17px;
+ left: -2.5px;
+ top: -2.5px;
+ background-color: white;
+ -webkit-transition: 0.25s;
+ transition: 0.25s cubic-bezier(0.215, 0.61, 0.355, 1);
+ border: 1px solid lightgray;
+}
+
+input:checked + .slider {
+ background-color: rgb(75, 255, 75);
+}
+
+input:disabled + .slider {
+ background-color: rgb(255, 75, 75);
+ cursor: not-allowed;
+}
+
+input:disabled + .slider:before {
+ background-color: rgb(255, 75, 75);
+ border: 1px solid rgb(255, 75, 75);
+ cursor: not-allowed;
+}
+
+input:focus + .slider {
+ box-shadow: 0 0 1px rgb(75, 255, 75);
+}
+
+input:hover + .slider {
+ transform: scale(1.1);
+}
+
+input:checked + .slider:before {
+ transform: translateX(20px);
+}
+
+/* Rounded sliders */
+
+.slider.round {
+ border-radius: 34px;
+}
+
+.slider.round:before {
+ border-radius: 50%;
+}
diff --git a/Extension/css/options.css b/Extension/css/options.css
new file mode 100644
index 0000000..e8fc5fc
--- /dev/null
+++ b/Extension/css/options.css
@@ -0,0 +1,15 @@
+.right {
+ float: right;
+}
+
+#content h1 {
+ margin: 5px;
+}
+
+table {
+ margin: 5px;
+}
+
+tr td:first-child {
+ width: 90%;
+}
diff --git a/Extension/popup.css b/Extension/css/popup.css
similarity index 72%
rename from Extension/popup.css
rename to Extension/css/popup.css
index a6ecdfa..35c07b7 100644
--- a/Extension/popup.css
+++ b/Extension/css/popup.css
@@ -43,10 +43,13 @@ body {
border-radius: 5px;
color: white;
text-align: center;
+}
+
+#panel:not(.open) {
cursor: pointer;
}
-#panel:hover {
+#panel:not(.open):hover {
transform: scale(1.05);
}
@@ -68,3 +71,28 @@ body {
.github {
background-color: #fa503c !important;
}
+
+.open {
+ position: fixed;
+ transition: 0.5s all ease-out;
+ transform: scale(5);
+ cursor: default;
+}
+
+.open * {
+ transition: 0.15s all ease-out;
+ opacity: 0;
+}
+
+.panelContent {
+ position: relative;
+ color: white;
+}
+
+.panelContent:not(.open) {
+ display: none;
+}
+
+.panelContent.open {
+ display: block;
+}
diff --git a/Extension/css/reset.css b/Extension/css/reset.css
new file mode 100644
index 0000000..17a3677
--- /dev/null
+++ b/Extension/css/reset.css
@@ -0,0 +1,20 @@
+html,
+body {
+ margin: 0;
+ padding: 0;
+ height: 0;
+ width: 325px;
+ background-color: #282828;
+}
+
+* {
+ color: #fff;
+}
+
+#header {
+ height: 50px;
+ background-color: #7289da;
+ color: white;
+ text-align: center;
+ line-height: 50px;
+}
diff --git a/Extension/html/popup/options.html b/Extension/html/popup/options.html
new file mode 100644
index 0000000..24df389
--- /dev/null
+++ b/Extension/html/popup/options.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
YouTube
+
+
+
+
+
+
YouTube Music
+
+
+
+
+
+
Twitch
+
+
+
+
+
+
SoundCloud
+
+
+
+
+
+
Netflix
+
+
+
+
+
+
KissAnime
+
+
+
+
+
+
JKAnime
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Extension/popup.html b/Extension/html/popup/popup.html
similarity index 58%
rename from Extension/popup.html
rename to Extension/html/popup/popup.html
index eb2c542..9f36106 100644
--- a/Extension/popup.html
+++ b/Extension/html/popup/popup.html
@@ -3,32 +3,26 @@
-
+