@riosst100/pwa-marketplace 1.6.4 → 1.6.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@riosst100/pwa-marketplace",
3
3
  "author": "riosst100@gmail.com",
4
- "version": "1.6.4",
4
+ "version": "1.6.5",
5
5
  "main": "src/index.js",
6
6
  "pwa-studio": {
7
7
  "targets": {
@@ -116,7 +116,7 @@ const CollectibleGameSets = props => {
116
116
  'value': 'newest'
117
117
  },
118
118
  {
119
- 'label': 'By Date',
119
+ 'label': 'By Year',
120
120
  'value': 'date'
121
121
  }
122
122
  ];
@@ -6,32 +6,45 @@ import defaultClasses from './productListTab.module.css';
6
6
 
7
7
  const ProductListTab = props => {
8
8
 
9
- const classes = useStyle(defaultClasses, props.classes);
9
+ const { activeTab, setActiveTab } = props
10
10
 
11
- const [activeTab, setActiveTab] = useState(null);
11
+ const classes = useStyle(defaultClasses, props.classes);
12
12
 
13
13
  let allProductClass = classes.firstButton;
14
14
  if (!activeTab) {
15
15
  allProductClass = classes.activeFirstButton;
16
16
  }
17
17
 
18
+ const productTabs = [
19
+ {
20
+ 'label': 'All Products',
21
+ 'value': 'all'
22
+ },
23
+ {
24
+ 'label': 'Sale',
25
+ 'value': 'sale'
26
+ },
27
+ {
28
+ 'label': 'Pre Order',
29
+ 'value': 'preorder'
30
+ },
31
+ {
32
+ 'label': 'Auction',
33
+ 'value': 'auction'
34
+ }
35
+ ];
36
+
18
37
  return (
19
38
  <div className={classes.root} aria-busy="true">
20
- {/* <FormattedMessage
21
- id={'searchPage.sortContainer'}
22
- defaultMessage={'Items sorted by '}
23
- />
24
- <span className={classes.sortText}>
25
- <FormattedMessage
26
- id={currentSort.sortId}
27
- defaultMessage={currentSort.sortText}
28
- />
29
- </span> */}
30
39
  <nav>
31
40
  <ul className={classes.buttonContainer}>
32
- <li><button className={classes.activeFirstButton}>All Products</button></li>
33
- <li><button className={classes.middleButton}>Pre Order</button></li>
34
- <li><button className={classes.lastButton}>Auctions</button></li>
41
+ {productTabs.map(({label, value}, index) =>
42
+ <li key={index}>
43
+ <button onClick={() => setActiveTab(value)} className={
44
+ (index == 0 ? classes.firstButton : (index == productTabs.length-1 ? classes.lastButton : classes.middleButton)) + (activeTab == value ? ' ' + classes.activeButton : '')
45
+ }>{label}</button>
46
+ </li>
47
+ )}
35
48
  </ul>
36
49
  </nav>
37
50
  </div>
@@ -24,7 +24,6 @@
24
24
  }
25
25
 
26
26
  .activeButton {
27
- composes: button;
28
27
  color: white;
29
28
  background-color: #4E31DB;
30
29
  }
@@ -75,6 +75,7 @@ const CategoryContent = props => {
75
75
  } = talonProps;
76
76
 
77
77
  const [activeLetter, setActiveLetter] = useState('all')
78
+ const [activeTab, setActiveTab] = useState('all');
78
79
 
79
80
  const handleActiveLetter = (val) => {
80
81
  setActiveLetter(val);
@@ -164,7 +165,7 @@ const CategoryContent = props => {
164
165
  ) : null;
165
166
 
166
167
  const maybeProductsTabContainer = shouldShowProductListTab ? (
167
- <ProductListTab />
168
+ <ProductListTab activeTab={activeTab} setActiveTab={setActiveTab} />
168
169
  ) : shouldShowProductListTabShimmer ? (
169
170
  <ProductListTabShimmer />
170
171
  ) : null;
@@ -76,7 +76,7 @@ export const useCollectibleGameSets = props => {
76
76
  if (result) {
77
77
  result.sets.push(set)
78
78
  } else {
79
- if (sortby == "date" || sortby == "newest" && sortbyData.length <= 5) {
79
+ if (sortby == "date" || sortby == "newest" && sortbyData.length < 2) {
80
80
  sortbyData.push({
81
81
  'release_type': release_year,
82
82
  'sets': [set]