Marketplace cleanup

src/components/modals/marketplace/Items.jsx

@@ -16,7 +16,7 @@ export default class Items extends React.PureComponent {
                     <div className='item' onClick={() => this.props.toggleFunction(item.name)} key={item.name}>
                         <img alt='icon' draggable={false} src={'https://external-content.duckduckgo.com/iu/?u=' + item.icon_url} />
                         <div className='details'>
-                            <h4>{item.display_name}</h4>
+                            <h4>{item.display_name ? item.display_name : item.name}</h4>
                             <p>{item.author}</p>
                         </div>
                     </div>)}

src/components/modals/settings/sections/DateSettings.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import SettingsFunctions from '../../../../modules/helpers/settings';
-import Section from '../Section';
-import Dropdown from '../Dropdown';
-
-export default class DateSettings extends React.PureComponent {
-  componentDidMount() {
-  }
-
-  render() {
-    return (
-      <React.Fragment>
-        <Section title={this.props.language.date.title} name='date'>
-          settings
-        </Section>
-      </React.Fragment>
-    );
-  }
-}

src/components/modals/tabs/Addons.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import LocalMallIcon from '@material-ui/icons/LocalMall';
 import { toast } from 'react-toastify';
 import Item from '../marketplace/Item';
+import Items from '../marketplace/Items';
 import MarketplaceFunctions from '../../../modules/helpers/marketplace';
 
 export default class Addons extends React.PureComponent {
@@ -28,17 +29,17 @@ export default class Addons extends React.PureComponent {
 
     toggle(type, type2, data) {
         if (type === 'item') {
-            let installed = JSON.parse(localStorage.getItem('installed'));
-            let info = installed.find(i => i.name === data).content;
+            const installed = JSON.parse(localStorage.getItem('installed'));
+            const info = installed.find(i => i.name === data);
             this.setState({
                 current_data: { type: type2, name: data, content: info },
                 item_data: {
-                    name: info.data.name,
-                    author: info.data.author,
-                    description: MarketplaceFunctions.urlParser(info.data.description.replace(/\n/g, '<br>')),
-                    updated: info.updated,
-                    version: info.data.version,
-                    icon: info.data.screenshot_url
+                    name: info.name,
+                    author: info.author,
+                    description: MarketplaceFunctions.urlParser(info.description.replace(/\n/g, '<br>')),
+                    updated: 'Not Implemented',
+                    version: info.version,
+                    icon: info.screenshot_url
                 }
             });
 
@@ -54,8 +55,7 @@ export default class Addons extends React.PureComponent {
     }
 
     uninstall() {
-        let type, data = this.state.current_data.type;
-        if (data === undefined) data = this.state.current_data.content.data.type;
+        let type, data = this.state.current_data.content.type;
         switch (data) {
             case 'photos':
                 type = 'photo_packs';
@@ -76,50 +76,14 @@ export default class Addons extends React.PureComponent {
     }
 
     install(input) {
-        let installed = JSON.parse(localStorage.getItem('installed'));
         let button;
-
-        const installStuff = () => {
-           installed.push({
-                content: {
-                   updated: 'Unpublished',
-                   data: input
-                }
-           });
-           localStorage.setItem('installed', JSON.stringify(installed));
-           toast(this.props.toastLanguage.installed);
-           button = <button className='removeFromMue' onClick={() => this.uninstall()}>{this.props.marketplaceLanguage.product.buttons.remove}</button>;
-           this.setState({
-               button: button,
-               installed: JSON.parse(localStorage.getItem('installed'))
-            });
-        }
-
-        switch (input.type) {
-            case 'settings':
-                localStorage.removeItem('backup_settings');
-                let oldSettings = [];
-                for (const key of Object.keys(localStorage)) oldSettings.push({name: key, value: localStorage.getItem(key)});
-                localStorage.setItem('backup_settings', JSON.stringify(oldSettings));
-                input.settings.forEach(element => localStorage.setItem(element.name, element.value));
-                installStuff();
-                break;
-            case 'photos':
-                localStorage.setItem('photo_packs', JSON.stringify(input.photos));
-                installStuff();
-                break;
-            case 'theme':
-                localStorage.setItem('theme', input.theme);
-                installStuff();
-                break;
-            case 'quote_packs':
-                if (input.quote_api) localStorage.setItem('quote_api', JSON.stringify(input.quote_api));
-                localStorage.setItem('quote_packs', JSON.stringify(input.quotes));
-                installStuff();
-                break;
-            default:
-               break;
-        }
+        MarketplaceFunctions.install(input.type, input, true);
+        toast(this.props.toastLanguage.installed);
+        button = <button className='removeFromMue' onClick={() => this.uninstall()}>{this.props.marketplaceLanguage.product.buttons.remove}</button>;
+        this.setState({
+            button: button,
+            installed: JSON.parse(localStorage.getItem('installed'))
+        });
     }
 
   componentDidMount() {
@@ -140,18 +104,9 @@ export default class Addons extends React.PureComponent {
   }
 
   render() {
-     let content = <div className='items'>
-           {this.state.installed.map((item) =>
-                <div className='item' onClick={() => this.toggle('item', item.type, item.name)}>
-                <img alt='icon' src={item.content.data.icon_url} />
-                <div className='details'>
-                    <h4>{item.content.data.name}</h4>
-                    <p>{item.content.data.author}</p>
-                </div>
-            </div>)}
-    </div>;
+    let content = <Items items={this.state.installed} toggleFunction={(input) => this.toggle('item', 'addon', input)} />
 
-     if (this.state.installed.length === 0) {
+    if (this.state.installed.length === 0) {
          content = <div className='items'>
                <div className='emptyMessage'>
                     <LocalMallIcon />
@@ -160,7 +115,7 @@ export default class Addons extends React.PureComponent {
                     <button className='goToMarket' onClick={this.props.openMarketplace}>{this.props.language.empty.button}</button>
               </div>
            </div>;
-     }
+    }
 
     return (
        <div>

src/components/modals/tabs/Marketplace.jsx

@@ -104,42 +104,11 @@ export default class Marketplace extends React.PureComponent {
     }
 
     install() {
-        let installed = JSON.parse(localStorage.getItem('installed'));
         let button;
-
-        const installStuff = () => {
-           installed.push(this.state.current_data);
-           localStorage.setItem('installed', JSON.stringify(installed));
-           toast(this.props.toastLanguage.installed);
-           button = <button className='removeFromMue' onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>;
-           this.setState({ button: button });
-        }
-
-        switch (this.state.current_data.type) {
-            case 'settings':
-                localStorage.removeItem('backup_settings');
-                let oldSettings = [];
-                for (const key of Object.keys(localStorage)) oldSettings.push({name: key, value: localStorage.getItem(key)});
-                localStorage.setItem('backup_settings', JSON.stringify(oldSettings));
-                this.state.current_data.content.data.settings.forEach(element => localStorage.setItem(element.name, element.value));
-                installStuff();
-                break;
-            case 'photo_packs':
-                localStorage.setItem('photo_packs', JSON.stringify(this.state.current_data.content.data.photos));
-                installStuff();
-                break;
-            case 'theme':
-                localStorage.setItem('theme', this.state.current_data.content.data.theme);
-                installStuff();
-                break;
-            case 'quote_packs':
-                if (this.state.current_data.content.data.quote_api) localStorage.setItem('quote_api', JSON.stringify(this.state.current_data.content.data.quote_api));
-                localStorage.setItem('quote_packs', JSON.stringify(this.state.current_data.content.data.quotes));
-                installStuff();
-                break;
-            default:
-               break;
-        }
+        MarketplaceFunctions.install(this.state.current_data.type, this.state.current_data.content.data);
+        toast(this.props.toastLanguage.installed);
+        button = <button className='removeFromMue' onClick={() => this.uninstall()}>{this.props.language.product.buttons.remove}</button>;
+        this.setState({ button: button });
     }
 
     uninstall() {
@@ -160,15 +129,15 @@ export default class Marketplace extends React.PureComponent {
     if (this.state.done === false) {
         return (
             <div id='marketplace'>
-            <div className='emptyMessage' style={{'marginTop': '20px', 'transform': 'translateY(80%)'}}>
+              <div className='emptyMessage' style={{ 'marginTop': '20px', 'transform': 'translateY(80%)' }}>
                 <h1>{this.props.updateLanguage.loading}</h1>
+              </div>
             </div>
-          </div>
-        )
+        );
     }
 
     return (
-        <div>
+        <React.Fragment>
             <div id='marketplace'>
                  <div className='featured' style={{backgroundColor: this.state.featured.colour}}>
                     <p>{this.state.featured.title}</p>
@@ -193,12 +162,6 @@ 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
-                   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')} /> */ }
              </div>
              <Item
                button={this.state.button}
@@ -215,7 +178,7 @@ export default class Marketplace extends React.PureComponent {
                   items={this.state.see_more}
                 />
              </div>
-        </div>
+        </React.Fragment>
       )
     }
 }

src/components/modals/tabs/Settings.jsx

@@ -7,7 +7,6 @@ import { toast } from 'react-toastify';
 import BackgroundSettings from '../settings/sections/BackgroundSettings';
 import SearchSettings from '../settings/sections/SearchSettings';
 import LanguageSettings from '../settings/sections/LanguageSettings';
-import DateSettings from '../settings/sections/DateSettings';
 
 export default class Settings extends React.PureComponent {
   resetGreeting() {

src/components/widgets/Date.jsx

@@ -28,7 +28,7 @@ export default class DateWidget extends React.PureComponent {
           day = dateYear;
           year = dateDay;
           break;
-        default:
+        default: // DMY
           break;
       }
 
@@ -49,7 +49,7 @@ export default class DateWidget extends React.PureComponent {
       const lang = localStorage.getItem('language');
 
       const day = date.toLocaleDateString(lang, { weekday: 'long' });
-      const nth = dtf.nth(date.getDate());
+      const nth = (localStorage.getItem('datenth') === 'true') ? dtf.nth(date.getDate()) : date.getDate();
       const month = date.toLocaleDateString(lang, { month: 'long' });
       const year = date.getFullYear();
 

src/modules/helpers/marketplace.js

@@ -41,4 +41,39 @@ export default class MarketplaceFunctions {
               }
           }
     }
+
+    static install(type, input, sideload) {
+        switch (type) {
+            case 'settings':
+                localStorage.removeItem('backup_settings');
+                let oldSettings = [];
+                for (const key of Object.keys(localStorage)) oldSettings.push({ name: key, value: localStorage.getItem(key) });
+                localStorage.setItem('backup_settings', JSON.stringify(oldSettings));
+                input.settings.forEach(element => localStorage.setItem(element.name, element.value));
+                break;
+            case 'photo_packs':
+                localStorage.setItem('photo_packs', JSON.stringify(input.photos));
+                break;
+            case 'theme':
+                localStorage.setItem('theme', input.theme);
+                break;
+            case 'quote_packs':
+                if (input.quote_api) localStorage.setItem('quote_api', JSON.stringify(input.quote_api));
+                localStorage.setItem('quote_packs', JSON.stringify(input.quotes));
+                break;
+            default:
+               break;
+        }
+
+        let installed = JSON.parse(localStorage.getItem('installed'));
+        if (sideload) {
+            installed.push({
+                content: {
+                   updated: 'Unpublished',
+                   data: input
+                }
+           });
+        } else installed.push(input);
+        localStorage.setItem('installed', JSON.stringify(installed));
+    }
 }