From a865cb87ef2272098a6b3f6074478a4788fd5f04 Mon Sep 17 00:00:00 2001
From: David Ralph <davetheprogrammer2@gmail.com>
Date: Fri, 16 Oct 2020 13:15:10 +0100
Subject: [PATCH] Bug fixes

---
 README.md                                              |  2 +-
 src/components/modals/MainModal.jsx                    |  2 +-
 src/components/modals/marketplace/Items.jsx            |  2 ++
 .../modals/settings/sections/LanguageSettings.jsx      |  2 +-
 src/components/modals/tabs/Marketplace.jsx             | 10 +++++-----
 src/components/widgets/Clock.jsx                       |  3 +++
 src/components/widgets/Favourite.jsx                   |  2 +-
 src/components/widgets/Maximise.jsx                    |  6 ++----
 src/components/widgets/Quote.jsx                       |  2 ++
 9 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 537a0c0f..4e3704b9 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Mue is a fast, open and free-to-use browser extension that gives a new, fresh an
 * Marketplace - download custom photo packs, quote packs, preset settings and themes made by the community!
 
 ### Planned Features
-Please see our [roadmap](https://github.com/mue/mue/projects/2)
+Please see our [roadmap](https://github.com/mue/mue/projects)
 
 ## Installation
 *A demo of the tab can be found [here](https://demo.muetab.xyz)*
diff --git a/src/components/modals/MainModal.jsx b/src/components/modals/MainModal.jsx
index a917a83d..94307fee 100644
--- a/src/components/modals/MainModal.jsx
+++ b/src/components/modals/MainModal.jsx
@@ -29,7 +29,7 @@ export default class MainModal extends React.PureComponent {
       switch (input) {
           case 'addons':
               this.setState({
-                  tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.toastLanguage}/>,
+                  tab: <Addons language={this.props.language.addons} marketplaceLanguage={this.props.language.marketplace} toastLanguage={this.props.toastLanguage} openMarketplace={() => this.changeEnabled('marketplace')}/>,
                   addonsActive: 'active',
                   settingsActive: '',
                   marketplaceActive: ''
diff --git a/src/components/modals/marketplace/Items.jsx b/src/components/modals/marketplace/Items.jsx
index 30ff2db6..6f217674 100644
--- a/src/components/modals/marketplace/Items.jsx
+++ b/src/components/modals/marketplace/Items.jsx
@@ -2,6 +2,8 @@ import React from 'react';
 
 export default class Items extends React.PureComponent {
   render() {
+    if (this.props.items.length === 0) return null;
+
     let seeMoreHTML;
     if (this.props.seeMoreFunction) seeMoreHTML = <button className='addToMue seemore' onClick={this.props.seeMoreFunction}>{this.props.seeMoreTitle}</button>;
 
diff --git a/src/components/modals/settings/sections/LanguageSettings.jsx b/src/components/modals/settings/sections/LanguageSettings.jsx
index 58a421ff..3c058006 100644
--- a/src/components/modals/settings/sections/LanguageSettings.jsx
+++ b/src/components/modals/settings/sections/LanguageSettings.jsx
@@ -4,7 +4,7 @@ export default class LanguageSettings extends React.PureComponent {
   render() {
     return (
         <div className='section'>
-        <h4 htmlFor='language'>{this.props.language.language}</h4>
+        <h4 htmlFor='language' className='nodropdown'>{this.props.language.language}</h4>
           <select className='select-css' name='language' id='language' onChange={() => localStorage.setItem('language', document.getElementById('language').value)}>
             <option className='choices' value='en'>English</option>
             <option className='choices' value='nl'>Nederlands</option>
diff --git a/src/components/modals/tabs/Marketplace.jsx b/src/components/modals/tabs/Marketplace.jsx
index 7baf1d7a..5b571338 100644
--- a/src/components/modals/tabs/Marketplace.jsx
+++ b/src/components/modals/tabs/Marketplace.jsx
@@ -171,9 +171,9 @@ export default class Marketplace extends React.PureComponent {
         <div>
             <div id='marketplace'>
                  <div className='featured' style={{backgroundColor: this.state.featured.colour}}>
-                     <p>{this.state.featured.title}</p>
-                     <h1>{this.state.featured.name}</h1>
-                     <button className='addToMue' onClick={() => window.location.href = this.state.featured.buttonLink}>{this.state.featured.buttonText}</button>
+                    <p>{this.state.featured.title}</p>
+                    <h1>{this.state.featured.name}</h1>
+                    <button className='addToMue' onClick={() => window.location.href = this.state.featured.buttonLink}>{this.state.featured.buttonText}</button>
                  </div>
                  <Items
                    title={this.props.language.photo_packs}
@@ -193,12 +193,12 @@ export default class Marketplace extends React.PureComponent {
                    items={this.state.quote_packs.slice(0, 3)}
                    toggleFunction={(input) => this.toggle('item', 'quote_packs', input)}
                    seeMoreFunction={() => this.toggle('seemore', 'quote_packs')} />
-                 <Items
+                 {/* <Items
                    title={this.props.language.themes}
                    seeMoreTitle={this.props.language.see_more}
                    items={this.state.themes.slice(0, 3)}
                    toggleFunction={(input) => this.toggle('item', 'theme', input)}
-                   seeMoreFunction={() => this.toggle('seemore', 'themes')} />
+                 seeMoreFunction={() => this.toggle('seemore', 'themes')} /> */ }
              </div>
              <Item
                button={this.state.button}
diff --git a/src/components/widgets/Clock.jsx b/src/components/widgets/Clock.jsx
index b1f17764..6ba3d149 100644
--- a/src/components/widgets/Clock.jsx
+++ b/src/components/widgets/Clock.jsx
@@ -65,8 +65,11 @@ export default class Clock extends React.PureComponent {
   }
 
   render() {
+    if (localStorage.getItem('time') === 'false') return null;
+
     let clockHTML = <h1 className='clock'>{this.state.time}<span className='ampm'>{this.state.ampm}</span> </h1>;
     if (localStorage.getItem('analog') === 'true') clockHTML = <Analog className='analogclock' value={this.state.time} renderHourMarks={false} renderMinuteMarks={false} />;
+
     return clockHTML;
   }
 }
diff --git a/src/components/widgets/Favourite.jsx b/src/components/widgets/Favourite.jsx
index f53613f8..64bff126 100644
--- a/src/components/widgets/Favourite.jsx
+++ b/src/components/widgets/Favourite.jsx
@@ -28,7 +28,7 @@ export default class Favourite extends React.PureComponent {
   }
 
   render() {
-    if (localStorage.getItem('favouriteEnabled') === 'false') return null;
+    if (localStorage.getItem('favouriteEnabled') === 'false' || localStorage.getItem('background') === 'false') return null;
     return <div className='favourite'>
         {this.state.favourited}
     </div>
diff --git a/src/components/widgets/Maximise.jsx b/src/components/widgets/Maximise.jsx
index 30d7ceda..fff9abaf 100644
--- a/src/components/widgets/Maximise.jsx
+++ b/src/components/widgets/Maximise.jsx
@@ -12,9 +12,7 @@ export default class View extends React.PureComponent {
     setAttribute(blur, brightness) {
         document.querySelector('#backgroundImage').setAttribute(
             'style',
-            `background-image: url(${document.getElementById('backgroundImage').style.backgroundImage.replace('url("', '').replace('")', '')});
-            -webkit-filter: blur(${blur});
-            -webkit-filter: brightness(${brightness}%);`
+            `background-image: url(${document.getElementById('backgroundImage').style.backgroundImage.replace('url("', '').replace('")', '')}); -webkit-filter: blur(${blur}); -webkit-filter: brightness(${brightness}%);`
         );
     }
 
@@ -38,7 +36,7 @@ export default class View extends React.PureComponent {
   }
 
   render() {
-    if (localStorage.getItem('view') === 'false') return null;
+    if (localStorage.getItem('view') === 'false' || localStorage.getItem('background') === 'false') return null;
     return <div className='view'>
         <FullscreenIcon id='viewButton' onClick={() => this.viewStuff()} />
     </div>
diff --git a/src/components/widgets/Quote.jsx b/src/components/widgets/Quote.jsx
index 62d02e3a..1cbfedc4 100644
--- a/src/components/widgets/Quote.jsx
+++ b/src/components/widgets/Quote.jsx
@@ -97,6 +97,8 @@ export default class Quote extends React.PureComponent {
   }
 
   render() {
+    if (localStorage.getItem('quote') === 'false') return null;
+
     let copy = <FileCopy className='copyButton' onClick={() => this.copyQuote()}></FileCopy>;
     if (localStorage.getItem('copyButton') === 'false') copy = null;