redirct for website

2020-11-11 16:25:54 -05:00
parent f470c61558
commit d2bbbc277e
8 changed files with 194 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
 dev-build
 node_modules
 build
+<<<<<<< Updated upstream
 *.psd
 *.ai
 cdn/
 artwork/
+=======
+.jshintrc
+>>>>>>> Stashed changes
--- 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.');
  });
 };

--- 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',
  }
 };
--- a/src/html/welcome.html
+++ b/src/html/welcome.html
@@ -7,7 +7,111 @@
    <title>Welcome Page</title>
    <meta http-equiv="refresh" content="0; URL='https://wompmacho.com/wompchat'" />
  </head>
+<<<<<<< Updated upstream
  <body>   
+=======
+  <body>
+
+    <!-- This Page Never Gets Loaded Anymore Save For Reference-->
+
+    <div class="success-overlay">
+      
+      <div class="icon-container">
+        <i class="material-icons">done</i>
+      </div>
+
+    </div>
+    
+    <div class="container">
+      <div class="logo">
+        <img src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/icons/icon512.png" alt="womp Logo">
+      </div>
+
+      <h1><span class="fw-light">Welcome to the </span><span class="fw-bold">Chat</span></h1>
+
+      <p class="heading-note">Were changing our name!</p>
+      <p class="heading-note">Aparently LIVE CHAT was a bad idea. Now We Are WOMP
+      </p>
+
+      <div class="shields">
+        <a href="https://discord.gg/pVNnTDA">
+          <img src="https://img.shields.io/discord/238458588169895937?label=Discord&style=plastic" alt="discord shield.io">
+        </a>
+        <a href="https://cdn.jsdelivr.net/gh/wompmacho/womp/src/assets/img/btc.JPG">
+          <img src="https://img.shields.io/static/v1?label=BTC&style=plastic&message=3QkKHVyT1nZLEeH8f77bUhXorXKPQs5gzN&color=red" alt="BTC shield.io">
+        </a>
+        <a href="https://github.com/wompmacho/womp">
+          <img alt="GitHub Release Date" src="https://img.shields.io/github/release-date/wompmacho/womp?label=Latest&style=plastic">
+        </a>
+      </div>
+
+      <hr>
+
+      <div class="links_div">
+        <a class="links_bottom" href="https://discord.gg/pVNnTDA" title="Join our Discord Community">Join our Discord Community</a>
+        <a class="links_bottom" href="https://streamelements.com/wompmacho-5882/tip" title="Donations">Donations</a>
+        <a class="links_bottom" href="https://www.youtube.com/wompmacho" title="Youtube">Youtube</a>
+        <a class="links_bottom" href="mailto:wompmacho@gmail.com">Contact Me</a>
+      </div>
+
+      <hr>
+
+      <h2>
+        Soon to come:
+      </h2>
+
+      <ul>
+        <li>Specific channel Emotes</li>
+        <li>Search for Emote Panel</li>
+        <li>Autocomplete for emote Selection</li>
+        <li><s>Theater Mode Fix for that quality Stream and Chat time</s></li>
+        <li>Moderation Options</li>
+        <li>User Profile Info</li>
+        <li>Other Styling Options</li>
+      </ul>
+
+      <hr>
+      
+      <h2>How To:</h2>
+
+      <p>
+        There is still a lot of stuff I am working on. This is very Beta at the moment so 
+      </p>
+      <h2>Use At Your Own Risk</h2>
+      <p>
+        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. 
+      </p>
+      <p>
+        Don't forget to pin this extension for easy access. 
+      </p>
+      <img src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/gif/pinYourExtension.gif" alt="pinYourExtension.gif">
+      <p>
+        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.
+      </p>
+      <img src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/gif/emotesMenu.gif" alt="emotesMenu.gif">
+      <p>
+        Enhanced Theater Mode Is Now Available. Just click the check in the option panel and refresh your page.
+      </p>
+      <img style="height: 540px; width: 960px;" src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/gif/theaterMode.gif" alt="theaterMode.gif">
+      <p>        
+        Over around 500 Top and Trending Emotes are loaded from popular sites. 
+        You can Enable/Disable them in the Options Menu.
+      </p>
+      <img src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/gif/optionsMenu.gif" alt="optionsMenu.gif">
+      <p>
+        Can Also Click on UserNames To Autofill an @ Notification
+      </p>
+      <img src="https://cdn.jsdelivr.net/gh/wompmacho/womp/assets/gif/clickUserNamesToAtThem.gif" alt="clickUserNamesToAtThem.gif">
+       
+      <h2>Use At Your Own Risk</h2>
+
+      <h1>Enjoy!</h1>
+    </div>
+    
+>>>>>>> Stashed changes
    <script src="../welcomePage.js"></script>
  </body>
 </html>
--- 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;
    }
  });
--- 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;
--- 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 ---