diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index e34a13a0..da515c6d 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -23,7 +23,7 @@ export default function Item(props) { } // prevent console error - let iconsrc = 'https://external-content.duckduckgo.com/iu/?u=' + props.data.icon; + let iconsrc = window.constants.DDG_PROXY + props.data.icon; if (!props.data.icon) { iconsrc = null; } @@ -31,12 +31,12 @@ export default function Item(props) { return (

- +

{props.data.name}

{props.button}

- product + product

{language.information}

diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx index 514e0477..6eb95743 100644 --- a/src/components/modals/main/marketplace/Items.jsx +++ b/src/components/modals/main/marketplace/Items.jsx @@ -8,14 +8,15 @@ export default function Items(props) { return (
- {props.items.map((item) => -
props.toggleFunction(item.name)} key={item.name}> - icon -
-

{item.display_name ? item.display_name : item.name}

-

{item.author}

+ {props.items.map((item) => ( +
props.toggleFunction(item.name)} key={item.name}> + icon +
+

{item.display_name ? item.display_name : item.name}

+

{item.author}

+
-
)} + ))}
); } diff --git a/src/components/modals/main/marketplace/sections/Added.jsx b/src/components/modals/main/marketplace/sections/Added.jsx index bb019a4c..f48718ef 100644 --- a/src/components/modals/main/marketplace/sections/Added.jsx +++ b/src/components/modals/main/marketplace/sections/Added.jsx @@ -109,14 +109,14 @@ export default class Added extends React.PureComponent { } return ( - + <>
this.manage('install', JSON.parse(e.target.result))} /> {content}
- -
+ this.toggle()} /> + ); } } diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index ac0063f6..ab224324 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -1,7 +1,6 @@ import React from 'react'; import WifiOffIcon from '@material-ui/icons/WifiOff'; -import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import Item from '../Item'; import Items from '../Items'; @@ -41,9 +40,9 @@ export default class Marketplace extends React.PureComponent { switch (type) { case 'item': let info; - // get item info + // get item info try { - info = await (await fetch(`${window.window.constants.MARKETPLACE_URL}/item/${this.props.type}/${data}`)).json(); + info = await (await fetch(`${window.constants.MARKETPLACE_URL}/item/${this.props.type}/${data}`)).json(); } catch (e) { return toast(this.props.toastLanguage.error); } @@ -82,8 +81,8 @@ export default class Marketplace extends React.PureComponent { } async getItems() { - const { data } = await (await fetch(window.window.constants.MARKETPLACE_URL + '/all')).json(); - const featured = await (await fetch(window.window.constants.MARKETPLACE_URL + '/featured')).json(); + const { data } = await (await fetch(window.constants.MARKETPLACE_URL + '/all')).json(); + const featured = await (await fetch(window.constants.MARKETPLACE_URL + '/featured')).json(); this.setState({ items: data[this.props.type], @@ -135,21 +134,21 @@ export default class Marketplace extends React.PureComponent { if (navigator.onLine === false) { return errorMessage( - + <>

Offline

Mue down!

-
+ ); } if (localStorage.getItem('offlineMode') === 'true') { return errorMessage( - + <>

Offline mode is enabled

Please turn off offline mode to access the marketplace

-
+ ); } @@ -158,7 +157,7 @@ export default class Marketplace extends React.PureComponent { } return ( - + <>

{this.state.featured.title}

@@ -169,8 +168,8 @@ export default class Marketplace extends React.PureComponent { items={this.state.items.slice(0, 3)} toggleFunction={(input) => this.toggle('item', input)} />
- - + this.toggle()} /> + ); } } diff --git a/src/scss/modules/_marketplace.scss b/src/scss/modules/_marketplace.scss index ef2373e3..ee5e0113 100644 --- a/src/scss/modules/_marketplace.scss +++ b/src/scss/modules/_marketplace.scss @@ -41,8 +41,8 @@ .details { position: absolute; - left: 90px; - top: 15px; + left: 85px; + top: -15px; img { margin-left: 10px; @@ -52,6 +52,7 @@ p { margin-top: 5px; + line-height: 20px; } &:hover { @@ -107,6 +108,7 @@ p.description { .informationContainer { float: right; + margin-right: 15px; } .productInformation { @@ -116,9 +118,15 @@ p.description { width: 200px; border-radius: 12px; + h4 { + cursor: initial !important; + } + li { margin-left: -4px; list-style: none; + font-size: 16px; + cursor: initial !important; &.header { text-transform: uppercase;