Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sort Products by Price and Release Date #26

Closed
wants to merge 7 commits into from
Closed

Sort Products by Price and Release Date #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c555b1
passing empty array as second arg of useEffect
May 10, 2022
6e59959
are properly displaying count of items in cart on navbar
May 10, 2022
28abb0d
cart now closes on click of gray region
May 10, 2022
3ec801d
implementing mockup on cart page (when cart is empty) using flexbox
May 10, 2022
0e13f70
Fix cart subtotal to accurately reflect items in cart
May 10, 2022
5c096ae
Cart is persisted when user does refresh
May 10, 2022
12a8357
On Click of Sort by Price and Sort by Release Date, products should b…
May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions src/Components/Cart.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
import { Dialog, Transition } from "@headlessui/react";
import { XIcon } from "@heroicons/react/outline";
import { ShoppingCartIcon, XIcon } from "@heroicons/react/outline";
import React, { Fragment } from "react";

export default function Cart({ open, setOpen, cart, updateCart }) {
const currencyFormatter = Intl.NumberFormat("en-US", {
style: "currency",
currency: "USD",
});

function calculateSubtotal(cart) {
let subtotal = 0;
cart.map((item) => (subtotal += item.price * item.quantity));
return currencyFormatter.format(subtotal);
}

export default function Cart({ open, setOpen, cart, updateCartAndLocalStorage }) {
let subtotal = calculateSubtotal(cart);
return (
<Transition.Root show={open} as={Fragment}>
<Dialog
Expand All @@ -22,7 +34,10 @@ export default function Cart({ open, setOpen, cart, updateCart }) {
leaveFrom="opacity-100"
leaveTo="opacity-0"
>
<Dialog.Overlay className="absolute inset-0 bg-gray-500 bg-opacity-75 transition-opacity" />
<Dialog.Overlay
onClick={() => setOpen(false)}
className="absolute inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
/>
</Transition.Child>

<div className="pointer-events-none fixed inset-y-0 right-0 flex max-w-full pl-10">
Expand Down Expand Up @@ -52,6 +67,13 @@ export default function Cart({ open, setOpen, cart, updateCart }) {
</div>
</div>

{cart.length === 0 && (
<div className="h-full flex flex-col items-center justify-center">
<ShoppingCartIcon className="w-12" />
<span className="pt-2">Your Cart is Empty.</span>
</div>
)}

<div className="mt-8">
<div className="flow-root">
<ul role="list" className="-my-6 divide-y divide-gray-200">
Expand Down Expand Up @@ -85,7 +107,7 @@ export default function Cart({ open, setOpen, cart, updateCart }) {

return p.quantity > 0;
});
updateCart(newCart);
updateCartAndLocalStorage(newCart);
}}
type="button"
className="font-medium text-gray-500 hover:text-black"
Expand All @@ -105,7 +127,7 @@ export default function Cart({ open, setOpen, cart, updateCart }) {
<div className="border-t border-gray-200 py-6 px-4 sm:px-6">
<div className="flex justify-between text-base font-medium text-gray-900">
<p>Subtotal</p>
<p>$262.00</p>
<p>{subtotal}</p>
</div>
<p className="mt-0.5 text-sm text-gray-500">Shipping and taxes calculated at checkout.</p>
<div className="mt-6">
Expand Down
13 changes: 11 additions & 2 deletions src/Components/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
import { ShoppingBagIcon } from "@heroicons/react/outline";
import React from "react";

export default function NavBar({ setOpen }) {
function countItemsInCart(cart) {
let count = 0;
cart.map((item) => (count += item.quantity));
return count;
}

export default function NavBar({ setOpen, cart }) {
let itemsInCart = countItemsInCart(cart);
return (
<div className="bg-white">
<header className="relative">
Expand Down Expand Up @@ -41,7 +48,9 @@ export default function NavBar({ setOpen }) {
className="flex-shrink-0 h-6 w-6 text-gray-400 group-hover:text-gray-500"
aria-hidden="true"
/>
<span className="ml-2 text-sm font-medium text-gray-700 group-hover:text-gray-800">0</span>
<span className="ml-2 text-sm font-medium text-gray-700 group-hover:text-gray-800">
{itemsInCart}
</span>
<span className="sr-only">items in cart, view bag</span>
</button>
</div>
Expand Down
13 changes: 11 additions & 2 deletions src/Components/ProductFilters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,21 @@ export default function ProductFilters({ filterOptions, setFilterOptions, sortOp
>
<Menu.Items className="origin-top-right absolute right-0 mt-2 w-40 rounded-md shadow-2xl bg-white ring-1 ring-black ring-opacity-5 focus:outline-none">
<div className="py-1">
{sortOptions.map((option) => (
{sortOptions.map((option, optionIdx) => (
<Menu.Item key={option.name}>
{({ active }) => (
<button
onClick={() => {
// TODO
let newSortOptions = [...sortOptions];
if (optionIdx == 0) {
newSortOptions[0].current = !newSortOptions[0].current;
newSortOptions[1].current = false;
} else {
newSortOptions[0].current = false;
newSortOptions[1].current = !newSortOptions[1].current;
}

setSortOptions(newSortOptions);
}}
className={classNames(
option.current ? "font-medium text-gray-900" : "text-gray-500",
Expand Down
28 changes: 25 additions & 3 deletions src/Components/ProductTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ const getDefaultSortOptions = () => {
];
};

export default function ProductTable({ cart, updateCart }) {
let originalProducts = [];

export default function ProductTable({ cart, updateCartAndLocalStorage }) {
let [products, setProducts] = useState([]);

const [filterOptions, setFilterOptions] = useState(getDefaultFilterOptions());
Expand All @@ -37,8 +39,28 @@ export default function ProductTable({ cart, updateCart }) {
console.info("Fetching Products...");
let res = await fetch("http://localhost:3001/products");
let body = await res.json();
originalProducts = body;
setProducts(body);
});
}, []);

useEffect(() => {
let option = sortOptions.filter((option) => option.current);
let newProducts = [...products];

if (option.length === 0) return setProducts(originalProducts);

newProducts.sort((product1, product2) => {
if (option[0].name === "Price") {
//sort by price
return product2.price - product1.price;
} else {
// sort by release date
return Number(product2.releaseDate) - Number(product1.releaseDate);
}
});

setProducts(newProducts);
}, [sortOptions]);

return (
<div className="bg-white">
Expand Down Expand Up @@ -72,7 +94,7 @@ export default function ProductTable({ cart, updateCart }) {
});
}

updateCart(newCart);
updateCartAndLocalStorage(newCart);
}}
>
Add To Cart
Expand Down
19 changes: 15 additions & 4 deletions src/Pages/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,26 @@ import Cart from "../Components/Cart";
import NavBar from "../Components/NavBar";
import ProductTable from "../Components/ProductTable";

const cartKey = "cart";

function getCart() {
return JSON.parse(window.localStorage.getItem(cartKey)) || [];
}

function Home() {
const [open, setOpen] = useState(false);
const [cart, updateCart] = useState([]);
const [cart, updateCart] = useState(getCart());

const updateCartAndLocalStorage = (c) => {
updateCart(c);
window.localStorage.setItem(cartKey, JSON.stringify(c));
};

return (
<main>
<NavBar {...{ setOpen }} />
<Cart {...{ open, setOpen, cart, updateCart }} />
<ProductTable {...{ cart, updateCart }} />
<NavBar {...{ setOpen, cart }} />
<Cart {...{ open, setOpen, cart, updateCartAndLocalStorage }} />
<ProductTable {...{ cart, updateCartAndLocalStorage }} />
</main>
);
}
Expand Down