From 9bd4f99006341cd05a8b9085ac5c11fa3b1a38c5 Mon Sep 17 00:00:00 2001
From: David Ralph <ohlookitsderpy@protonmail.com>
Date: Fri, 25 Sep 2020 14:32:14 +0100
Subject: [PATCH] should be ready now

---
 src/App.jsx                                                 | 6 +++---
 src/components/modals/Settings.jsx                          | 2 +-
 src/components/modals/Update.jsx                            | 4 ++--
 src/components/modals/settings/Section.jsx                  | 2 +-
 .../modals/settings/sections/LanguageSettings.jsx           | 2 +-
 src/scss/modules/_settings.scss                             | 4 ++++
 src/translations/en.json                                    | 3 ++-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 46fb03b0..e21668a0 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -21,7 +21,7 @@ const Settings = React.lazy(() => import('./components/modals/Settings'));
 const Update = React.lazy(() => import('./components/modals/Update'));
 const Marketplace = React.lazy(() => import('./components/modals/Marketplace'));
 const Addons = React.lazy(() => import('./components/modals/Addons'));
-const Welcome = React.lazy(() => import('./components/modals/Welcome'));
+//const Welcome = React.lazy(() => import('./components/modals/Welcome'));
 const renderLoader = () => <div></div>;
 
 export default class App extends React.PureComponent {
@@ -115,9 +115,9 @@ export default class App extends React.PureComponent {
                 openMarketplace={() => this.setState({ addonsModal: false, marketplaceModal: true })}
                 toastLanguage={language.toasts} />
             </Modal>
-            <Modal onRequestClose={() => this.setState({ welcomeModal: false })} isOpen={this.state.welcomeModal} className={modalClassList} overlayClassName='Overlay' ariaHideApp={false}>
+            {/* <Modal onRequestClose={() => this.setState({ welcomeModal: false })} isOpen={this.state.welcomeModal} className={modalClassList} overlayClassName='Overlay' ariaHideApp={false}>
               <Welcome modalClose={() => this.setState({ welcomeModal: false })} />
-            </Modal>
+             </Modal> */ }
           </React.Suspense>
         </div>
       </React.Fragment>
diff --git a/src/components/modals/Settings.jsx b/src/components/modals/Settings.jsx
index 8b7732d9..a3b31c1d 100644
--- a/src/components/modals/Settings.jsx
+++ b/src/components/modals/Settings.jsx
@@ -39,7 +39,7 @@ export default class Settings extends React.PureComponent {
       reader.onload = (readerEvent) => {
         const content = JSON.parse(readerEvent.target.result);
         for (const key of Object.keys(content)) localStorage.setItem(key, content[key]);
-        toast(this.props.toastLanguage.imported_settings);
+        toast(this.props.toastLanguage.imported);
       };
     };
 
diff --git a/src/components/modals/Update.jsx b/src/components/modals/Update.jsx
index 6afe7031..f0db00e3 100644
--- a/src/components/modals/Update.jsx
+++ b/src/components/modals/Update.jsx
@@ -44,10 +44,10 @@ export default class Update extends React.PureComponent {
   render() {
     return <div className='updateContent'>
         <span className='closeModal' onClick={this.props.modalClose}>&times;</span>
-        <h1 style={{ 'marginBottom':'-10px' }} dangerouslySetInnerHTML={{__html: this.state.title}}></h1>
+        <h1 style={{ 'marginBottom':'-10px' }}>{this.state.title}</h1>
         <h5 style={{ 'lineHeight':'0px' }}> By {this.state.author} • {this.state.date}</h5>
         <img draggable='false' src={this.state.image} alt='Update'></img>
-        <p dangerouslySetInnerHTML={{__html: this.state.content + `<br/><p>Read on the blog here: <a target='_blank' href='${this.state.url}'>${this.state.url}</a></p>`}}></p>
+        <p dangerouslySetInnerHTML={{__html: this.state.content + `<br/><p>Read on the blog here: <a target='_blank' class='modalLink' href='${this.state.url}'>${this.state.url}</a></p>`}}></p>
       </div>;
     }
 }
\ No newline at end of file
diff --git a/src/components/modals/settings/Section.jsx b/src/components/modals/settings/Section.jsx
index daa2a215..b928e750 100644
--- a/src/components/modals/settings/Section.jsx
+++ b/src/components/modals/settings/Section.jsx
@@ -10,7 +10,7 @@ export default class Section extends React.PureComponent {
         extraHTML = <li className={'extraSettings ' + this.props.title}>{this.props.children}</li>
         expandMore = <ExpandMore
                         style={{ 'transition': 'all 0.5s ease 0s' }}
-                        className={'expandIcons ' + 'expand' + this.props.title}
+                        className={`expandIcons expand${this.props.title}`}
                         onClick={() => SettingsFunctions.toggleExtra(document.getElementsByClassName(this.props.title)[0], document.getElementsByClassName('expand' + this.props.title)[0])}
                     />
     }
diff --git a/src/components/modals/settings/sections/LanguageSettings.jsx b/src/components/modals/settings/sections/LanguageSettings.jsx
index fc9a0281..58a421ff 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'>{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/scss/modules/_settings.scss b/src/scss/modules/_settings.scss
index f6efe0eb..006eb214 100644
--- a/src/scss/modules/_settings.scss
+++ b/src/scss/modules/_settings.scss
@@ -248,6 +248,10 @@ select#language {
   .choices {
     background-color: white;
   }
+
+  .modalLink {
+    color: #3498db;
+  }
 }
 
 .nodropdown {
diff --git a/src/translations/en.json b/src/translations/en.json
index 22b3eb2d..70c71fc2 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -84,7 +84,8 @@
         "reset": "Reset successfully",
         "installed": "Successfully installed",
         "removed": "Successfully removed",
-        "error": "Something went wrong"
+        "error": "Something went wrong",
+        "imported": "Successfully imported"
     },
     "marketplace": {
         "photo_packs": "Photo Packs",