@riosst100/pwa-marketplace 3.1.2 → 3.1.4

package/src/talons/SellerProducts/useProductContent.js

@@ -9,9 +9,6 @@ import DEFAULT_OPERATIONS from './productContent.gql';
 export const useProductContent = props => {
     const { sellerId, categoryId, data, pageSize = 6 } = props;
 
-    // const categoryId = 'MTI=';
-    // alert(categoryId)
-
     const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
 
     const {
@@ -22,16 +19,12 @@ export const useProductContent = props => {
     } = operations;
 
     const placeholderItems = Array.from({ length: pageSize }).fill(null);
-
-    // console.log(getStoreConfigQuery)
     
     const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
         fetchPolicy: 'cache-and-network',
         nextFetchPolicy: 'cache-first'
     });
 
-    // return '';
-
     const virtualCategoryFilters = useMemo(() => {
         if (storeConfigData) {
             const data = storeConfigData.storeConfig.custommarketplace_plp_filters_virtualcategory;
@@ -135,18 +128,9 @@ export const useProductContent = props => {
         filters.push(newFilter);
     });
 
-    const attributesBlock = null;
     const parent = null;
-    // const categoryName = null;
     const categoryDescription = null;
-    
-    // const attributesBlock = categoryData && categoryData.categories.items.length
-    // ? categoryData.categories.items[0].attributes_block
-    // : null;
-    // const parent =
-    // categoryData && categoryData.categories.items.length
-    //     ? categoryData.categories.items[0].parent
-    //     : null;
+
     const totalPagesFromData = data
         ? data.page_info.total_pages
         : null;
@@ -156,28 +140,10 @@ export const useProductContent = props => {
         categoryData && categoryData.categories.items.length
             ? categoryData.categories.items[0].name
             : null;
-    // const categoryDescription =
-    //     categoryData && categoryData.categories.items.length
-    //         ? categoryData.categories.items[0].description
-    //         : null;
     const availableSortMethods = sortData
         ? sortData.products.sort_fields.options
         : null;
 
-    // useEffect(() => {
-    //     if (!categoryLoading && categoryData.categories.items.length > 0) {
-    //         dispatch({
-    //             type: 'CATEGORY_PAGE_VIEW',
-    //             payload: {
-    //                 id: categoryData.categories.items[0].uid,
-    //                 name: categoryData.categories.items[0].name,
-    //                 url_key: categoryData.categories.items[0].url_key,
-    //                 url_path: categoryData.categories.items[0].url_path
-    //             }
-    //         });
-    //     }
-    // }, [categoryData, dispatch, categoryLoading]);
-
     return {
         availableSortMethods,
         categoryName,
@@ -188,7 +154,6 @@ export const useProductContent = props => {
         totalPagesFromData,
         children,
         parent,
-        attributesBlock,
         category,
         virtualCategoryFilters
     };

package/src/components/AttributesBlock/attributesBlock.js

@@ -1,54 +0,0 @@
-import { useAttributesBlock } from '@riosst100/pwa-marketplace/src/talons/AttributesBlock/useAttributesBlock';
-import React from 'react';
-import { Link } from 'react-router-dom';
-import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
-import defaultClasses from './attributesBlock.module.css';
-import { useStyle } from '@magento/venia-ui/lib/classify';
-
-const AttributesBlock = props => {
-    const { attributesBlock, category } = props;
-
-    const talonProps = useAttributesBlock({ attributesBlock });
-
-    const classes = useStyle(defaultClasses, props.classes);
-
-    const {
-        categoryUrlSuffix,
-        getPath
-    } = talonProps;
-    
-    const result = [];
-    
-    attributesBlock && attributesBlock.map(({ label, code, items }, index) => {
-
-        const itemsResult = [];
-
-        items && items.map(({ label, value }, index) => {
-            const path = resourceUrl(
-                `/${category.url_path}${categoryUrlSuffix || ''}?${code}[filter]=${label},${value}`
-            );
-
-            itemsResult.push(
-                <>
-                    <Link
-                            key={index}
-                            to={path}
-                        >
-                        <li className={classes.item}>{label}</li>
-                    </Link>
-                </>
-            )
-        });
-
-        result.push(
-            <span key={index}>
-                <div className={classes.title}>{label}</div>
-                <ul className={classes.root}>{itemsResult}</ul>
-            </span>
-        )
-    });
-
-    return result;
-};
-
-export default AttributesBlock;

package/src/components/AttributesBlock/attributesBlock.module.css

@@ -1,28 +0,0 @@
-.root {
-    composes: flex from global;
-    composes: flex-wrap from global;
-    composes: mt-3 from global;
-    composes: gap-[15px] from global;
-    margin-bottom: 30px;
-}
-
-.item {
-    composes: px-4 from global;
-    composes: py-2 from global;
-    composes: transition-colors from global;
-    composes: duration-150 from global;
-    composes: border from global;
-    composes: border-solid from global;
-    composes: leading-normal from global;
-    composes: text-base from global;
-    composes: text-colorDefault from global;
-    composes: bg-white from global;
-    composes: border-gray-100 from global;
-    border-radius: 5px;
-}
-
-.title {
-    composes: pb-3 from global;
-    composes: font-bold from global;
-    composes: text-[14px] from global;
-}

package/src/components/ShopBy/shopBy copy.js

@@ -1,172 +0,0 @@
-import React, { Fragment, useEffect, useMemo, useState } from 'react';
-import ErrorView from '@magento/venia-ui/lib/components/ErrorView';
-import { StoreTitle, Meta } from '@magento/venia-ui/lib/components/Head';
-import { Link } from 'react-router-dom';
-import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
-import defaultClasses from './shopBy.module.css';
-import { useStyle } from '@magento/venia-ui/lib/classify';
-import cn from 'classnames';
-import Divider from '@riosst100/pwa-marketplace/src/components/Divider';
-import { ShopByShimmer } from '@riosst100/pwa-marketplace/src/components/ShopBy';
-import CustomSortBy from '@riosst100/pwa-marketplace/src/components/CustomSortBy';
-import ArraySearchInput from '@riosst100/pwa-marketplace/src/components/ArraySearchInput';
-import { useCustomSort } from '@riosst100/pwa-marketplace/src/hooks/useCustomSort';
-import { useShopBy } from '@riosst100/pwa-marketplace/src/talons/ShopBy/useShopBy';
-
-const ShopBy = props => {
-    const [active, setActive] = useState('all');
-
-    const [searchQuery, setSearchQuery] = useState('');
-
-    
-    const sortProps = useCustomSort({ sortFromSearch: false, defaultSort: {
-        sortText: 'All (A-Z)',
-        value: 'all'
-    }});
-
-    const [currentSort] = sortProps;
-
-    // const [sortBy, setSortBy] = useState({
-    //     sortText: 'All (A-Z)',
-    //     value: 'all'
-    // });
-
-
-    const classes = useStyle(defaultClasses);
-
-    const talonProps = useShopBy({ searchQuery, setActive, currentSort });
-
-    const { error, loading, dataResult, categoryUrlSuffix, categoryUrlKey, productType, filteredCollectibleGameSets, availableGroups, attributeData, alpha, category } = talonProps;
-
-    if (loading && !dataResult)
-        return <ShopByShimmer />;
-    if (error && !dataResult) return <ErrorView />;
-
-    if (!dataResult && !loading && !error) {
-        return <ShopByShimmer />;
-    }
-
-    const newData = searchQuery ? filteredCollectibleGameSets : dataResult;
-
-    const setRelases = availableGroups.map((group, index) => {
-        const optionsResult = [];
-
-        if (active === 'all' || active === group) {
-            dataResult[group].map((option, index) => {
-                const { label, value } = option;
-
-                const categoryUrl = resourceUrl(
-                    `/${categoryUrlKey}${categoryUrlSuffix || ''}?${attributeData.attribute_code}[filter]=${label},${value}`
-                );
-
-                optionsResult.push(<li className='list-none'>
-                    <Link to={categoryUrl} className="hover_bg-darkblue-900 hover_text-white w-full block text-[14px] py-[2px] px-2">
-                        {label}
-                    </Link>
-                </li>)
-            })
-
-            return (
-                <>
-                    {optionsResult ?
-                    <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>
-                        <div className='singles_item_group_letter text-xl font-medium border-b border-gray-100 pb-1 mb-2' >
-                            {group}
-                        </div>
-                        <div className={cn('singles_item-list flex flex-col')}>{optionsResult}</div>
-                    </div> : ''}
-                </>
-            );
-        }
-        
-        return null;
-    });
-
-    const handleActive = (val) => {
-        setActive(val);
-
-        // 
-
-
-        setSearchQuery('')
-    }
-
-    let availableSortBy = [
-        {
-            'label': 'All (A-Z)',
-            'value': 'all'
-        }
-    ];
-
-    let title = "All Sets";
-    if (productType == "expansion-sets") {
-        title = "Expansion Sets";
-    } else if (productType == "artist") {
-        title = "Artist";
-    }
-
-    return (
-        <Fragment>
-            <StoreTitle>{title}</StoreTitle>
-            <h1 className='mx-auto relative block text-xl font-bold text-center pt-10 pb-4'>
-                {attributeData ? 'By ' + attributeData.label : 'Shop By'}
-            </h1>
-            <div className='border border-gray-100 px-6'>
-                {dataResult ? (
-                    <div
-                        className={classes.toolbar}
-                    >
-                        <div style={{"width":"35%"}}><ArraySearchInput active={active} searchQuery={searchQuery} placeholder="Search sets..." isOpen={true} setSearchQuery={setSearchQuery} /></div>
-                        <CustomSortBy sortProps={sortProps} availableSortMethods={availableSortBy} />
-                    </div>
-                ) : ''}
-                {productType != "expansion-sets" ? (
-                    <>
-                        <section className='single_list-indexing-container relative m-auto py-10'>
-                            <ul className='flex gap-2 justify-center flex-wrap'>
-                                <li>
-                                    <button
-                                        className={cn(
-                                            'rounded-md border border-solid border-gray-100 p-2 min-w-[28px]',
-                                            'leading-4 font-medium text-base hover_bg-gray-50'
-                                        )}
-                                        onClick={() => {
-                                            handleActive('all')
-                                        }}
-                                    >
-                                        {active == 'all' ? <b>All</b> : 'All'}
-                                    </button>
-                                </li>
-                                {alpha.map((letter, index) => (
-                                    <li key={index}>
-                                        <button
-                                            className={cn(
-                                                'rounded-md border border-solid border-gray-100 p-2 min-w-[28px]',
-                                                'leading-4 font-medium text-base ',
-                                                availableGroups.includes(letter) > 0 ? 'hover_bg-gray-50' : 'bg-gray-100 text-gray-400',
-                                            )}
-                                            onClick={() => {
-                                                handleActive(letter)
-                                            }}
-                                            disabled={availableGroups.includes(letter) > 0 ? false : true}
-                                        >
-                                            {active == letter ? <b>{letter}</b> : letter}
-                                        </button>
-                                    </li>
-                                ))}
-                            </ul>
-                        </section>
-                    </>
-                ) : ''}
-                <Divider className="mb-5 px-4 mt-5" />
-                <section className='singles-container'>
-                    <div className={cn('singles-wrapper block -mx-4', classes.singlesWrapper)}>
-                        {Object.keys(dataResult).length != 0 ? setRelases : (searchQuery ? <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No data found for <b>{searchQuery}</b> search query.</div> : <div className='singles_group-wrapper mb-4 px-2 inline-block w-full'>No data found.</div>)}
-                    </div>
-                </section>
-            </div>
-        </Fragment>
-    );
-}
-
-export default ShopBy;

package/src/components/SubCategory/customSubCategory.js

@@ -1,45 +0,0 @@
-import { useCustomSubCategory } from '@riosst100/pwa-marketplace/src/talons/SubCategory/useCustomSubCategory';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
-import defaultClasses from './customSubCategory.module.css';
-import { useStyle } from '@magento/venia-ui/lib/classify';
-
-const CustomSubCategory = props => {
-    const { customSubCategory, categoryName } = props;
-
-    const talonProps = useCustomSubCategory({ customSubCategory });
-
-    const classes = useStyle(defaultClasses, props.classes);
-
-    const {
-        normalizedData
-    } = talonProps;
-    
-    const subCategory = [];
-    
-    normalizedData && normalizedData.map(({ text, path }, index) => {
-        if (text == categoryName) {
-            subCategory.push(
-                <span>
-                    <b>
-                        <li className={classes.item}>{text}</li>
-                    </b>
-                </span>
-            )
-        } else {
-            subCategory.push(
-                <Link
-                    key={index}
-                    to={resourceUrl(path)}
-                >
-                    <li className={classes.item}>{text}</li>
-                </Link>
-            )
-        }
-    });
-
-    return subCategory.length ? <ul className={classes.root}>{subCategory}</ul> : '';
-};
-
-export default CustomSubCategory;

package/src/components/SubCategory/customSubCategory.module.css

@@ -1,22 +0,0 @@
-.root {
-    composes: flex from global;
-    composes: flex-wrap from global;
-    composes: mt-3 from global;
-    composes: gap-[15px] from global;
-    margin-bottom: 10px;
-}
-
-.item {
-    composes: px-4 from global;
-    composes: py-2 from global;
-    composes: transition-colors from global;
-    composes: duration-150 from global;
-    composes: border from global;
-    composes: border-solid from global;
-    composes: leading-normal from global;
-    composes: text-base from global;
-    composes: text-colorDefault from global;
-    composes: bg-white from global;
-    composes: border-gray-100 from global;
-    border-radius: 5px;
-}

package/src/talons/AttributesBlock/attributesBlock.gql.js

@@ -1,15 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const GET_STORE_CONFIG_DATA = gql`
-    query GetStoreConfigForBreadcrumbs {
-        # eslint-disable-next-line @graphql-eslint/require-id-when-available
-        storeConfig {
-            store_code
-            category_url_suffix
-        }
-    }
-`;
-
-export default {
-    getStoreConfigQuery: GET_STORE_CONFIG_DATA
-};

package/src/talons/AttributesBlock/useAttributesBlock.js

@@ -1,38 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery } from '@apollo/client';
-
-import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
-
-import DEFAULT_OPERATIONS from './attributesBlock.gql';
-
-const getPath = (path, suffix) => {
-    if (path) {
-        return `/${path}${suffix || ''}`;
-    }
-
-    // If there is no path this is just a dead link.
-    return '#';
-};
-
-export const useAttributesBlock = props => {
-    const { attributesBlock } = props;
-
-    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
-    const { getStoreConfigQuery } = operations;
-
-    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
-        fetchPolicy: 'cache-and-network',
-        nextFetchPolicy: 'cache-first'
-    });
-
-    const categoryUrlSuffix = useMemo(() => {
-        if (storeConfigData) {
-            return storeConfigData.storeConfig.category_url_suffix;
-        }
-    }, [storeConfigData]);
-
-    return {
-        categoryUrlSuffix,
-        getPath
-    };
-};

package/src/talons/SubCategory/useCustomSubCategory.js

@@ -1,50 +0,0 @@
-import { useMemo } from 'react';
-import { useQuery } from '@apollo/client';
-
-import mergeOperations from '@magento/peregrine/lib/util/shallowMerge';
-
-import DEFAULT_OPERATIONS from './subCategory.gql';
-
-const getPath = (path, suffix) => {
-    if (path) {
-        return `/${path}${suffix || ''}`;
-    }
-
-    // If there is no path this is just a dead link.
-    return '#';
-};
-
-export const useCustomSubCategory = props => {
-    const { customSubCategory } = props;
-
-    const operations = mergeOperations(DEFAULT_OPERATIONS, props.operations);
-    const { getStoreConfigQuery } = operations;
-
-    const { data: storeConfigData } = useQuery(getStoreConfigQuery, {
-        fetchPolicy: 'cache-and-network',
-        nextFetchPolicy: 'cache-first'
-    });
-
-    const categoryUrlSuffix = useMemo(() => {
-        if (storeConfigData) {
-            return storeConfigData.storeConfig.category_url_suffix;
-        }
-    }, [storeConfigData]);
-
-    const normalizedData = useMemo(() => {
-        if (customSubCategory) {
-            return (
-                customSubCategory.length &&
-                customSubCategory
-                    .map(category => ({
-                        text: category.name,
-                        path: `/${category.path}`
-                    }))
-            );
-        }
-    }, [categoryUrlSuffix, customSubCategory]);
-
-    return {
-        normalizedData: normalizedData || []
-    };
-};