diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx
index 9fb8c842..d70bd755 100644
--- a/src/components/modals/main/marketplace/Items.jsx
+++ b/src/components/modals/main/marketplace/Items.jsx
@@ -19,11 +19,12 @@ export default function Items({
toggleFunction,
collectionFunction,
onCollection,
+ filter,
}) {
const [count, setCount] = useState(8);
- const [filter, setFilter] = useState('');
const [cheese, setCheese] = useState('photo')
const [filteredCategory, setFilteredCategory] = useState('');
+ console.log(filter)
const incrementCount = () => {
if (count !== items.length && count <= items.length) {
if (count + 8 > items.length) {
@@ -36,19 +37,9 @@ export default function Items({
return (
<>
- {(type === 'all' && !onCollection) || (type === 'collections' && !onCollection) ? (
+ {(type === 'all' && !onCollection && (filter === null || filter === '')) || (type === 'collections' && !onCollection && (filter === null || filter === '')) ? (
<>
-
{variables.getMessage('modals.main.navbar.marketplace')}
- {variables.getMessage('modals.main.marketplace.collection')}
+ {' '}
+ {variables.getMessage('modals.main.marketplace.collection')}
{this.state.collectionTitle}
{this.state.collectionDescription}
- Collection
+
+ {variables.getMessage('modals.main.marketplace.collection')}
+
>
) : (
@@ -356,9 +361,24 @@ export default class Marketplace extends PureComponent {
-
this.reloadItems()}>
- {variables.getMessage('widgets.navbar.tooltips.refresh')}
-
+ {this.props.type !== 'collections' ? (
+
+
+ {/* this.reloadItems()}>
+ {variables.getMessage('widgets.navbar.tooltips.refresh')}
+ */}
+
+ ) : null}
{variables.getMessage('modals.main.addons.sort.a_z')}
-
+
>
)}
- {this.props.type === 'collections' && !this.state.collection ? (
+ {(this.props.type === 'collections' && !this.state.collection) ? (
this.state.items.map((item) => (
<>
{!item.news ? (
@@ -403,10 +423,14 @@ export default class Marketplace extends PureComponent {
this.toggle('item', input)}
collectionFunction={(input) => this.toggle('collection', input)}
+ filter={this.state.filter}
/>
)}
>
diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss
index 942adaef..228219c5 100644
--- a/src/components/modals/main/scss/index.scss
+++ b/src/components/modals/main/scss/index.scss
@@ -142,6 +142,15 @@ h5 {
display: flex;
flex-flow: column;
gap: -1px;
+ padding: 10px 0;
+ div:nth-child(1) {
+ display: flex;
+ flex-flow: column;
+ gap: 10px;
+ }
+ form {
+ margin-top: 10px;
+ }
.link {
display: flex;
flex-flow: row;
diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss
index c014635f..0408f37e 100644
--- a/src/components/modals/main/scss/marketplace/_main.scss
+++ b/src/components/modals/main/scss/marketplace/_main.scss
@@ -471,12 +471,19 @@ a.collectionButton {
}
}
+.marketplaceRefresh {
+ display: flex;
+ flex-flow: row;
+ gap: 5px;
+ align-items: center;
+}
+
.marketplaceSearch {
display: flex;
align-items: center;
padding: 10px 30px;
border-radius: 10px;
- font-size: 16px;
+ font-size: 18px;
@include themed() {
background: t($modal-sidebarActive);
box-shadow: 0 0 0 3px t($modal-sidebarActive);
diff --git a/src/components/modals/main/tabs/backend/Tabs.jsx b/src/components/modals/main/tabs/backend/Tabs.jsx
index 8a4fc06d..4b8748a0 100644
--- a/src/components/modals/main/tabs/backend/Tabs.jsx
+++ b/src/components/modals/main/tabs/backend/Tabs.jsx
@@ -59,7 +59,7 @@ export default class Tabs extends PureComponent {
return (
-
+
{this.props.children.map((tab, index) => (