From f701c9c146e02b039885ced6c1c6dba67aa7bdce Mon Sep 17 00:00:00 2001
From: alexsparkes <turbomarshmello@gmail.com>
Date: Wed, 17 Aug 2022 22:54:17 +0100
Subject: [PATCH] fix: various welcome modal fixes - fix links - fix style
 choice - change how theme selector works

---
 .../modals/welcome/WelcomeSections.jsx        | 23 ++++++++++++++-----
 src/components/modals/welcome/welcome.scss    | 15 +++++++++---
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/modals/welcome/WelcomeSections.jsx b/src/components/modals/welcome/WelcomeSections.jsx
index 712c4c33..7410d590 100644
--- a/src/components/modals/welcome/WelcomeSections.jsx
+++ b/src/components/modals/welcome/WelcomeSections.jsx
@@ -32,6 +32,9 @@ export default class WelcomeSections extends PureComponent {
       autoClass: 'toggle auto active',
       lightClass: 'toggle lightTheme',
       darkClass: 'toggle darkTheme',
+      // styles
+      newStyle: 'toggle newStyle active',
+      legacyStyle: 'toggle legacyStyle',
       // welcome
       welcomeImage: 0,
       // final
@@ -52,6 +55,14 @@ export default class WelcomeSections extends PureComponent {
     loadSettings(true);
   }
 
+  changeStyle(type) { 
+    this.setState({
+      newStyle: type === 'new' ? 'toggle newStyle active' : 'toggle newStyle',
+      legacyStyle: type === 'legacy' ? 'toggle legacyStyle active' : 'toggle legacyStyle',
+    });
+    localStorage.setItem('widgetStyle', type);
+  }
+
   getSetting(name) {
     const value = localStorage.getItem(name).replace('false', 'Off').replace('true', 'On');
     return value.charAt(0).toUpperCase() + value.slice(1);
@@ -159,9 +170,9 @@ export default class WelcomeSections extends PureComponent {
             <span className="title">Join our Discord</span>
             <span className="subtitle">Talk with the Mue community and developers</span>
           </div>
-          <button>
+          <a href="https://discord.gg/zv8C9F8">
             <MdOpenInNew /> Join
-          </button>
+          </a>
         </div>
         <div className="welcomeNotice">
           <div className="icon">
@@ -171,9 +182,9 @@ export default class WelcomeSections extends PureComponent {
             <span className="title">Contribute on GitHub</span>
             <span className="subtitle">Report bugs, add features or donate</span>
           </div>
-          <button>
+          <a href="https://github.com/mue/mue">
             <MdOpenInNew /> Open
-          </button>
+          </a>
         </div>
       </>
     );
@@ -234,11 +245,11 @@ export default class WelcomeSections extends PureComponent {
         <span className="subtitle">Mue currently offers the choice between the legacy styling and the newly released modern styling.</span>
         <div className="themesToggleArea">
           <div className="options">
-            <div className={this.state.lightClass} onClick={() => this.changeTheme('light')}>
+            <div className={this.state.legacyStyle} onClick={() => this.changeStyle('legacy')}>
               <MdArchive />
               <span>Legacy</span>
             </div>
-            <div className={this.state.darkClass} onClick={() => this.changeTheme('dark')}>
+            <div className={this.state.newStyle} onClick={() => this.changeStyle('new')}>
               <MdOutlineWhatshot />
               <span>Modern</span>
             </div>
diff --git a/src/components/modals/welcome/welcome.scss b/src/components/modals/welcome/welcome.scss
index 79564659..c9ca824a 100644
--- a/src/components/modals/welcome/welcome.scss
+++ b/src/components/modals/welcome/welcome.scss
@@ -132,7 +132,9 @@
       margin-top: 25px;
 
       .lightTheme,
-      .darkTheme {
+      .darkTheme,
+      .legacyStyle,
+      .newStyle {
         width: 40%;
         padding: 50px;
 
@@ -265,9 +267,16 @@ a.privacy {
     display: flex;
     flex-flow: column;
   }
-  button {
+  a {
+    text-decoration: none;
     margin-left: auto;
-    padding: 5px 20px;
+    padding: 0 20px;
     @include modal-button(standard);
   }
 }
+
+.toggle.active {
+  @include themed() {
+    background-color: t($modal-sidebarActive) !important;
+  }
+}
\ No newline at end of file