Merge branch 'products-custom-components' of ntasicc/coffee into master

components/buttons/load-more/LoadMore.jsx

@@ -0,0 +1,49 @@
+import { Button } from '@mui/material';
+import CircularProgress from '@mui/material/CircularProgress';
+import Image from 'next/image';
+
+const LoadMore = ({ fetchNextPage, isFetchingNextPage, hasNextPage }) => {
+  return (
+    <Button
+      onClick={fetchNextPage}
+      startIcon={
+        !isFetchingNextPage && (
+          <Image
+            src="/images/arrow.svg"
+            alt="arrow down"
+            width={29}
+            height={29}
+          />
+        )
+      }
+      sx={{
+        backgroundColor: 'primary.main',
+        height: 50,
+        width: 150,
+        color: 'white',
+        ':hover': {
+          bgcolor: 'primary.main',
+          color: 'white',
+        },
+      }}
+    >
+      {isFetchingNextPage && (
+        <CircularProgress
+          style={{
+            color: '#fff',
+            width: '29px',
+            height: '29px',
+            marginRight: '20px',
+          }}
+        />
+      )}
+      {isFetchingNextPage
+        ? 'Loading...'
+        : hasNextPage
+        ? 'Load More'
+        : 'Nothing more to load'}
+    </Button>
+  );
+};
+
+export default LoadMore;

components/cards/card-container/CardContainer.jsx

@@ -12,7 +12,7 @@ const CardContainer = ({ children }) => {
           sm: 'row',
           lg: 'column',
         },
-        justifyContent: { sm: 'space-between' },
+        justifyContent: { sm: 'flex-start' },
         flexWrap: 'wrap',
       }}
     >

components/grid-item/GridItem.jsx

@@ -1,5 +1,11 @@
+import { Grid } from '@mui/material';
+
 const GridItem = ({ children }) => {
-  return <p>Hello</p>;
+  return (
+    <Grid item md={4} sm={6} xs={12} sx={{ mb: '100px' }}>
+      {children}
+    </Grid>
+  );
 };
 
 export default GridItem;

components/products-grid/ProductsGrid.jsx

@@ -1,7 +1,7 @@
-import { Button, Container, Grid } from '@mui/material';
-import CircularProgress from '@mui/material/CircularProgress';
+import { Container, Grid } from '@mui/material';
 import { Box } from '@mui/system';
-import Image from 'next/image';
+import LoadMore from '../buttons/load-more/LoadMore';
+import GridItem from '../grid-item/GridItem';
 import ProductCard from '../product-card/ProductCard';
 
 const ProductsGrid = ({
@@ -12,9 +12,9 @@ const ProductsGrid = ({
 }) => {
   const dataToDisplay = allProducts.pages.map((page) =>
     page.product.map((item) => (
-      <Grid key={item._id} item md={4} sm={6} xs={12} sx={{ mb: '100px' }}>
+      <GridItem key={item._id}>
         <ProductCard product={item} />
-      </Grid>
+      </GridItem>
     ))
   );
 
@@ -29,45 +29,11 @@ const ProductsGrid = ({
       </Grid>
       <Box textAlign="center" mt={-5} mb={5}>
         {hasNextPage && (
-          <Button
-            onClick={fetchNextPage}
-            startIcon={
-              !isFetchingNextPage && (
-                <Image
-                  src="/images/arrow.svg"
-                  alt="arrow down"
-                  width={29}
-                  height={29}
-                />
-              )
-            }
-            sx={{
-              backgroundColor: 'primary.main',
-              height: 50,
-              width: 150,
-              color: 'white',
-              ':hover': {
-                bgcolor: 'primary.main',
-                color: 'white',
-              },
-            }}
-          >
-            {isFetchingNextPage && (
-              <CircularProgress
-                style={{
-                  color: '#fff',
-                  width: '29px',
-                  height: '29px',
-                  marginRight: '20px',
-                }}
-              />
-            )}
-            {isFetchingNextPage
-              ? 'Loading...'
-              : hasNextPage
-              ? 'Load More'
-              : 'Nothing more to load'}
-          </Button>
+          <LoadMore
+            fetchNextPage={fetchNextPage}
+            isFetchingNextPage={isFetchingNextPage}
+            hasNextPage={hasNextPage}
+          />
         )}
       </Box>
     </Container>

components/tab-content/TabContent.jsx

@@ -0,0 +1,85 @@
+import { Button, Grid, Tab, Tabs, Typography } from '@mui/material';
+import { Box } from '@mui/system';
+import { useState } from 'react';
+import TabPanel from '../tab-panel/TabPanel';
+
+const TabContent = ({
+  description,
+  inCart,
+  price,
+  category,
+  addProductToCart,
+}) => {
+  const [value, setValue] = useState(0);
+
+  const handleChange = (event, newValue) => {
+    setValue(newValue);
+  };
+
+  function a11yProps(index) {
+    return {
+      id: `simple-tab-${index}`,
+      'aria-controls': `simple-tabpanel-${index}`,
+    };
+  }
+
+  return (
+    <Grid item xs={12} md={6}>
+      <Tabs
+        sx={{
+          '& button:focus': {
+            borderTop: '1px solid black',
+            borderLeft: '1px solid black',
+            borderRight: '1px solid black',
+            borderRadius: '5px 5px 0 0',
+            borderBottom: 'none',
+          },
+        }}
+        value={value}
+        onChange={handleChange}
+        aria-label="basic tabs example"
+      >
+        <Tab
+          sx={{
+            width: '50%',
+          }}
+          label="Purchase"
+          {...a11yProps(0)}
+        />
+        <Tab sx={{ width: '50%' }} label="Category" {...a11yProps(1)} />
+      </Tabs>
+      <TabPanel value={value} index={0}>
+        <Box flexGrow={2} sx={{ pb: { xs: '70px' } }}>
+          <Typography>{description}</Typography>
+        </Box>
+        <Box
+          sx={{
+            display: { xs: 'flex' },
+            flexDirection: { xs: 'column' },
+            justifyContent: { xs: 'center' },
+            alignItems: { xs: 'center', md: 'flex-end' },
+          }}
+        >
+          <Typography mb={2}>${price}</Typography>
+          <Button
+            disabled={inCart}
+            onClick={() => addProductToCart(1)}
+            sx={{
+              backgroundColor: '#CBA213',
+              height: 50,
+              width: { xs: '300px', md: '150px' },
+              color: 'white',
+            }}
+          >
+            {inCart ? 'In Cart' : 'Add to cart'}
+          </Button>
+        </Box>
+      </TabPanel>
+      <TabPanel value={value} index={1}>
+        <Box sx={{ mb: { xs: '60px' } }}>{category}</Box>
+      </TabPanel>{' '}
+    </Grid>
+  );
+};
+
+export default TabContent;

pages/products/[customId].js

@@ -1,12 +1,13 @@
-import { Button, Grid, Tab, Tabs, Typography } from '@mui/material';
+import { Grid, Typography } from '@mui/material';
 import { Box, Container } from '@mui/system';
 import { dehydrate, QueryClient } from '@tanstack/react-query';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import React, { useState } from 'react';
+import React from 'react';
+import GridItem from '../../components/grid-item/GridItem';
 import Loader from '../../components/loader/Loader';
 import ProductCard from '../../components/product-card/ProductCard';
-import TabPanel from '../../components/tab-panel/TabPanel';
+import TabContent from '../../components/tab-content/TabContent';
 import { useFetchSingleProduct } from '../../hooks/useFetchProductData';
 import { getProductData } from '../../requests/products/producDataRequest';
 import { useStore, useStoreUpdate } from '../../store/cart-context';
@@ -21,10 +22,6 @@ const SingleProduct = () => {
 
   const { data, isLoading } = useFetchSingleProduct(customId);
 
-  // const productCategory = data?.product.category;
-
-  const [value, setValue] = useState(0);
-
   const addProductToCart = (quantity) => addCartValue(data.product, quantity);
   const inCart = cartStorage?.some(
     (item) => item.product.customID === data?.product.customID
@@ -32,17 +29,6 @@ const SingleProduct = () => {
     ? true
     : false;
 
-  const handleChange = (event, newValue) => {
-    setValue(newValue);
-  };
-
-  function a11yProps(index) {
-    return {
-      id: `simple-tab-${index}`,
-      'aria-controls': `simple-tabpanel-${index}`,
-    };
-  }
-
   if (isLoading) {
     return <Loader loading={isLoading} />;
   }
@@ -71,61 +57,13 @@ const SingleProduct = () => {
               height={700}
             />
           </Grid>
-          <Grid item xs={12} md={6}>
-            <Tabs
-              sx={{
-                '& button:focus': {
-                  borderTop: '1px solid black',
-                  borderLeft: '1px solid black',
-                  borderRight: '1px solid black',
-                  borderRadius: '5px 5px 0 0',
-                  borderBottom: 'none',
-                },
-              }}
-              value={value}
-              onChange={handleChange}
-              aria-label="basic tabs example"
-            >
-              <Tab
-                sx={{
-                  width: '50%',
-                }}
-                label="Purchase"
-                {...a11yProps(0)}
-              />
-              <Tab sx={{ width: '50%' }} label="Category" {...a11yProps(1)} />
-            </Tabs>
-            <TabPanel value={value} index={0}>
-              <Box flexGrow={2} sx={{ pb: { xs: '70px' } }}>
-                <Typography>{data.product.description}</Typography>
-              </Box>
-              <Box
-                sx={{
-                  display: { xs: 'flex' },
-                  flexDirection: { xs: 'column' },
-                  justifyContent: { xs: 'center' },
-                  alignItems: { xs: 'center', md: 'flex-end' },
-                }}
-              >
-                <Typography mb={2}>${data.product.price}</Typography>
-                <Button
-                  disabled={inCart}
-                  onClick={() => addProductToCart(1)}
-                  sx={{
-                    backgroundColor: '#CBA213',
-                    height: 50,
-                    width: { xs: '300px', md: '150px' },
-                    color: 'white',
-                  }}
-                >
-                  {inCart ? 'In Cart' : 'Add to cart'}
-                </Button>
-              </Box>
-            </TabPanel>
-            <TabPanel value={value} index={1}>
-              <Box sx={{ mb: { xs: '60px' } }}>{data.product.category}</Box>
-            </TabPanel>
-          </Grid>
+          <TabContent
+            description={data?.product.description}
+            inCart={inCart}
+            price={data?.product.price}
+            category={data?.product.category}
+            addProductToCart={addProductToCart}
+          />
         </Grid>
 
         <Typography
@@ -140,16 +78,9 @@ const SingleProduct = () => {
         </Typography>
         <Grid container spacing={2}>
           {data.similarProducts.map((product) => (
-            <Grid
-              key={product._id}
-              item
-              md={4}
-              sm={6}
-              xs={12}
-              sx={{ mb: '100px' }}
-            >
+            <GridItem key={product._id}>
               <ProductCard product={product} />
-            </Grid>
+            </GridItem>
           ))}
         </Grid>
       </Container>

pages/products/index.js

@@ -1,7 +1,7 @@
 import ProductsContent from '../../components/products-content/ProductsContent';
 
 const Products = () => {
-  return <ProductsContent />;
+  return <ProductsContent></ProductsContent>;
 };
 
 export default Products;