diff --git a/.gitignore b/.gitignore index 0255484..394395b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,11 @@ dev-build node_modules build +<<<<<<< Updated upstream *.psd *.ai cdn/ -artwork/ \ No newline at end of file +artwork/ +======= +.jshintrc +>>>>>>> Stashed changes diff --git a/src/background/Setup.js b/src/background/Setup.js index 5c14862..7540b8b 100644 --- a/src/background/Setup.js +++ b/src/background/Setup.js @@ -29,9 +29,13 @@ const ensure = () => { return true; }; +<<<<<<< Updated upstream chrome.tabs.create({ url: 'html/welcome.html' }); +======= + chrome.tabs.create({ url: 'https://wompmacho.com/wompchat' }); +>>>>>>> Stashed changes chrome.runtime.onMessage.addListener(onSetupComplete); - console.log('Setup Complete'); + console.log('Storage Setup Complete, Linking User To Welcome Page.'); }); }; diff --git a/src/config.js b/src/config.js index 8274f6b..447782d 100644 --- a/src/config.js +++ b/src/config.js @@ -18,7 +18,11 @@ const CONFIG = { setLiveChat: true, allowTextSlider: false, +<<<<<<< Updated upstream // Var +======= + // Variables +>>>>>>> Stashed changes textSizeSlider: 'inherit', } }; diff --git a/src/html/welcome.html b/src/html/welcome.html index 7571609..3d36324 100644 --- a/src/html/welcome.html +++ b/src/html/welcome.html @@ -7,7 +7,111 @@ Welcome Page +<<<<<<< Updated upstream +======= + + + + +
+ +
+ done +
+ +
+ +
+ + +

Welcome to the Chat

+ +

Were changing our name!

+

Aparently LIVE CHAT was a bad idea. Now We Are WOMP +

+ +
+ + discord shield.io + + + BTC shield.io + + + GitHub Release Date + +
+ +
+ +
+ Join our Discord Community + Donations + Youtube + Contact Me +
+ +
+ +

+ Soon to come: +

+ + + +
+ +

How To:

+ +

+ There is still a lot of stuff I am working on. This is very Beta at the moment so +

+

Use At Your Own Risk

+

+ This is a Chrome Extension for Youtube Live Streams, adding some Quality of Life improvements for the Chat. + Adds Top, Trending and Global (500ish) Emotes from popular sites. These Update with what is Trending. +

+

+ Don't forget to pin this extension for easy access. +

+ pinYourExtension.gif +

+ Youtube Live is slow to load its pages currently. + Give the extension a moment while the page's iframes are loading. + Once you see the Emote Panel Icon you can open the Emote Selection Panel. +

+ emotesMenu.gif +

+ Enhanced Theater Mode Is Now Available. Just click the check in the option panel and refresh your page. +

+ theaterMode.gif +

+ Over around 500 Top and Trending Emotes are loaded from popular sites. + You can Enable/Disable them in the Options Menu. +

+ optionsMenu.gif +

+ Can Also Click on UserNames To Autofill an @ Notification +

+ clickUserNamesToAtThem.gif + +

Use At Your Own Risk

+ +

Enjoy!

+
+ +>>>>>>> Stashed changes \ No newline at end of file diff --git a/src/options.js b/src/options.js index 15f683a..3064afd 100644 --- a/src/options.js +++ b/src/options.js @@ -3,8 +3,6 @@ import './stylus/options.styl'; import { debounce } from 'lodash'; import PersistentSyncStorage from './helpers/PersistentSyncStorage'; - - // hides element after short timeout const hideDebounce = debounce(ele => { ele.classList.remove('show'); @@ -29,7 +27,6 @@ const SaveStatusEle = document.getElementById('save-status'); SaveStatusEle.classList.add('show'); }; - /////////////////////////////////////////////////////////////////////////////// var textSizeSlider = document.getElementById("textSizeSlider"); @@ -50,7 +47,6 @@ allowTextSlider.oninput = function(){ }; - const optionOnChange = (input) => { var inputValueKey; @@ -107,7 +103,6 @@ const optionOnChange = (input) => { return onChange; }; - // Executed code const OptionInputs = document.querySelectorAll('.option-input'); @@ -117,29 +112,79 @@ PersistentSyncStorage.on('ready', () => { const inputOnChange = optionOnChange(input); input.addEventListener('change', inputOnChange); - switch (input.id) { - case 'allowTextSlider': - input.removeAttribute('disabled'); + case 'enableBTTVEmotes': + input.removeAttribute('disabled'); + break; + +<<<<<<< Updated upstream if(PersistentSyncStorage.data.options.allowTextSlider == true){ textSizeSlider.disabled = false; }else{ textSizeSlider.disabled = true; } +======= + case 'enableFrankerEmotes': + input.removeAttribute('disabled'); + break; + + case 'enableTwitchEmotes': + input.removeAttribute('disabled'); + break; + + case 'kappaFix': + input.removeAttribute('disabled'); +>>>>>>> Stashed changes break; case 'theaterModeFix': - // do nothing, stay disabled input.removeAttribute('disabled'); break; - case 'textSizeSlider' : - // do nothing + case 'setAuthorColor': + input.removeAttribute('disabled'); + break; + + case 'showTimeStamp': + input.removeAttribute('disabled'); + break; + + case 'alternateLineColor' : + input.removeAttribute('disabled'); + break; + + case 'hideAuthorIcons' : + input.removeAttribute('disabled'); + break; + + case 'hideWelcomBanner' : + input.removeAttribute('disabled'); + break; + + case 'setTwitchColors' : + input.removeAttribute('disabled'); + break; + + case 'setLiveChat' : + input.removeAttribute('disabled'); + break; + + case 'allowTextSlider' : + // + break; + + case 'allowTextSlider': + input.removeAttribute('disabled'); + if(PersistentSyncStorage.data.options.allowTextSlider == true){ + textSizeSlider.disabled = false; + }else if(PersistentSyncStorage.data.options.allowTextSlider == false){ + textSizeSlider.disabled = true; + } break; default: - input.removeAttribute('disabled'); + // shouldn't get hete if handled break; } }); diff --git a/src/utils/chrome/LocalStorage.js b/src/utils/chrome/LocalStorage.js index aff4a6e..4552fd8 100644 --- a/src/utils/chrome/LocalStorage.js +++ b/src/utils/chrome/LocalStorage.js @@ -7,4 +7,4 @@ class LocalStorage extends Storage { } } -export default LocalStorage; +export default LocalStorage; \ No newline at end of file diff --git a/src/utils/chrome/index.js b/src/utils/chrome/index.js index f3ea505..0e73353 100644 --- a/src/utils/chrome/index.js +++ b/src/utils/chrome/index.js @@ -2,12 +2,6 @@ import _LocalStorage from './LocalStorage'; import _SyncStorage from './SyncStorage'; import _Notifications from './Notifications'; -// export default { -// LocalStorage: new _LocalStorage, -// SyncStorage: new _SyncStorage, -// Notifications: new _Notifications -// } - export const LocalStorage = new _LocalStorage; export const SyncStorage = new _SyncStorage; export const Notifications = new _Notifications; \ No newline at end of file diff --git a/src/welcomePage.js b/src/welcomePage.js index 6973b32..21b63f4 100644 --- a/src/welcomePage.js +++ b/src/welcomePage.js @@ -1,7 +1,21 @@ +<<<<<<< Updated upstream import PersistentSyncStorage from './helpers/PersistentSyncStorage'; const setupComplete = () => { +======= +import './stylus/setupPage.styl'; +import PersistentSyncStorage from './helpers/PersistentSyncStorage'; + +// --- Definitions --- +const completeButton = document.querySelector('.complete-setup-button'); +const successOverlay = document.querySelector('.success-overlay'); +const successIcon = successOverlay.querySelector('.material-icons'); +const successCloseMessageCountdown = successOverlay.querySelector('.countdown'); + +const setupComplete = () => { + // do nuffin +>>>>>>> Stashed changes }; // --- Main --- @@ -21,6 +35,10 @@ const main = () => { console.log('Competed setup, sent message'); }); +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes }; // --- Executed ---