From ecd671ebdf0b9e5d5afa7e91fd28e3cdd1e53478 Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:27:18 -0800 Subject: [PATCH 001/101] Almost Done --- src/api/supabase/queries/order_queries.ts | 42 ++++++++++++++--------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 3274daf4..24931c69 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,8 +1,9 @@ /* eslint-disable no-console */ // -import { Order, OrderProduct } from '../../../schema/schema'; +import { Order, OrderProduct , Product } from '../../../schema/schema'; import { fetchUser } from './user_queries'; +import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; /** @@ -74,6 +75,7 @@ export async function fetchOrdersByUser(): Promise { return data; } + /** * gets all orders by user id and sorted it by creation data * @param Order[] - An array of Order objects. @@ -94,6 +96,12 @@ export async function fetchNOrdersByUserIdSorted(n: number): Promise { return sortOrdersByCreated(orders).slice(0, n); } +export async function fetchOrderIdsByUserIdSorted(): Promise { + const ordersProm = await fetchOrdersByUser(); + const orders = sortOrdersByCreated(ordersProm); + return orders.map(order => order.id); +} + export async function fetchOrderProductById( productId: number, ): Promise { @@ -108,20 +116,22 @@ export async function fetchOrderProductById( return orderProduct; } -export async function fetchRecentOrderProducts(): Promise { - const order = await fetchNOrdersByUserIdSorted(1); - const orderProductIds = order[0].order_product_id_array; - - const orderProducts = await Promise.all( - orderProductIds.map(async orderProductId => { - try { - const orderProduct = await fetchOrderProductById(orderProductId); - return orderProduct; - } catch (error) { - throw new Error(`Error fetching order product array.`); - } - }), - ); +export async function fetchProductFromOrderProduct(orderProductId: number): Promise{ + const orderProduct = await fetchOrderProductById(orderProductId); + const product = await fetchProductByID(orderProduct.product_id); + return product; + +} + +export async function fetchProductsFromOrder(orderId: number):Promise { + const order = await getOrderById(orderId); + const products = order.order_product_id_array; + + const productPromises = products.map(async (productID: number) => { + const product = await fetchProductFromOrderProduct(productID); + return product; + }); + const fetchedProducts = await Promise.all(productPromises); - return orderProducts; + return fetchedProducts; } From 1138da0acb171525e97f06d35ecf3d84bc85c89e Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:27:35 -0800 Subject: [PATCH 002/101] Almost --- src/app/orderHistory/page.tsx | 45 ++++++++++++++ src/app/orderHistory/styles.ts | 54 +++++++++++++++++ src/components/OrderHistory/Chevron_Right.svg | 8 +++ src/components/OrderHistory/ImageCarousel.tsx | 31 ++++++++++ .../OrderHistory/OrderHistoryBox.tsx | 60 +++++++++++++++++++ .../OrderHistory/OrderHistoryText.tsx | 34 +++++++++++ src/components/OrderHistory/styles.ts | 59 ++++++++++++++++++ 7 files changed, 291 insertions(+) create mode 100644 src/app/orderHistory/page.tsx create mode 100644 src/app/orderHistory/styles.ts create mode 100644 src/components/OrderHistory/Chevron_Right.svg create mode 100644 src/components/OrderHistory/ImageCarousel.tsx create mode 100644 src/components/OrderHistory/OrderHistoryBox.tsx create mode 100644 src/components/OrderHistory/OrderHistoryText.tsx create mode 100644 src/components/OrderHistory/styles.ts diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx new file mode 100644 index 00000000..65d3c7e1 --- /dev/null +++ b/src/app/orderHistory/page.tsx @@ -0,0 +1,45 @@ +'use client'; + +import React, { useEffect, useState } from 'react'; +import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; +import {fetchOrderIdsByUserIdSorted} from '../../api/supabase/queries/order_queries'; +import { GlobalStyle, OrderHistoryContainer, OutterBox, FooterMoved, NavBarMovedUP } from './styles'; +import BackButton from '../../components/BackButton/BackButton'; + + +function OrderHistory() { + const [orderIds, setOrderIds] = useState([]); + + useEffect(() => { + const fetchIds = async () => { + const ids = await fetchOrderIdsByUserIdSorted(); + setOrderIds(ids); + }; + + fetchIds(); + }, []); + + return ( +
+ + + + +

Order History

+ + + {orderIds.length > 0 ? ( + orderIds.map((orderId: number) => ( + + )) + ) : ( +
Loading...
+ )} + + + +
+ ); +} + +export default OrderHistory; \ No newline at end of file diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts new file mode 100644 index 00000000..84c13161 --- /dev/null +++ b/src/app/orderHistory/styles.ts @@ -0,0 +1,54 @@ +// styles.ts (for styled-components) +import styled, { createGlobalStyle } from 'styled-components'; +import NavBar from '../../components/NavBarFolder/NavBar'; + +import Footer from '../../components/FooterFolder/Footer'; + + +export const FooterMoved = styled(Footer)` + transform: translateY(50px); +`; + +export const NavBarMovedUP = styled(NavBar)` + position: relative; +`; + +export const GlobalStyle = createGlobalStyle` + body { + background:white; + color: black; + overflow: visible; + } +`; + +export const OutterBox = styled.div` + width: 900px; + margin-left: 500px; +`; + + +export const OrderHistoryContainer = styled.div` +display: flex; +flex-direction: column; +border-radius: 10px; +background: var(--White, #fff); +box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); +width: 900px; +height: 1021px; +overflow: scroll; +margin-top: 10px; +`; + +export const OrderHistoryBox = styled.div` + width: 80%; + max-width: 960px; // Adjust to match the design width + margin: 20px 0; // Spacing between the orders + padding: 30px; // Inner spacing + border-radius: 8px; + background: #fff; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + gap: 20px; + overflow-y: auto; +`; diff --git a/src/components/OrderHistory/Chevron_Right.svg b/src/components/OrderHistory/Chevron_Right.svg new file mode 100644 index 00000000..d116c6dc --- /dev/null +++ b/src/components/OrderHistory/Chevron_Right.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx new file mode 100644 index 00000000..1ed6e678 --- /dev/null +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -0,0 +1,31 @@ +/* eslint-disable react/no-array-index-key */ +import React from 'react'; + +interface ImageGalleryProps { + images: string[]; // Array of image URLs +} + +export default function ImageGallery(props: ImageGalleryProps) { + const { images } = props; + + return ( +
+ {images.map((image, index) => ( +
+ {`Gallery +
+ ))} +
+ ); +} diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx new file mode 100644 index 00000000..0e9ea7dd --- /dev/null +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -0,0 +1,60 @@ +'use client'; + +// Importing the required components and styles +import React, { useState, useEffect } from 'react'; +import { Order, Product} from '../../schema/schema'; +import {getOrderById, fetchProductsFromOrder } from '../../api/supabase/queries/order_queries'; +import ImageCarousel from './ImageCarousel'; +import OrderHistoryText from './OrderHistoryText'; + +interface OrderDetailsWithProductsProps { + orderId: number; +} + +export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithProductsProps) { + const [order, setOrder] = useState(null); + const [products, setProducts] = useState([]); + const [loading, setLoading] = useState(true); + + useEffect(() => { + const fetchData = async () => { + setLoading(true); + try { + const fetchedOrder = await getOrderById(orderId); + const fetchedProducts = await fetchProductsFromOrder(orderId); + setOrder(fetchedOrder); + setProducts(fetchedProducts); + } + finally { + setLoading(false); + } + }; + + fetchData(); + }, [orderId]); + + if (loading) { + return
Loading...
; + } + + if (!order) { + return
Order not found.
; + } + + + + const imageUrls = products.map(product => product.photo); + + return ( +
+
+ + +
+
+ ); +} \ No newline at end of file diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx new file mode 100644 index 00000000..4d69436c --- /dev/null +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -0,0 +1,34 @@ +import React from 'react'; +import { useRouter } from 'next/navigation'; +import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + +interface OrderDetailsProps { + date: string; + orderNumber: string; + status: string; // Define more statuses if needed +} + +export default function OrderDetails(props: OrderDetailsProps) { + const { date, orderNumber, status } = props; + const router = useRouter(); + + const viewOrder = () => { + // Navigate to the order details page + router.push(`/order/${orderNumber}`); + }; + + return ( +
+
+
{date}
+
Order No. {orderNumber}
+
+ {status === 'Confirmed' ? '✓' : '✗'} {status} +
+
+ + View order + +
+ ); +} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts new file mode 100644 index 00000000..acb126f8 --- /dev/null +++ b/src/components/OrderHistory/styles.ts @@ -0,0 +1,59 @@ +// styles.ts +import styled from 'styled-components'; +import COLORS from '../../styles/colors'; + + +export const containerStyle = styled.div` + width: 250px; + height: 250px; + margin-right: 130px; + margin-left: 30px; + color: ${COLORS.black}; + text-align: center; + font-family: Public Sans; + font-size: 20px; + font-style: normal; + line-height: normal; +`; + +export const imageGalleryStyle = { + display: 'flex', + overflowX: 'auto', + gap: '10px', + // Add more styles as needed +}; + +export const viewButtonStyle = { + marginTop: '10px', + backgroundColor: 'blue', + color: 'white', + padding: '10px 20px', + cursor: 'pointer', + // Add more styles as needed +}; + + +export const ViewOrderButton = styled.button` + overflow: hidden; + color: var(--Black, #101010); + text-align: right; + text-overflow: ellipsis; + font-family: 'Public Sans', sans-serif; + font-size: 15px; + font-style: normal; + font-weight: 400; + line-height: normal; + text-decoration-line: underline; + background: none; + border: none; + cursor: pointer; + display: flex; + align-items: center; +`; + +export const ArrowIcon = styled.img` + margin-left: 5px; + width: 16px; // Set width as needed + height: 16px; // Set height as needed + // No need to set color since it's an img element +`; \ No newline at end of file From cded9911f2a297df76c2fd8a5f3aa714ad102bb1 Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:31:39 -0800 Subject: [PATCH 003/101] need to figure out image --- src/app/profileScreen/page.tsx | 2 +- src/components/OrderHistory/OrderHistoryText.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 5ca4f9e8..1b340a7d 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -92,7 +92,7 @@ function OrderHistorySection() { Order History - + diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 4d69436c..99404b71 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -27,7 +27,7 @@ export default function OrderDetails(props: OrderDetailsProps) { - View order + View order ); From 6c16907be3b0dd91fc2185453c4423f9ba162131 Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:33:56 -0800 Subject: [PATCH 004/101] prettier --- src/api/supabase/queries/order_queries.ts | 12 +++--- src/app/orderHistory/page.tsx | 19 ++++++---- src/app/orderHistory/styles.ts | 20 +++++----- src/components/OrderHistory/ImageCarousel.tsx | 37 ++++++++++++------- .../OrderHistory/OrderHistoryBox.tsx | 30 ++++++++------- .../OrderHistory/OrderHistoryText.tsx | 11 +++++- src/components/OrderHistory/styles.ts | 4 +- 7 files changed, 77 insertions(+), 56 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 24931c69..51e49c1d 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,7 +1,7 @@ /* eslint-disable no-console */ // -import { Order, OrderProduct , Product } from '../../../schema/schema'; +import { Order, OrderProduct, Product } from '../../../schema/schema'; import { fetchUser } from './user_queries'; import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; @@ -75,7 +75,6 @@ export async function fetchOrdersByUser(): Promise { return data; } - /** * gets all orders by user id and sorted it by creation data * @param Order[] - An array of Order objects. @@ -116,14 +115,17 @@ export async function fetchOrderProductById( return orderProduct; } -export async function fetchProductFromOrderProduct(orderProductId: number): Promise{ +export async function fetchProductFromOrderProduct( + orderProductId: number, +): Promise { const orderProduct = await fetchOrderProductById(orderProductId); const product = await fetchProductByID(orderProduct.product_id); return product; - } -export async function fetchProductsFromOrder(orderId: number):Promise { +export async function fetchProductsFromOrder( + orderId: number, +): Promise { const order = await getOrderById(orderId); const products = order.order_product_id_array; diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 65d3c7e1..afd4554c 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -2,11 +2,16 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; -import {fetchOrderIdsByUserIdSorted} from '../../api/supabase/queries/order_queries'; -import { GlobalStyle, OrderHistoryContainer, OutterBox, FooterMoved, NavBarMovedUP } from './styles'; +import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import { + GlobalStyle, + OrderHistoryContainer, + OutterBox, + FooterMoved, + NavBarMovedUP, +} from './styles'; import BackButton from '../../components/BackButton/BackButton'; - function OrderHistory() { const [orderIds, setOrderIds] = useState([]); @@ -21,11 +26,11 @@ function OrderHistory() { return (
- + - -

Order History

+ +

Order History

{orderIds.length > 0 ? ( @@ -42,4 +47,4 @@ function OrderHistory() { ); } -export default OrderHistory; \ No newline at end of file +export default OrderHistory; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 84c13161..f35c36b1 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -4,7 +4,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const FooterMoved = styled(Footer)` transform: translateY(50px); `; @@ -26,17 +25,16 @@ export const OutterBox = styled.div` margin-left: 500px; `; - export const OrderHistoryContainer = styled.div` -display: flex; -flex-direction: column; -border-radius: 10px; -background: var(--White, #fff); -box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); -width: 900px; -height: 1021px; -overflow: scroll; -margin-top: 10px; + display: flex; + flex-direction: column; + border-radius: 10px; + background: var(--White, #fff); + box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); + width: 900px; + height: 1021px; + overflow: scroll; + margin-top: 10px; `; export const OrderHistoryBox = styled.div` diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index 1ed6e678..cfca61fb 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -9,21 +9,30 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+
{images.map((image, index) => ( -
- {`Gallery +
+ {`Gallery
))}
diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 0e9ea7dd..870344a8 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -2,8 +2,11 @@ // Importing the required components and styles import React, { useState, useEffect } from 'react'; -import { Order, Product} from '../../schema/schema'; -import {getOrderById, fetchProductsFromOrder } from '../../api/supabase/queries/order_queries'; +import { Order, Product } from '../../schema/schema'; +import { + getOrderById, + fetchProductsFromOrder, +} from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; @@ -11,7 +14,9 @@ interface OrderDetailsWithProductsProps { orderId: number; } -export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithProductsProps) { +export default function OrderDetailsWithProducts({ + orderId, +}: OrderDetailsWithProductsProps) { const [order, setOrder] = useState(null); const [products, setProducts] = useState([]); const [loading, setLoading] = useState(true); @@ -24,8 +29,7 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr const fetchedProducts = await fetchProductsFromOrder(orderId); setOrder(fetchedOrder); setProducts(fetchedProducts); - } - finally { + } finally { setLoading(false); } }; @@ -41,20 +45,18 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr return
Order not found.
; } - - const imageUrls = products.map(product => product.photo); return (
- - + +
); -} \ No newline at end of file +} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 99404b71..a7d9e8a6 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -18,7 +18,14 @@ export default function OrderDetails(props: OrderDetailsProps) { }; return ( -
+
{date}
Order No. {orderNumber}
@@ -27,7 +34,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index acb126f8..862f7cc8 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -2,7 +2,6 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; - export const containerStyle = styled.div` width: 250px; height: 250px; @@ -32,7 +31,6 @@ export const viewButtonStyle = { // Add more styles as needed }; - export const ViewOrderButton = styled.button` overflow: hidden; color: var(--Black, #101010); @@ -56,4 +54,4 @@ export const ArrowIcon = styled.img` width: 16px; // Set width as needed height: 16px; // Set height as needed // No need to set color since it's an img element -`; \ No newline at end of file +`; From 79d86d41f65076f309fb51f2c4b5a1ba77f94207 Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:36:50 -0800 Subject: [PATCH 005/101] TSC --- src/api/supabase/queries/order_queries.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 51e49c1d..82f78fb1 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -137,3 +137,21 @@ export async function fetchProductsFromOrder( return fetchedProducts; } + +export async function fetchRecentOrderProducts(): Promise { + const order = await fetchNOrdersByUserIdSorted(1); + const orderProductIds = order[0].order_product_id_array; + + const orderProducts = await Promise.all( + orderProductIds.map(async orderProductId => { + try { + const orderProduct = await fetchOrderProductById(orderProductId); + return orderProduct; + } catch (error) { + throw new Error(`Error fetching order product array.`); + } + }), + ); + + return orderProducts; +} \ No newline at end of file From 624b98e3a9e054fe9c3a2f166edcb39d44c6878d Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:38:01 -0800 Subject: [PATCH 006/101] prettier --- src/api/supabase/queries/order_queries.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 82f78fb1..383dc6ff 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -154,4 +154,4 @@ export async function fetchRecentOrderProducts(): Promise { ); return orderProducts; -} \ No newline at end of file +} From 9cee959a4a6906a89b81147ad6aa4ec7b5295571 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Sun, 3 Mar 2024 16:12:21 -0800 Subject: [PATCH 007/101] WIP --- holder.zip | Bin 0 -> 48762 bytes src/api/supabase/queries/pickup_queries.ts | 17 ++++++ src/app/cart/styles.tsx | 1 + src/app/login/styles.ts | 4 ++ src/app/orderHistory/styles.ts | 20 ++++--- src/app/pickup/page.tsx | 53 +++++++++++++++--- src/components/OrderHistory/ImageCarousel.tsx | 29 +++------- .../OrderHistory/OrderHistoryBox.tsx | 1 + .../OrderHistory/OrderHistoryText.tsx | 8 ++- src/components/OrderHistory/styles.ts | 41 ++++++++++++-- src/schema/schema.ts | 2 +- 11 files changed, 133 insertions(+), 43 deletions(-) create mode 100644 holder.zip diff --git a/holder.zip b/holder.zip new file mode 100644 index 0000000000000000000000000000000000000000..f73e7a51dab44fcbcef02776374442c3af33e72d GIT binary patch literal 48762 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 { } return getTimes; } + +/** + * + * @returns 2 most recent pickup times + */ +export async function fetchNRecentPickupTimes(n: number): Promise { + const { data: getTimes, error } = await supabase + .from('pickup_times') + .select('*') + .order('start_time', { ascending: false }) + .limit(n); + + if (error) { + throw new Error(`Error fetching pickup times: ${error.message}`); + } + return getTimes; +} \ No newline at end of file diff --git a/src/app/cart/styles.tsx b/src/app/cart/styles.tsx index 8d2594ae..6deb758a 100644 --- a/src/app/cart/styles.tsx +++ b/src/app/cart/styles.tsx @@ -15,6 +15,7 @@ export const GlobalStyle = createGlobalStyle` } `; + export const FavoriteDiv = styled.div` display: flex; flex-direction: row; diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index f53cfee9..036568fe 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -2,6 +2,10 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const LoginBox = styled.div` + flex-direction: column; + justify-content: center; + align-items: center; + position: fixed; display: flex; flex-direction: column; width: 500px; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f35c36b1..6706fc2e 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -6,6 +6,9 @@ import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` transform: translateY(50px); + position: fixed; + left: 0; + bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` @@ -18,30 +21,32 @@ export const GlobalStyle = createGlobalStyle` color: black; overflow: visible; } + `; export const OutterBox = styled.div` width: 900px; - margin-left: 500px; + margin: 0 auto; // This will center the OutterBox `; export const OrderHistoryContainer = styled.div` display: flex; flex-direction: column; + align-items: center; border-radius: 10px; background: var(--White, #fff); box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); - width: 900px; - height: 1021px; + width: 800px; // Width of the outer box + height: 700px; overflow: scroll; margin-top: 10px; + padding: 0; // Ensure there's no padding pushing the internal boxes inward `; export const OrderHistoryBox = styled.div` - width: 80%; - max-width: 960px; // Adjust to match the design width - margin: 20px 0; // Spacing between the orders - padding: 30px; // Inner spacing + width: 100%; // Make internal box take full width of the container + margin: 20px 0; // Keep vertical spacing between orders + padding: 30px; // Inner spacing for content inside the box border-radius: 8px; background: #fff; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); @@ -50,3 +55,4 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; + diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index c8cb6d2c..a35733cf 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,12 +2,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites } from '@/api/supabase/queries/user_queries'; +import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product } from '@/schema/schema'; +import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; +import { Pickup, Product, User } from '@/schema/schema'; + import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, @@ -32,11 +33,30 @@ import { PickupTimeButton, } from './styles'; + +function DateInfoComponent({ date }: { date: Date }) { + const dayOfWeek = date.getDay; + console.log(dayOfWeek); + const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; + + + return { + dayOfWeek, + dateAsMonthDay + }; +} + + +// + export default function Pickup() { const [Cart, setCart] = useState([]); const router = useRouter(); const [Times, setTimes] = useState([]); + const [Profile, setProfile] = useState(); + + useEffect(() => { async function fetchProducts() { const data = await arrayOfFavorites(); // change the function to grab the cartItems as products @@ -47,11 +67,20 @@ export default function Pickup() { useEffect(() => { async function fetchTimes() { - const data = await fetchRecentPickupTimes(); // change the function to grab the cartItems as products + const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); } fetchTimes(); }, []); + + useEffect(() => { + async function fetchUserData() { + const data = await fetchUser(); // change the function to grab the cartItems as products + setProfile(data); + } + fetchUserData(); + }, []); + return (
@@ -68,12 +97,20 @@ export default function Pickup() { Pick Up Name - Ethan Auyeung + {Profile?.first_name} {Profile?.last_name} Phone Number - +1 123-456-7890 - + {Profile?.phone_numbers} + {/* */} - Time + + {Times.length > 0 && ( + <> +
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
+
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
+ + )} + +
Location: 3170 23rd Street, San Francisco, CA 94110
diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cfca61fb..cdd94bea 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,5 +1,7 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; +import {GalleryContainer, ImageContainer, GalleryImage} from './styles' + interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -9,32 +11,15 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+ {images.map((image, index) => ( -
- + -
+ ))} -
+ ); } diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 870344a8..b71090e5 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,6 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; +import { OrderDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index a7d9e8a6..6fb4aa3f 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -2,6 +2,12 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary +function formatDate(isoString: string) { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(isoString); + return date.toLocaleDateString('en-US', options); +} + interface OrderDetailsProps { date: string; orderNumber: string; @@ -27,7 +33,7 @@ export default function OrderDetails(props: OrderDetailsProps) { }} >
-
{date}
+
{formatDate(date)}
Order No. {orderNumber}
{status === 'Confirmed' ? '✓' : '✗'} {status} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index 862f7cc8..bd22fa0f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -3,12 +3,11 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const containerStyle = styled.div` - width: 250px; + width: 250px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; - margin-right: 130px; - margin-left: 30px; + margin-right: auto; // Center the container if that's the intention + margin-left: auto; // Center the container if that's the intention color: ${COLORS.black}; - text-align: center; font-family: Public Sans; font-size: 20px; font-style: normal; @@ -55,3 +54,37 @@ export const ArrowIcon = styled.img` height: 16px; // Set height as needed // No need to set color since it's an img element `; + +export const OrderDiv = styled.div` + display: flex; + flex-direction: row; + align-items: start; + justify-content: space-between; // Changed to space-between to align items to the edges + width: 100%; + margin-bottom: 50px; + margin-top: 30px; + padding-left: 30px; // Adjust as necessary to align with the left edge + padding-right: 130px; // Adjust as necessary to align with the right edge +`; +export const GalleryContainer = styled.div` + display: flex; + overflow-x: auto; + gap: 10px; + padding: 10px; +`; + +export const ImageContainer = styled.div` + flex: 0 0 auto; + background-color: var(--Greyish, #e6e6e6); + width: 124px; + height: 124px; + display: flex; + justify-content: center; + align-items: center; +`; + +export const GalleryImage = styled.img` + max-height: 115px; + max-width: 115px; + display: block; +`; \ No newline at end of file diff --git a/src/schema/schema.ts b/src/schema/schema.ts index 3fba9ba3..e483579c 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -11,7 +11,7 @@ export type User = { address_id: string; // UUID fav_items: number[]; // JSONB with item as key and quantity as value num_pets: number; // Integer value containing number of pets - phone_number: string; // User's phone number for pick up orders + phone_numbers: string; // User's phone number for pick up orders pet_prescription: string[]; // JSONB with pet_name as key and perscription as value }; From 287e758218cd477091f3ad34f874a9dcaf6683a4 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Sun, 3 Mar 2024 22:38:19 -0800 Subject: [PATCH 008/101] buyankhuu's Edit --- src/app/orderHistory/page.tsx | 5 ++--- src/app/orderHistory/styles.ts | 9 +------- .../OrderHistory/OrderHistoryBox.tsx | 22 +++++++++---------- .../OrderHistory/OrderHistoryText.tsx | 7 +++++- src/components/OrderHistory/styles.ts | 8 ++++++- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index afd4554c..104dfcae 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import Footer from '../../components/FooterFolder/Footer'; import { GlobalStyle, OrderHistoryContainer, @@ -27,11 +28,9 @@ function OrderHistory() { return (
-

Order History

- {orderIds.length > 0 ? ( orderIds.map((orderId: number) => ( @@ -42,7 +41,7 @@ function OrderHistory() { )} - +
); } diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6706fc2e..3e2047c8 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -15,14 +15,7 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; -export const GlobalStyle = createGlobalStyle` - body { - background:white; - color: black; - overflow: visible; - } - -`; + export const OutterBox = styled.div` width: 900px; diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index b71090e5..feb7f8da 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv } from './styles'; +import { OrderDiv, RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; @@ -46,18 +46,16 @@ export default function OrderDetailsWithProducts({ return
Order not found.
; } - const imageUrls = products.map(product => product.photo); + const imageUrls = products.map(product => product.photo).slice(0, 3); return ( -
-
- - -
-
+ + + + ); } diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 6fb4aa3f..bf1187a0 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -3,7 +3,11 @@ import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary function formatDate(isoString: string) { - const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const options: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric', + }; const date = new Date(isoString); return date.toLocaleDateString('en-US', options); } @@ -40,6 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
+ {/**DO NOT USE IMAGE Please use the icon in the feather library! */} View order
diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index bd22fa0f..a59e2442 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -87,4 +87,10 @@ export const GalleryImage = styled.img` max-height: 115px; max-width: 115px; display: block; -`; \ No newline at end of file +`; + +export const RowDiv = styled.div` + width: 700px; + height: 400px; + margin-bottom: 50px; +`; From 467b6c92d11b4a9286762c3614b4d9550cae306b Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Fri, 8 Mar 2024 00:09:56 -0800 Subject: [PATCH 009/101] toastFix --- src/app/profileScreen/page.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 504420d4..3ad0f06d 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { useRouter } from 'next/navigation'; -import { toast } from 'react-toastify'; +import { toast, ToastContainer } from 'react-toastify'; import { useEffect, useState } from 'react'; import { Heading2, @@ -223,6 +223,12 @@ export default function Profile() { My Profile + {user.delivery_allowed ? ( From cd35ef37152910dfe4111fccda49194856f9b6bc Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Sat, 9 Mar 2024 19:36:58 -0800 Subject: [PATCH 010/101] WIP{ --- src/api/supabase/queries/order_queries.ts | 24 +++++++ src/app/pickup/page.tsx | 76 ++++++++++++++++------- src/app/pickup/styles.ts | 4 +- 3 files changed, 81 insertions(+), 23 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 22cc1040..0ca062ad 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -33,6 +33,7 @@ export async function createOrder() { .insert({ user_id: user.id }) .select('*') .single(); + if (error) { throw new Error(`Error creating order: ${error.message}`); } @@ -55,6 +56,8 @@ function sortOrdersByCreated(orders: Order[]): Order[] { ); } + + /** * user = fetch_use() * cart_id = user.cart_id @@ -180,3 +183,24 @@ export async function fetchCurrentOrdersByUser(): Promise { return data; } + + + + + +export async function updateOrderPickupId(orderId: number, pickupId: number) { + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', orderId); +} + + +export async function updateCartPickupId(pickupId: number) { + const user = await fetchUser(); + const cartId = user.cart_id; + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', cartId); +} \ No newline at end of file diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 7be1611f..fe06211d 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -3,11 +3,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import { useState, useEffect } from 'react'; +import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product, User } from '@/schema/schema'; +import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; +import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -33,14 +35,20 @@ import { } from './styles'; -function DateInfoComponent({ date }: { date: Date }) { - const dayOfWeek = date.getDay; - console.log(dayOfWeek); - const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; +function DateInfoComponent(date: string) { + const date1 = new Date(date.date); + + + + const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const getDayOfWeek = daysOfWeek[date1.getDay()]; + + const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); + return { - dayOfWeek, + getDayOfWeek, dateAsMonthDay }; } @@ -49,7 +57,7 @@ function DateInfoComponent({ date }: { date: Date }) { // export default function Pickup() { - const [Cart, setCart] = useState([]); + const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); @@ -58,7 +66,7 @@ export default function Pickup() { useEffect(() => { async function fetchProducts() { - const data = await arrayOfFavorites(); // change the function to grab the cartItems as products + const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products setCart(data); } async function fetchTimes() { @@ -78,6 +86,12 @@ export default function Pickup() { fetchUserData(); }, []); + const [selectedPickupIndex, setSelectedPickupIndex] = useState(null); + + const handleButtonClick = (index: SetStateAction) => { + setSelectedPickupIndex(index); + }; + return (
@@ -99,14 +113,18 @@ export default function Pickup() { {Profile?.phone_numbers} {/* */} - - {Times.length > 0 && ( - <> -
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
-
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
- - )} - +
+ {Time.map((time, index) => ( + handleButtonClick(index)} + > +
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
+
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+ + ))} +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -128,16 +146,30 @@ export default function Pickup() { - 10 + {Cart.reduce((acc, item) => acc + item.quantity, 0)} router.push('/orderConfirmationPickUp')} - > - Place Order - + // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace + // it with an empty cart convettying it to an order and then redirecting to the order + // confirmation page + onClick={async () => { + // Add the pickup ID to the order + const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + if (pickupId) { + await updateCartPickupId(pickupId); + + // Add your code here to update the order with the pickup ID + // For example: + // const updatedOrder = await updateOrderWithPickupId(orderId, pickupId); + // console.log(updatedOrder); + } + router.push('/orderConfirmationPickUp'); + }}> + Checkout +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 5e40dacb..56a9d594 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,6 +6,7 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; + export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -30,7 +31,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - background: ${COLORS.lightGrey}; + + background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; height: 124px; width: 242px; From f0929fdd14bf751db60875acfc46b9f8613b0250 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Sat, 9 Mar 2024 19:41:25 -0800 Subject: [PATCH 011/101] WIP --- src/app/pickup/page.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fe06211d..fc70381e 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -155,6 +155,7 @@ export default function Pickup() { // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace // it with an empty cart convettying it to an order and then redirecting to the order // confirmation page + onClick={async () => { // Add the pickup ID to the order const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; From 13f03908da97cde4a6823c98405b42fb3aa1ff9b Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 14:06:26 -0700 Subject: [PATCH 012/101] WIP --- src/api/supabase/queries/order_queries.ts | 11 +-- src/api/supabase/queries/pickup_queries.ts | 2 +- src/app/delivery/page.tsx | 6 +- src/app/orderConfirmationDelivery/page.tsx | 2 - src/app/orderConfirmationPickUp/page.tsx | 3 - src/app/orderHistory/page.tsx | 2 - src/app/orderHistory/styles.ts | 5 +- src/app/pickup/page.tsx | 81 ++++++++++++------- src/app/pickup/styles.ts | 5 +- src/components/OrderHistory/ImageCarousel.tsx | 8 +- .../OrderHistory/OrderHistoryBox.tsx | 2 +- .../OrderHistory/OrderHistoryText.tsx | 2 +- 12 files changed, 63 insertions(+), 66 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 0ca062ad..c740a606 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -33,7 +33,7 @@ export async function createOrder() { .insert({ user_id: user.id }) .select('*') .single(); - + if (error) { throw new Error(`Error creating order: ${error.message}`); } @@ -56,8 +56,6 @@ function sortOrdersByCreated(orders: Order[]): Order[] { ); } - - /** * user = fetch_use() * cart_id = user.cart_id @@ -184,10 +182,6 @@ export async function fetchCurrentOrdersByUser(): Promise { return data; } - - - - export async function updateOrderPickupId(orderId: number, pickupId: number) { await supabase .from('order') @@ -195,7 +189,6 @@ export async function updateOrderPickupId(orderId: number, pickupId: number) { .eq('id', orderId); } - export async function updateCartPickupId(pickupId: number) { const user = await fetchUser(); const cartId = user.cart_id; @@ -203,4 +196,4 @@ export async function updateCartPickupId(pickupId: number) { .from('order') .update({ pickup_time_id: pickupId }) .eq('id', cartId); -} \ No newline at end of file +} diff --git a/src/api/supabase/queries/pickup_queries.ts b/src/api/supabase/queries/pickup_queries.ts index b43eff84..df2dfcb0 100644 --- a/src/api/supabase/queries/pickup_queries.ts +++ b/src/api/supabase/queries/pickup_queries.ts @@ -66,4 +66,4 @@ export async function fetchNRecentPickupTimes(n: number): Promise { throw new Error(`Error fetching pickup times: ${error.message}`); } return getTimes; -} \ No newline at end of file +} diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 2b794d7c..34d9ec66 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,19 +8,15 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import { fetchRecentOrderProducts } from '../../api/supabase/queries/order_queries'; -import { OrderProduct, ProductWithQuantity } from '../../schema/schema'; +import {ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; -import ItemRows from './itemRows'; import NavBar from '../../components/NavBarFolder/NavBar'; import { DeliveryContainer, OrderContainer, - OrderSummaryText, OrderButton, InformationContainer, InformationText, - QtyText, } from './styles'; export default function App() { diff --git a/src/app/orderConfirmationDelivery/page.tsx b/src/app/orderConfirmationDelivery/page.tsx index 412e9231..af027295 100644 --- a/src/app/orderConfirmationDelivery/page.tsx +++ b/src/app/orderConfirmationDelivery/page.tsx @@ -16,12 +16,10 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import { FavoriteDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, CenterBox, AddressDiv, diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx index 4cf471d9..65b42154 100644 --- a/src/app/orderConfirmationPickUp/page.tsx +++ b/src/app/orderConfirmationPickUp/page.tsx @@ -16,14 +16,11 @@ import { FavoriteDiv, ColDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, - PickUpText, CenterBox, AddressDiv, } from './styles'; diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 104dfcae..bff5b701 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -5,10 +5,8 @@ import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistory import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; import { - GlobalStyle, OrderHistoryContainer, OutterBox, - FooterMoved, NavBarMovedUP, } from './styles'; import BackButton from '../../components/BackButton/BackButton'; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 3e2047c8..f62918e2 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -1,5 +1,5 @@ // styles.ts (for styled-components) -import styled, { createGlobalStyle } from 'styled-components'; +import styled from 'styled-components'; import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; @@ -15,8 +15,6 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; - - export const OutterBox = styled.div` width: 900px; margin: 0 auto; // This will center the OutterBox @@ -48,4 +46,3 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; - diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fc70381e..ccb1987f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,14 +2,18 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { + fetchUser, +} from '@/api/supabase/queries/user_queries'; +import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; -import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; +import { + fetchNRecentPickupTimes, +} from '@/api/supabase/queries/pickup_queries'; +import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; +import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -34,26 +38,31 @@ import { PickupTimeButton, } from './styles'; - function DateInfoComponent(date: string) { const date1 = new Date(date.date); - - - const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const daysOfWeek = [ + 'Sunday', + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + ]; const getDayOfWeek = daysOfWeek[date1.getDay()]; - const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); - - + const dateAsMonthDay = date1.toLocaleDateString(undefined, { + month: 'long', + day: 'numeric', + }); return { getDayOfWeek, - dateAsMonthDay + dateAsMonthDay, }; } - // export default function Pickup() { @@ -63,7 +72,6 @@ export default function Pickup() { const [Profile, setProfile] = useState(); - useEffect(() => { async function fetchProducts() { const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products @@ -77,7 +85,7 @@ export default function Pickup() { fetchProducts(); fetchTimes(); }, []); - + useEffect(() => { async function fetchUserData() { const data = await fetchUser(); // change the function to grab the cartItems as products @@ -92,7 +100,6 @@ export default function Pickup() { setSelectedPickupIndex(index); }; - return (
@@ -108,7 +115,9 @@ export default function Pickup() { Pick Up Name - {Profile?.first_name} {Profile?.last_name} + + {Profile?.first_name} {Profile?.last_name} + Phone Number {Profile?.phone_numbers} {/* */} @@ -116,16 +125,26 @@ export default function Pickup() {
{Time.map((time, index) => ( handleButtonClick(index)} > -
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
-
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+
+ {String( + DateInfoComponent({ date: time.start_time }) + ?.getDayOfWeek, + )} +
+
+ { + DateInfoComponent({ date: time.start_time }) + ?.dateAsMonthDay + } +
))}
- +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -152,13 +171,16 @@ export default function Pickup() { { // Add the pickup ID to the order - const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + const pickupId = + selectedPickupIndex !== null + ? Time[selectedPickupIndex]?.id + : null; if (pickupId) { await updateCartPickupId(pickupId); @@ -168,9 +190,10 @@ export default function Pickup() { // console.log(updatedOrder); } router.push('/orderConfirmationPickUp'); - }}> + }} + > Checkout - +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 2573345a..519eeb63 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,7 +6,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -31,8 +30,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - - background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; + background: ${props => + props.isSelected ? COLORS.periwinkle : COLORS.lightGrey}; height: 124px; width: 242px; diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cdd94bea..159adb28 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,7 +1,6 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; -import {GalleryContainer, ImageContainer, GalleryImage} from './styles' - +import { GalleryContainer, ImageContainer, GalleryImage } from './styles'; interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -14,10 +13,7 @@ export default function ImageGallery(props: ImageGalleryProps) { {images.map((image, index) => ( - + ))} diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index feb7f8da..4e9f1962 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv, RowDiv } from './styles'; +import {RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index bf1187a0..d6d2ef07 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -44,7 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- {/**DO NOT USE IMAGE Please use the icon in the feather library! */} + {/** DO NOT USE IMAGE Please use the icon in the feather library! */} View order
From 282a3c72af1b5a458e431f39828c6b758dff922b Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:36:05 -0700 Subject: [PATCH 013/101] WIP --- src/app/orderHistory/styles.ts | 4 +--- src/app/pickup/page.tsx | 7 +++++-- src/components/OrderHistory/OrderHistoryText.tsx | 3 ++- src/components/OrderHistory/styles.ts | 10 ++++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f62918e2..6fe1a260 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,10 +5,8 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - transform: translateY(50px); - position: fixed; + left: 0; - bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index ccb1987f..a7f3bd44 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -120,8 +120,11 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers} - {/* */} - +
+ Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM +
+
{Time.map((time, index) => ( {/** DO NOT USE IMAGE Please use the icon in the feather library! */} - View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index a59e2442..f6eee23f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -48,11 +48,13 @@ export const ViewOrderButton = styled.button` align-items: center; `; -export const ArrowIcon = styled.img` +export const ArrowIcon = styled.div` + width: 0; + height: 0; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid var(--Black, #101010); margin-left: 5px; - width: 16px; // Set width as needed - height: 16px; // Set height as needed - // No need to set color since it's an img element `; export const OrderDiv = styled.div` From 60bf3884646e20bf80c3fcec875b3e72259fde79 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:37:22 -0700 Subject: [PATCH 014/101] WIP --- src/app/delivery/page.tsx | 2 +- src/app/orderHistory/page.tsx | 6 +----- src/app/orderHistory/styles.ts | 1 - src/app/pickup/page.tsx | 16 +++++----------- src/components/OrderHistory/OrderHistoryBox.tsx | 2 +- src/components/OrderHistory/OrderHistoryText.tsx | 1 - 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 34d9ec66..c0688332 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,7 +8,7 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import {ProductWithQuantity } from '../../schema/schema'; +import { ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; import NavBar from '../../components/NavBarFolder/NavBar'; import { diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index bff5b701..dbd474c1 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -4,11 +4,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; -import { - OrderHistoryContainer, - OutterBox, - NavBarMovedUP, -} from './styles'; +import { OrderHistoryContainer, OutterBox, NavBarMovedUP } from './styles'; import BackButton from '../../components/BackButton/BackButton'; function OrderHistory() { diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6fe1a260..543a736b 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,7 +5,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - left: 0; `; diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index a7f3bd44..441d3f1b 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,20 +2,15 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { - fetchUser, -} from '@/api/supabase/queries/user_queries'; +import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { - fetchNRecentPickupTimes, -} from '@/api/supabase/queries/pickup_queries'; +import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; -import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, OrderSummaryDiv, @@ -80,7 +75,6 @@ export default function Pickup() { async function fetchTimes() { const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); - console.log(Time); } fetchProducts(); fetchTimes(); @@ -121,10 +115,10 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers}
- Pick Up Time - Pick Up times: 10:00 AM - 12:00 PM + Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM
- +
{Time.map((time, index) => ( Date: Wed, 13 Mar 2024 17:42:16 -0700 Subject: [PATCH 015/101] WIP --- src/app/pickup/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 441d3f1b..392868fd 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,8 +33,8 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: string) { - const date1 = new Date(date.date); +function DateInfoComponent(date: { date: unknown; }) { + const date1 = new Date(date.date as string); const daysOfWeek = [ 'Sunday', From 271c77dec8dcfbd7d83b49e98d276f057fff76d0 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:43:18 -0700 Subject: [PATCH 016/101] prettier --- src/app/pickup/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 392868fd..22a02c4f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,7 +33,7 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: { date: unknown; }) { +function DateInfoComponent(date: { date: unknown }) { const date1 = new Date(date.date as string); const daysOfWeek = [ From e0886d7b8bf61e276ebf8b7b9a2e3714edddf082 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 00:59:50 -0700 Subject: [PATCH 017/101] rebase1 --- src/api/supabase/queries/order_queries.ts | 56 ++++++++++------------- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 5f3076ca..ba2d5233 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,12 +1,9 @@ /* eslint-disable no-console */ // -import { - Order, - OrderProduct, - ProductWithQuantity, -} from '../../../schema/schema'; +import { Order, OrderProduct, Product } from '../../../schema/schema'; import { fetchUser } from './user_queries'; +import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; /** @@ -103,6 +100,12 @@ export async function fetchNOrdersByUserIdSorted(n: number): Promise { return sortOrdersByCreated(orders).slice(0, n); } +export async function fetchOrderIdsByUserIdSorted(): Promise { + const ordersProm = await fetchOrdersByUser(); + const orders = sortOrdersByCreated(ordersProm); + return orders.map(order => order.id); +} + export async function fetchOrderProductById( productId: number, ): Promise { @@ -117,36 +120,27 @@ export async function fetchOrderProductById( return orderProduct; } -export async function fetchProductWithQuantityById( - productId: number, -): Promise { - const { data: orderProduct, error } = await supabase - .from('product') - .select('*') - .eq('id', productId) - .single(); - if (error) { - throw new Error(`Error fetching order product: ${error.message}`); - } - return orderProduct; +export async function fetchProductFromOrderProduct( + orderProductId: number, +): Promise { + const orderProduct = await fetchOrderProductById(orderProductId); + const product = await fetchProductByID(orderProduct.product_id); + return product; } -export async function fetchRecentOrderProducts(): Promise { - const order = await fetchNOrdersByUserIdSorted(1); - const orderProductIds = order[0].order_product_id_array; +export async function fetchProductsFromOrder( + orderId: number, +): Promise { + const order = await getOrderById(orderId); + const products = order.order_product_id_array; - const orderProducts = await Promise.all( - orderProductIds.map(async orderProductId => { - try { - const orderProduct = await fetchOrderProductById(orderProductId); - return orderProduct; - } catch (error) { - throw new Error(`Error fetching order product array.`); - } - }), - ); + const productPromises = products.map(async (productID: number) => { + const product = await fetchProductFromOrderProduct(productID); + return product; + }); + const fetchedProducts = await Promise.all(productPromises); - return orderProducts; + return fetchedProducts; } export async function fetchOrderProductsbyOrderId( From 2b3973c41c9247c8c5263ef8565ef5251b92969b Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:27:35 -0800 Subject: [PATCH 018/101] Almost --- src/app/orderHistory/page.tsx | 45 ++++++++++++++ src/app/orderHistory/styles.ts | 54 +++++++++++++++++ src/components/OrderHistory/Chevron_Right.svg | 8 +++ src/components/OrderHistory/ImageCarousel.tsx | 31 ++++++++++ .../OrderHistory/OrderHistoryBox.tsx | 60 +++++++++++++++++++ .../OrderHistory/OrderHistoryText.tsx | 34 +++++++++++ src/components/OrderHistory/styles.ts | 59 ++++++++++++++++++ 7 files changed, 291 insertions(+) create mode 100644 src/app/orderHistory/page.tsx create mode 100644 src/app/orderHistory/styles.ts create mode 100644 src/components/OrderHistory/Chevron_Right.svg create mode 100644 src/components/OrderHistory/ImageCarousel.tsx create mode 100644 src/components/OrderHistory/OrderHistoryBox.tsx create mode 100644 src/components/OrderHistory/OrderHistoryText.tsx create mode 100644 src/components/OrderHistory/styles.ts diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx new file mode 100644 index 00000000..65d3c7e1 --- /dev/null +++ b/src/app/orderHistory/page.tsx @@ -0,0 +1,45 @@ +'use client'; + +import React, { useEffect, useState } from 'react'; +import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; +import {fetchOrderIdsByUserIdSorted} from '../../api/supabase/queries/order_queries'; +import { GlobalStyle, OrderHistoryContainer, OutterBox, FooterMoved, NavBarMovedUP } from './styles'; +import BackButton from '../../components/BackButton/BackButton'; + + +function OrderHistory() { + const [orderIds, setOrderIds] = useState([]); + + useEffect(() => { + const fetchIds = async () => { + const ids = await fetchOrderIdsByUserIdSorted(); + setOrderIds(ids); + }; + + fetchIds(); + }, []); + + return ( +
+ + + + +

Order History

+ + + {orderIds.length > 0 ? ( + orderIds.map((orderId: number) => ( + + )) + ) : ( +
Loading...
+ )} + + + +
+ ); +} + +export default OrderHistory; \ No newline at end of file diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts new file mode 100644 index 00000000..84c13161 --- /dev/null +++ b/src/app/orderHistory/styles.ts @@ -0,0 +1,54 @@ +// styles.ts (for styled-components) +import styled, { createGlobalStyle } from 'styled-components'; +import NavBar from '../../components/NavBarFolder/NavBar'; + +import Footer from '../../components/FooterFolder/Footer'; + + +export const FooterMoved = styled(Footer)` + transform: translateY(50px); +`; + +export const NavBarMovedUP = styled(NavBar)` + position: relative; +`; + +export const GlobalStyle = createGlobalStyle` + body { + background:white; + color: black; + overflow: visible; + } +`; + +export const OutterBox = styled.div` + width: 900px; + margin-left: 500px; +`; + + +export const OrderHistoryContainer = styled.div` +display: flex; +flex-direction: column; +border-radius: 10px; +background: var(--White, #fff); +box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); +width: 900px; +height: 1021px; +overflow: scroll; +margin-top: 10px; +`; + +export const OrderHistoryBox = styled.div` + width: 80%; + max-width: 960px; // Adjust to match the design width + margin: 20px 0; // Spacing between the orders + padding: 30px; // Inner spacing + border-radius: 8px; + background: #fff; + box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + gap: 20px; + overflow-y: auto; +`; diff --git a/src/components/OrderHistory/Chevron_Right.svg b/src/components/OrderHistory/Chevron_Right.svg new file mode 100644 index 00000000..d116c6dc --- /dev/null +++ b/src/components/OrderHistory/Chevron_Right.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx new file mode 100644 index 00000000..1ed6e678 --- /dev/null +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -0,0 +1,31 @@ +/* eslint-disable react/no-array-index-key */ +import React from 'react'; + +interface ImageGalleryProps { + images: string[]; // Array of image URLs +} + +export default function ImageGallery(props: ImageGalleryProps) { + const { images } = props; + + return ( +
+ {images.map((image, index) => ( +
+ {`Gallery +
+ ))} +
+ ); +} diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx new file mode 100644 index 00000000..0e9ea7dd --- /dev/null +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -0,0 +1,60 @@ +'use client'; + +// Importing the required components and styles +import React, { useState, useEffect } from 'react'; +import { Order, Product} from '../../schema/schema'; +import {getOrderById, fetchProductsFromOrder } from '../../api/supabase/queries/order_queries'; +import ImageCarousel from './ImageCarousel'; +import OrderHistoryText from './OrderHistoryText'; + +interface OrderDetailsWithProductsProps { + orderId: number; +} + +export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithProductsProps) { + const [order, setOrder] = useState(null); + const [products, setProducts] = useState([]); + const [loading, setLoading] = useState(true); + + useEffect(() => { + const fetchData = async () => { + setLoading(true); + try { + const fetchedOrder = await getOrderById(orderId); + const fetchedProducts = await fetchProductsFromOrder(orderId); + setOrder(fetchedOrder); + setProducts(fetchedProducts); + } + finally { + setLoading(false); + } + }; + + fetchData(); + }, [orderId]); + + if (loading) { + return
Loading...
; + } + + if (!order) { + return
Order not found.
; + } + + + + const imageUrls = products.map(product => product.photo); + + return ( +
+
+ + +
+
+ ); +} \ No newline at end of file diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx new file mode 100644 index 00000000..4d69436c --- /dev/null +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -0,0 +1,34 @@ +import React from 'react'; +import { useRouter } from 'next/navigation'; +import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + +interface OrderDetailsProps { + date: string; + orderNumber: string; + status: string; // Define more statuses if needed +} + +export default function OrderDetails(props: OrderDetailsProps) { + const { date, orderNumber, status } = props; + const router = useRouter(); + + const viewOrder = () => { + // Navigate to the order details page + router.push(`/order/${orderNumber}`); + }; + + return ( +
+
+
{date}
+
Order No. {orderNumber}
+
+ {status === 'Confirmed' ? '✓' : '✗'} {status} +
+
+ + View order + +
+ ); +} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts new file mode 100644 index 00000000..acb126f8 --- /dev/null +++ b/src/components/OrderHistory/styles.ts @@ -0,0 +1,59 @@ +// styles.ts +import styled from 'styled-components'; +import COLORS from '../../styles/colors'; + + +export const containerStyle = styled.div` + width: 250px; + height: 250px; + margin-right: 130px; + margin-left: 30px; + color: ${COLORS.black}; + text-align: center; + font-family: Public Sans; + font-size: 20px; + font-style: normal; + line-height: normal; +`; + +export const imageGalleryStyle = { + display: 'flex', + overflowX: 'auto', + gap: '10px', + // Add more styles as needed +}; + +export const viewButtonStyle = { + marginTop: '10px', + backgroundColor: 'blue', + color: 'white', + padding: '10px 20px', + cursor: 'pointer', + // Add more styles as needed +}; + + +export const ViewOrderButton = styled.button` + overflow: hidden; + color: var(--Black, #101010); + text-align: right; + text-overflow: ellipsis; + font-family: 'Public Sans', sans-serif; + font-size: 15px; + font-style: normal; + font-weight: 400; + line-height: normal; + text-decoration-line: underline; + background: none; + border: none; + cursor: pointer; + display: flex; + align-items: center; +`; + +export const ArrowIcon = styled.img` + margin-left: 5px; + width: 16px; // Set width as needed + height: 16px; // Set height as needed + // No need to set color since it's an img element +`; \ No newline at end of file From deb84c73b4f0ec5d6e52fac542e9e418826276f6 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:01:34 -0700 Subject: [PATCH 019/101] check --- src/components/OrderHistory/OrderHistoryText.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 4d69436c..99404b71 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -27,7 +27,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- View order + View order ); From ed61d7f4e028001745198d0d292e553fa85ef25c Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:33:56 -0800 Subject: [PATCH 020/101] prettier --- src/app/orderHistory/page.tsx | 19 ++++++---- src/app/orderHistory/styles.ts | 20 +++++----- src/components/OrderHistory/ImageCarousel.tsx | 37 ++++++++++++------- .../OrderHistory/OrderHistoryBox.tsx | 30 ++++++++------- .../OrderHistory/OrderHistoryText.tsx | 11 +++++- src/components/OrderHistory/styles.ts | 4 +- 6 files changed, 70 insertions(+), 51 deletions(-) diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 65d3c7e1..afd4554c 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -2,11 +2,16 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; -import {fetchOrderIdsByUserIdSorted} from '../../api/supabase/queries/order_queries'; -import { GlobalStyle, OrderHistoryContainer, OutterBox, FooterMoved, NavBarMovedUP } from './styles'; +import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import { + GlobalStyle, + OrderHistoryContainer, + OutterBox, + FooterMoved, + NavBarMovedUP, +} from './styles'; import BackButton from '../../components/BackButton/BackButton'; - function OrderHistory() { const [orderIds, setOrderIds] = useState([]); @@ -21,11 +26,11 @@ function OrderHistory() { return ( From 018695bd104221660f004bb3fa5b0e2ea700074e Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:36:05 -0700 Subject: [PATCH 027/101] WIP --- src/app/orderHistory/styles.ts | 4 +--- src/app/pickup/page.tsx | 7 +++++-- src/components/OrderHistory/OrderHistoryText.tsx | 3 ++- src/components/OrderHistory/styles.ts | 10 ++++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f62918e2..6fe1a260 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,10 +5,8 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - transform: translateY(50px); - position: fixed; + left: 0; - bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index ccb1987f..a7f3bd44 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -120,8 +120,11 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers} - {/* */} - +
+ Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM +
+
{Time.map((time, index) => ( {/** DO NOT USE IMAGE Please use the icon in the feather library! */} - View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index a59e2442..f6eee23f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -48,11 +48,13 @@ export const ViewOrderButton = styled.button` align-items: center; `; -export const ArrowIcon = styled.img` +export const ArrowIcon = styled.div` + width: 0; + height: 0; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid var(--Black, #101010); margin-left: 5px; - width: 16px; // Set width as needed - height: 16px; // Set height as needed - // No need to set color since it's an img element `; export const OrderDiv = styled.div` From bdc114fd5865fca1513e98e22a601e22573bcbd1 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:37:22 -0700 Subject: [PATCH 028/101] WIP --- src/app/delivery/page.tsx | 2 +- src/app/orderHistory/page.tsx | 6 +----- src/app/orderHistory/styles.ts | 1 - src/app/pickup/page.tsx | 16 +++++----------- src/components/OrderHistory/OrderHistoryBox.tsx | 2 +- src/components/OrderHistory/OrderHistoryText.tsx | 1 - 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 34d9ec66..c0688332 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,7 +8,7 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import {ProductWithQuantity } from '../../schema/schema'; +import { ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; import NavBar from '../../components/NavBarFolder/NavBar'; import { diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index bff5b701..dbd474c1 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -4,11 +4,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; -import { - OrderHistoryContainer, - OutterBox, - NavBarMovedUP, -} from './styles'; +import { OrderHistoryContainer, OutterBox, NavBarMovedUP } from './styles'; import BackButton from '../../components/BackButton/BackButton'; function OrderHistory() { diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6fe1a260..543a736b 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,7 +5,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - left: 0; `; diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index a7f3bd44..441d3f1b 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,20 +2,15 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { - fetchUser, -} from '@/api/supabase/queries/user_queries'; +import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { - fetchNRecentPickupTimes, -} from '@/api/supabase/queries/pickup_queries'; +import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; -import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, OrderSummaryDiv, @@ -80,7 +75,6 @@ export default function Pickup() { async function fetchTimes() { const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); - console.log(Time); } fetchProducts(); fetchTimes(); @@ -121,10 +115,10 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers}
- Pick Up Time - Pick Up times: 10:00 AM - 12:00 PM + Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM
- +
{Time.map((time, index) => ( Date: Wed, 13 Mar 2024 17:42:16 -0700 Subject: [PATCH 029/101] WIP --- src/app/pickup/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 441d3f1b..392868fd 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,8 +33,8 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: string) { - const date1 = new Date(date.date); +function DateInfoComponent(date: { date: unknown; }) { + const date1 = new Date(date.date as string); const daysOfWeek = [ 'Sunday', From fc4675a60a84260dfad64ca04b6ab6e412767f56 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:43:18 -0700 Subject: [PATCH 030/101] prettier --- src/app/pickup/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 392868fd..22a02c4f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,7 +33,7 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: { date: unknown; }) { +function DateInfoComponent(date: { date: unknown }) { const date1 = new Date(date.date as string); const daysOfWeek = [ From 7083c8f38d97d474babc7236a3b7b90803b78960 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:14:40 -0700 Subject: [PATCH 031/101] RebasedVersion --- src/api/supabase/queries/order_queries.ts | 42 ++++++++++++++++++++++- src/app/pickup/styles.ts | 3 +- src/app/profileScreen/page.tsx | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index c740a606..2435e3cd 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,7 +1,12 @@ /* eslint-disable no-console */ // -import { Order, OrderProduct, Product } from '../../../schema/schema'; +import { + Order, + OrderProduct, + Product, + ProductWithQuantity, +} from '../../../schema/schema'; import { fetchUser } from './user_queries'; import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; @@ -197,3 +202,38 @@ export async function updateCartPickupId(pickupId: number) { .update({ pickup_time_id: pickupId }) .eq('id', cartId); } + +export async function fetchProductWithQuantityById( + productId: number, +): Promise { + const { data: orderProduct, error } = await supabase + .from('product') + .select('*') + .eq('id', productId) + .single(); + if (error) { + throw new Error(`Error fetching order product: ${error.message}`); + } + return orderProduct; +} + +export async function fetchOrderProductsbyOrderId( + orderId: number, +): Promise { + const order = await getOrderById(orderId); + const orderProductIds = order.order_product_id_array; + + const newOrderProducts = await Promise.all( + orderProductIds.map(orderProductId => + fetchOrderProductById(orderProductId), + ), + ); + console.log(newOrderProducts); + const orderProducts = await Promise.all( + newOrderProducts.map(async orderProduct => + fetchProductWithQuantityById(orderProduct.product_id), + ), + ); + + return orderProducts; +} diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 519eeb63..d076c943 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -30,8 +30,7 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - background: ${props => - props.isSelected ? COLORS.periwinkle : COLORS.lightGrey}; + background: {COLORS.periwinkle}; height: 124px; width: 242px; diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 30d0e29b..36aea2f2 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -90,7 +90,7 @@ function OrderHistorySection() { Order History - + From 89b6b629930c6eacc2b569be8ea7a935d0e81a1f Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:22:14 -0700 Subject: [PATCH 032/101] checl --- src/api/supabase/queries/order_queries.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 01cb2be5..2435e3cd 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,16 +1,12 @@ /* eslint-disable no-console */ // -<<<<<<< HEAD import { Order, OrderProduct, Product, ProductWithQuantity, } from '../../../schema/schema'; -======= -import { Order, OrderProduct, Product } from '../../../schema/schema'; ->>>>>>> 271c77dec8dcfbd7d83b49e98d276f057fff76d0 import { fetchUser } from './user_queries'; import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; From a37e4231e57b13e7cbbda6d794422e2bca50820e Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 02:17:27 -0700 Subject: [PATCH 033/101] fixedRouting --- src/app/orderPage/page.tsx | 17 +++++++++++++---- .../OrderHistory/OrderHistoryText.tsx | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index 5e5562b6..f54e8ff5 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -24,7 +24,7 @@ import { } from './styles'; import { ProductWithQuantity, Order } from '../../schema/schema'; - +import { useSearchParams } from 'next/navigation'; function formatDate(date: string | undefined): string { if (!date) return ''; @@ -51,9 +51,18 @@ function formatDate(date: string | undefined): string { return `${month} ${day}, ${year}`; } -export default function FavoritesPage() { +export default function OrderPage() { const [orders, setOrders] = useState([]); - const currOrderId = 32; + const searchParams = useSearchParams(); + const orderIDFromSearch = searchParams.get('orderID'); + console.log(orderIDFromSearch); + let currOrderId = 0; + if (orderIDFromSearch !== null) { + currOrderId = parseInt(orderIDFromSearch); + } else { + currOrderId = 32; + } + const [order, setOrder] = useState(); async function fetchProducts() { @@ -75,7 +84,7 @@ export default function FavoritesPage() { - + {formatDate(order?.created_at)} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 48313d90..3cad5c40 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary - +import querystring from 'querystring'; function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', @@ -22,9 +22,9 @@ export default function OrderDetails(props: OrderDetailsProps) { const { date, orderNumber, status } = props; const router = useRouter(); - const viewOrder = () => { - // Navigate to the order details page - router.push(`/order/${orderNumber}`); + const viewOrder = (orderID: string) => { + const queryString = querystring.stringify({ orderID }); + router.push(`/orderPage?${queryString}`); }; return ( @@ -43,7 +43,7 @@ export default function OrderDetails(props: OrderDetailsProps) { {status === 'Confirmed' ? '✓' : '✗'} {status}
- + viewOrder(orderNumber)}> {/** DO NOT USE IMAGE Please use the icon in the feather library! */} View order From 584ce61a96d6ed83d57c149ad4030035951b1262 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 02:20:34 -0700 Subject: [PATCH 034/101] eslintFixed --- src/app/orderPage/page.tsx | 5 +++-- src/components/OrderHistory/OrderHistoryText.tsx | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index f54e8ff5..662c6bd3 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'; import { Body1, Body2 } from '@/styles/fonts'; +import { useSearchParams } from 'next/navigation'; import BackButton from '../../components/BackButton/BackButton'; import { @@ -24,7 +25,7 @@ import { } from './styles'; import { ProductWithQuantity, Order } from '../../schema/schema'; -import { useSearchParams } from 'next/navigation'; + function formatDate(date: string | undefined): string { if (!date) return ''; @@ -58,7 +59,7 @@ export default function OrderPage() { console.log(orderIDFromSearch); let currOrderId = 0; if (orderIDFromSearch !== null) { - currOrderId = parseInt(orderIDFromSearch); + currOrderId = parseInt(orderIDFromSearch, 10); } else { currOrderId = 32; } diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 3cad5c40..8aef6d1b 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -1,7 +1,9 @@ import React from 'react'; import { useRouter } from 'next/navigation'; -import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + import querystring from 'querystring'; +import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', From a8905fea7e6eac10fea552a7996c73407e756f43 Mon Sep 17 00:00:00 2001 From: David Qing Date: Sat, 16 Mar 2024 11:23:53 -0700 Subject: [PATCH 035/101] fixed styling for cart --- package-lock.json | 1493 ++++++--------------------------------- src/app/cart/page.tsx | 23 +- src/app/cart/styles.tsx | 11 - 3 files changed, 219 insertions(+), 1308 deletions(-) diff --git a/package-lock.json b/package-lock.json index aca220b0..4796890e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -112,6 +113,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -126,6 +128,7 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -134,6 +137,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -156,6 +160,7 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -178,19 +183,6 @@ "node": ">=6" } }, - "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", - "hasInstallScript": true, - "peer": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -219,6 +211,7 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -232,6 +225,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, "engines": { "node": ">=12.22" }, @@ -243,71 +237,8 @@ "node_modules/@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", - "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", - "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true }, "node_modules/@next/env": { "version": "13.5.6", @@ -577,35 +508,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@types/eslint": { - "version": "8.44.7", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", - "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", - "dev": true, - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "peer": true - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -860,187 +762,14 @@ "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true }, "node_modules/acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -1048,20 +777,11 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peer": true, - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -1070,6 +790,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1094,6 +815,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, "engines": { "node": ">=8" } @@ -1102,6 +824,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -1115,7 +838,8 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/aria-query": { "version": "5.3.0", @@ -1321,46 +1045,6 @@ "node": ">=8" } }, - "node_modules/browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "peer": true, - "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "peer": true - }, "node_modules/bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -1401,6 +1085,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, "engines": { "node": ">=6" } @@ -1436,6 +1121,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1447,16 +1133,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0" - } - }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -1474,6 +1150,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -1484,14 +1161,8 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/concat-map": { "version": "0.0.1", @@ -1508,6 +1179,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1573,7 +1245,8 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "node_modules/define-data-property": { "version": "1.1.1", @@ -1627,6 +1300,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "dependencies": { "esutils": "^2.0.2" }, @@ -1645,13 +1319,6 @@ "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, - "node_modules/electron-to-chromium": { - "version": "1.4.585", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", - "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==", - "dev": true, - "peer": true - }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -1751,13 +1418,6 @@ "safe-array-concat": "^1.0.1" } }, - "node_modules/es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", - "dev": true, - "peer": true - }, "node_modules/es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -1828,20 +1488,11 @@ "ext": "^1.1.2" } }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, "engines": { "node": ">=10" }, @@ -1853,6 +1504,7 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -2253,6 +1905,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2268,6 +1921,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -2284,6 +1938,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -2295,6 +1950,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -2318,16 +1974,6 @@ "node": ">=0.10.0" } }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.8.x" - } - }, "node_modules/ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -2344,7 +1990,8 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.3.2", @@ -2375,12 +2022,14 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "node_modules/fastq": { "version": "1.15.0", @@ -2394,6 +2043,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -2436,6 +2086,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2451,6 +2102,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -2463,7 +2115,8 @@ "node_modules/flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "node_modules/for-each": { "version": "0.3.3", @@ -2574,6 +2227,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -2590,6 +2244,7 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -2652,7 +2307,8 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "node_modules/has-bigints": { "version": "1.0.2", @@ -2666,6 +2322,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -2740,6 +2397,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2755,6 +2413,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "engines": { "node": ">=0.8.19" } @@ -2964,6 +2623,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -3088,7 +2748,8 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "node_modules/iterator.prototype": { "version": "1.1.2", @@ -3102,37 +2763,6 @@ "set-function-name": "^2.0.1" } }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3142,6 +2772,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -3152,24 +2783,20 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "node_modules/json5": { "version": "2.2.3", @@ -3201,6 +2828,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "dependencies": { "json-buffer": "3.0.1" } @@ -3225,6 +2853,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -3233,16 +2862,6 @@ "node": ">= 0.8.0" } }, - "node_modules/loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.11.5" - } - }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -3261,6 +2880,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -3274,7 +2894,8 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/loose-envify": { "version": "1.4.0", @@ -3298,13 +2919,6 @@ "node": ">=10" } }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3325,29 +2939,6 @@ "node": ">=8.6" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "peer": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3392,7 +2983,8 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "node_modules/natural-compare-lite": { "version": "1.4.0", @@ -3400,13 +2992,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "peer": true - }, "node_modules/next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -3478,13 +3063,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true, - "peer": true - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -3606,6 +3184,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -3622,6 +3201,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -3636,6 +3216,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -3650,6 +3231,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "dependencies": { "callsites": "^3.0.0" }, @@ -3661,6 +3243,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, "engines": { "node": ">=8" } @@ -3677,6 +3260,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -3746,6 +3330,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, "engines": { "node": ">= 0.8.0" } @@ -3779,6 +3364,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, "engines": { "node": ">=6" } @@ -3802,16 +3388,6 @@ } ] }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, "node_modules/react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -3953,6 +3529,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, "engines": { "node": ">=4" } @@ -3978,6 +3555,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -4027,27 +3605,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "peer": true - }, "node_modules/safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -4101,16 +3658,6 @@ "node": ">=10" } }, - "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "peer": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, "node_modules/set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -4147,6 +3694,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4158,6 +3706,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "engines": { "node": ">=8" } @@ -4183,16 +3732,6 @@ "node": ">=8" } }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -4201,17 +3740,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "peer": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -4285,6 +3813,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -4304,6 +3833,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, "engines": { "node": ">=8" }, @@ -4369,6 +3899,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -4395,64 +3926,11 @@ "node": ">=6" } }, - "node_modules/terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/to-regex-range": { "version": "5.0.1", @@ -4525,6 +4003,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -4536,6 +4015,7 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, "engines": { "node": ">=10" }, @@ -4616,6 +4096,7 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4638,41 +4119,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "peer": true, - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -4706,64 +4157,6 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, - "node_modules/webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -4806,6 +4199,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -4910,6 +4304,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, "engines": { "node": ">=10" }, @@ -4922,7 +4317,8 @@ "@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true }, "@babel/runtime": { "version": "7.23.2", @@ -4936,15 +4332,13 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@calblueprint/eslint-config-react/-/eslint-config-react-0.0.3.tgz", "integrity": "sha512-1Tbws/hjtb7JaKtTtE/g3s3cuky3eqKbIM6mm/QZOMmzcHex4+fAh2QHjeOPE9z4ZXuJS2HWx5n4VDdHJcDs5A==", - "dev": true, - "requires": {} + "dev": true }, "@calblueprint/prettier-config": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/is-prop-valid": { "version": "1.2.1", @@ -4968,6 +4362,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, "requires": { "eslint-visitor-keys": "^3.3.0" } @@ -4975,12 +4370,14 @@ "@eslint-community/regexpp": { "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==" + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true }, "@eslint/eslintrc": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -4996,7 +4393,8 @@ "@eslint/js": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==" + "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "dev": true }, "@fortawesome/fontawesome-common-types": { "version": "6.4.2", @@ -5008,15 +4406,6 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==" }, - "@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", - "peer": true, - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.2" - } - }, "@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -5037,6 +4426,7 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, "requires": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -5046,67 +4436,14 @@ "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true }, "@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, - "peer": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "peer": true - }, - "@jridgewell/source-map": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", - "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", - "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true }, "@next/env": { "version": "13.5.6", @@ -5280,35 +4617,6 @@ "tslib": "^2.4.0" } }, - "@types/eslint": { - "version": "8.44.7", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", - "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", - "dev": true, - "peer": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "peer": true - }, "@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -5474,206 +4782,26 @@ "@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true }, "acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" - }, - "acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peer": true, - "requires": {} + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "dev": true }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "dev": true }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -5685,18 +4813,19 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -5704,7 +4833,8 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "aria-query": { "version": "5.3.0", @@ -5859,26 +4989,6 @@ "fill-range": "^7.0.1" } }, - "browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", - "dev": true, - "peer": true, - "requires": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "peer": true - }, "bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -5908,7 +5018,8 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true }, "camelize": { "version": "1.0.1", @@ -5924,18 +5035,12 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "peer": true - }, "client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -5950,6 +5055,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -5957,14 +5063,8 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "concat-map": { "version": "0.0.1", @@ -5981,6 +5081,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6032,7 +5133,8 @@ "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "define-data-property": { "version": "1.1.1", @@ -6071,6 +5173,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "requires": { "esutils": "^2.0.2" } @@ -6080,13 +5183,6 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==" }, - "electron-to-chromium": { - "version": "1.4.585", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", - "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==", - "dev": true, - "peer": true - }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -6174,13 +5270,6 @@ "safe-array-concat": "^1.0.1" } }, - "es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", - "dev": true, - "peer": true - }, "es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -6238,22 +5327,17 @@ "ext": "^1.1.2" } }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "peer": true - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true }, "eslint": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6299,6 +5383,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -6357,8 +5442,7 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.9", @@ -6533,8 +5617,7 @@ "eslint-plugin-react-hooks": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "requires": {} + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" }, "eslint-scope": { "version": "5.1.1", @@ -6563,6 +5646,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, "requires": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -6573,6 +5657,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, "requires": { "estraverse": "^5.1.0" } @@ -6581,6 +5666,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "requires": { "estraverse": "^5.2.0" } @@ -6595,13 +5681,6 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true - }, "ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -6620,7 +5699,8 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-glob": { "version": "3.3.2", @@ -6647,12 +5727,14 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "fastq": { "version": "1.15.0", @@ -6666,6 +5748,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "requires": { "flat-cache": "^3.0.4" } @@ -6692,6 +5775,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, "requires": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -6701,6 +5785,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, "requires": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -6710,7 +5795,8 @@ "flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "for-each": { "version": "0.3.3", @@ -6791,6 +5877,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "requires": { "is-glob": "^4.0.3" } @@ -6804,6 +5891,7 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -6845,7 +5933,8 @@ "graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "has-bigints": { "version": "1.0.2", @@ -6855,7 +5944,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-property-descriptors": { "version": "1.0.1", @@ -6900,6 +5990,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -6908,7 +5999,8 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true }, "inflight": { "version": "1.0.6", @@ -7045,7 +6137,8 @@ "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true }, "is-regex": { "version": "1.1.4", @@ -7128,7 +6221,8 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "iterator.prototype": { "version": "1.1.2", @@ -7142,30 +6236,6 @@ "set-function-name": "^2.0.1" } }, - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "peer": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "peer": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -7175,6 +6245,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -7182,24 +6253,20 @@ "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "json5": { "version": "2.2.3", @@ -7222,6 +6289,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "requires": { "json-buffer": "3.0.1" } @@ -7243,18 +6311,12 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "requires": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true - }, "loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -7270,6 +6332,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, "requires": { "p-locate": "^5.0.0" } @@ -7277,7 +6340,8 @@ "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -7295,13 +6359,6 @@ "yallist": "^4.0.0" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true - }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -7316,23 +6373,6 @@ "picomatch": "^2.3.1" } }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "peer": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "peer": true, - "requires": { - "mime-db": "1.52.0" - } - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -7359,7 +6399,8 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "natural-compare-lite": { "version": "1.4.0", @@ -7367,13 +6408,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "peer": true - }, "next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -7400,8 +6434,7 @@ "next-google-fonts": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/next-google-fonts/-/next-google-fonts-2.2.0.tgz", - "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==", - "requires": {} + "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==" }, "next-tick": { "version": "1.1.0", @@ -7413,13 +6446,6 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==" }, - "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true, - "peer": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -7508,6 +6534,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, "requires": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -7521,6 +6548,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, "requires": { "yocto-queue": "^0.1.0" } @@ -7529,6 +6557,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, "requires": { "p-limit": "^3.0.2" } @@ -7537,6 +6566,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "requires": { "callsites": "^3.0.0" } @@ -7544,7 +6574,8 @@ "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true }, "path-is-absolute": { "version": "1.0.1", @@ -7554,7 +6585,8 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "path-parse": { "version": "1.0.7", @@ -7594,7 +6626,8 @@ "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true }, "prettier": { "version": "2.8.8", @@ -7615,23 +6648,14 @@ "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "peer": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -7728,7 +6752,8 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true }, "resolve-pkg-maps": { "version": "1.0.0", @@ -7744,6 +6769,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "requires": { "glob": "^7.1.3" } @@ -7767,13 +6793,6 @@ "isarray": "^2.0.5" } }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "peer": true - }, "safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -7811,16 +6830,6 @@ "lru-cache": "^6.0.0" } }, - "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "peer": true, - "requires": { - "randombytes": "^2.1.0" - } - }, "set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -7851,6 +6860,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -7858,7 +6868,8 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true }, "side-channel": { "version": "1.0.4", @@ -7875,29 +6886,11 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true - }, "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "peer": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -7953,6 +6946,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -7965,7 +6959,8 @@ "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true }, "styled-components": { "version": "6.1.1", @@ -8000,6 +6995,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -8014,37 +7010,11 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, - "terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, - "terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.17", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" - } - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "to-regex-range": { "version": "5.0.1", @@ -8109,6 +7079,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "requires": { "prelude-ls": "^1.2.1" } @@ -8116,7 +7087,8 @@ "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true }, "typed-array-buffer": { "version": "1.0.0", @@ -8172,7 +7144,8 @@ "typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true }, "unbox-primitive": { "version": "1.0.2", @@ -8185,21 +7158,11 @@ "which-boxed-primitive": "^1.0.2" } }, - "update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "peer": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -8226,46 +7189,6 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, - "webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", - "dev": true, - "peer": true, - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true - }, "websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -8307,6 +7230,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "requires": { "isexe": "^2.0.0" } @@ -8383,7 +7307,8 @@ "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true } } } diff --git a/src/app/cart/page.tsx b/src/app/cart/page.tsx index be0f62f8..de077e27 100644 --- a/src/app/cart/page.tsx +++ b/src/app/cart/page.tsx @@ -14,7 +14,6 @@ import { import CartItem from './cartItem'; import NavBar from '../../components/NavBarFolder/NavBar'; import { - OutterFavoriteDiv, PageDiv, CheckoutButton, LeftColumnDiv, @@ -55,18 +54,16 @@ export default function OrderPage() {

Cart

- - {cart.map(cartItem => ( - - ))} - + {cart.map(cartItem => ( + + ))} diff --git a/src/app/cart/styles.tsx b/src/app/cart/styles.tsx index 45e0c0d3..04071e68 100644 --- a/src/app/cart/styles.tsx +++ b/src/app/cart/styles.tsx @@ -17,17 +17,6 @@ export const FavoriteDiv = styled.div` margin-top: 30px; `; -export const OutterFavoriteDiv = styled.div` - display: flex; - flex-direction: column; - align-items: center; - border-radius: 10px; - width: 1000px; - height: 700px; - overflow: scroll; - margin-top: 10px; -`; - export const BackDiv = styled.button` display: flex; flex-direction: row; From 1121d9055b76cbfa4e5f12b961b24c4dd228b5de Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sat, 16 Mar 2024 12:28:11 -0700 Subject: [PATCH 036/101] switchbranch --- src/api/supabase/queries/button_queries.ts | 18 ++++++ src/app/storefront/StoreFrontNavBar.tsx | 70 ++++++++++++++++++++-- src/app/storefront/productButtons.tsx | 12 ++-- src/schema/schema.ts | 7 +++ 4 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 src/api/supabase/queries/button_queries.ts diff --git a/src/api/supabase/queries/button_queries.ts b/src/api/supabase/queries/button_queries.ts new file mode 100644 index 00000000..d2ae675e --- /dev/null +++ b/src/api/supabase/queries/button_queries.ts @@ -0,0 +1,18 @@ +import { StorefrontButtons } from '../../../schema/schema'; +import supabase from '../createClient'; + +export async function fetchButoonCategories(): Promise { + const { data: buttons, error } = await supabase + .from('storefront_buttons') + .select('*'); + if (error) { + throw new Error(`Error fetching buttons: ${error.message}`); + } + console.log("func tester") + console.log(buttons) + return buttons; +} + +export async function fetchButton() { + return 0 +} \ No newline at end of file diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 7ff4599e..498fba32 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -1,7 +1,9 @@ +/* eslint-disable react/button-has-type */ import Image from 'next/image'; import Link from 'next/link'; import React, { useEffect, useState } from 'react'; +import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { totalNumberOfItemsInCart } from '../../api/supabase/queries/cart_queries'; import { @@ -12,12 +14,10 @@ import { ShoppingCartIcon, } from '../../components/NavBarFolder/styles'; -import { Product } from '../../schema/schema'; +import { Product, StorefrontButtons } from '../../schema/schema'; import { ButtonsContainer } from './styles'; -import { buttons } from './buttonValues'; - import ProductButtons from './productButtons'; export default function StoreFrontNavBar(props: { @@ -26,8 +26,7 @@ export default function StoreFrontNavBar(props: { IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; }) { - const [data, setData] = useState(0); - const [isZero, setIsZero] = useState(true); + const { setFilteredProducts, setIsClickedButton, @@ -35,6 +34,15 @@ export default function StoreFrontNavBar(props: { setCategoryWord, } = props; + const [data, setData] = useState(0); + const [isZero, setIsZero] = useState(true); + const [buttonCategories, setButtonCategories] = useState([]); + const [buttonDisplay, setButtonDisplay] = useState([]); + let ind = 0; + const length = 4; + // const [reachedEnd, setReachedEnd] = useState(false); + // const [reachedStart, setReachedStart] = useState(true); + useEffect(() => { const fetchData = async () => { setData(await totalNumberOfItemsInCart()); @@ -51,6 +59,54 @@ export default function StoreFrontNavBar(props: { changeData(); }, [data]); + useEffect(() => { + const fetchButtonCat = async () => { + setButtonCategories(await fetchButoonCategories()); + }; + fetchButtonCat(); + }, []) + + useEffect(() => { + const displayedButtons = async () => { + const button = await fetchButoonCategories() + setButtonDisplay(button.slice(0, 4)); + }; + displayedButtons(); + }, []) + + const changeDisplay = (direction : number) => { + setButtonDisplay(buttonCategories.slice(ind, ind+4)); + const clicked = IsClickedButton; + for (let i = 0; i < buttonDisplay.length; i += 1) { + buttonDisplay[i].count += direction; + if (clicked[i]) { + clicked[i] = false; + clicked[i+direction] = true; + } + } + + setIsClickedButton(clicked); + + } + + const handlePrevious = () => { + console.log(ind > 0); + if (ind > 0) { + ind -= 1; + console.log(ind); + // setInd(newIndex < 0 ? length - 1 : newIndex); + changeDisplay(-1); + } + }; + + const handleNext = () => { + if (ind + 4 < buttonCategories.length) { + ind += 1; + console.log(ind); + changeDisplay(1); + } + }; + return ( @@ -62,7 +118,8 @@ export default function StoreFrontNavBar(props: { /> - {buttons.map((type, index) => ( + + {buttonDisplay.map((type, index) => ( ))} + diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 7d8976cb..80efc83a 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -2,10 +2,12 @@ import React from 'react'; +import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { Button, Label, IndividualContainer } from './styles'; import { buttons } from './buttonValues'; + import { fetchUserProducts, filterUserProducts, @@ -41,10 +43,12 @@ export default function ProductButtons(props: { const category = e.currentTarget.value; const productItem = await fetchUserProducts(); + const buttonCategories = await fetchButoonCategories(); - for (let i = 0; i < buttons.length; i += 1) { - if (buttons[i].value === category) { - const ind = buttons[i].count; + for (let i = 0; i < buttonCategories.length; i += 1) { + console.log(buttonCategories[i].value, category); + if (buttonCategories[i].value === category) { + const ind = buttonCategories[i].count; if (IsClickedButton[ind] === true) { const tempArray = [...IsClickedButton]; tempArray[ind] = !tempArray[ind]; @@ -59,7 +63,7 @@ export default function ProductButtons(props: { } const arrayOfFalse = [false, false, false, false]; arrayOfFalse[ind] = true; - setCategoryWord(buttons[i].value); + setCategoryWord(buttonCategories[i].value); setIsClickedButton(arrayOfFalse); break; diff --git a/src/schema/schema.ts b/src/schema/schema.ts index 51a028ba..5dd98d91 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -79,3 +79,10 @@ export type Address = { zipcode: string; user_id: number; }; + +export type StorefrontButtons = { + id: number; + name: string; + value: string; + count: number; +}; From 86b352f00618e58f1b51b9cf20052aa779a98de6 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sat, 16 Mar 2024 12:30:32 -0700 Subject: [PATCH 037/101] buyankhuu'ssmallchange --- src/app/storefront/StoreFrontNavBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 49c271db..422e1f2b 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -79,7 +79,7 @@ export default function StoreFrontNavBar(props: { -

User

+

Users

From 5375ac5f49b6b87d3a956a5b552d760fe52e4e1f Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sat, 16 Mar 2024 12:30:32 -0700 Subject: [PATCH 038/101] buyankhuu'ssmallchange --- src/app/storefront/StoreFrontNavBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 498fba32..e162ef70 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -137,7 +137,7 @@ export default function StoreFrontNavBar(props: { -

User

+

Users

From 9711e145e1f16dba7163463567c20bb48aa07500 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sat, 16 Mar 2024 16:39:44 -0700 Subject: [PATCH 039/101] rebase --- src/app/storefront/StoreFrontNavBar.tsx | 72 ++++++++++++++----------- src/app/storefront/page.tsx | 4 +- src/app/storefront/styles.ts | 26 ++++++++- 3 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index e162ef70..0ff5b47c 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -6,6 +6,8 @@ import React, { useEffect, useState } from 'react'; import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { totalNumberOfItemsInCart } from '../../api/supabase/queries/cart_queries'; + + import { NavBarComp, ButtonsDiv, @@ -16,7 +18,12 @@ import { import { Product, StorefrontButtons } from '../../schema/schema'; -import { ButtonsContainer } from './styles'; +import { ButtonsContainer, + FrontButton, + BackButton, + Front, + Back + } from './styles'; import ProductButtons from './productButtons'; @@ -38,11 +45,9 @@ export default function StoreFrontNavBar(props: { const [isZero, setIsZero] = useState(true); const [buttonCategories, setButtonCategories] = useState([]); const [buttonDisplay, setButtonDisplay] = useState([]); - let ind = 0; - const length = 4; - // const [reachedEnd, setReachedEnd] = useState(false); - // const [reachedStart, setReachedStart] = useState(true); - + const [ind, setInd] = useState(0); + let newInd = 0; + useEffect(() => { const fetchData = async () => { setData(await totalNumberOfItemsInCart()); @@ -73,38 +78,41 @@ export default function StoreFrontNavBar(props: { }; displayedButtons(); }, []) + - const changeDisplay = (direction : number) => { - setButtonDisplay(buttonCategories.slice(ind, ind+4)); + const changeDisplay = (direction : number, index : number) => { + setButtonDisplay(buttonCategories.slice(index, index+4)); const clicked = IsClickedButton; - for (let i = 0; i < buttonDisplay.length; i += 1) { - buttonDisplay[i].count += direction; - if (clicked[i]) { - clicked[i] = false; - clicked[i+direction] = true; - } - } - - setIsClickedButton(clicked); - + // for (let i = 0; i < buttonDisplay.length; i += 1) { + + // if (clicked[i]) { + // clicked[i] = false; + // if (i+direction >= 0 || i+direction < buttonCategories.length) { + // clicked[i+direction] = true; + // } + // } + // } + + // setIsClickedButton(clicked); + console.log(IsClickedButton); } const handlePrevious = () => { - console.log(ind > 0); if (ind > 0) { - ind -= 1; - console.log(ind); - // setInd(newIndex < 0 ? length - 1 : newIndex); - changeDisplay(-1); + newInd = ind - 1; + setInd(newInd); + changeDisplay(-1, newInd); } }; const handleNext = () => { if (ind + 4 < buttonCategories.length) { - ind += 1; - console.log(ind); - changeDisplay(1); + newInd = ind + 1; + setInd(ind+1); + changeDisplay(1, newInd); + } + }; return ( @@ -118,20 +126,24 @@ export default function StoreFrontNavBar(props: { /> - + + + {buttonDisplay.map((type, index) => ( ))} - + + + diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 6e9aed22..db9f8fea 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -20,7 +20,9 @@ export default function App() { false, false, false, - ]); + ] + + ); useEffect(() => { async function fetchAllProducts() { diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index 2afce95e..156fba6b 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { Heart, User, ShoppingCart } from 'react-feather'; +import { Heart, User, ShoppingCart, ArrowLeft, ArrowRight } from 'react-feather'; import { Body1 } from '@/styles/fonts'; @@ -213,3 +213,27 @@ export const OutterDiv = styled.div` width: 300px; height: 375px; `; + +export const Front = styled(ArrowLeft)` + width: 30px; + height: 30px; + position: relative; +`; + +export const FrontButton = styled.button` + position: relative; + background-color: transparent; + border: none; +`; + +export const Back = styled(ArrowRight)` + width: 30px; + height: 30px; + position: relative; +`; + +export const BackButton = styled.button` + position: relative; + background-color: transparent; + border: none; +`; \ No newline at end of file From 6fb57ce1966f21399deb2958f485f4a2bf2784b4 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sun, 17 Mar 2024 16:04:18 -0700 Subject: [PATCH 040/101] changed it so that it shows 4 at a time --- src/api/supabase/queries/button_queries.ts | 3 +- src/api/supabase/queries/product_queries.ts | 3 ++ src/app/storefront/StoreFrontNavBar.tsx | 38 ++++++++++----------- src/app/storefront/page.tsx | 7 +++- src/app/storefront/productButtons.tsx | 32 +++++++++-------- 5 files changed, 46 insertions(+), 37 deletions(-) diff --git a/src/api/supabase/queries/button_queries.ts b/src/api/supabase/queries/button_queries.ts index d2ae675e..f9569328 100644 --- a/src/api/supabase/queries/button_queries.ts +++ b/src/api/supabase/queries/button_queries.ts @@ -8,8 +8,7 @@ export async function fetchButoonCategories(): Promise { if (error) { throw new Error(`Error fetching buttons: ${error.message}`); } - console.log("func tester") - console.log(buttons) + return buttons; } diff --git a/src/api/supabase/queries/product_queries.ts b/src/api/supabase/queries/product_queries.ts index ae9c44cc..a03acb70 100644 --- a/src/api/supabase/queries/product_queries.ts +++ b/src/api/supabase/queries/product_queries.ts @@ -105,11 +105,14 @@ export async function filterUserProducts( const products = await fetchUnprescribedCategory(productType); const user = await fetchUser(); + + const { data: prescribed, error } = await supabase .from('product') .select('*') .eq('prescribed', true) .eq('category', productType); + if (error) { throw new Error(`Error fetching products: ${error.message}`); } diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 0ff5b47c..cb33e52b 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -6,8 +6,6 @@ import React, { useEffect, useState } from 'react'; import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { totalNumberOfItemsInCart } from '../../api/supabase/queries/cart_queries'; - - import { NavBarComp, ButtonsDiv, @@ -22,7 +20,7 @@ import { ButtonsContainer, FrontButton, BackButton, Front, - Back + Back, } from './styles'; import ProductButtons from './productButtons'; @@ -32,6 +30,8 @@ export default function StoreFrontNavBar(props: { setIsClickedButton: (clicked: boolean[]) => void; IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; + clickedButton: number; + setClickedButton: (clicked: number) => void; }) { const { @@ -39,6 +39,8 @@ export default function StoreFrontNavBar(props: { setIsClickedButton, IsClickedButton, setCategoryWord, + setClickedButton, + clickedButton } = props; const [data, setData] = useState(0); @@ -82,24 +84,15 @@ export default function StoreFrontNavBar(props: { const changeDisplay = (direction : number, index : number) => { setButtonDisplay(buttonCategories.slice(index, index+4)); - const clicked = IsClickedButton; - // for (let i = 0; i < buttonDisplay.length; i += 1) { - - // if (clicked[i]) { - // clicked[i] = false; - // if (i+direction >= 0 || i+direction < buttonCategories.length) { - // clicked[i+direction] = true; - // } - // } - // } - - // setIsClickedButton(clicked); - console.log(IsClickedButton); } const handlePrevious = () => { if (ind > 0) { - newInd = ind - 1; + if (ind % 4 !== 0) { + newInd = 4 * (Math.floor(buttonCategories.length / 4) - 1); + } else { + newInd = ind - 4; + } setInd(newInd); changeDisplay(-1, newInd); } @@ -107,8 +100,13 @@ export default function StoreFrontNavBar(props: { const handleNext = () => { if (ind + 4 < buttonCategories.length) { - newInd = ind + 1; - setInd(ind+1); + const remainder = buttonCategories.length - ind - 4; + if (remainder < 4) { + newInd = buttonCategories.length - 4; + } else { + newInd = ind + 4 + } + setInd(newInd); changeDisplay(1, newInd); } @@ -139,6 +137,8 @@ export default function StoreFrontNavBar(props: { IsClickedButton={IsClickedButton} setCategoryWord={setCategoryWord} index={index+ind} + setClickedButton={setClickedButton} + clickedButton={clickedButton} /> ))} diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index db9f8fea..3dbcacc4 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -21,9 +21,12 @@ export default function App() { false, false, ] - ); + + const [clickedButton, setClickedButton] = useState(0); + + useEffect(() => { async function fetchAllProducts() { try { @@ -44,6 +47,8 @@ export default function App() { setIsClickedButton={setIsClickedButton} IsClickedButton={IsClickedButton} setCategoryWord={setCategoryWord} + clickedButton={clickedButton} + setClickedButton={setClickedButton} /> Shop {CategoryWord} diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 80efc83a..8a0495a3 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -5,9 +5,6 @@ import React from 'react'; import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { Button, Label, IndividualContainer } from './styles'; -import { buttons } from './buttonValues'; - - import { fetchUserProducts, filterUserProducts, @@ -24,6 +21,8 @@ export default function ProductButtons(props: { IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; index: number; + setClickedButton: (clicked: number) => void; + clickedButton: number; }) { const { key, @@ -34,6 +33,8 @@ export default function ProductButtons(props: { IsClickedButton, setCategoryWord, index, + setClickedButton, + clickedButton } = props; async function applyFilter( @@ -46,25 +47,26 @@ export default function ProductButtons(props: { const buttonCategories = await fetchButoonCategories(); for (let i = 0; i < buttonCategories.length; i += 1) { - console.log(buttonCategories[i].value, category); if (buttonCategories[i].value === category) { - const ind = buttonCategories[i].count; - if (IsClickedButton[ind] === true) { - const tempArray = [...IsClickedButton]; - tempArray[ind] = !tempArray[ind]; - tempArray[0] = true; + const ind = buttonCategories[i].id - 1; + if (ind === clickedButton) { + // const tempArray = [...IsClickedButton]; + // tempArray[ind] = !tempArray[ind]; + // tempArray[0] = true; setCategoryWord('All'); - setIsClickedButton(tempArray); + // setIsClickedButton(tempArray); + setClickedButton(0); if (productItem !== null) { setFiltredProducts(productItem); } return; } - const arrayOfFalse = [false, false, false, false]; - arrayOfFalse[ind] = true; + setClickedButton(ind); + // const arrayOfFalse = [false, false, false, false]; + // arrayOfFalse[ind] = true; setCategoryWord(buttonCategories[i].value); - setIsClickedButton(arrayOfFalse); + // setIsClickedButton(arrayOfFalse); break; } @@ -90,14 +92,14 @@ export default function ProductButtons(props: { return ( - {/* + {/* */} - - - - + + + ); } diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index 7a51d8e3..b090dfb7 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -85,11 +85,8 @@ export const EyeIcon = styled(Eye)` `; export const Fullscreen = styled.div` - display: flex; - justify-content: center; - align-items: center; width: 100%; - height: 870px; + height: 100%; `; export const InputField = styled.div` diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 8a6d66c4..7ff09c74 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -36,6 +36,7 @@ import { BackButtonDiv, BlankSpace, HeaderDiv, + Fullscreen, } from './styles'; import { signOut } from '../../api/supabase/auth/auth'; import 'react-toastify/dist/ReactToastify.css'; @@ -215,7 +216,7 @@ export default function Profile() { return

Error Loading User

; } return ( -
+ @@ -242,6 +243,6 @@ export default function Profile() { Favorites */} -
+ ); } diff --git a/src/app/profileScreen/styles.ts b/src/app/profileScreen/styles.ts index 640722eb..323640e5 100644 --- a/src/app/profileScreen/styles.ts +++ b/src/app/profileScreen/styles.ts @@ -138,3 +138,10 @@ export const BlankSpace = styled.div` width: 250px; height: 200px; `; + +export const Fullscreen = styled.div` + + width: 100%; + height: 100%; +`; + diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 6e9aed22..55089975 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react'; import Storefront from './storefrontItems'; import Footer from '../../components/FooterFolder/Footer'; -import { ShopAllText } from './styles'; +import { ShopAllText, Fullscreen } from './styles'; import { fetchUserProducts } from '../../api/supabase/queries/product_queries'; import { Product } from '../../schema/schema'; @@ -36,7 +36,7 @@ export default function App() { }, []); return ( -
+ Shop {CategoryWord}
-
+ ); } diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index 2afce95e..77719059 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -213,3 +213,10 @@ export const OutterDiv = styled.div` width: 300px; height: 375px; `; + + +export const Fullscreen = styled.div` + + width: 100%; + height: 100%; +`; \ No newline at end of file diff --git a/src/styles/components.tsx b/src/styles/components.tsx index c21ca849..a86bcc97 100644 --- a/src/styles/components.tsx +++ b/src/styles/components.tsx @@ -3,20 +3,6 @@ import styled, { createGlobalStyle } from 'styled-components'; import { User, ShoppingCart } from 'react-feather'; import COLORS from './colors'; -export const GlobalStyle = createGlobalStyle` - @import url('https://fonts.googleapis.com/css2?family=Public+Sans:wght@400;700&display=swap'); - - body { - background: ${COLORS.offWhite}; - color: ${COLORS.black}; - font-family: 'Public Sans', sans-serif; - } - span{ - - color:black; - } -`; - export const StickyHeader = styled.div` position: fixed; background-color: ${COLORS.lightPeriwinkle}; From 1a3754da1b818d36e2287d131f838365c6838416 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sun, 17 Mar 2024 16:41:25 -0700 Subject: [PATCH 042/101] made it so the arrows disappear at start and end of category list --- src/app/storefront/StoreFrontNavBar.tsx | 12 ++++++++---- src/app/storefront/styles.ts | 14 +++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index cb33e52b..e8a7c81c 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -49,6 +49,8 @@ export default function StoreFrontNavBar(props: { const [buttonDisplay, setButtonDisplay] = useState([]); const [ind, setInd] = useState(0); let newInd = 0; + const [reachedStart, setReachedStart] = useState(false); + const [reachedEnd, setReachedEnd] = useState(true); useEffect(() => { const fetchData = async () => { @@ -95,7 +97,9 @@ export default function StoreFrontNavBar(props: { } setInd(newInd); changeDisplay(-1, newInd); + setReachedStart(!(newInd === 0)); } + setReachedEnd(true); }; const handleNext = () => { @@ -108,9 +112,9 @@ export default function StoreFrontNavBar(props: { } setInd(newInd); changeDisplay(1, newInd); - } - + setReachedEnd(ind + 5 < buttonCategories.length); + setReachedStart(true); }; return ( @@ -124,7 +128,7 @@ export default function StoreFrontNavBar(props: { /> - + {buttonDisplay.map((type, index) => ( @@ -141,7 +145,7 @@ export default function StoreFrontNavBar(props: { clickedButton={clickedButton} /> ))} - + diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index 156fba6b..de72ff37 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { Heart, User, ShoppingCart, ArrowLeft, ArrowRight } from 'react-feather'; +import { Heart, User, ShoppingCart, ChevronLeft, ChevronRight } from 'react-feather'; import { Body1 } from '@/styles/fonts'; @@ -11,6 +11,8 @@ import COLORS from '../../styles/colors'; interface props { isClicked: boolean; isHovering: boolean; + hasReachedStart: boolean; + hasReachedEnd: boolean; } export const StickyHeader = styled.div` @@ -214,26 +216,28 @@ export const OutterDiv = styled.div` height: 375px; `; -export const Front = styled(ArrowLeft)` +export const Front = styled(ChevronLeft)` width: 30px; height: 30px; position: relative; `; -export const FrontButton = styled.button` +export const FrontButton = styled.button<{ $reachedStart?: boolean }>` position: relative; background-color: transparent; border: none; + visibility: ${props => (props.$reachedStart ? 'visible' : 'hidden')}; `; -export const Back = styled(ArrowRight)` +export const Back = styled(ChevronRight)` width: 30px; height: 30px; position: relative; `; -export const BackButton = styled.button` +export const BackButton = styled.button<{ $reachedEnd?: boolean }>` position: relative; background-color: transparent; border: none; + visibility: ${props => (props.$reachedEnd ? 'visible' : 'hidden')}; `; \ No newline at end of file From ca79ef0fee973441735e82f64776546943749634 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sun, 17 Mar 2024 16:48:57 -0700 Subject: [PATCH 043/101] fix: eslint and pretteir --- src/api/supabase/queries/button_queries.ts | 20 +++++----- src/api/supabase/queries/product_queries.ts | 4 +- src/app/storefront/StoreFrontNavBar.tsx | 43 +++++++++------------ src/app/storefront/page.tsx | 12 ------ src/app/storefront/productButtons.tsx | 10 ++--- src/app/storefront/styles.ts | 10 ++++- 6 files changed, 41 insertions(+), 58 deletions(-) diff --git a/src/api/supabase/queries/button_queries.ts b/src/api/supabase/queries/button_queries.ts index f9569328..77fb8038 100644 --- a/src/api/supabase/queries/button_queries.ts +++ b/src/api/supabase/queries/button_queries.ts @@ -2,16 +2,16 @@ import { StorefrontButtons } from '../../../schema/schema'; import supabase from '../createClient'; export async function fetchButoonCategories(): Promise { - const { data: buttons, error } = await supabase - .from('storefront_buttons') - .select('*'); - if (error) { - throw new Error(`Error fetching buttons: ${error.message}`); - } - - return buttons; + const { data: buttons, error } = await supabase + .from('storefront_buttons') + .select('*'); + if (error) { + throw new Error(`Error fetching buttons: ${error.message}`); + } + + return buttons; } export async function fetchButton() { - return 0 -} \ No newline at end of file + return 0; +} diff --git a/src/api/supabase/queries/product_queries.ts b/src/api/supabase/queries/product_queries.ts index a03acb70..96e1f470 100644 --- a/src/api/supabase/queries/product_queries.ts +++ b/src/api/supabase/queries/product_queries.ts @@ -105,14 +105,12 @@ export async function filterUserProducts( const products = await fetchUnprescribedCategory(productType); const user = await fetchUser(); - - const { data: prescribed, error } = await supabase .from('product') .select('*') .eq('prescribed', true) .eq('category', productType); - + if (error) { throw new Error(`Error fetching products: ${error.message}`); } diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index e8a7c81c..09e7f8f5 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -16,42 +16,40 @@ import { import { Product, StorefrontButtons } from '../../schema/schema'; -import { ButtonsContainer, +import { + ButtonsContainer, FrontButton, BackButton, Front, Back, - } from './styles'; +} from './styles'; import ProductButtons from './productButtons'; export default function StoreFrontNavBar(props: { setFilteredProducts: (category: Product[]) => void; - setIsClickedButton: (clicked: boolean[]) => void; - IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; clickedButton: number; setClickedButton: (clicked: number) => void; }) { - const { setFilteredProducts, - setIsClickedButton, - IsClickedButton, setCategoryWord, setClickedButton, - clickedButton + clickedButton, } = props; const [data, setData] = useState(0); const [isZero, setIsZero] = useState(true); - const [buttonCategories, setButtonCategories] = useState([]); + const [buttonCategories, setButtonCategories] = useState( + [], + ); const [buttonDisplay, setButtonDisplay] = useState([]); const [ind, setInd] = useState(0); let newInd = 0; const [reachedStart, setReachedStart] = useState(false); const [reachedEnd, setReachedEnd] = useState(true); - + useEffect(() => { const fetchData = async () => { setData(await totalNumberOfItemsInCart()); @@ -73,20 +71,19 @@ export default function StoreFrontNavBar(props: { setButtonCategories(await fetchButoonCategories()); }; fetchButtonCat(); - }, []) - + }, []); + useEffect(() => { const displayedButtons = async () => { - const button = await fetchButoonCategories() + const button = await fetchButoonCategories(); setButtonDisplay(button.slice(0, 4)); }; displayedButtons(); - }, []) - + }, []); - const changeDisplay = (direction : number, index : number) => { - setButtonDisplay(buttonCategories.slice(index, index+4)); - } + const changeDisplay = (direction: number, index: number) => { + setButtonDisplay(buttonCategories.slice(index, index + 4)); + }; const handlePrevious = () => { if (ind > 0) { @@ -108,7 +105,7 @@ export default function StoreFrontNavBar(props: { if (remainder < 4) { newInd = buttonCategories.length - 4; } else { - newInd = ind + 4 + newInd = ind + 4; } setInd(newInd); changeDisplay(1, newInd); @@ -129,7 +126,7 @@ export default function StoreFrontNavBar(props: { - + {buttonDisplay.map((type, index) => ( ))} - + diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 3dbcacc4..480b4a53 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -15,18 +15,8 @@ export default function App() { const [CategoryWord, setCategoryWord] = useState('All'); - const [IsClickedButton, setIsClickedButton] = useState([ - true, - false, - false, - false, - ] - ); - - const [clickedButton, setClickedButton] = useState(0); - useEffect(() => { async function fetchAllProducts() { try { @@ -44,8 +34,6 @@ export default function App() {
void; content: string; - setIsClickedButton: (clicked: boolean[]) => void; - IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; index: number; setClickedButton: (clicked: number) => void; @@ -29,12 +27,10 @@ export default function ProductButtons(props: { value, content, setFiltredProducts, - setIsClickedButton, - IsClickedButton, setCategoryWord, index, setClickedButton, - clickedButton + clickedButton, } = props; async function applyFilter( @@ -92,14 +88,14 @@ export default function ProductButtons(props: { return ( + {buttonDisplay.map((type, index) => ( ))} + diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 7d8976cb..80efc83a 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -2,10 +2,12 @@ import React from 'react'; +import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { Button, Label, IndividualContainer } from './styles'; import { buttons } from './buttonValues'; + import { fetchUserProducts, filterUserProducts, @@ -41,10 +43,12 @@ export default function ProductButtons(props: { const category = e.currentTarget.value; const productItem = await fetchUserProducts(); + const buttonCategories = await fetchButoonCategories(); - for (let i = 0; i < buttons.length; i += 1) { - if (buttons[i].value === category) { - const ind = buttons[i].count; + for (let i = 0; i < buttonCategories.length; i += 1) { + console.log(buttonCategories[i].value, category); + if (buttonCategories[i].value === category) { + const ind = buttonCategories[i].count; if (IsClickedButton[ind] === true) { const tempArray = [...IsClickedButton]; tempArray[ind] = !tempArray[ind]; @@ -59,7 +63,7 @@ export default function ProductButtons(props: { } const arrayOfFalse = [false, false, false, false]; arrayOfFalse[ind] = true; - setCategoryWord(buttons[i].value); + setCategoryWord(buttonCategories[i].value); setIsClickedButton(arrayOfFalse); break; diff --git a/src/schema/schema.ts b/src/schema/schema.ts index 51a028ba..5dd98d91 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -79,3 +79,10 @@ export type Address = { zipcode: string; user_id: number; }; + +export type StorefrontButtons = { + id: number; + name: string; + value: string; + count: number; +}; From e30220084a2167bb7a8977d9975033b23fb8455e Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Sat, 16 Mar 2024 12:30:32 -0700 Subject: [PATCH 047/101] buyankhuu'ssmallchange --- src/app/storefront/StoreFrontNavBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 498fba32..e162ef70 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -137,7 +137,7 @@ export default function StoreFrontNavBar(props: { -

User

+

Users

From ed4f2979233348ef209e8a566be1b0ae8bec54c5 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Sat, 16 Mar 2024 14:54:25 -0700 Subject: [PATCH 048/101] donen --- src/app/storefront/StoreFrontNavBar.tsx | 28 +++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index e162ef70..70efcd83 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -26,7 +26,6 @@ export default function StoreFrontNavBar(props: { IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; }) { - const { setFilteredProducts, setIsClickedButton, @@ -36,9 +35,12 @@ export default function StoreFrontNavBar(props: { const [data, setData] = useState(0); const [isZero, setIsZero] = useState(true); - const [buttonCategories, setButtonCategories] = useState([]); + const [buttonCategories, setButtonCategories] = useState( + [], + ); const [buttonDisplay, setButtonDisplay] = useState([]); - let ind = 0; + const [ind, setInd] = useState(0); + const length = 4; // const [reachedEnd, setReachedEnd] = useState(false); // const [reachedStart, setReachedStart] = useState(true); @@ -64,35 +66,35 @@ export default function StoreFrontNavBar(props: { setButtonCategories(await fetchButoonCategories()); }; fetchButtonCat(); - }, []) - + }, []); + useEffect(() => { const displayedButtons = async () => { - const button = await fetchButoonCategories() + const button = await fetchButoonCategories(); setButtonDisplay(button.slice(0, 4)); }; displayedButtons(); - }, []) + }, []); - const changeDisplay = (direction : number) => { - setButtonDisplay(buttonCategories.slice(ind, ind+4)); + const changeDisplay = (direction: number) => { + setButtonDisplay(buttonCategories.slice(ind, ind + 4)); const clicked = IsClickedButton; for (let i = 0; i < buttonDisplay.length; i += 1) { buttonDisplay[i].count += direction; if (clicked[i]) { clicked[i] = false; - clicked[i+direction] = true; + clicked[i + direction] = true; } } setIsClickedButton(clicked); - - } + }; const handlePrevious = () => { console.log(ind > 0); + console.log(ind); if (ind > 0) { - ind -= 1; + setInd(ind - 1); console.log(ind); // setInd(newIndex < 0 ? length - 1 : newIndex); changeDisplay(-1); From cfb7f5975f8b56b2dc7e1586875c211dc92008dd Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Mon, 18 Mar 2024 14:15:04 -0700 Subject: [PATCH 049/101] navbarmerge --- src/app/storefront/StoreFrontNavBar.tsx | 65 ++++++++++++++----------- src/app/storefront/page.tsx | 4 +- src/app/storefront/styles.ts | 26 +++++++++- 3 files changed, 64 insertions(+), 31 deletions(-) diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 70efcd83..6cdbddc3 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -16,7 +16,13 @@ import { import { Product, StorefrontButtons } from '../../schema/schema'; -import { ButtonsContainer } from './styles'; +import { + ButtonsContainer, + FrontButton, + BackButton, + Front, + Back, +} from './styles'; import ProductButtons from './productButtons'; @@ -40,10 +46,7 @@ export default function StoreFrontNavBar(props: { ); const [buttonDisplay, setButtonDisplay] = useState([]); const [ind, setInd] = useState(0); - - const length = 4; - // const [reachedEnd, setReachedEnd] = useState(false); - // const [reachedStart, setReachedStart] = useState(true); + let newInd = 0; useEffect(() => { const fetchData = async () => { @@ -76,36 +79,36 @@ export default function StoreFrontNavBar(props: { displayedButtons(); }, []); - const changeDisplay = (direction: number) => { - setButtonDisplay(buttonCategories.slice(ind, ind + 4)); + const changeDisplay = (direction: number, index: number) => { + setButtonDisplay(buttonCategories.slice(index, index + 4)); const clicked = IsClickedButton; - for (let i = 0; i < buttonDisplay.length; i += 1) { - buttonDisplay[i].count += direction; - if (clicked[i]) { - clicked[i] = false; - clicked[i + direction] = true; - } - } - - setIsClickedButton(clicked); + // for (let i = 0; i < buttonDisplay.length; i += 1) { + + // if (clicked[i]) { + // clicked[i] = false; + // if (i+direction >= 0 || i+direction < buttonCategories.length) { + // clicked[i+direction] = true; + // } + // } + // } + + // setIsClickedButton(clicked); + console.log(IsClickedButton); }; const handlePrevious = () => { - console.log(ind > 0); - console.log(ind); if (ind > 0) { - setInd(ind - 1); - console.log(ind); - // setInd(newIndex < 0 ? length - 1 : newIndex); - changeDisplay(-1); + newInd = ind - 1; + setInd(newInd); + changeDisplay(-1, newInd); } }; const handleNext = () => { if (ind + 4 < buttonCategories.length) { - ind += 1; - console.log(ind); - changeDisplay(1); + newInd = ind + 1; + setInd(ind + 1); + changeDisplay(1, newInd); } }; @@ -120,20 +123,24 @@ export default function StoreFrontNavBar(props: { /> - + + + {buttonDisplay.map((type, index) => ( ))} - + + + diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index 6e9aed22..db9f8fea 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -20,7 +20,9 @@ export default function App() { false, false, false, - ]); + ] + + ); useEffect(() => { async function fetchAllProducts() { diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index 2afce95e..156fba6b 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { Heart, User, ShoppingCart } from 'react-feather'; +import { Heart, User, ShoppingCart, ArrowLeft, ArrowRight } from 'react-feather'; import { Body1 } from '@/styles/fonts'; @@ -213,3 +213,27 @@ export const OutterDiv = styled.div` width: 300px; height: 375px; `; + +export const Front = styled(ArrowLeft)` + width: 30px; + height: 30px; + position: relative; +`; + +export const FrontButton = styled.button` + position: relative; + background-color: transparent; + border: none; +`; + +export const Back = styled(ArrowRight)` + width: 30px; + height: 30px; + position: relative; +`; + +export const BackButton = styled.button` + position: relative; + background-color: transparent; + border: none; +`; \ No newline at end of file From 4152e37608b1a5158d0feb9562fac225deb557fe Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Mon, 18 Mar 2024 14:16:05 -0700 Subject: [PATCH 050/101] navbarmerge --- src/api/supabase/queries/button_queries.ts | 3 +- src/api/supabase/queries/product_queries.ts | 3 ++ src/app/storefront/StoreFrontNavBar.tsx | 34 +++++++++++---------- src/app/storefront/page.tsx | 7 ++++- src/app/storefront/productButtons.tsx | 32 ++++++++++--------- 5 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/api/supabase/queries/button_queries.ts b/src/api/supabase/queries/button_queries.ts index d2ae675e..f9569328 100644 --- a/src/api/supabase/queries/button_queries.ts +++ b/src/api/supabase/queries/button_queries.ts @@ -8,8 +8,7 @@ export async function fetchButoonCategories(): Promise { if (error) { throw new Error(`Error fetching buttons: ${error.message}`); } - console.log("func tester") - console.log(buttons) + return buttons; } diff --git a/src/api/supabase/queries/product_queries.ts b/src/api/supabase/queries/product_queries.ts index ae9c44cc..a03acb70 100644 --- a/src/api/supabase/queries/product_queries.ts +++ b/src/api/supabase/queries/product_queries.ts @@ -105,11 +105,14 @@ export async function filterUserProducts( const products = await fetchUnprescribedCategory(productType); const user = await fetchUser(); + + const { data: prescribed, error } = await supabase .from('product') .select('*') .eq('prescribed', true) .eq('category', productType); + if (error) { throw new Error(`Error fetching products: ${error.message}`); } diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 6cdbddc3..c01e6174 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -31,12 +31,16 @@ export default function StoreFrontNavBar(props: { setIsClickedButton: (clicked: boolean[]) => void; IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; + clickedButton: number; + setClickedButton: (clicked: number) => void; }) { const { setFilteredProducts, setIsClickedButton, IsClickedButton, setCategoryWord, + setClickedButton, + clickedButton, } = props; const [data, setData] = useState(0); @@ -81,24 +85,15 @@ export default function StoreFrontNavBar(props: { const changeDisplay = (direction: number, index: number) => { setButtonDisplay(buttonCategories.slice(index, index + 4)); - const clicked = IsClickedButton; - // for (let i = 0; i < buttonDisplay.length; i += 1) { - - // if (clicked[i]) { - // clicked[i] = false; - // if (i+direction >= 0 || i+direction < buttonCategories.length) { - // clicked[i+direction] = true; - // } - // } - // } - - // setIsClickedButton(clicked); - console.log(IsClickedButton); }; const handlePrevious = () => { if (ind > 0) { - newInd = ind - 1; + if (ind % 4 !== 0) { + newInd = 4 * (Math.floor(buttonCategories.length / 4) - 1); + } else { + newInd = ind - 4; + } setInd(newInd); changeDisplay(-1, newInd); } @@ -106,8 +101,13 @@ export default function StoreFrontNavBar(props: { const handleNext = () => { if (ind + 4 < buttonCategories.length) { - newInd = ind + 1; - setInd(ind + 1); + const remainder = buttonCategories.length - ind - 4; + if (remainder < 4) { + newInd = buttonCategories.length - 4; + } else { + newInd = ind + 4; + } + setInd(newInd); changeDisplay(1, newInd); } }; @@ -136,6 +136,8 @@ export default function StoreFrontNavBar(props: { IsClickedButton={IsClickedButton} setCategoryWord={setCategoryWord} index={index + ind} + setClickedButton={setClickedButton} + clickedButton={clickedButton} /> ))} diff --git a/src/app/storefront/page.tsx b/src/app/storefront/page.tsx index db9f8fea..3dbcacc4 100644 --- a/src/app/storefront/page.tsx +++ b/src/app/storefront/page.tsx @@ -21,9 +21,12 @@ export default function App() { false, false, ] - ); + + const [clickedButton, setClickedButton] = useState(0); + + useEffect(() => { async function fetchAllProducts() { try { @@ -44,6 +47,8 @@ export default function App() { setIsClickedButton={setIsClickedButton} IsClickedButton={IsClickedButton} setCategoryWord={setCategoryWord} + clickedButton={clickedButton} + setClickedButton={setClickedButton} /> Shop {CategoryWord} diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 80efc83a..8a0495a3 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -5,9 +5,6 @@ import React from 'react'; import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; import { Button, Label, IndividualContainer } from './styles'; -import { buttons } from './buttonValues'; - - import { fetchUserProducts, filterUserProducts, @@ -24,6 +21,8 @@ export default function ProductButtons(props: { IsClickedButton: boolean[]; setCategoryWord: (word: string) => void; index: number; + setClickedButton: (clicked: number) => void; + clickedButton: number; }) { const { key, @@ -34,6 +33,8 @@ export default function ProductButtons(props: { IsClickedButton, setCategoryWord, index, + setClickedButton, + clickedButton } = props; async function applyFilter( @@ -46,25 +47,26 @@ export default function ProductButtons(props: { const buttonCategories = await fetchButoonCategories(); for (let i = 0; i < buttonCategories.length; i += 1) { - console.log(buttonCategories[i].value, category); if (buttonCategories[i].value === category) { - const ind = buttonCategories[i].count; - if (IsClickedButton[ind] === true) { - const tempArray = [...IsClickedButton]; - tempArray[ind] = !tempArray[ind]; - tempArray[0] = true; + const ind = buttonCategories[i].id - 1; + if (ind === clickedButton) { + // const tempArray = [...IsClickedButton]; + // tempArray[ind] = !tempArray[ind]; + // tempArray[0] = true; setCategoryWord('All'); - setIsClickedButton(tempArray); + // setIsClickedButton(tempArray); + setClickedButton(0); if (productItem !== null) { setFiltredProducts(productItem); } return; } - const arrayOfFalse = [false, false, false, false]; - arrayOfFalse[ind] = true; + setClickedButton(ind); + // const arrayOfFalse = [false, false, false, false]; + // arrayOfFalse[ind] = true; setCategoryWord(buttonCategories[i].value); - setIsClickedButton(arrayOfFalse); + // setIsClickedButton(arrayOfFalse); break; } @@ -90,14 +92,14 @@ export default function ProductButtons(props: { return ( - {/* */} - - - -
+ {errorMessage && {errorMessage}} + + + + ); } diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index 7a51d8e3..a5f91ddd 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -5,8 +5,7 @@ import COLORS from '../../styles/colors'; export const LoginBox = styled.div` width: 500px; height: 420px; - - border: 1px solid #b3b3b3; + border: 1px solid ${COLORS.neutralGrey}; `; export const LoginContent = styled.div` @@ -15,31 +14,20 @@ export const LoginContent = styled.div` align-self: center; justify-self: center; margin-top: 30px; - text-color: black; + text-color: ${COLORS.black}; `; export const Button = styled.button` color: ${COLORS.white}; - text-align: center; - font-size: 17px; - font-style: normal; - font-weight: 600; - line-height: normal; width: 420px; height: 40px; border-radius: 8px; background: ${COLORS.navy}; border: transparent; - z-index: 1; `; export const WelcomeSign = styled.div` color: ${COLORS.navy}; - font-size: 40px; - font-style: normal; - font-weight: 600; - line-height: normal; - padding-bottom: 10px; `; export const FormHeaders = styled.p` @@ -70,8 +58,8 @@ export const EyeOffIcon = styled(EyeOff)` stroke-width: 1.5; width: 20px; height: 20px; - color: black; - margin: 20px 20px 20px 20px; + color: ${COLORS.black}; + margin: 20px; transform: translateY(-250%) translateX(1800%); `; @@ -79,8 +67,8 @@ export const EyeIcon = styled(Eye)` stroke-width: 1.5; width: 20px; height: 20px; - color: black; - margin: 20px 20px 20px 20px; + color: ${COLORS.black}; + margin: 20px; transform: translateY(-250%) translateX(1800%); `; diff --git a/src/components/InputFieldsFolder/InputFields.tsx b/src/components/InputFieldsFolder/InputFields.tsx index 3e187a6a..21625e58 100644 --- a/src/components/InputFieldsFolder/InputFields.tsx +++ b/src/components/InputFieldsFolder/InputFields.tsx @@ -1,6 +1,7 @@ 'use client'; import { useState } from 'react'; +import { Heading4 } from '@/styles/fonts'; import { FormHeaders, Input } from './styles'; export default function InputFields(props: { @@ -38,7 +39,9 @@ export default function InputFields(props: { return (
- {text} + + {text} + ` - color: ${props => (props.$pickColor ? '#203354' : 'black')}; - background: ${props => (props.$pickColor ? '#ADD8E6' : '#FFFFFF')}; + color: ${props => (props.$pickColor ? '#203354' : COLORS.black)}; + background: ${props => (props.$pickColor ? '#ADD8E6' : COLORS.white)}; stroke-width: 1px; width: 420px; height: 40px; @@ -12,12 +12,8 @@ export const Input1 = styled.input<{ $pickColor?: boolean }>` border-color: ${COLORS.black}; `; -export const FormHeaders = styled.p` +export const FormHeaders = styled.div` color: ${COLORS.black}; - font-size: 18px; - font-style: normal; - font-weight: 400; - line-height: normal; margin-top: 20px; margin-bottom: 10px; `; @@ -27,25 +23,21 @@ export const Input = styled.input<{ $wrongLogin?: boolean; }>` &:focus { - border: 1.5px solid #1b3679; - background: #f5fbff; + border: 1.5px solid ${COLORS.navy}; + background: ${COLORS.skyBlue}; outline: none; - color: #1b3679; + color: ${COLORS.navy}; } stroke-width: 1px; - color: #000000; - border: 1.5px solid ${props => (props.$wrongLogin ? '#B60000' : 'black')}; - background: ${props => (props.$pickColor ? '#ffdddd' : 'white')}; + color: ${COLORS.black}; + border: 1.5px solid + ${props => (props.$wrongLogin ? COLORS.darkRed : COLORS.black)}; + background: ${props => (props.$pickColor ? COLORS.lightRed : COLORS.white)}; width: 420px; height: 40px; padding-left: 10px; `; -export const wrong = styled.div` - color: red; - background: pink; -`; - export const EyeOffIcon = styled(EyeOff)` stroke-width: 1.5; width: 20px; From 8d2a43ebd17c63c99250d960f80ef454fe168867 Mon Sep 17 00:00:00 2001 From: Monique Cheng Date: Mon, 18 Mar 2024 16:00:54 -0700 Subject: [PATCH 057/101] fixed the issues --- src/api/supabase/queries/button_queries.ts | 2 +- src/app/storefront/StoreFrontNavBar.tsx | 19 ++++++++++--------- src/app/storefront/productButtons.tsx | 4 ++-- src/app/storefront/styles.ts | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/api/supabase/queries/button_queries.ts b/src/api/supabase/queries/button_queries.ts index 77fb8038..b749889e 100644 --- a/src/api/supabase/queries/button_queries.ts +++ b/src/api/supabase/queries/button_queries.ts @@ -1,7 +1,7 @@ import { StorefrontButtons } from '../../../schema/schema'; import supabase from '../createClient'; -export async function fetchButoonCategories(): Promise { +export async function fetchButtonCategories(): Promise { const { data: buttons, error } = await supabase .from('storefront_buttons') .select('*'); diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 4b0fd05f..52d70058 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -3,7 +3,8 @@ import Image from 'next/image'; import Link from 'next/link'; import React, { useEffect, useState } from 'react'; -import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; +import { fetchButtonCategories } from '@/api/supabase/queries/button_queries'; +import { Body2 } from '@/styles/fonts'; import { totalNumberOfItemsInCart } from '../../api/supabase/queries/cart_queries'; import { @@ -20,8 +21,8 @@ import { ButtonsContainer, FrontButton, BackButton, - Front, - Back, + FrontArrow, + BackArrow, } from './styles'; import ProductButtons from './productButtons'; @@ -68,14 +69,14 @@ export default function StoreFrontNavBar(props: { useEffect(() => { const fetchButtonCat = async () => { - setButtonCategories(await fetchButoonCategories()); + setButtonCategories(await fetchButtonCategories()); }; fetchButtonCat(); }, []); useEffect(() => { const displayedButtons = async () => { - const button = await fetchButoonCategories(); + const button = await fetchButtonCategories(); setButtonDisplay(button.slice(0, 4)); }; displayedButtons(); @@ -126,7 +127,7 @@ export default function StoreFrontNavBar(props: { - + {buttonDisplay.map((type, index) => ( ))} - + -

Users

+ Users -

Cart

+ Cart {data} diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 0c645e74..837d6042 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -2,7 +2,7 @@ import React from 'react'; -import { fetchButoonCategories } from '@/api/supabase/queries/button_queries'; +import { fetchButtonCategories } from '@/api/supabase/queries/button_queries'; import { Button, Label, IndividualContainer } from './styles'; import { @@ -40,7 +40,7 @@ export default function ProductButtons(props: { const category = e.currentTarget.value; const productItem = await fetchUserProducts(); - const buttonCategories = await fetchButoonCategories(); + const buttonCategories = await fetchButtonCategories(); for (let i = 0; i < buttonCategories.length; i += 1) { if (buttonCategories[i].name === category) { diff --git a/src/app/storefront/styles.ts b/src/app/storefront/styles.ts index e60ec236..0821c532 100644 --- a/src/app/storefront/styles.ts +++ b/src/app/storefront/styles.ts @@ -221,7 +221,7 @@ export const OutterDiv = styled.div` height: 375px; `; -export const Front = styled(ChevronLeft)` +export const FrontArrow = styled(ChevronLeft)` width: 30px; height: 30px; position: relative; @@ -235,7 +235,7 @@ export const FrontButton = styled.button<{ $reachedStart?: boolean }>` visibility: ${props => (props.$reachedStart ? 'visible' : 'hidden')}; `; -export const Back = styled(ChevronRight)` +export const BackArrow = styled(ChevronRight)` width: 30px; height: 30px; position: relative; From fa582f0ad4e1fc1ed4017d1069bebbdeb1369eb1 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Mon, 18 Mar 2024 16:10:32 -0700 Subject: [PATCH 058/101] fixedFavoritesPage --- src/app/favorites/page.tsx | 15 ++++++--------- src/app/favorites/styles.ts | 16 ++++++++++++---- src/app/globals.css | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app/favorites/page.tsx b/src/app/favorites/page.tsx index 93975e09..9aad30f6 100644 --- a/src/app/favorites/page.tsx +++ b/src/app/favorites/page.tsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import { Body2 } from '@/styles/fonts'; +import { Body1Bold, Body2 } from '@/styles/fonts'; import BackButton from '../../components/BackButton/BackButton'; import { @@ -20,6 +20,7 @@ import { HeartIcon, TransparentButton, ViewItem, + Fullscreen, } from './styles'; import { Product } from '../../schema/schema'; @@ -43,9 +44,8 @@ export default function FavoritesPage() { } return ( -
+ -

Favorites

@@ -59,11 +59,8 @@ export default function FavoritesPage() { /> -

- {favorite.name} -
- Product ID: {favorite.id} -

+ {favorite.name} + Category: {favorite.category} router.push(`/${favorite.id}`)}> View Item @@ -78,6 +75,6 @@ export default function FavoritesPage() { ))} -
+ ); } diff --git a/src/app/favorites/styles.ts b/src/app/favorites/styles.ts index d88971d3..1cf4c27e 100644 --- a/src/app/favorites/styles.ts +++ b/src/app/favorites/styles.ts @@ -7,7 +7,7 @@ import NavBar from '../../components/NavBarFolder/NavBar'; export const FavoriteDiv = styled.div` display: flex; flex-direction: row; - align-items: start; + align-items: center; justify-content: space-around; width: 100%; margin-bottom: 50px; @@ -22,7 +22,7 @@ export const OutterFavoriteDiv = styled.div` background: var(--White, #fff); box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); width: 800px; - height: 700px; + height: 650px; overflow: scroll; margin-top: 10px; `; @@ -39,8 +39,8 @@ export const BackDiv = styled.button` `; export const OutterBox = styled.div` - width: 900px; - margin-left: 500px; + width: 800px; + height: 100%; `; export const Backtext = styled.p` @@ -85,3 +85,11 @@ export const ViewItem = styled.button` line-height: normal; border-radius: 14px; `; + +export const Fullscreen = styled.div` + width: 100vw; + height: 100%; + display: flex; + flex-direction: column; + align-items: center; +`; diff --git a/src/app/globals.css b/src/app/globals.css index 91c93ba2..021ca9f4 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -82,7 +82,7 @@ html, body { max-width: 100vw; - overflow-x: hidden; + height: 100%; } body { From 2ec67002c56962437da23d1fad535196425382ec Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Mon, 18 Mar 2024 16:19:36 -0700 Subject: [PATCH 059/101] changeToProfilePage --- src/app/profileScreen/page.tsx | 7 ++----- src/app/profileScreen/styles.ts | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 30d0e29b..38041d1f 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -66,11 +66,8 @@ function FavoriteSection(props: { style={{ width: '75px', height: '75px' }} /> -

- {favorite.name} -
- Product ID: {favorite.id} -

+ {favorite.name} + Category: {favorite.category} clickFunctions({ fav: favorite })} diff --git a/src/app/profileScreen/styles.ts b/src/app/profileScreen/styles.ts index 640722eb..aab40616 100644 --- a/src/app/profileScreen/styles.ts +++ b/src/app/profileScreen/styles.ts @@ -104,7 +104,7 @@ export const NavBarMovedUP = styled(NavBar)` export const FavoriteDiv = styled.div` display: flex; flex-direction: row; - align-items: start; + align-items: center; justify-content: space-around; width: 100%; margin-bottom: 50px; From 1fa7a70643a1dd5e6091b0b26a8e4d5217ba201f Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Mon, 18 Mar 2024 18:12:26 -0700 Subject: [PATCH 060/101] buyankhuu'sFix --- src/app/login/styles.ts | 3 +++ src/app/storefront/IndividualItem.tsx | 5 ++--- src/app/storefront/StoreFrontNavBar.tsx | 1 + src/app/storefront/productButtons.tsx | 6 +++--- src/app/storefront/styles.ts | 21 ++++++++++----------- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index b6a73e48..273a4576 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -6,6 +6,8 @@ export const LoginBox = styled.div` width: 500px; height: 420px; border: 1px solid ${COLORS.neutralGrey}; + justify-self: center; + align-self: center; `; export const LoginContent = styled.div` @@ -75,6 +77,7 @@ export const EyeIcon = styled(Eye)` export const Fullscreen = styled.div` width: 100%; height: 100%; + display: grid; `; export const InputField = styled.div` diff --git a/src/app/storefront/IndividualItem.tsx b/src/app/storefront/IndividualItem.tsx index a44c13e3..e0975f53 100644 --- a/src/app/storefront/IndividualItem.tsx +++ b/src/app/storefront/IndividualItem.tsx @@ -51,15 +51,14 @@ export default function IndividualItem(props: { style={{ width: '250px', height: '250px' }} /> - clickFunction()} onMouseEnter={() => setHovering(true)} onMouseLeave={() => setHovering(false)} > - + - + {IsFavorite ? 'Remove from favorites' : 'Add to favorites'} diff --git a/src/app/storefront/StoreFrontNavBar.tsx b/src/app/storefront/StoreFrontNavBar.tsx index 52d70058..2642b4a9 100644 --- a/src/app/storefront/StoreFrontNavBar.tsx +++ b/src/app/storefront/StoreFrontNavBar.tsx @@ -134,6 +134,7 @@ export default function StoreFrontNavBar(props: { key={type.id - 1} value={type.name} setFiltredProducts={setFilteredProducts} + id={type.id} content={type.name} setCategoryWord={setCategoryWord} index={index + ind} diff --git a/src/app/storefront/productButtons.tsx b/src/app/storefront/productButtons.tsx index 837d6042..5e84713a 100644 --- a/src/app/storefront/productButtons.tsx +++ b/src/app/storefront/productButtons.tsx @@ -13,20 +13,20 @@ import { import { Product } from '../../schema/schema'; export default function ProductButtons(props: { - key: number; value: string; setFiltredProducts: (category: Product[]) => void; content: string; setCategoryWord: (word: string) => void; index: number; + id: number; setClickedButton: (clicked: number) => void; clickedButton: number; }) { const { - key, value, content, setFiltredProducts, + id, setCategoryWord, index, setClickedButton, @@ -89,7 +89,7 @@ export default function ProductButtons(props: {
diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 5e1784f7..6abd8705 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -54,6 +54,7 @@ export default function OrderDetailsWithProducts({ date={order.created_at} orderNumber={order.id.toString()} status={order.status} + order={order} /> diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 8aef6d1b..d4773b35 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -2,8 +2,18 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import querystring from 'querystring'; -import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary - +import { + ViewOrderButton, + ArrowIcon, + OrderStatusDiv, + CheckStyled, + OrderStatusApprovedDiv, + CrossStyled, + OrderStatusSubmittedDiv, + LoaderStyled, +} from './styles'; // Adjust the import path as necessary +import { Heading4Bold, Body1, OrderStatusFont } from '@/styles/fonts'; +import { Order, OrderStatus } from '../../schema/schema'; function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', @@ -18,37 +28,138 @@ interface OrderDetailsProps { date: string; orderNumber: string; status: string; // Define more statuses if needed + order: Order; } export default function OrderDetails(props: OrderDetailsProps) { - const { date, orderNumber, status } = props; + const { date, orderNumber, status, order } = props; const router = useRouter(); const viewOrder = (orderID: string) => { const queryString = querystring.stringify({ orderID }); router.push(`/orderPage?${queryString}`); }; + if (order.status === OrderStatus.OrderRejected) { + return ( + - + viewOrder(orderNumber)}> {/** DO NOT USE IMAGE Please use the icon in the feather library! */} View order From 2dca8b0e5513ab5db9faefa307a571bfc3bb208e Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 02:20:34 -0700 Subject: [PATCH 085/101] eslintFixed --- src/app/orderPage/page.tsx | 5 +++-- src/components/OrderHistory/OrderHistoryText.tsx | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index f54e8ff5..662c6bd3 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'; import { Body1, Body2 } from '@/styles/fonts'; +import { useSearchParams } from 'next/navigation'; import BackButton from '../../components/BackButton/BackButton'; import { @@ -24,7 +25,7 @@ import { } from './styles'; import { ProductWithQuantity, Order } from '../../schema/schema'; -import { useSearchParams } from 'next/navigation'; + function formatDate(date: string | undefined): string { if (!date) return ''; @@ -58,7 +59,7 @@ export default function OrderPage() { console.log(orderIDFromSearch); let currOrderId = 0; if (orderIDFromSearch !== null) { - currOrderId = parseInt(orderIDFromSearch); + currOrderId = parseInt(orderIDFromSearch, 10); } else { currOrderId = 32; } diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 3cad5c40..8aef6d1b 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -1,7 +1,9 @@ import React from 'react'; import { useRouter } from 'next/navigation'; -import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + import querystring from 'querystring'; +import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary + function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', From 30efa2b63b1d1044619d5b9662596f69da7db671 Mon Sep 17 00:00:00 2001 From: David Qing Date: Sat, 16 Mar 2024 11:23:53 -0700 Subject: [PATCH 086/101] fixed styling for cart --- package-lock.json | 1493 ++++++--------------------------------- src/app/cart/page.tsx | 23 +- src/app/cart/styles.tsx | 11 - 3 files changed, 219 insertions(+), 1308 deletions(-) diff --git a/package-lock.json b/package-lock.json index aca220b0..4796890e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,6 +47,7 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -112,6 +113,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -126,6 +128,7 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -134,6 +137,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -156,6 +160,7 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -178,19 +183,6 @@ "node": ">=6" } }, - "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", - "hasInstallScript": true, - "peer": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -219,6 +211,7 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -232,6 +225,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, "engines": { "node": ">=12.22" }, @@ -243,71 +237,8 @@ "node_modules/@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", - "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", - "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true }, "node_modules/@next/env": { "version": "13.5.6", @@ -577,35 +508,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@types/eslint": { - "version": "8.44.7", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", - "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", - "dev": true, - "peer": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "peer": true - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -860,187 +762,14 @@ "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true }, "node_modules/acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -1048,20 +777,11 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peer": true, - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -1070,6 +790,7 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1094,6 +815,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, "engines": { "node": ">=8" } @@ -1102,6 +824,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -1115,7 +838,8 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/aria-query": { "version": "5.3.0", @@ -1321,46 +1045,6 @@ "node": ">=8" } }, - "node_modules/browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "peer": true, - "dependencies": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "peer": true - }, "node_modules/bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -1401,6 +1085,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, "engines": { "node": ">=6" } @@ -1436,6 +1121,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1447,16 +1133,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0" - } - }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -1474,6 +1150,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -1484,14 +1161,8 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/concat-map": { "version": "0.0.1", @@ -1508,6 +1179,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1573,7 +1245,8 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "node_modules/define-data-property": { "version": "1.1.1", @@ -1627,6 +1300,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "dependencies": { "esutils": "^2.0.2" }, @@ -1645,13 +1319,6 @@ "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, - "node_modules/electron-to-chromium": { - "version": "1.4.585", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", - "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==", - "dev": true, - "peer": true - }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -1751,13 +1418,6 @@ "safe-array-concat": "^1.0.1" } }, - "node_modules/es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", - "dev": true, - "peer": true - }, "node_modules/es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -1828,20 +1488,11 @@ "ext": "^1.1.2" } }, - "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, "engines": { "node": ">=10" }, @@ -1853,6 +1504,7 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -2253,6 +1905,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -2268,6 +1921,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -2284,6 +1938,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -2295,6 +1950,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -2318,16 +1974,6 @@ "node": ">=0.10.0" } }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.8.x" - } - }, "node_modules/ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -2344,7 +1990,8 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.3.2", @@ -2375,12 +2022,14 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "node_modules/fastq": { "version": "1.15.0", @@ -2394,6 +2043,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -2436,6 +2086,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2451,6 +2102,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -2463,7 +2115,8 @@ "node_modules/flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "node_modules/for-each": { "version": "0.3.3", @@ -2574,6 +2227,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -2590,6 +2244,7 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -2652,7 +2307,8 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "node_modules/has-bigints": { "version": "1.0.2", @@ -2666,6 +2322,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -2740,6 +2397,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2755,6 +2413,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, "engines": { "node": ">=0.8.19" } @@ -2964,6 +2623,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, "engines": { "node": ">=8" } @@ -3088,7 +2748,8 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "node_modules/iterator.prototype": { "version": "1.1.2", @@ -3102,37 +2763,6 @@ "set-function-name": "^2.0.1" } }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "peer": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3142,6 +2772,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -3152,24 +2783,20 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "node_modules/json5": { "version": "2.2.3", @@ -3201,6 +2828,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "dependencies": { "json-buffer": "3.0.1" } @@ -3225,6 +2853,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -3233,16 +2862,6 @@ "node": ">= 0.8.0" } }, - "node_modules/loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.11.5" - } - }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -3261,6 +2880,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -3274,7 +2894,8 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/loose-envify": { "version": "1.4.0", @@ -3298,13 +2919,6 @@ "node": ">=10" } }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true - }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -3325,29 +2939,6 @@ "node": ">=8.6" } }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "peer": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3392,7 +2983,8 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "node_modules/natural-compare-lite": { "version": "1.4.0", @@ -3400,13 +2992,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "peer": true - }, "node_modules/next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -3478,13 +3063,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true, - "peer": true - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -3606,6 +3184,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -3622,6 +3201,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -3636,6 +3216,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -3650,6 +3231,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "dependencies": { "callsites": "^3.0.0" }, @@ -3661,6 +3243,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, "engines": { "node": ">=8" } @@ -3677,6 +3260,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, "engines": { "node": ">=8" } @@ -3746,6 +3330,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, "engines": { "node": ">= 0.8.0" } @@ -3779,6 +3364,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, "engines": { "node": ">=6" } @@ -3802,16 +3388,6 @@ } ] }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, "node_modules/react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -3953,6 +3529,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, "engines": { "node": ">=4" } @@ -3978,6 +3555,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -4027,27 +3605,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "peer": true - }, "node_modules/safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -4101,16 +3658,6 @@ "node": ">=10" } }, - "node_modules/serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "peer": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, "node_modules/set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -4147,6 +3694,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -4158,6 +3706,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, "engines": { "node": ">=8" } @@ -4183,16 +3732,6 @@ "node": ">=8" } }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -4201,17 +3740,6 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "peer": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -4285,6 +3813,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -4304,6 +3833,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, "engines": { "node": ">=8" }, @@ -4369,6 +3899,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -4395,64 +3926,11 @@ "node": ">=6" } }, - "node_modules/terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/to-regex-range": { "version": "5.0.1", @@ -4525,6 +4003,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -4536,6 +4015,7 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, "engines": { "node": ">=10" }, @@ -4616,6 +4096,7 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4638,41 +4119,11 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "peer": true, - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -4706,64 +4157,6 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, - "node_modules/webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -4806,6 +4199,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -4910,6 +4304,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, "engines": { "node": ">=10" }, @@ -4922,7 +4317,8 @@ "@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "dev": true }, "@babel/runtime": { "version": "7.23.2", @@ -4936,15 +4332,13 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@calblueprint/eslint-config-react/-/eslint-config-react-0.0.3.tgz", "integrity": "sha512-1Tbws/hjtb7JaKtTtE/g3s3cuky3eqKbIM6mm/QZOMmzcHex4+fAh2QHjeOPE9z4ZXuJS2HWx5n4VDdHJcDs5A==", - "dev": true, - "requires": {} + "dev": true }, "@calblueprint/prettier-config": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/is-prop-valid": { "version": "1.2.1", @@ -4968,6 +4362,7 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, "requires": { "eslint-visitor-keys": "^3.3.0" } @@ -4975,12 +4370,14 @@ "@eslint-community/regexpp": { "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==" + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true }, "@eslint/eslintrc": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", + "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -4996,7 +4393,8 @@ "@eslint/js": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==" + "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", + "dev": true }, "@fortawesome/fontawesome-common-types": { "version": "6.4.2", @@ -5008,15 +4406,6 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==" }, - "@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", - "peer": true, - "requires": { - "@fortawesome/fontawesome-common-types": "6.4.2" - } - }, "@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -5037,6 +4426,7 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", + "dev": true, "requires": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -5046,67 +4436,14 @@ "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true }, "@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "@jridgewell/gen-mapping": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "dev": true, - "peer": true - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, - "peer": true - }, - "@jridgewell/source-map": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", - "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true - }, - "@jridgewell/trace-mapping": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", - "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", + "dev": true }, "@next/env": { "version": "13.5.6", @@ -5280,35 +4617,6 @@ "tslib": "^2.4.0" } }, - "@types/eslint": { - "version": "8.44.7", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz", - "integrity": "sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==", - "dev": true, - "peer": true, - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "peer": true - }, "@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -5474,206 +4782,26 @@ "@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "@webassemblyjs/ast": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", - "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", - "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", - "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", - "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", - "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", - "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", - "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", - "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", - "dev": true, - "peer": true, - "requires": { - "@webassemblyjs/ast": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true }, "acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" - }, - "acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peer": true, - "requires": {} + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", + "dev": true }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "requires": {} + "dev": true }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -5685,18 +4813,19 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -5704,7 +4833,8 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "aria-query": { "version": "5.3.0", @@ -5859,26 +4989,6 @@ "fill-range": "^7.0.1" } }, - "browserslist": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", - "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", - "dev": true, - "peer": true, - "requires": { - "caniuse-lite": "^1.0.30001541", - "electron-to-chromium": "^1.4.535", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.13" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "peer": true - }, "bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -5908,7 +5018,8 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true }, "camelize": { "version": "1.0.1", @@ -5924,18 +5035,12 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "peer": true - }, "client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -5950,6 +5055,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -5957,14 +5063,8 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true, - "peer": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "concat-map": { "version": "0.0.1", @@ -5981,6 +5081,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6032,7 +5133,8 @@ "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "define-data-property": { "version": "1.1.1", @@ -6071,6 +5173,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, "requires": { "esutils": "^2.0.2" } @@ -6080,13 +5183,6 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==" }, - "electron-to-chromium": { - "version": "1.4.585", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.585.tgz", - "integrity": "sha512-B4yBlX0azdA3rVMxpYwLQfDpdwOgcnLCkpvSOd68iFmeedo+WYjaBJS3/W58LVD8CB2nf+o7C4K9xz1l09RkWg==", - "dev": true, - "peer": true - }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -6174,13 +5270,6 @@ "safe-array-concat": "^1.0.1" } }, - "es-module-lexer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", - "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==", - "dev": true, - "peer": true - }, "es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -6238,22 +5327,17 @@ "ext": "^1.1.2" } }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, - "peer": true - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true }, "eslint": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", + "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6299,6 +5383,7 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -6357,8 +5442,7 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.9", @@ -6533,8 +5617,7 @@ "eslint-plugin-react-hooks": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "requires": {} + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" }, "eslint-scope": { "version": "5.1.1", @@ -6563,6 +5646,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, "requires": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -6573,6 +5657,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, "requires": { "estraverse": "^5.1.0" } @@ -6581,6 +5666,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, "requires": { "estraverse": "^5.2.0" } @@ -6595,13 +5681,6 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true - }, "ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -6620,7 +5699,8 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "fast-glob": { "version": "3.3.2", @@ -6647,12 +5727,14 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "fastq": { "version": "1.15.0", @@ -6666,6 +5748,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, "requires": { "flat-cache": "^3.0.4" } @@ -6692,6 +5775,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, "requires": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -6701,6 +5785,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, "requires": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -6710,7 +5795,8 @@ "flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "for-each": { "version": "0.3.3", @@ -6791,6 +5877,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "requires": { "is-glob": "^4.0.3" } @@ -6804,6 +5891,7 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", + "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -6845,7 +5933,8 @@ "graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "has-bigints": { "version": "1.0.2", @@ -6855,7 +5944,8 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "has-property-descriptors": { "version": "1.0.1", @@ -6900,6 +5990,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -6908,7 +5999,8 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true }, "inflight": { "version": "1.0.6", @@ -7045,7 +6137,8 @@ "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true }, "is-regex": { "version": "1.1.4", @@ -7128,7 +6221,8 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true }, "iterator.prototype": { "version": "1.1.2", @@ -7142,30 +6236,6 @@ "set-function-name": "^2.0.1" } }, - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "peer": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "peer": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -7175,6 +6245,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, "requires": { "argparse": "^2.0.1" } @@ -7182,24 +6253,20 @@ "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true, - "peer": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "json5": { "version": "2.2.3", @@ -7222,6 +6289,7 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, "requires": { "json-buffer": "3.0.1" } @@ -7243,18 +6311,12 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, "requires": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "peer": true - }, "loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -7270,6 +6332,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, "requires": { "p-locate": "^5.0.0" } @@ -7277,7 +6340,8 @@ "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "loose-envify": { "version": "1.4.0", @@ -7295,13 +6359,6 @@ "yallist": "^4.0.0" } }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true, - "peer": true - }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -7316,23 +6373,6 @@ "picomatch": "^2.3.1" } }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "peer": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "peer": true, - "requires": { - "mime-db": "1.52.0" - } - }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -7359,7 +6399,8 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "natural-compare-lite": { "version": "1.4.0", @@ -7367,13 +6408,6 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true, - "peer": true - }, "next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -7400,8 +6434,7 @@ "next-google-fonts": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/next-google-fonts/-/next-google-fonts-2.2.0.tgz", - "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==", - "requires": {} + "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==" }, "next-tick": { "version": "1.1.0", @@ -7413,13 +6446,6 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==" }, - "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true, - "peer": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -7508,6 +6534,7 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dev": true, "requires": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -7521,6 +6548,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, "requires": { "yocto-queue": "^0.1.0" } @@ -7529,6 +6557,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, "requires": { "p-limit": "^3.0.2" } @@ -7537,6 +6566,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, "requires": { "callsites": "^3.0.0" } @@ -7544,7 +6574,8 @@ "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true }, "path-is-absolute": { "version": "1.0.1", @@ -7554,7 +6585,8 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true }, "path-parse": { "version": "1.0.7", @@ -7594,7 +6626,8 @@ "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true }, "prettier": { "version": "2.8.8", @@ -7615,23 +6648,14 @@ "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "peer": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -7728,7 +6752,8 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true }, "resolve-pkg-maps": { "version": "1.0.0", @@ -7744,6 +6769,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, "requires": { "glob": "^7.1.3" } @@ -7767,13 +6793,6 @@ "isarray": "^2.0.5" } }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "peer": true - }, "safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -7811,16 +6830,6 @@ "lru-cache": "^6.0.0" } }, - "serialize-javascript": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", - "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", - "dev": true, - "peer": true, - "requires": { - "randombytes": "^2.1.0" - } - }, "set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -7851,6 +6860,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -7858,7 +6868,8 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true }, "side-channel": { "version": "1.0.4", @@ -7875,29 +6886,11 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "peer": true - }, "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "peer": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -7953,6 +6946,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -7965,7 +6959,8 @@ "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true }, "styled-components": { "version": "6.1.1", @@ -8000,6 +6995,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -8014,37 +7010,11 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, - "terser": { - "version": "5.24.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz", - "integrity": "sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - } - }, - "terser-webpack-plugin": { - "version": "5.3.9", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", - "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.17", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" - } - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "to-regex-range": { "version": "5.0.1", @@ -8109,6 +7079,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, "requires": { "prelude-ls": "^1.2.1" } @@ -8116,7 +7087,8 @@ "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true }, "typed-array-buffer": { "version": "1.0.0", @@ -8172,7 +7144,8 @@ "typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true }, "unbox-primitive": { "version": "1.0.2", @@ -8185,21 +7158,11 @@ "which-boxed-primitive": "^1.0.2" } }, - "update-browserslist-db": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", - "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", - "dev": true, - "peer": true, - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, "requires": { "punycode": "^2.1.0" } @@ -8226,46 +7189,6 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, - "webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", - "dev": true, - "peer": true, - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true - }, "websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -8307,6 +7230,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, "requires": { "isexe": "^2.0.0" } @@ -8383,7 +7307,8 @@ "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true } } } diff --git a/src/app/cart/page.tsx b/src/app/cart/page.tsx index be0f62f8..de077e27 100644 --- a/src/app/cart/page.tsx +++ b/src/app/cart/page.tsx @@ -14,7 +14,6 @@ import { import CartItem from './cartItem'; import NavBar from '../../components/NavBarFolder/NavBar'; import { - OutterFavoriteDiv, PageDiv, CheckoutButton, LeftColumnDiv, @@ -55,18 +54,16 @@ export default function OrderPage() {

Cart

- - {cart.map(cartItem => ( - - ))} - + {cart.map(cartItem => ( + + ))} diff --git a/src/app/cart/styles.tsx b/src/app/cart/styles.tsx index 45e0c0d3..04071e68 100644 --- a/src/app/cart/styles.tsx +++ b/src/app/cart/styles.tsx @@ -17,17 +17,6 @@ export const FavoriteDiv = styled.div` margin-top: 30px; `; -export const OutterFavoriteDiv = styled.div` - display: flex; - flex-direction: column; - align-items: center; - border-radius: 10px; - width: 1000px; - height: 700px; - overflow: scroll; - margin-top: 10px; -`; - export const BackDiv = styled.button` display: flex; flex-direction: row; From 3b2265bfd28f3f242b6e9e8778e53b1aead8cc9d Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Mon, 18 Mar 2024 20:29:51 -0700 Subject: [PATCH 087/101] WIP Need to fix button still that change color --- src/api/supabase/queries/order_queries.ts | 2 +- src/app/delivery/page.tsx | 2 ++ src/app/pickup/styles.ts | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index b9296a2d..ce212f5b 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -277,4 +277,4 @@ export async function fetchOrderProductsbyOrderId( ); return orderProducts; -} +} diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index c0688332..a4f3c252 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -19,6 +19,8 @@ import { InformationText, } from './styles'; + + export default function App() { const [numberOfItems, setNumberOfItems] = useState(0); const [cart, setCart] = useState([]); diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index d076c943..f66c2120 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -31,7 +31,6 @@ export const PickupContent = styled.div` export const PickupTimeButton = styled.button` background: {COLORS.periwinkle}; - height: 124px; width: 242px; margin-top: 20px; From 1967f82be2eb29f838796115244399acc497dfba Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 11:37:20 -0700 Subject: [PATCH 088/101] removedFile --- src/components/OrderHistory/Chevron_Right.svg | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/components/OrderHistory/Chevron_Right.svg diff --git a/src/components/OrderHistory/Chevron_Right.svg b/src/components/OrderHistory/Chevron_Right.svg deleted file mode 100644 index d116c6dc..00000000 --- a/src/components/OrderHistory/Chevron_Right.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - From a53ca6ee3120092a5d116449fd6b70e3ca825893 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 11:46:17 -0700 Subject: [PATCH 089/101] Buyankhuu'sChecl --- src/api/supabase/queries/order_queries.ts | 35 +++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index d7b6b693..5d83696e 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,12 +1,9 @@ /* eslint-disable no-console */ // -import { - Order, - OrderProduct, - Product, -} from '../../../schema/schema'; +import { Order, OrderProduct, Product } from '../../../schema/schema'; import { fetchUser } from './user_queries'; +import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; /** @@ -78,7 +75,6 @@ export async function fetchOrdersByUser(): Promise { return data; } - /** * gets all orders by user id and sorted it by creation data * @param Order[] - An array of Order objects. @@ -119,7 +115,6 @@ export async function fetchOrderProductById( return orderProduct; } - export async function fetchProductWithQuantityById( productId: number, ): Promise { @@ -193,7 +188,6 @@ export async function fetchCurrentOrdersByUser(): Promise { return data; } - export async function updateCartPickupId(pickupId: number) { const user = await fetchUser(); const cartId = user.cart_id; @@ -201,4 +195,27 @@ export async function updateCartPickupId(pickupId: number) { .from('order') .update({ pickup_time_id: pickupId }) .eq('id', cartId); -} \ No newline at end of file +} + +export async function fetchProductsFromOrder( + orderId: number, +): Promise { + const order = await getOrderById(orderId); + const products = order.order_product_id_array; + + const productPromises = products.map(async (productID: number) => { + const product = await fetchProductFromOrderProduct(productID); + return product; + }); + const fetchedProducts = await Promise.all(productPromises); + + return fetchedProducts; +} + +export async function fetchProductFromOrderProduct( + orderProductId: number, +): Promise { + const orderProduct = await fetchOrderProductById(orderProductId); + const product = await fetchProductByID(orderProduct.product_id); + return product; +} From 06a2817efb649a1a3d0cabb2a4cea04a931903d4 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 11:49:21 -0700 Subject: [PATCH 090/101] fix --- package-lock.json | 1602 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 1376 insertions(+), 226 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4796890e..d2fac894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,6 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -113,7 +112,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -128,7 +126,6 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -137,7 +134,6 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", - "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -160,7 +156,6 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", - "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -183,6 +178,29 @@ "node": ">=6" } }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", + "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", + "hasInstallScript": true, + "peer": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core/node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", + "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", + "hasInstallScript": true, + "peer": true, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -211,7 +229,6 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", - "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -225,7 +242,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, "engines": { "node": ">=12.22" }, @@ -237,8 +253,71 @@ "node_modules/@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true, + "peer": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } }, "node_modules/@next/env": { "version": "13.5.6", @@ -508,6 +587,35 @@ "tslib": "^2.4.0" } }, + "node_modules/@types/eslint": { + "version": "8.56.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", + "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", + "dev": true, + "peer": true, + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "peer": true, + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true, + "peer": true + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -762,14 +870,187 @@ "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true, + "peer": true + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true, + "peer": true + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true, + "peer": true + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true, + "peer": true + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "peer": true, + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "peer": true, + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true, + "peer": true + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "peer": true, + "dependencies": { + "@webassemblyjs/ast": "1.12.1", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true, + "peer": true + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true, + "peer": true }, "node_modules/acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -777,11 +1058,20 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "dev": true, + "peer": true, + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -790,7 +1080,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -815,7 +1104,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -824,7 +1112,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -838,8 +1125,7 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/aria-query": { "version": "5.3.0", @@ -1045,6 +1331,46 @@ "node": ">=8" } }, + "node_modules/browserslist": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "peer": true, + "dependencies": { + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "peer": true + }, "node_modules/bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -1085,7 +1411,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, "engines": { "node": ">=6" } @@ -1099,9 +1424,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001562", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", - "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==", + "version": "1.0.30001599", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz", + "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==", "funding": [ { "type": "opencollective", @@ -1121,7 +1446,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1133,6 +1457,16 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6.0" + } + }, "node_modules/client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -1150,7 +1484,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -1161,8 +1494,14 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "peer": true }, "node_modules/concat-map": { "version": "0.0.1", @@ -1179,7 +1518,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1245,8 +1583,7 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, "node_modules/define-data-property": { "version": "1.1.1", @@ -1300,7 +1637,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, "dependencies": { "esutils": "^2.0.2" }, @@ -1319,6 +1655,13 @@ "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, + "node_modules/electron-to-chromium": { + "version": "1.4.710", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.710.tgz", + "integrity": "sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==", + "dev": true, + "peer": true + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -1418,6 +1761,13 @@ "safe-array-concat": "^1.0.1" } }, + "node_modules/es-module-lexer": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", + "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", + "dev": true, + "peer": true + }, "node_modules/es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -1456,13 +1806,14 @@ } }, "node_modules/es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "hasInstallScript": true, "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" }, "engines": { @@ -1488,11 +1839,20 @@ "ext": "^1.1.2" } }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6" + } + }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, "engines": { "node": ">=10" }, @@ -1504,7 +1864,6 @@ "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", - "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -1905,7 +2264,6 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -1917,11 +2275,29 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esniff/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -1938,7 +2314,6 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -1950,7 +2325,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -1974,6 +2348,25 @@ "node": ">=0.10.0" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, + "peer": true, + "engines": { + "node": ">=0.8.x" + } + }, "node_modules/ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -1990,8 +2383,7 @@ "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/fast-glob": { "version": "3.3.2", @@ -2022,14 +2414,12 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "node_modules/fastq": { "version": "1.15.0", @@ -2043,7 +2433,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -2086,7 +2475,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -2102,7 +2490,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -2115,8 +2502,7 @@ "node_modules/flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" }, "node_modules/for-each": { "version": "0.3.3", @@ -2227,7 +2613,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -2244,7 +2629,6 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -2307,8 +2691,7 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "node_modules/has-bigints": { "version": "1.0.2", @@ -2322,7 +2705,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -2397,7 +2779,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2413,7 +2794,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, "engines": { "node": ">=0.8.19" } @@ -2623,7 +3003,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -2748,8 +3127,7 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/iterator.prototype": { "version": "1.1.2", @@ -2763,6 +3141,37 @@ "set-function-name": "^2.0.1" } }, + "node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "peer": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -2772,7 +3181,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -2783,20 +3191,24 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "peer": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "node_modules/json5": { "version": "2.2.3", @@ -2828,7 +3240,6 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, "dependencies": { "json-buffer": "3.0.1" } @@ -2853,7 +3264,6 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -2862,6 +3272,16 @@ "node": ">= 0.8.0" } }, + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=6.11.5" + } + }, "node_modules/loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -2880,7 +3300,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -2894,8 +3313,7 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "node_modules/loose-envify": { "version": "1.4.0", @@ -2919,6 +3337,13 @@ "node": ">=10" } }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "peer": true + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -2939,11 +3364,34 @@ "node": ">=8.6" } }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "peer": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "peer": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { "brace-expansion": "^1.1.7" }, "engines": { @@ -2983,8 +3431,7 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "node_modules/natural-compare-lite": { "version": "1.4.0", @@ -2992,6 +3439,13 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "peer": true + }, "node_modules/next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -3063,6 +3517,13 @@ "node-gyp-build-test": "build-test.js" } }, + "node_modules/node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true, + "peer": true + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -3184,7 +3645,6 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -3201,7 +3661,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -3216,7 +3675,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -3231,7 +3689,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "dependencies": { "callsites": "^3.0.0" }, @@ -3243,7 +3700,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "engines": { "node": ">=8" } @@ -3260,7 +3716,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -3330,7 +3785,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -3364,7 +3818,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, "engines": { "node": ">=6" } @@ -3388,6 +3841,16 @@ } ] }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "peer": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, "node_modules/react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -3529,7 +3992,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, "engines": { "node": ">=4" } @@ -3555,7 +4017,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -3605,6 +4066,27 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "peer": true + }, "node_modules/safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -3658,6 +4140,16 @@ "node": ">=10" } }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "peer": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, "node_modules/set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -3694,7 +4186,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -3706,7 +4197,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -3732,6 +4222,16 @@ "node": ">=8" } }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -3740,6 +4240,17 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "peer": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -3813,7 +4324,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -3833,7 +4343,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, "engines": { "node": ">=8" }, @@ -3899,7 +4408,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -3926,11 +4434,64 @@ "node": ">=6" } }, + "node_modules/terser": { + "version": "5.29.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz", + "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==", + "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, "node_modules/to-regex-range": { "version": "5.0.1", @@ -4003,7 +4564,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -4015,7 +4575,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, "engines": { "node": ">=10" }, @@ -4096,7 +4655,6 @@ "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -4119,11 +4677,41 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "peer": true, + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -4157,6 +4745,64 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, + "node_modules/webpack": { + "version": "5.90.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", + "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", + "dev": true, + "peer": true, + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "peer": true, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -4199,7 +4845,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -4304,7 +4949,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, "engines": { "node": ">=10" }, @@ -4317,8 +4961,7 @@ "@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" }, "@babel/runtime": { "version": "7.23.2", @@ -4332,13 +4975,15 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/@calblueprint/eslint-config-react/-/eslint-config-react-0.0.3.tgz", "integrity": "sha512-1Tbws/hjtb7JaKtTtE/g3s3cuky3eqKbIM6mm/QZOMmzcHex4+fAh2QHjeOPE9z4ZXuJS2HWx5n4VDdHJcDs5A==", - "dev": true + "dev": true, + "requires": {} }, "@calblueprint/prettier-config": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", - "dev": true + "dev": true, + "requires": {} }, "@emotion/is-prop-valid": { "version": "1.2.1", @@ -4362,7 +5007,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, "requires": { "eslint-visitor-keys": "^3.3.0" } @@ -4370,14 +5014,12 @@ "@eslint-community/regexpp": { "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==" }, "@eslint/eslintrc": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", - "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -4393,8 +5035,7 @@ "@eslint/js": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", - "dev": true + "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==" }, "@fortawesome/fontawesome-common-types": { "version": "6.4.2", @@ -4406,6 +5047,23 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==" }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", + "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", + "peer": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.5.1" + }, + "dependencies": { + "@fortawesome/fontawesome-common-types": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", + "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", + "peer": true + } + } + }, "@fortawesome/free-solid-svg-icons": { "version": "6.4.2", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", @@ -4426,7 +5084,6 @@ "version": "0.11.13", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", - "dev": true, "requires": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -4436,14 +5093,67 @@ "@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" }, "@humanwhocodes/object-schema": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" + }, + "@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "peer": true + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true, + "peer": true + }, + "@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true, + "peer": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } }, "@next/env": { "version": "13.5.6", @@ -4617,6 +5327,35 @@ "tslib": "^2.4.0" } }, + "@types/eslint": { + "version": "8.56.6", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", + "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", + "dev": true, + "peer": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dev": true, + "peer": true, + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true, + "peer": true + }, "@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -4782,26 +5521,206 @@ "@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" + }, + "@webassemblyjs/ast": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true, + "peer": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" + } + }, + "@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "peer": true, + "requires": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "peer": true, + "requires": { + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true, + "peer": true + }, + "@webassemblyjs/wasm-edit": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "peer": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@xtuc/long": "4.2.2" + } + }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true, + "peer": true + }, + "@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true, + "peer": true }, "acorn": { "version": "8.11.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true + "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==" + }, + "acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "dev": true, + "peer": true, + "requires": {} }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "requires": {} }, "ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -4813,19 +5732,18 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -4833,8 +5751,7 @@ "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "aria-query": { "version": "5.3.0", @@ -4989,6 +5906,26 @@ "fill-range": "^7.0.1" } }, + "browserslist": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "dev": true, + "peer": true, + "requires": { + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "peer": true + }, "bufferutil": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", @@ -5018,8 +5955,7 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, "camelize": { "version": "1.0.1", @@ -5027,20 +5963,26 @@ "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==" }, "caniuse-lite": { - "version": "1.0.30001562", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", - "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==" + "version": "1.0.30001599", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz", + "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==" }, "chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, + "chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "dev": true, + "peer": true + }, "client-only": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", @@ -5055,7 +5997,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -5063,8 +6004,14 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true, + "peer": true }, "concat-map": { "version": "0.0.1", @@ -5081,7 +6028,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -5133,8 +6079,7 @@ "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, "define-data-property": { "version": "1.1.1", @@ -5173,7 +6118,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, "requires": { "esutils": "^2.0.2" } @@ -5183,6 +6127,13 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==" }, + "electron-to-chromium": { + "version": "1.4.710", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.710.tgz", + "integrity": "sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==", + "dev": true, + "peer": true + }, "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -5270,6 +6221,13 @@ "safe-array-concat": "^1.0.1" } }, + "es-module-lexer": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", + "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", + "dev": true, + "peer": true + }, "es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -5299,12 +6257,13 @@ } }, "es5-ext": { - "version": "0.10.62", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", - "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "requires": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" } }, @@ -5327,17 +6286,22 @@ "ext": "^1.1.2" } }, + "escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true, + "peer": true + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" }, "eslint": { "version": "8.53.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", - "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -5383,7 +6347,6 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, "requires": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -5442,7 +6405,8 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true + "dev": true, + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.9", @@ -5617,7 +6581,8 @@ "eslint-plugin-react-hooks": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", + "requires": {} }, "eslint-scope": { "version": "5.1.1", @@ -5642,11 +6607,28 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==" }, + "esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "requires": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "dependencies": { + "type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + } + } + }, "espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, "requires": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -5657,7 +6639,6 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, "requires": { "estraverse": "^5.1.0" } @@ -5666,7 +6647,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "requires": { "estraverse": "^5.2.0" } @@ -5681,6 +6661,22 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "requires": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true, + "peer": true + }, "ext": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", @@ -5699,8 +6695,7 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-glob": { "version": "3.3.2", @@ -5727,14 +6722,12 @@ "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "fastq": { "version": "1.15.0", @@ -5748,7 +6741,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, "requires": { "flat-cache": "^3.0.4" } @@ -5775,7 +6767,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, "requires": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -5785,7 +6776,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, "requires": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -5795,8 +6785,7 @@ "flatted": { "version": "3.2.9", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" }, "for-each": { "version": "0.3.3", @@ -5877,7 +6866,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, "requires": { "is-glob": "^4.0.3" } @@ -5891,7 +6879,6 @@ "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, "requires": { "type-fest": "^0.20.2" } @@ -5933,8 +6920,7 @@ "graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "has-bigints": { "version": "1.0.2", @@ -5944,8 +6930,7 @@ "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "has-property-descriptors": { "version": "1.0.1", @@ -5990,7 +6975,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -5999,8 +6983,7 @@ "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" }, "inflight": { "version": "1.0.6", @@ -6137,8 +7120,7 @@ "is-path-inside": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" }, "is-regex": { "version": "1.1.4", @@ -6221,8 +7203,7 @@ "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "iterator.prototype": { "version": "1.1.2", @@ -6236,6 +7217,30 @@ "set-function-name": "^2.0.1" } }, + "jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "peer": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "peer": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6245,7 +7250,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, "requires": { "argparse": "^2.0.1" } @@ -6253,20 +7257,24 @@ "json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true, + "peer": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "json5": { "version": "2.2.3", @@ -6289,7 +7297,6 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, "requires": { "json-buffer": "3.0.1" } @@ -6311,12 +7318,18 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, "requires": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, + "loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true, + "peer": true + }, "loader-utils": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", @@ -6332,7 +7345,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, "requires": { "p-locate": "^5.0.0" } @@ -6340,8 +7352,7 @@ "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "loose-envify": { "version": "1.4.0", @@ -6359,6 +7370,13 @@ "yallist": "^4.0.0" } }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true, + "peer": true + }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -6373,6 +7391,23 @@ "picomatch": "^2.3.1" } }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "peer": true + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "peer": true, + "requires": { + "mime-db": "1.52.0" + } + }, "minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -6399,8 +7434,7 @@ "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "natural-compare-lite": { "version": "1.4.0", @@ -6408,6 +7442,13 @@ "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", "dev": true }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "peer": true + }, "next": { "version": "13.5.6", "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", @@ -6434,7 +7475,8 @@ "next-google-fonts": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/next-google-fonts/-/next-google-fonts-2.2.0.tgz", - "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==" + "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==", + "requires": {} }, "next-tick": { "version": "1.1.0", @@ -6446,6 +7488,13 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==" }, + "node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true, + "peer": true + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -6534,7 +7583,6 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, "requires": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -6548,7 +7596,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, "requires": { "yocto-queue": "^0.1.0" } @@ -6557,7 +7604,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, "requires": { "p-limit": "^3.0.2" } @@ -6566,7 +7612,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, "requires": { "callsites": "^3.0.0" } @@ -6574,8 +7619,7 @@ "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" }, "path-is-absolute": { "version": "1.0.1", @@ -6585,8 +7629,7 @@ "path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { "version": "1.0.7", @@ -6626,8 +7669,7 @@ "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" }, "prettier": { "version": "2.8.8", @@ -6648,14 +7690,23 @@ "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==" }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "peer": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", @@ -6752,8 +7803,7 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "resolve-pkg-maps": { "version": "1.0.0", @@ -6769,7 +7819,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "requires": { "glob": "^7.1.3" } @@ -6793,6 +7842,13 @@ "isarray": "^2.0.5" } }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "peer": true + }, "safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -6830,6 +7886,16 @@ "lru-cache": "^6.0.0" } }, + "serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "peer": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "set-function-length": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", @@ -6860,7 +7926,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "requires": { "shebang-regex": "^3.0.0" } @@ -6868,8 +7933,7 @@ "shebang-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, "side-channel": { "version": "1.0.4", @@ -6886,11 +7950,29 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "peer": true + }, "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "peer": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, "streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -6946,7 +8028,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -6959,8 +8040,7 @@ "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" }, "styled-components": { "version": "6.1.1", @@ -6995,7 +8075,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -7010,11 +8089,37 @@ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" }, + "terser": { + "version": "5.29.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz", + "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + } + }, + "terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + } + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, "to-regex-range": { "version": "5.0.1", @@ -7079,7 +8184,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, "requires": { "prelude-ls": "^1.2.1" } @@ -7087,8 +8191,7 @@ "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" }, "typed-array-buffer": { "version": "1.0.0", @@ -7144,8 +8247,7 @@ "typescript": { "version": "4.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==" }, "unbox-primitive": { "version": "1.0.2", @@ -7158,11 +8260,21 @@ "which-boxed-primitive": "^1.0.2" } }, + "update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "dev": true, + "peer": true, + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "requires": { "punycode": "^2.1.0" } @@ -7189,6 +8301,46 @@ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, + "webpack": { + "version": "5.90.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", + "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", + "dev": true, + "peer": true, + "requires": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + } + }, + "webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true, + "peer": true + }, "websocket": { "version": "1.0.34", "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", @@ -7230,7 +8382,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -7307,8 +8458,7 @@ "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" } } } From 7e38d97566929e6c883d736cfea401b7423ac9fb Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 11:55:50 -0700 Subject: [PATCH 091/101] check --- src/api/supabase/queries/order_queries.ts | 16 ++++++++-------- src/components/OrderHistory/OrderHistoryText.tsx | 2 +- src/styles/components.tsx | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 5d83696e..a84870e7 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -197,6 +197,14 @@ export async function updateCartPickupId(pickupId: number) { .eq('id', cartId); } +export async function fetchProductFromOrderProduct( + orderProductId: number, +): Promise { + const orderProduct = await fetchOrderProductById(orderProductId); + const product = await fetchProductByID(orderProduct.product_id); + return product; +} + export async function fetchProductsFromOrder( orderId: number, ): Promise { @@ -211,11 +219,3 @@ export async function fetchProductsFromOrder( return fetchedProducts; } - -export async function fetchProductFromOrderProduct( - orderProductId: number, -): Promise { - const orderProduct = await fetchOrderProductById(orderProductId); - const product = await fetchProductByID(orderProduct.product_id); - return product; -} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 8f118510..122b728a 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -33,7 +33,7 @@ interface OrderDetailsProps { } export default function OrderDetails(props: OrderDetailsProps) { - const { date, orderNumber, status, order } = props; + const { date, orderNumber, order } = props; const router = useRouter(); const viewOrder = (orderID: string) => { diff --git a/src/styles/components.tsx b/src/styles/components.tsx index a86bcc97..755b1ba3 100644 --- a/src/styles/components.tsx +++ b/src/styles/components.tsx @@ -1,4 +1,4 @@ -import styled, { createGlobalStyle } from 'styled-components'; +import styled from 'styled-components'; import { User, ShoppingCart } from 'react-feather'; import COLORS from './colors'; From 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 12:31:38 -0700 Subject: [PATCH 092/101] fix --- src/components/OrderHistory/OrderHistoryText.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 122b728a..74765f82 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -163,4 +163,5 @@ export default function OrderDetails(props: OrderDetailsProps) { ); } + return

error occured

; } From ef6494a3fb40fe1e909426cf0ab3473a815003e2 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 26 Mar 2024 23:18:57 -0700 Subject: [PATCH 093/101] ORDER hist style almost done Error within the size of each histroy container --- public/check.svg | 4 + public/ready.svg | 11 +++ public/right_arrow.svg | 4 + public/x.svg | 6 ++ src/api/supabase/queries/order_queries.ts | 65 ++++---------- src/app/orderHistory/styles.ts | 8 +- src/components/OrderHistory/Chevron_Right.svg | 8 -- .../OrderHistory/OrderHistoryBox.tsx | 5 +- .../OrderHistory/OrderHistoryText.tsx | 58 +++++++++++-- src/components/OrderHistory/styles.ts | 84 ++++++++++++++++++- 10 files changed, 180 insertions(+), 73 deletions(-) create mode 100644 public/check.svg create mode 100644 public/ready.svg create mode 100644 public/right_arrow.svg create mode 100644 public/x.svg delete mode 100644 src/components/OrderHistory/Chevron_Right.svg diff --git a/public/check.svg b/public/check.svg new file mode 100644 index 00000000..dbeb8fb5 --- /dev/null +++ b/public/check.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/ready.svg b/public/ready.svg new file mode 100644 index 00000000..3e356ae2 --- /dev/null +++ b/public/ready.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/public/right_arrow.svg b/public/right_arrow.svg new file mode 100644 index 00000000..36957c93 --- /dev/null +++ b/public/right_arrow.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/x.svg b/public/x.svg new file mode 100644 index 00000000..495c7fc5 --- /dev/null +++ b/public/x.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index ce212f5b..dfc14520 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -71,7 +71,7 @@ function sortOrdersByCreated(orders: Order[]): Order[] { * @param Order[] - An array of Order objects. * @returns Promise - An array of Order objects. */ -export async function fetchOrdersByUser(): Promise { +export async function fetchOrdersByUser(): Promise { const user = await fetchUser(); const userId = user.id; const { data, error } = await supabase @@ -149,6 +149,20 @@ export async function fetchProductsFromOrder( return fetchedProducts; } +export async function fetchProductWithQuantityById( + productId: number, +): Promise { + const { data: orderProduct, error } = await supabase + .from('product') + .select('*') + .eq('id', productId) + .single(); + if (error) { + throw new Error(`Error fetching order product: ${error.message}`); + } + return orderProduct; +} + export async function fetchOrderProductsbyOrderId( orderId: number, ): Promise { @@ -208,25 +222,7 @@ export async function fetchRecentOrderProducts(): Promise { return orderProducts; } -/** - * gets all orders by user id and sorted it by creation data - * @param Order[] - An array of Order objects. - * @returns Promise - An array of Order objects. - */ -export async function fetchCurrentOrdersByUser(): Promise { - const user = await fetchUser(); - const userCartId = user.cart_id; - const { data, error } = await supabase - .from('order') - .select('*') - .eq('id', userCartId); - if (error) { - throw new Error(`Error fetching orders for user: ${error.message}`); - } - - return data; -} export async function updateOrderPickupId(orderId: number, pickupId: number) { await supabase @@ -244,37 +240,6 @@ export async function updateCartPickupId(pickupId: number) { .eq('id', cartId); } -export async function fetchProductWithQuantityById( - productId: number, -): Promise { - const { data: orderProduct, error } = await supabase - .from('product') - .select('*') - .eq('id', productId) - .single(); - if (error) { - throw new Error(`Error fetching order product: ${error.message}`); - } - return orderProduct; -} -export async function fetchOrderProductsbyOrderId( - orderId: number, -): Promise { - const order = await getOrderById(orderId); - const orderProductIds = order.order_product_id_array; - const newOrderProducts = await Promise.all( - orderProductIds.map(orderProductId => - fetchOrderProductById(orderProductId), - ), - ); - console.log(newOrderProducts); - const orderProducts = await Promise.all( - newOrderProducts.map(async orderProduct => - fetchProductWithQuantityById(orderProduct.product_id), - ), - ); - return orderProducts; -} diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 543a736b..190a90c6 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -23,12 +23,12 @@ export const OrderHistoryContainer = styled.div` align-items: center; border-radius: 10px; background: var(--White, #fff); - box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); - width: 800px; // Width of the outer box - height: 700px; + box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.10); + width: 900px; // Width of the outer box + height: 1021px; overflow: scroll; margin-top: 10px; - padding: 0; // Ensure there's no padding pushing the internal boxes inward + padding: 10pxeç; // Ensure there's no padding pushing the internal boxes inward `; export const OrderHistoryBox = styled.div` diff --git a/src/components/OrderHistory/Chevron_Right.svg b/src/components/OrderHistory/Chevron_Right.svg deleted file mode 100644 index d116c6dc..00000000 --- a/src/components/OrderHistory/Chevron_Right.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 5e1784f7..3d1aa759 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -43,11 +43,10 @@ export default function OrderDetailsWithProducts({ } if (!order) { - return
Order not found.
; + return
; } - + console.log('order', order); const imageUrls = products.map(product => product.photo).slice(0, 3); - return ( + + Ready for Pick Up + + ); + } else if (status === 'Rejected') { + statusElement = ( + + + Order Rejected + + ); + } else { + statusElement = ( + + + Order Approved + + ); + } + console.log('status', status); return (
-
{formatDate(date)}
-
Order No. {orderNumber}
-
- {status === 'Confirmed' ? '✓' : '✗'} {status} +
+

+ Order No. {orderNumber} +

+
+
{formatDate(date)} +
+
+ + {statusElement}
viewOrder(orderNumber)}> {/** DO NOT USE IMAGE Please use the icon in the feather library! */} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index f6eee23f..daac4eb9 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -3,7 +3,7 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const containerStyle = styled.div` - width: 250px; // This width might be too small if it's meant to contain the OrderDiv + width: 750px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; margin-right: auto; // Center the container if that's the intention margin-left: auto; // Center the container if that's the intention @@ -68,6 +68,79 @@ export const OrderDiv = styled.div` padding-left: 30px; // Adjust as necessary to align with the left edge padding-right: 130px; // Adjust as necessary to align with the right edge `; + +export const OrderApproved = styled.div` + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; /* Assuming you want the checkmark and text to be at the start */ + background-color: #CEE8BE; /* Or the exact color from the image */ + color: white; + color: var(--Black, #101010); + font-family: "Public Sans"; + font-size: 20px; + font-style: normal; + font-weight: 700; + line-height: normal; + + border-radius: 20px; /* Adjust for the exact curvature you want */ + gap: 14px; /* Space between the checkmark and text */ + width: 245px; + margin-top: 18px; + padding-left: 10px; /* Adjust as necessary to align with the left edge */ + padding-right: 10px; /* Adjust as necessary to align with the right edge */ + padding-top: 5px; /* Adjust as necessary to align with the top edge */ + padding-bottom: 5px; /* Adjust as necessary to align with the bottom edge */ +`; + +export const OrderReject = styled.div` + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; /* Assuming you want the checkmark and text to be at the start */ + background-color: #FDD; /* Or the exact color from the image */ + color: white; + color: var(--Black, #101010); + font-family: "Public Sans"; + font-size: 20px; + font-style: normal; + font-weight: 700; + line-height: normal; + + border-radius: 20px; /* Adjust for the exact curvature you want */ + gap: 14px; /* Space between the checkmark and text */ + width: 245px; + margin-top: 18px; + padding-left: 10px; /* Adjust as necessary to align with the left edge */ + padding-right: 10px; /* Adjust as necessary to align with the right edge */ + padding-top: 5px; /* Adjust as necessary to align with the top edge */ + padding-bottom: 5px; /* Adjust as necessary to align with the bottom edge */ +`; + +export const OrderReady = styled.div` + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; /* Assuming you want the checkmark and text to be at the start */ + background-color: #FDD; /* Or the exact color from the image */ + color: white; + color: var(--Black, #101010); + font-family: "Public Sans"; + font-size: 20px; + font-style: normal; + font-weight: 700; + line-height: normal; + + border-radius: 20px; /* Adjust for the exact curvature you want */ + gap: 14px; /* Space between the checkmark and text */ + width: 245px; + margin-top: 18px; + padding-left: 10px; /* Adjust as necessary to align with the left edge */ + padding-right: 10px; /* Adjust as necessary to align with the right edge */ + padding-top: 5px; /* Adjust as necessary to align with the top edge */ + padding-bottom: 5px; /* Adjust as necessary to align with the bottom edge */ +`; + export const GalleryContainer = styled.div` display: flex; overflow-x: auto; @@ -92,7 +165,12 @@ export const GalleryImage = styled.img` `; export const RowDiv = styled.div` - width: 700px; + width: 750px height: 400px; - margin-bottom: 50px; + margin-bottom: 30px; `; + +export const CheckmarkIcon = styled.img` + width: 20px; /* Adjust based on the exact size you need */ + height: 20px; /* Adjust based on the exact size you need */ +`; \ No newline at end of file From c87f00328082d09c484355e193b31337b20e17a0 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 2 Apr 2024 16:37:12 -0700 Subject: [PATCH 094/101] DONE --- src/app/login/styles.ts | 12 +----------- src/app/pickup/page.tsx | 7 +++---- src/components/OrderHistory/OrderHistoryBox.tsx | 2 +- src/components/OrderHistory/OrderHistoryText.tsx | 4 ++-- src/schema/schema.ts | 1 + 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index 17a4ae45..a36e94e7 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -3,16 +3,6 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const LoginBox = styled.div` - flex-direction: column; - justify-content: center; - align-items: center; - position: fixed; - display: flex; - flex-direction: column; -<<<<<<< HEAD -======= - ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 width: 500px; height: 420px; border: 1px solid ${COLORS.neutralGrey}; @@ -92,4 +82,4 @@ export const Fullscreen = styled.div` export const InputField = styled.div` position: relative; -`; +`; \ No newline at end of file diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index e1786ae2..594c8c33 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -111,7 +111,6 @@ export default function Pickup() { {Profile?.phone_numbers}
Time Slot - Pick Up times: 10:00 AM - 12:00 PM
@@ -136,7 +135,7 @@ export default function Pickup() { ))}
- +
Pick Up times: 10:00 AM - 12:00 PM
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -165,10 +164,10 @@ export default function Pickup() { { if (selectedPickupIndex !== 0) { - await updateCartPickupId(selectedPickupIndex); + await updateCartPickupId(selectedPickupIndex); // TODO double check if this is correct router.push('/orderConfirmationPickUp'); } else { - // handle the case where they didn't select a time! + // TODO handle the case where they didn't select a time! } }} > diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 6abd8705..329a921c 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -43,7 +43,7 @@ export default function OrderDetailsWithProducts({ } if (!order) { - return
Order not found.
; + return
; } const imageUrls = products.map(product => product.photo).slice(0, 3); diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 74765f82..8ced1589 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -81,7 +81,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
); } - if (order.status === OrderStatus.OrderApproved) { + if (order.status === OrderStatus.OrderReady) { return (
); } - return

error occured

; + return

; } diff --git a/src/schema/schema.ts b/src/schema/schema.ts index be622755..7c3fc879 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -19,6 +19,7 @@ export enum OrderStatus { OrderRejected = 'Rejected', OrderApproved = 'Confirmed', OrderSubmitted = 'Submitted', + OrderReady = 'Ready', } export type Order = { From 9d6eafd7be6077c909916ca0046dd58e2365ada4 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 2 Apr 2024 16:37:32 -0700 Subject: [PATCH 095/101] Prettier --- src/api/supabase/queries/order_queries.ts | 8 +------- src/app/delivery/page.tsx | 2 -- src/app/login/styles.ts | 2 +- src/components/OrderHistory/styles.ts | 18 +++++++++--------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 8743cb4a..4246a8a6 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -61,7 +61,7 @@ function sortOrdersByCreated(orders: Order[]): Order[] { * @param Order[] - An array of Order objects. * @returns Promise - An array of Order objects. */ -export async function fetchOrdersByUser(): Promise { +export async function fetchOrdersByUser(): Promise { const user = await fetchUser(); const userId = user.id; const { data, error } = await supabase @@ -212,8 +212,6 @@ export async function fetchRecentOrderProducts(): Promise { return orderProducts; } - - export async function updateOrderPickupId(orderId: number, pickupId: number) { await supabase .from('order') @@ -229,7 +227,3 @@ export async function updateCartPickupId(pickupId: number) { .update({ pickup_time_id: pickupId }) .eq('id', cartId); } - - - - diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index a4f3c252..c0688332 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -19,8 +19,6 @@ import { InformationText, } from './styles'; - - export default function App() { const [numberOfItems, setNumberOfItems] = useState(0); const [cart, setCart] = useState([]); diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index a36e94e7..273a4576 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -82,4 +82,4 @@ export const Fullscreen = styled.div` export const InputField = styled.div` position: relative; -`; \ No newline at end of file +`; diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index 9fc6cc8b..c321c849 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -73,15 +73,15 @@ export const OrderApproved = styled.div` flex-direction: row; align-items: center; justify-content: center; /* Assuming you want the checkmark and text to be at the start */ - background-color: #CEE8BE; /* Or the exact color from the image */ + background-color: #cee8be; /* Or the exact color from the image */ color: white; color: var(--Black, #101010); - font-family: "Public Sans"; + font-family: 'Public Sans'; font-size: 20px; font-style: normal; font-weight: 700; line-height: normal; - + border-radius: 20px; /* Adjust for the exact curvature you want */ gap: 14px; /* Space between the checkmark and text */ width: 245px; @@ -97,15 +97,15 @@ export const OrderReject = styled.div` flex-direction: row; align-items: center; justify-content: center; /* Assuming you want the checkmark and text to be at the start */ - background-color: #FDD; /* Or the exact color from the image */ + background-color: #fdd; /* Or the exact color from the image */ color: white; color: var(--Black, #101010); - font-family: "Public Sans"; + font-family: 'Public Sans'; font-size: 20px; font-style: normal; font-weight: 700; line-height: normal; - + border-radius: 20px; /* Adjust for the exact curvature you want */ gap: 14px; /* Space between the checkmark and text */ width: 245px; @@ -121,15 +121,15 @@ export const OrderReady = styled.div` flex-direction: row; align-items: center; justify-content: center; /* Assuming you want the checkmark and text to be at the start */ - background-color: #FDD; /* Or the exact color from the image */ + background-color: #fdd; /* Or the exact color from the image */ color: white; color: var(--Black, #101010); - font-family: "Public Sans"; + font-family: 'Public Sans'; font-size: 20px; font-style: normal; font-weight: 700; line-height: normal; - + border-radius: 20px; /* Adjust for the exact curvature you want */ gap: 14px; /* Space between the checkmark and text */ width: 245px; From 4105a39554c50e50bc1f40d557e4b078c55e4f17 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 2 Apr 2024 16:39:54 -0700 Subject: [PATCH 096/101] NPM CI --- package-lock.json | 10510 ++++++++++++++++++-------------------------- 1 file changed, 4328 insertions(+), 6182 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25713026..e6307458 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "shanti-project", "version": "0.1.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -45,4904 +45,1917 @@ }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", + "node_modules/@ampproject/remapping": { + "version": "2.2.1", + "license": "Apache-2.0", "dependencies": { - "regenerator-runtime": "^0.14.0" + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@calblueprint/eslint-config-react": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@calblueprint/eslint-config-react/-/eslint-config-react-0.0.3.tgz", - "integrity": "sha512-1Tbws/hjtb7JaKtTtE/g3s3cuky3eqKbIM6mm/QZOMmzcHex4+fAh2QHjeOPE9z4ZXuJS2HWx5n4VDdHJcDs5A==", - "dev": true, - "peerDependencies": { - "@typescript-eslint/eslint-plugin": "^5.52.0", - "@typescript-eslint/parser": "^5.52.0", - "eslint": "^8.28.0", - "eslint-config-airbnb": "^19.0.4", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.32.2", - "eslint-plugin-react-hooks": "^4.6.0", - "prettier": "^2.7.1", - "typescript": "^4.3.0" + "node": ">=6.0.0" } }, - "node_modules/@calblueprint/prettier-config": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", - "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", - "dev": true, + "node_modules/@babel/cli": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "commander": "^4.0.1", + "convert-source-map": "^2.0.0", + "fs-readdir-recursive": "^1.1.0", + "glob": "^7.2.0", + "make-dir": "^2.1.0", + "slash": "^2.0.0" + }, + "bin": { + "babel": "bin/babel.js", + "babel-external-helpers": "bin/babel-external-helpers.js" + }, + "engines": { + "node": ">=6.9.0" + }, + "optionalDependencies": { + "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3", + "chokidar": "^3.4.0" + }, "peerDependencies": { - "prettier": "^2.8.4" + "@babel/core": "^7.0.0-0" } }, - "node_modules/@emotion/is-prop-valid": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz", - "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==", + "node_modules/@babel/cli/node_modules/glob": { + "version": "7.2.3", + "license": "ISC", "dependencies": { - "@emotion/memoize": "^0.8.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@emotion/memoize": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" - }, - "node_modules/@emotion/unitless": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "node_modules/@babel/cli/node_modules/slash": { + "version": "2.0.0", + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, + "node_modules/@babel/code-frame": { + "version": "7.22.13", + "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=6.9.0" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=4" } }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", - "dev": true, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "license": "MIT", "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=4" } }, - "node_modules/@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" } }, - "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", - "hasInstallScript": true, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "license": "MIT" + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=0.8.0" } }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", - "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==", - "hasInstallScript": true, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=4" } }, -<<<<<<< HEAD -======= - "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", - "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", - "hasInstallScript": true, - "peer": true, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "license": "MIT", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.5.1" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=6" + "node": ">=4" } }, - "node_modules/@fortawesome/fontawesome-svg-core/node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", - "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", - "hasInstallScript": true, - "peer": true, + "node_modules/@babel/compat-data": { + "version": "7.22.20", + "license": "MIT", "engines": { - "node": ">=6" + "node": ">=6.9.0" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", - "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", - "hasInstallScript": true, + "node_modules/@babel/core": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.0", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.0", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { - "node": ">=6" + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, - "node_modules/@fortawesome/react-fontawesome": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "prop-types": "^15.8.1" + "@babel/types": "^7.23.0", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" }, - "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "~1 || ~6", - "react": ">=16.3" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", - "dev": true, + "node_modules/@babel/helper-annotate-as-pure": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.1", - "debug": "^4.1.1", - "minimatch": "^3.0.5" + "@babel/types": "^7.22.5" }, "engines": { - "node": ">=10.10.0" + "node": ">=6.9.0" } }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" + "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.22.15", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.15" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", -<<<<<<< HEAD - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true -======= - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "peer": true, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.15", + "browserslist": "^4.21.9", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { - "node": ">=6.0.0" + "node": ">=6.9.0" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" } }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6.0.0" + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", - "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, - "peer": true, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "license": "ISC" + }, + "node_modules/@babel/helper-create-class-features-plugin": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true + "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "peer": true, + "node_modules/@babel/helper-create-regexp-features-plugin": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 }, - "node_modules/@next/env": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", - "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==" + "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } }, - "node_modules/@next/eslint-plugin-next": { - "version": "13.5.2", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.5.2.tgz", - "integrity": "sha512-Ew8DOUerJYGRo8pI84SVwn9wxxx8sH92AanCXSkkLJM2W0RJEWy+BqWSCfrlA/3ZIczEl4l4o4lOeTGBPYfBJg==", + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.4.2", + "license": "MIT", "dependencies": { - "glob": "7.1.7" + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@next/swc-darwin-arm64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", - "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "darwin" - ], + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", + "license": "MIT", "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-darwin-x64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", - "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "darwin" - ], + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-linux-arm64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", - "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], + "node_modules/@babel/helper-hoist-variables": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.5" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-linux-arm64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", - "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "linux" - ], + "node_modules/@babel/helper-member-expression-to-functions": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.23.0" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-linux-x64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", - "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], + "node_modules/@babel/helper-module-imports": { + "version": "7.22.15", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.15" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-linux-x64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", - "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "linux" - ], + "node_modules/@babel/helper-module-transforms": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@next/swc-win32-arm64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", - "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", - "cpu": [ - "arm64" - ], - "optional": true, - "os": [ - "win32" - ], + "node_modules/@babel/helper-optimise-call-expression": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.5" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-win32-ia32-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", - "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", - "cpu": [ - "ia32" - ], - "optional": true, - "os": [ - "win32" - ], + "node_modules/@babel/helper-plugin-utils": { + "version": "7.22.5", + "license": "MIT", "engines": { - "node": ">= 10" + "node": ">=6.9.0" } }, - "node_modules/@next/swc-win32-x64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", - "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", - "cpu": [ - "x64" - ], - "optional": true, - "os": [ - "win32" - ], + "node_modules/@babel/helper-remap-async-to-generator": { + "version": "7.22.20", + "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" + }, "engines": { - "node": ">= 10" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "node_modules/@babel/helper-replace-supers": { + "version": "7.22.20", + "license": "MIT", "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { - "node": ">= 8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "node_modules/@babel/helper-simple-access": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.5" + }, "engines": { - "node": ">= 8" + "node": ">=6.9.0" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "@babel/types": "^7.22.5" }, "engines": { - "node": ">= 8" + "node": ">=6.9.0" } }, - "node_modules/@remix-run/router": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz", - "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==", + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.22.6", + "license": "MIT", + "dependencies": { + "@babel/types": "^7.22.5" + }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" } }, - "node_modules/@rushstack/eslint-patch": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz", - "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==" - }, - "node_modules/@supabase/functions-js": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.1.5.tgz", - "integrity": "sha512-BNzC5XhCzzCaggJ8s53DP+WeHHGT/NfTsx2wUSSGKR2/ikLFQTBCDzMvGz/PxYMqRko/LwncQtKXGOYp1PkPaw==", - "dependencies": { - "@supabase/node-fetch": "^2.6.14" + "node_modules/@babel/helper-string-parser": { + "version": "7.22.5", + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@supabase/gotrue-js": { - "version": "2.57.0", - "resolved": "https://registry.npmjs.org/@supabase/gotrue-js/-/gotrue-js-2.57.0.tgz", - "integrity": "sha512-/CcAW40aPKgp9/w9WgXVUQFg1AOdvFR687ONOMjASPBuC6FsNbKlcXp4pc+rwKNtxyxDkBbR+x7zj/8g00r/Og==", - "dependencies": { - "@supabase/node-fetch": "^2.6.14" + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.20", + "license": "MIT", + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@supabase/node-fetch": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/@supabase/node-fetch/-/node-fetch-2.6.14.tgz", - "integrity": "sha512-w/Tsd22e/5fAeoxqQ4P2MX6EyF+iM6rc9kmlMVFkHuG0rAltt2TLhFbDJfemnHbtvnazWaRfy5KnFU/SYT37dQ==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, + "node_modules/@babel/helper-validator-option": { + "version": "7.22.15", + "license": "MIT", "engines": { - "node": "4.x || >=6.0.0" + "node": ">=6.9.0" } }, - "node_modules/@supabase/postgrest-js": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.8.5.tgz", - "integrity": "sha512-XvoqN5e5Z4TsQOYWLQYLW0HIlZtFSzwAcwiuToaSBSTpLOGCg4NaZ7au5GfBzCQJZdZPY5vk5FvwthfDsQK/Jw==", + "node_modules/@babel/helper-wrap-function": { + "version": "7.22.20", + "license": "MIT", "dependencies": { - "@supabase/node-fetch": "^2.6.14" + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@supabase/realtime-js": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.8.4.tgz", - "integrity": "sha512-5C9slLTGikHnYmAnIBOaPogAgbcNY68vnIyE6GpqIKjHElVb6LIi4clwNcjHSj4z6szuvvzj8T/+ePEgGEGekw==", + "node_modules/@babel/helpers": { + "version": "7.23.1", + "license": "MIT", "dependencies": { - "@supabase/node-fetch": "^2.6.14", - "@types/phoenix": "^1.5.4", - "@types/websocket": "^1.0.3", - "websocket": "^1.0.34" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.0", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@supabase/storage-js": { - "version": "2.5.4", - "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.5.4.tgz", - "integrity": "sha512-yspHD19I9uQUgfTh0J94+/r/g6hnhdQmw6Y7OWqr/EbnL6uvicGV1i1UDkkmeUHqfF9Mbt2sLtuxRycYyKv2ew==", + "node_modules/@babel/highlight": { + "version": "7.22.20", + "license": "MIT", "dependencies": { - "@supabase/node-fetch": "^2.6.14" + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "node_modules/@supabase/supabase-js": { - "version": "2.38.4", - "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.38.4.tgz", - "integrity": "sha512-bYwxm/GosvRqOMIv6YP7qUTZWi/trgHtDWUEZDEmyRHW24d0JYIb1GOt6RaO2hsWlecn88DAJIpjoNbprocgRA==", + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "license": "MIT", "dependencies": { - "@supabase/functions-js": "^2.1.5", - "@supabase/gotrue-js": "^2.56.0", - "@supabase/node-fetch": "^2.6.14", - "@supabase/postgrest-js": "^1.8.5", - "@supabase/realtime-js": "^2.8.4", - "@supabase/storage-js": "^2.5.4" + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" } }, - "node_modules/@swc/helpers": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", - "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "license": "MIT", "dependencies": { - "tslib": "^2.4.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" } }, -<<<<<<< HEAD -======= - "node_modules/@types/eslint": { - "version": "8.56.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", - "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", - "dev": true, - "peer": true, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "license": "MIT", "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" + "color-name": "1.1.3" } }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "peer": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "license": "MIT" }, - "node_modules/@types/estree": { + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true, - "peer": true - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "node_modules/@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" - }, - "node_modules/@types/node": { - "version": "20.6.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", - "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==" - }, - "node_modules/@types/phoenix": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.4.tgz", - "integrity": "sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==" - }, - "node_modules/@types/prop-types": { - "version": "15.7.10", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz", - "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==" + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } }, - "node_modules/@types/react": { - "version": "18.2.22", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.22.tgz", - "integrity": "sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==", - "dependencies": { - "@types/prop-types": "*", - "@types/scheduler": "*", - "csstype": "^3.0.2" + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=4" } }, - "node_modules/@types/react-dom": { - "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "license": "MIT", "dependencies": { - "@types/react": "*" + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" } }, - "node_modules/@types/scheduler": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz", - "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==" - }, - "node_modules/@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", - "dev": true - }, - "node_modules/@types/stylis": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.3.tgz", - "integrity": "sha512-86XLCVEmWagiUEbr2AjSbeY4qHN9jMm3pgM3PuBYfLIbT0MpDSnA3GA/4W7KoH/C/eeK77kNaeIxZzjhKYIBgw==" - }, - "node_modules/@types/websocket": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.9.tgz", - "integrity": "sha512-xrMBdqdKdlE+7L9Wg2PQblIkZGSgiMlEoP6UAaYKMHbbxqCJ6PV/pTZ2RcMcSSERurU2TtGbmO4lqpFOJd01ww==", - "dependencies": { - "@types/node": "*" + "node_modules/@babel/parser": { + "version": "7.23.0", + "license": "MIT", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" } }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, + "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=6.9.0" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "@babel/core": "^7.0.0" } }, - "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.22.15" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": ">=6.9.0" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "@babel/core": "^7.13.0" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "node_modules/@babel/plugin-external-helpers": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=6.9.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, + "node_modules/@babel/plugin-proposal-class-properties": { + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", -<<<<<<< HEAD - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true -======= - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "peer": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true, - "peer": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", - "dev": true, - "peer": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true, - "peer": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true, - "peer": true ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - }, - "node_modules/acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", - "dependencies": { - "dequal": "^2.0.3" - } - }, - "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-includes": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", - "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flat": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/array.prototype.tosorted": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", - "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" - } - }, - "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", - "is-shared-array-buffer": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/ast-types-flow": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", - "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==" - }, - "node_modules/asynciterator.prototype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", - "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", - "dependencies": { - "has-symbols": "^1.0.3" - } - }, - "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/axe-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", - "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/axobject-query": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", - "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", - "dependencies": { - "dequal": "^2.0.3" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, -<<<<<<< HEAD -======= - "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "peer": true, - "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true, - "peer": true - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/bufferutil": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", - "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==", - "hasInstallScript": true, - "dependencies": { - "node-gyp-build": "^4.3.0" - }, - "engines": { - "node": ">=6.14.2" - } - }, - "node_modules/busboy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "dependencies": { - "streamsearch": "^1.1.0" - }, - "engines": { - "node": ">=10.16.0" - } - }, - "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", - "dependencies": { - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camelize": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", - "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001599", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz", - "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/client-only": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", - "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==" - }, - "node_modules/clsx": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", - "engines": { - "node": ">=6" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" - }, - "node_modules/confusing-browser-globals": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", - "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", - "dev": true - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/css-color-keywords": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", - "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==", - "engines": { - "node": ">=4" - } - }, - "node_modules/css-to-react-native": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz", - "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==", - "dependencies": { - "camelize": "^1.0.0", - "css-color-keywords": "^1.0.0", - "postcss-value-parser": "^4.0.2" - } - }, - "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" - }, - "node_modules/d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "dependencies": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" - } - }, - "node_modules/damerau-levenshtein": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==" - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", - "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "engines": { - "node": ">=6" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dotenv": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" - } - }, -<<<<<<< HEAD -======= - "node_modules/electron-to-chromium": { - "version": "1.4.710", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.710.tgz", - "integrity": "sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==", - "dev": true, - "peer": true - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", - "globalthis": "^1.0.3", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", - "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.8", - "string.prototype.trimend": "^1.0.7", - "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-iterator-helpers": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", - "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", - "dependencies": { - "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.1", - "es-abstract": "^1.22.1", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", - "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.0.1" - } - }, -<<<<<<< HEAD -======= - "node_modules/es-module-lexer": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", - "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", - "dev": true, - "peer": true - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", - "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", - "dependencies": { - "hasown": "^2.0.0" - } - }, - "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es5-ext": { - "version": "0.10.64", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", - "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", - "hasInstallScript": true, - "dependencies": { - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.3", - "esniff": "^2.0.1", - "next-tick": "^1.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "dependencies": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "node_modules/es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "dependencies": { - "d": "^1.0.1", - "ext": "^1.1.2" - } - }, -<<<<<<< HEAD -======= - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", - "@humanwhocodes/config-array": "^0.11.13", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-config-airbnb": { - "version": "19.0.4", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz", - "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==", - "dev": true, - "dependencies": { - "eslint-config-airbnb-base": "^15.0.0", - "object.assign": "^4.1.2", - "object.entries": "^1.1.5" - }, - "engines": { - "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^7.32.0 || ^8.2.0", - "eslint-plugin-import": "^2.25.3", - "eslint-plugin-jsx-a11y": "^6.5.1", - "eslint-plugin-react": "^7.28.0", - "eslint-plugin-react-hooks": "^4.3.0" - } - }, - "node_modules/eslint-config-airbnb-base": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", - "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", - "dev": true, - "dependencies": { - "confusing-browser-globals": "^1.0.10", - "object.assign": "^4.1.2", - "object.entries": "^1.1.5", - "semver": "^6.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "peerDependencies": { - "eslint": "^7.32.0 || ^8.2.0", - "eslint-plugin-import": "^2.25.2" - } - }, - "node_modules/eslint-config-airbnb-base/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-config-next": { - "version": "13.5.2", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.5.2.tgz", - "integrity": "sha512-kCF7k7fHBtFtxfP6J6AP6Mo0vW3CrFeoIuoZ7NHGIvLFc/RUaIspJ6inO/R33zE1o9t/lbJgTnsqnRB++sxCUQ==", - "dependencies": { - "@next/eslint-plugin-next": "13.5.2", - "@rushstack/eslint-patch": "^1.3.3", - "@typescript-eslint/parser": "^5.4.2 || ^6.0.0", - "eslint-import-resolver-node": "^0.3.6", - "eslint-import-resolver-typescript": "^3.5.2", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-react-hooks": "^4.5.0 || 5.0.0-canary-7118f5dd7-20230705" - }, - "peerDependencies": { - "eslint": "^7.23.0 || ^8.0.0", - "typescript": ">=3.3.1" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-config-prettier": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", - "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true, - "bin": { - "eslint-config-prettier": "bin/cli.js" - }, - "peerDependencies": { - "eslint": ">=7.0.0" - } - }, - "node_modules/eslint-import-resolver-node": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "dependencies": { - "debug": "^3.2.7", - "is-core-module": "^2.13.0", - "resolve": "^1.22.4" - } - }, - "node_modules/eslint-import-resolver-node/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-import-resolver-typescript": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", - "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", - "dependencies": { - "debug": "^4.3.4", - "enhanced-resolve": "^5.12.0", - "eslint-module-utils": "^2.7.4", - "fast-glob": "^3.3.1", - "get-tsconfig": "^4.5.0", - "is-core-module": "^2.11.0", - "is-glob": "^4.0.3" - }, - "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" - }, - "peerDependencies": { - "eslint": "*", - "eslint-plugin-import": "*" - } - }, - "node_modules/eslint-module-utils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", - "dependencies": { - "debug": "^3.2.7" - }, - "engines": { - "node": ">=4" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } - }, - "node_modules/eslint-module-utils/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", - "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", - "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", - "debug": "^3.2.7", - "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", - "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", - "is-glob": "^4.0.3", - "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", - "semver": "^6.3.1", - "tsconfig-paths": "^3.14.2" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" - } - }, - "node_modules/eslint-plugin-import/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint-plugin-import/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-plugin-jsx-a11y": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz", - "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==", - "dependencies": { - "@babel/runtime": "^7.23.2", - "aria-query": "^5.3.0", - "array-includes": "^3.1.7", - "array.prototype.flatmap": "^1.3.2", - "ast-types-flow": "^0.0.8", - "axe-core": "=4.7.0", - "axobject-query": "^3.2.1", - "damerau-levenshtein": "^1.0.8", - "emoji-regex": "^9.2.2", - "es-iterator-helpers": "^1.0.15", - "hasown": "^2.0.0", - "jsx-ast-utils": "^3.3.5", - "language-tags": "^1.0.9", - "minimatch": "^3.1.2", - "object.entries": "^1.1.7", - "object.fromentries": "^2.0.7" - }, - "engines": { - "node": ">=4.0" - }, - "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" - } - }, - "node_modules/eslint-plugin-react": { - "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "array.prototype.tosorted": "^1.1.1", - "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.12", - "estraverse": "^5.3.0", - "jsx-ast-utils": "^2.4.1 || ^3.0.0", - "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "object.hasown": "^1.1.2", - "object.values": "^1.1.6", - "prop-types": "^15.8.1", - "resolve": "^2.0.0-next.4", - "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.8" - }, - "engines": { - "node": ">=4" - }, - "peerDependencies": { - "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" - } - }, - "node_modules/eslint-plugin-react-hooks": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" - } - }, - "node_modules/eslint-plugin-react/node_modules/doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-scope/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esniff": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", - "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", - "dependencies": { - "d": "^1.0.1", - "es5-ext": "^0.10.62", - "event-emitter": "^0.3.5", - "type": "^2.7.2" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esniff/node_modules/type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "engines": { - "node": ">=0.10.0" - } - }, -<<<<<<< HEAD -======= - "node_modules/event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", - "dependencies": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.8.x" - } - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/ext": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", - "dependencies": { - "type": "^2.7.2" - } - }, - "node_modules/ext/node_modules/type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/file-loader": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", - "dev": true, - "dependencies": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true - }, - "node_modules/for-each": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "dependencies": { - "is-callable": "^1.1.3" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/functions-have-names": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", - "dependencies": { - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-symbol-description": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-tsconfig": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", - "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, - "node_modules/globals": { - "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globalthis": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "dependencies": { - "define-properties": "^1.1.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", - "dependencies": { - "get-intrinsic": "^1.2.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", - "engines": { - "node": ">= 4" - } - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", - "dependencies": { - "get-intrinsic": "^1.2.2", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-callable": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dependencies": { - "hasown": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-negative-zero": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-set": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-shared-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dependencies": { - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dependencies": { - "has-symbols": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", - "dependencies": { - "which-typed-array": "^1.1.11" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" - }, - "node_modules/is-weakmap": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "dependencies": { - "call-bind": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-weakset": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/iterator.prototype": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", - "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", - "dependencies": { - "define-properties": "^1.2.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.4", - "set-function-name": "^2.0.1" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsx-ast-utils": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", - "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.flat": "^1.3.1", - "object.assign": "^4.1.4", - "object.values": "^1.1.6" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/language-subtag-registry": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", - "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==" - }, - "node_modules/language-tags": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", - "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", - "dependencies": { - "language-subtag-registry": "^0.3.20" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" + "node": ">=6.9.0" }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "node_modules/next": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", - "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", + "node_modules/@babel/plugin-proposal-object-rest-spread": { + "version": "7.20.7", + "license": "MIT", "dependencies": { - "@next/env": "13.5.6", - "@swc/helpers": "0.5.2", - "busboy": "1.6.0", - "caniuse-lite": "^1.0.30001406", - "postcss": "8.4.31", - "styled-jsx": "5.1.1", - "watchpack": "2.4.0" - }, - "bin": { - "next": "dist/bin/next" + "@babel/compat-data": "^7.20.5", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.20.7" }, "engines": { - "node": ">=16.14.0" - }, - "optionalDependencies": { - "@next/swc-darwin-arm64": "13.5.6", - "@next/swc-darwin-x64": "13.5.6", - "@next/swc-linux-arm64-gnu": "13.5.6", - "@next/swc-linux-arm64-musl": "13.5.6", - "@next/swc-linux-x64-gnu": "13.5.6", - "@next/swc-linux-x64-musl": "13.5.6", - "@next/swc-win32-arm64-msvc": "13.5.6", - "@next/swc-win32-ia32-msvc": "13.5.6", - "@next/swc-win32-x64-msvc": "13.5.6" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.1.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "sass": "^1.3.0" + "node": ">=6.9.0" }, - "peerDependenciesMeta": { - "@opentelemetry/api": { - "optional": true - }, - "sass": { - "optional": true - } - } - }, - "node_modules/next-google-fonts": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/next-google-fonts/-/next-google-fonts-2.2.0.tgz", - "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==", - "deprecated": "As of Next.js 10.2, Google Fonts are automatically optimized! For more info, see https://github.com/joe-bell/next-google-fonts", "peerDependencies": { - "next": ">= 10.0.7", - "react": ">= 17.0.1", - "react-dom": ">= 17.0.1" - } - }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" - }, - "node_modules/node-gyp-build": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", - "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==", - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" - } - }, -<<<<<<< HEAD -======= - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true, - "peer": true - }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "engines": { - "node": ">= 0.4" + "@babel/core": "^7.0.0-0" } }, - "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "has-symbols": "^1.0.3", - "object-keys": "^1.1.1" - }, + "node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "license": "MIT", "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.entries": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", - "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "node": ">=6.9.0" }, - "engines": { - "node": ">= 0.4" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/object.fromentries": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", - "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-plugin-utils": "^7.8.0" }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/object.groupby": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/object.hasown": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "license": "MIT", "dependencies": { - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-plugin-utils": "^7.12.13" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/object.values": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", - "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/optionator": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, - "dependencies": { - "@aashutoshrathi/word-wrap": "^1.2.3", - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0" + "node": ">=6.9.0" }, - "engines": { - "node": ">= 0.8.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, + "node_modules/@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "license": "MIT", "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" + "@babel/helper-plugin-utils": "^7.8.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, + "node_modules/@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "license": "MIT", "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" + "@babel/helper-plugin-utils": "^7.8.3" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, + "node_modules/@babel/plugin-syntax-import-assertions": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "callsites": "^3.0.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=6" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "engines": { - "node": ">=8.6" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": "^10 || ^12 || >=14" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=10.13.0" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "license": "MIT", "dependencies": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "engines": { - "node": ">=6" + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0" + "@babel/helper-plugin-utils": "^7.10.4" }, - "engines": { - "node": ">=0.10.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "license": "MIT", "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { - "react": "^18.2.0" + "@babel/core": "^7.0.0-0" } }, - "node_modules/react-feather": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/react-feather/-/react-feather-2.0.10.tgz", - "integrity": "sha512-BLhukwJ+Z92Nmdcs+EMw6dy1Z/VLiJTzEQACDUEnWMClhYnFykJCGWQx+NmwP/qQHGX/5CzQ+TGi8ofg2+HzVQ==", + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "license": "MIT", "dependencies": { - "prop-types": "^15.7.2" + "@babel/helper-plugin-utils": "^7.8.0" }, "peerDependencies": { - "react": ">=16.8.6" + "@babel/core": "^7.0.0-0" } }, - "node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } }, - "node_modules/react-router": { - "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz", - "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==", + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "license": "MIT", "dependencies": { - "@remix-run/router": "1.10.0" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" }, "peerDependencies": { - "react": ">=16.8" + "@babel/core": "^7.0.0-0" } }, - "node_modules/react-router-dom": { - "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz", - "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==", + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "license": "MIT", "dependencies": { - "@remix-run/router": "1.10.0", - "react-router": "6.17.0" + "@babel/helper-plugin-utils": "^7.14.5" }, "engines": { - "node": ">=14.0.0" + "node": ">=6.9.0" }, "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" + "@babel/core": "^7.0.0-0" } }, - "node_modules/react-toastify": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz", - "integrity": "sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==", + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "clsx": "^1.1.1" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" }, "peerDependencies": { - "react": ">=16", - "react-dom": ">=16" + "@babel/core": "^7.0.0-0" } }, - "node_modules/reflect.getprototypeof": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", - "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { + "version": "7.18.6", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0" } }, - "node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" - }, - "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/plugin-syntax-async-generators": "^7.8.4" }, - "bin": { - "resolve": "bin/resolve" + "engines": { + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.5" + }, "engines": { - "node": ">=4" - } - }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "glob": "^7.1.3" + "@babel/helper-plugin-utils": "^7.22.5" }, - "bin": { - "rimraf": "bin.js" + "engines": { + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], + "node_modules/@babel/plugin-transform-class-properties": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "queue-microtask": "^1.2.2" + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/safe-array-concat": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", - "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "node_modules/@babel/plugin-transform-class-static-block": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "isarray": "^2.0.5" + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" }, "engines": { - "node": ">=0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.12.0" } }, - "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "node_modules/@babel/plugin-transform-classes": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "is-regex": "^1.1.4" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "dependencies": { - "loose-envify": "^1.1.0" + "node_modules/@babel/plugin-transform-classes/node_modules/globals": { + "version": "11.12.0", + "license": "MIT", + "engines": { + "node": ">=4" } }, - "node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.5" }, "engines": { - "node": ">= 10.13.0" + "node": ">=6.9.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=10" - } - }, -<<<<<<< HEAD -======= - "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "peer": true, - "dependencies": { - "randombytes": "^2.1.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/set-function-length": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", - "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "node_modules/@babel/plugin-transform-duplicate-keys": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "define-data-property": "^1.0.1", - "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/shallowequal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "shebang-regex": "^3.0.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { - "node": ">=8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "node": ">=8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "node_modules/@babel/plugin-transform-for-of": { + "version": "7.22.15", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "node": ">=8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "node_modules/@babel/plugin-transform-function-name": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-compilation-targets": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "node": ">=0.10.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "node_modules/@babel/plugin-transform-json-strings": { + "version": "7.22.11", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + }, "engines": { - "node": ">=10.0.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/string.prototype.matchall": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", - "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", + "node_modules/@babel/plugin-transform-literals": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "regexp.prototype.flags": "^1.5.0", - "set-function-name": "^2.0.0", - "side-channel": "^1.0.4" + "@babel/helper-plugin-utils": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/string.prototype.trim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", - "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "node_modules/@babel/plugin-transform-logical-assignment-operators": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/string.prototype.trimend": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", - "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "node_modules/@babel/plugin-transform-member-expression-literals": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-plugin-utils": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/string.prototype.trimstart": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", - "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "node_modules/@babel/plugin-transform-modules-amd": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, + "node_modules/@babel/plugin-transform-modules-commonjs": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" }, "engines": { - "node": ">=8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "node_modules/@babel/plugin-transform-modules-systemjs": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" + }, "engines": { - "node": ">=4" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, + "node_modules/@babel/plugin-transform-modules-umd": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "node": ">=8" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/styled-components": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.1.tgz", - "integrity": "sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==", + "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@emotion/is-prop-valid": "^1.2.1", - "@emotion/unitless": "^0.8.0", - "@types/stylis": "^4.0.2", - "css-to-react-native": "^3.2.0", - "csstype": "^3.1.2", - "postcss": "^8.4.31", - "shallowequal": "^1.1.0", - "stylis": "^4.3.0", - "tslib": "^2.5.0" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 16" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/styled-components" + "node": ">=6.9.0" }, "peerDependencies": { - "react": ">= 16.8.0", - "react-dom": ">= 16.8.0" + "@babel/core": "^7.0.0" } }, - "node_modules/styled-jsx": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", - "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==", + "node_modules/@babel/plugin-transform-new-target": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "client-only": "0.0.1" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 12.0.0" + "node": ">=6.9.0" }, "peerDependencies": { - "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "babel-plugin-macros": { - "optional": true - } + "@babel/core": "^7.0.0-0" } }, - "node_modules/stylis": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz", - "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==" - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" }, "engines": { - "node": ">=8" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "node_modules/@babel/plugin-transform-numeric-separator": { + "version": "7.22.11", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "node_modules/@babel/plugin-transform-object-rest-spread": { + "version": "7.22.15", + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.22.15" + }, "engines": { - "node": ">=6" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, -<<<<<<< HEAD -======= - "node_modules/terser": { - "version": "5.29.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz", - "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==", - "dev": true, - "peer": true, + "node_modules/@babel/plugin-transform-object-super": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.5" }, "engines": { - "node": ">=10" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", - "dev": true, - "peer": true, + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.20", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" }, "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "node": ">=6.9.0" }, "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } + "@babel/core": "^7.0.0-0" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/@babel/plugin-transform-optional-chaining": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "is-number": "^7.0.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=8.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" + "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.22.11", + "license": "MIT", "dependencies": { - "minimist": "^1.2.0" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.11", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, - "bin": { - "json5": "lib/cli.js" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "tslib": "^1.8.1" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 6" + "node": ">=6.9.0" }, "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + "@babel/core": "^7.0.0-0" } }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, - "node_modules/type": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, + "node_modules/@babel/plugin-transform-react-display-name": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "prelude-ls": "^1.2.1" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 0.8.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, + "node_modules/@babel/plugin-transform-react-jsx": { + "version": "7.22.15", + "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-jsx": "^7.22.5", + "@babel/types": "^7.22.15" + }, "engines": { - "node": ">=10" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "node_modules/@babel/plugin-transform-react-jsx-development": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "@babel/plugin-transform-react-jsx": "^7.22.5" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "node_modules/@babel/plugin-transform-react-pure-annotations": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "node_modules/@babel/plugin-transform-regenerator": { + "version": "7.22.10", + "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "@babel/helper-plugin-utils": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "node_modules/@babel/plugin-transform-shorthand-properties": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "is-typedarray": "^1.0.0" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "node_modules/@babel/plugin-transform-spread": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { - "node": ">=4.2.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "node_modules/@babel/plugin-transform-sticky-regex": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" + "@babel/helper-plugin-utils": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, + "node_modules/@babel/plugin-transform-template-literals": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "punycode": "^2.1.0" + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/utf-8-validate": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", - "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", - "hasInstallScript": true, + "node_modules/@babel/plugin-transform-typeof-symbol": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "node-gyp-build": "^4.3.0" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=6.14.2" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "node_modules/@babel/plugin-transform-typescript": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-typescript": "^7.22.5" }, "engines": { - "node": ">=10.13.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, -<<<<<<< HEAD -======= - "node_modules/webpack": { - "version": "5.90.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", - "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", - "dev": true, - "peer": true, + "node_modules/@babel/plugin-transform-unicode-escapes": { + "version": "7.22.10", + "license": "MIT", "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.21.10", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "node": ">=6.9.0" }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "peer": true, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.22.5", + "license": "MIT", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, "engines": { - "node": ">=10.13.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "node_modules/websocket": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", - "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==", + "node_modules/@babel/plugin-transform-unicode-regex": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "bufferutil": "^4.0.1", - "debug": "^2.2.0", - "es5-ext": "^0.10.50", - "typedarray-to-buffer": "^3.1.5", - "utf-8-validate": "^5.0.2", - "yaeti": "^0.0.6" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { - "node": ">=4.0.0" + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/websocket/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.22.5", + "license": "MIT", "dependencies": { - "ms": "2.0.0" + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.22.20", + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.22.20", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-import-assertions": "^7.22.5", + "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.22.5", + "@babel/plugin-transform-async-generator-functions": "^7.22.15", + "@babel/plugin-transform-async-to-generator": "^7.22.5", + "@babel/plugin-transform-block-scoped-functions": "^7.22.5", + "@babel/plugin-transform-block-scoping": "^7.22.15", + "@babel/plugin-transform-class-properties": "^7.22.5", + "@babel/plugin-transform-class-static-block": "^7.22.11", + "@babel/plugin-transform-classes": "^7.22.15", + "@babel/plugin-transform-computed-properties": "^7.22.5", + "@babel/plugin-transform-destructuring": "^7.22.15", + "@babel/plugin-transform-dotall-regex": "^7.22.5", + "@babel/plugin-transform-duplicate-keys": "^7.22.5", + "@babel/plugin-transform-dynamic-import": "^7.22.11", + "@babel/plugin-transform-exponentiation-operator": "^7.22.5", + "@babel/plugin-transform-export-namespace-from": "^7.22.11", + "@babel/plugin-transform-for-of": "^7.22.15", + "@babel/plugin-transform-function-name": "^7.22.5", + "@babel/plugin-transform-json-strings": "^7.22.11", + "@babel/plugin-transform-literals": "^7.22.5", + "@babel/plugin-transform-logical-assignment-operators": "^7.22.11", + "@babel/plugin-transform-member-expression-literals": "^7.22.5", + "@babel/plugin-transform-modules-amd": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.22.15", + "@babel/plugin-transform-modules-systemjs": "^7.22.11", + "@babel/plugin-transform-modules-umd": "^7.22.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.22.5", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11", + "@babel/plugin-transform-numeric-separator": "^7.22.11", + "@babel/plugin-transform-object-rest-spread": "^7.22.15", + "@babel/plugin-transform-object-super": "^7.22.5", + "@babel/plugin-transform-optional-catch-binding": "^7.22.11", + "@babel/plugin-transform-optional-chaining": "^7.22.15", + "@babel/plugin-transform-parameters": "^7.22.15", + "@babel/plugin-transform-private-methods": "^7.22.5", + "@babel/plugin-transform-private-property-in-object": "^7.22.11", + "@babel/plugin-transform-property-literals": "^7.22.5", + "@babel/plugin-transform-regenerator": "^7.22.10", + "@babel/plugin-transform-reserved-words": "^7.22.5", + "@babel/plugin-transform-shorthand-properties": "^7.22.5", + "@babel/plugin-transform-spread": "^7.22.5", + "@babel/plugin-transform-sticky-regex": "^7.22.5", + "@babel/plugin-transform-template-literals": "^7.22.5", + "@babel/plugin-transform-typeof-symbol": "^7.22.5", + "@babel/plugin-transform-unicode-escapes": "^7.22.10", + "@babel/plugin-transform-unicode-property-regex": "^7.22.5", + "@babel/plugin-transform-unicode-regex": "^7.22.5", + "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "@babel/types": "^7.22.19", + "babel-plugin-polyfill-corejs2": "^0.4.5", + "babel-plugin-polyfill-corejs3": "^0.8.3", + "babel-plugin-polyfill-regenerator": "^0.5.2", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/websocket/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "node_modules/@babel/preset-env/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, + "node_modules/@babel/preset-modules": { + "version": "0.1.6-no-external-plugins", + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" }, - "engines": { - "node": ">= 8" + "peerDependencies": { + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "node_modules/@babel/preset-react": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-transform-react-display-name": "^7.22.5", + "@babel/plugin-transform-react-jsx": "^7.22.15", + "@babel/plugin-transform-react-jsx-development": "^7.22.5", + "@babel/plugin-transform-react-pure-annotations": "^7.22.5" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/which-builtin-type": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "node_modules/@babel/preset-typescript": { + "version": "7.23.0", + "license": "MIT", "dependencies": { - "function.prototype.name": "^1.1.5", - "has-tostringtag": "^1.0.0", - "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", - "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", - "is-weakref": "^1.0.2", - "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.9" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-syntax-jsx": "^7.22.5", + "@babel/plugin-transform-modules-commonjs": "^7.23.0", + "@babel/plugin-transform-typescript": "^7.22.15" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/which-collection": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "node_modules/@babel/regjsgen": { + "version": "0.8.0", + "license": "MIT" + }, + "node_modules/@babel/runtime": { + "version": "7.23.1", + "license": "MIT", "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" + "regenerator-runtime": "^0.14.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=6.9.0" } }, - "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "node_modules/@babel/template": { + "version": "7.22.15", + "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">=6.9.0" } }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==", + "node_modules/@babel/traverse": { + "version": "7.23.2", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, "engines": { - "node": ">=0.10.32" + "node": ">=6.9.0" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "license": "MIT", "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } - } - }, - "dependencies": { - "@aashutoshrathi/word-wrap": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true }, - "@babel/runtime": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz", - "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==", - "requires": { - "regenerator-runtime": "^0.14.0" + "node_modules/@babel/types": { + "version": "7.23.0", + "license": "MIT", + "dependencies": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" } }, - "@calblueprint/eslint-config-react": { + "node_modules/@calblueprint/eslint-config-react": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@calblueprint/eslint-config-react/-/eslint-config-react-0.0.3.tgz", - "integrity": "sha512-1Tbws/hjtb7JaKtTtE/g3s3cuky3eqKbIM6mm/QZOMmzcHex4+fAh2QHjeOPE9z4ZXuJS2HWx5n4VDdHJcDs5A==", - "dev": true + "dev": true, + "license": "MIT", + "peerDependencies": { + "@typescript-eslint/eslint-plugin": "^5.52.0", + "@typescript-eslint/parser": "^5.52.0", + "eslint": "^8.28.0", + "eslint-config-airbnb": "^19.0.4", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-import": "^2.27.5", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-react": "^7.32.2", + "eslint-plugin-react-hooks": "^4.6.0", + "prettier": "^2.7.1", + "typescript": "^4.3.0" + } }, - "@calblueprint/prettier-config": { + "node_modules/@calblueprint/prettier-config": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@calblueprint/prettier-config/-/prettier-config-0.0.1.tgz", - "integrity": "sha512-WIF1b8p57gArSMXu1XXQaE7fQWrTYHmP3F17YfS4Fjwz6o5Gog/fTiTJDsqnzKl98WjoegPXsK6ahomHAiFaZg==", - "dev": true + "dev": true, + "license": "MIT", + "peerDependencies": { + "prettier": "^2.8.4" + } }, - "@emotion/is-prop-valid": { + "node_modules/@emotion/is-prop-valid": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz", - "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==", - "requires": { + "license": "MIT", + "dependencies": { "@emotion/memoize": "^0.8.1" } }, - "@emotion/memoize": { + "node_modules/@emotion/memoize": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz", - "integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==" + "license": "MIT" }, - "@emotion/unitless": { + "node_modules/@emotion/unitless": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.1.tgz", - "integrity": "sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==" + "license": "MIT" }, - "@eslint-community/eslint-utils": { + "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true + "node_modules/@eslint-community/regexpp": { + "version": "4.9.1", + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } }, - "@eslint/eslintrc": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz", - "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==", - "dev": true, - "requires": { + "node_modules/@eslint/eslintrc": { + "version": "2.1.2", + "license": "MIT", + "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^9.6.0", @@ -4952,420 +1965,371 @@ "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/js": { + "version": "8.51.0", + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "@eslint/js": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz", - "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==", - "dev": true + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.4.2", + "hasInstallScript": true, + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "@fortawesome/fontawesome-common-types": { + "node_modules/@fortawesome/fontawesome-free": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==" + "hasInstallScript": true, + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "engines": { + "node": ">=6" + } }, - "@fortawesome/fontawesome-free": { + "node_modules/@fortawesome/fontawesome-svg-core": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", - "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==" - }, -<<<<<<< HEAD -======= - "@fortawesome/fontawesome-svg-core": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", - "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", + "hasInstallScript": true, + "license": "MIT", "peer": true, - "requires": { - "@fortawesome/fontawesome-common-types": "6.5.1" - }, "dependencies": { - "@fortawesome/fontawesome-common-types": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", - "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", - "peer": true - } + "@fortawesome/fontawesome-common-types": "6.4.2" + }, + "engines": { + "node": ">=6" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "@fortawesome/free-solid-svg-icons": { + "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", - "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", - "requires": { + "hasInstallScript": true, + "license": "(CC-BY-4.0 AND MIT)", + "dependencies": { "@fortawesome/fontawesome-common-types": "6.4.2" + }, + "engines": { + "node": ">=6" } }, - "@fortawesome/react-fontawesome": { + "node_modules/@fortawesome/react-fontawesome": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", - "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", - "requires": { + "license": "MIT", + "dependencies": { "prop-types": "^15.8.1" + }, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "react": ">=16.3" } }, - "@humanwhocodes/config-array": { - "version": "0.11.13", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", - "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^2.0.1", + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.11", + "license": "Apache-2.0", + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" } }, - "@humanwhocodes/module-importer": { + "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, - "@humanwhocodes/object-schema": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", -<<<<<<< HEAD - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true -======= - "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==" - }, - "@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "peer": true, - "requires": { - "@jridgewell/set-array": "^1.2.1", + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "license": "BSD-3-Clause" + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" } }, - "@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "peer": true + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.1", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } }, - "@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "peer": true + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } }, - "@jridgewell/source-map": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", - "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "node_modules/@jridgewell/source-map": { + "version": "0.3.5", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" } }, - "@jridgewell/sourcemap-codec": { + "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true, - "peer": true + "license": "MIT" }, - "@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "peer": true, - "requires": { + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.19", + "license": "MIT", + "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 }, - "@next/env": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.6.tgz", - "integrity": "sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw==" + "node_modules/@next/env": { + "version": "13.5.4", + "license": "MIT" }, - "@next/eslint-plugin-next": { + "node_modules/@next/eslint-plugin-next": { "version": "13.5.2", - "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.5.2.tgz", - "integrity": "sha512-Ew8DOUerJYGRo8pI84SVwn9wxxx8sH92AanCXSkkLJM2W0RJEWy+BqWSCfrlA/3ZIczEl4l4o4lOeTGBPYfBJg==", - "requires": { + "license": "MIT", + "dependencies": { "glob": "7.1.7" } }, - "@next/swc-darwin-arm64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.6.tgz", - "integrity": "sha512-5nvXMzKtZfvcu4BhtV0KH1oGv4XEW+B+jOfmBdpFI3C7FrB/MfujRpWYSBBO64+qbW8pkZiSyQv9eiwnn5VIQA==", - "optional": true - }, - "@next/swc-darwin-x64": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.6.tgz", - "integrity": "sha512-6cgBfxg98oOCSr4BckWjLLgiVwlL3vlLj8hXg2b+nDgm4bC/qVXXLfpLB9FHdoDu4057hzywbxKvmYGmi7yUzA==", - "optional": true - }, - "@next/swc-linux-arm64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.6.tgz", - "integrity": "sha512-txagBbj1e1w47YQjcKgSU4rRVQ7uF29YpnlHV5xuVUsgCUf2FmyfJ3CPjZUvpIeXCJAoMCFAoGnbtX86BK7+sg==", - "optional": true - }, - "@next/swc-linux-arm64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.6.tgz", - "integrity": "sha512-cGd+H8amifT86ZldVJtAKDxUqeFyLWW+v2NlBULnLAdWsiuuN8TuhVBt8ZNpCqcAuoruoSWynvMWixTFcroq+Q==", - "optional": true - }, - "@next/swc-linux-x64-gnu": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.6.tgz", - "integrity": "sha512-Mc2b4xiIWKXIhBy2NBTwOxGD3nHLmq4keFk+d4/WL5fMsB8XdJRdtUlL87SqVCTSaf1BRuQQf1HvXZcy+rq3Nw==", - "optional": true - }, - "@next/swc-linux-x64-musl": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.6.tgz", - "integrity": "sha512-CFHvP9Qz98NruJiUnCe61O6GveKKHpJLloXbDSWRhqhkJdZD2zU5hG+gtVJR//tyW897izuHpM6Gtf6+sNgJPQ==", - "optional": true - }, - "@next/swc-win32-arm64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.6.tgz", - "integrity": "sha512-aFv1ejfkbS7PUa1qVPwzDHjQWQtknzAZWGTKYIAaS4NMtBlk3VyA6AYn593pqNanlicewqyl2jUhQAaFV/qXsg==", - "optional": true - }, - "@next/swc-win32-ia32-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.6.tgz", - "integrity": "sha512-XqqpHgEIlBHvzwG8sp/JXMFkLAfGLqkbVsyN+/Ih1mR8INb6YCc2x/Mbwi6hsAgUnqQztz8cvEbHJUbSl7RHDg==", - "optional": true + "node_modules/@next/swc-darwin-arm64": { + "version": "13.5.4", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } }, - "@next/swc-win32-x64-msvc": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.6.tgz", - "integrity": "sha512-Cqfe1YmOS7k+5mGu92nl5ULkzpKuxJrP3+4AEuPmrpFZ3BHxTY3TnHmU1On3bFmFFs6FbTcdF58CCUProGpIGQ==", + "node_modules/@nicolo-ribaudo/chokidar-2": { + "version": "2.1.8-no-fsevents.3", + "license": "MIT", "optional": true }, - "@nodelib/fs.scandir": { + "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "requires": { + "license": "MIT", + "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" } }, - "@nodelib/fs.stat": { + "node_modules/@nodelib/fs.stat": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" + "license": "MIT", + "engines": { + "node": ">= 8" + } }, - "@nodelib/fs.walk": { + "node_modules/@nodelib/fs.walk": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "requires": { + "license": "MIT", + "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" } }, - "@remix-run/router": { + "node_modules/@remix-run/router": { "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz", - "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==" + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } }, - "@rushstack/eslint-patch": { + "node_modules/@rushstack/eslint-patch": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz", - "integrity": "sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==" + "license": "MIT" }, - "@supabase/functions-js": { + "node_modules/@supabase/functions-js": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.1.5.tgz", - "integrity": "sha512-BNzC5XhCzzCaggJ8s53DP+WeHHGT/NfTsx2wUSSGKR2/ikLFQTBCDzMvGz/PxYMqRko/LwncQtKXGOYp1PkPaw==", - "requires": { + "license": "MIT", + "dependencies": { "@supabase/node-fetch": "^2.6.14" } }, - "@supabase/gotrue-js": { - "version": "2.57.0", - "resolved": "https://registry.npmjs.org/@supabase/gotrue-js/-/gotrue-js-2.57.0.tgz", - "integrity": "sha512-/CcAW40aPKgp9/w9WgXVUQFg1AOdvFR687ONOMjASPBuC6FsNbKlcXp4pc+rwKNtxyxDkBbR+x7zj/8g00r/Og==", - "requires": { + "node_modules/@supabase/gotrue-js": { + "version": "2.55.0", + "license": "MIT", + "dependencies": { "@supabase/node-fetch": "^2.6.14" } }, - "@supabase/node-fetch": { + "node_modules/@supabase/node-fetch": { "version": "2.6.14", - "resolved": "https://registry.npmjs.org/@supabase/node-fetch/-/node-fetch-2.6.14.tgz", - "integrity": "sha512-w/Tsd22e/5fAeoxqQ4P2MX6EyF+iM6rc9kmlMVFkHuG0rAltt2TLhFbDJfemnHbtvnazWaRfy5KnFU/SYT37dQ==", - "requires": { + "license": "MIT", + "dependencies": { "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" } }, - "@supabase/postgrest-js": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.8.5.tgz", - "integrity": "sha512-XvoqN5e5Z4TsQOYWLQYLW0HIlZtFSzwAcwiuToaSBSTpLOGCg4NaZ7au5GfBzCQJZdZPY5vk5FvwthfDsQK/Jw==", - "requires": { + "node_modules/@supabase/postgrest-js": { + "version": "1.8.4", + "license": "MIT", + "dependencies": { "@supabase/node-fetch": "^2.6.14" } }, - "@supabase/realtime-js": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.8.4.tgz", - "integrity": "sha512-5C9slLTGikHnYmAnIBOaPogAgbcNY68vnIyE6GpqIKjHElVb6LIi4clwNcjHSj4z6szuvvzj8T/+ePEgGEGekw==", - "requires": { + "node_modules/@supabase/realtime-js": { + "version": "2.8.0", + "license": "MIT", + "dependencies": { "@supabase/node-fetch": "^2.6.14", "@types/phoenix": "^1.5.4", "@types/websocket": "^1.0.3", "websocket": "^1.0.34" } }, - "@supabase/storage-js": { + "node_modules/@supabase/storage-js": { "version": "2.5.4", - "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.5.4.tgz", - "integrity": "sha512-yspHD19I9uQUgfTh0J94+/r/g6hnhdQmw6Y7OWqr/EbnL6uvicGV1i1UDkkmeUHqfF9Mbt2sLtuxRycYyKv2ew==", - "requires": { + "license": "MIT", + "dependencies": { "@supabase/node-fetch": "^2.6.14" } }, - "@supabase/supabase-js": { - "version": "2.38.4", - "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.38.4.tgz", - "integrity": "sha512-bYwxm/GosvRqOMIv6YP7qUTZWi/trgHtDWUEZDEmyRHW24d0JYIb1GOt6RaO2hsWlecn88DAJIpjoNbprocgRA==", - "requires": { + "node_modules/@supabase/supabase-js": { + "version": "2.38.0", + "license": "MIT", + "dependencies": { "@supabase/functions-js": "^2.1.5", - "@supabase/gotrue-js": "^2.56.0", + "@supabase/gotrue-js": "^2.54.2", "@supabase/node-fetch": "^2.6.14", - "@supabase/postgrest-js": "^1.8.5", - "@supabase/realtime-js": "^2.8.4", + "@supabase/postgrest-js": "^1.8.4", + "@supabase/realtime-js": "^2.8.0", "@supabase/storage-js": "^2.5.4" } }, - "@swc/helpers": { + "node_modules/@swc/helpers": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", - "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", - "requires": { + "license": "Apache-2.0", + "dependencies": { "tslib": "^2.4.0" } }, -<<<<<<< HEAD -======= - "@types/eslint": { - "version": "8.56.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz", - "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==", + "node_modules/@types/eslint": { + "version": "8.44.3", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, - "@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "node_modules/@types/eslint-scope": { + "version": "3.7.5", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, - "@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "node_modules/@types/estree": { + "version": "1.0.2", "dev": true, + "license": "MIT", "peer": true }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true + "node_modules/@types/json-schema": { + "version": "7.0.13", + "dev": true, + "license": "MIT" }, - "@types/json5": { + "node_modules/@types/json5": { "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" + "license": "MIT" }, - "@types/node": { + "node_modules/@types/node": { "version": "20.6.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", - "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==" + "license": "MIT" }, - "@types/phoenix": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.4.tgz", - "integrity": "sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==" + "node_modules/@types/phoenix": { + "version": "1.6.2", + "license": "MIT" }, - "@types/prop-types": { - "version": "15.7.10", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz", - "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==" + "node_modules/@types/prop-types": { + "version": "15.7.8", + "license": "MIT" }, - "@types/react": { + "node_modules/@types/react": { "version": "18.2.22", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.22.tgz", - "integrity": "sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==", - "requires": { + "license": "MIT", + "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", "csstype": "^3.0.2" } }, - "@types/react-dom": { + "node_modules/@types/react-dom": { "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", - "requires": { + "license": "MIT", + "dependencies": { "@types/react": "*" } }, - "@types/scheduler": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz", - "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==" + "node_modules/@types/scheduler": { + "version": "0.16.4", + "license": "MIT" }, - "@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", - "dev": true + "node_modules/@types/semver": { + "version": "7.5.3", + "dev": true, + "license": "MIT" }, - "@types/stylis": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.3.tgz", - "integrity": "sha512-86XLCVEmWagiUEbr2AjSbeY4qHN9jMm3pgM3PuBYfLIbT0MpDSnA3GA/4W7KoH/C/eeK77kNaeIxZzjhKYIBgw==" + "node_modules/@types/stylis": { + "version": "4.2.1", + "license": "MIT" }, - "@types/websocket": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.9.tgz", - "integrity": "sha512-xrMBdqdKdlE+7L9Wg2PQblIkZGSgiMlEoP6UAaYKMHbbxqCJ6PV/pTZ2RcMcSSERurU2TtGbmO4lqpFOJd01ww==", - "requires": { + "node_modules/@types/websocket": { + "version": "1.0.7", + "license": "MIT", + "dependencies": { "@types/node": "*" } }, - "@typescript-eslint/eslint-plugin": { + "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@eslint-community/regexpp": "^4.4.0", "@typescript-eslint/scope-manager": "5.62.0", "@typescript-eslint/type-utils": "5.62.0", @@ -5376,50 +2340,105 @@ "natural-compare-lite": "^1.4.0", "semver": "^7.3.7", "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "@typescript-eslint/parser": { + "node_modules/@typescript-eslint/parser": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "@typescript-eslint/scope-manager": "5.62.0", "@typescript-eslint/types": "5.62.0", "@typescript-eslint/typescript-estree": "5.62.0", "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "@typescript-eslint/scope-manager": { + "node_modules/@typescript-eslint/scope-manager": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "requires": { + "license": "MIT", + "dependencies": { "@typescript-eslint/types": "5.62.0", "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "@typescript-eslint/type-utils": { + "node_modules/@typescript-eslint/type-utils": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@typescript-eslint/typescript-estree": "5.62.0", "@typescript-eslint/utils": "5.62.0", "debug": "^4.3.4", "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "@typescript-eslint/types": { + "node_modules/@typescript-eslint/types": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==" + "license": "MIT", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } }, - "@typescript-eslint/typescript-estree": { + "node_modules/@typescript-eslint/typescript-estree": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "@typescript-eslint/types": "5.62.0", "@typescript-eslint/visitor-keys": "5.62.0", "debug": "^4.3.4", @@ -5427,14 +2446,25 @@ "is-glob": "^4.0.3", "semver": "^7.3.7", "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "@typescript-eslint/utils": { + "node_modules/@typescript-eslint/utils": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", @@ -5443,169 +2473,162 @@ "@typescript-eslint/typescript-estree": "5.62.0", "eslint-scope": "^5.1.1", "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "@typescript-eslint/visitor-keys": { + "node_modules/@typescript-eslint/visitor-keys": { "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "requires": { + "license": "MIT", + "dependencies": { "@typescript-eslint/types": "5.62.0", "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" } }, - "@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", -<<<<<<< HEAD - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true -======= - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" - }, - "@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "node_modules/@webassemblyjs/ast": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@webassemblyjs/helper-numbers": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, - "@webassemblyjs/floating-point-hex-parser": { + "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true, + "license": "MIT", "peer": true }, - "@webassemblyjs/helper-api-error": { + "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true, + "license": "MIT", "peer": true }, - "@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true }, - "@webassemblyjs/helper-numbers": { + "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, - "@webassemblyjs/helper-wasm-bytecode": { + "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true, + "license": "MIT", "peer": true }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" + "@webassemblyjs/wasm-gen": "1.11.6" } }, - "@webassemblyjs/ieee754": { + "node_modules/@webassemblyjs/ieee754": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, - "@webassemblyjs/leb128": { + "node_modules/@webassemblyjs/leb128": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, + "license": "Apache-2.0", "peer": true, - "requires": { + "dependencies": { "@xtuc/long": "4.2.2" } }, - "@webassemblyjs/utf8": { + "node_modules/@webassemblyjs/utf8": { "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true, + "license": "MIT", "peer": true }, - "@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, - "@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", "@webassemblyjs/leb128": "1.11.6", "@webassemblyjs/utf8": "1.11.6" } }, - "@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, - "@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", "@webassemblyjs/helper-api-error": "1.11.6", "@webassemblyjs/helper-wasm-bytecode": "1.11.6", "@webassemblyjs/ieee754": "1.11.6", @@ -5613,156 +2636,207 @@ "@webassemblyjs/utf8": "1.11.6" } }, - "@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.6", "dev": true, + "license": "MIT", "peer": true, - "requires": { - "@webassemblyjs/ast": "1.12.1", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, - "@xtuc/ieee754": { + "node_modules/@xtuc/ieee754": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", "dev": true, + "license": "BSD-3-Clause", "peer": true }, - "@xtuc/long": { + "node_modules/@xtuc/long": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true, + "license": "Apache-2.0", "peer": true ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 }, - "acorn": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz", - "integrity": "sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==", - "dev": true + "node_modules/acorn": { + "version": "8.10.0", + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "dev": true, + "license": "MIT", + "peer": true, + "peerDependencies": { + "acorn": "^8" + } }, - "acorn-jsx": { + "node_modules/acorn-jsx": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } }, - "ajv": { + "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "ajv-keywords": { + "node_modules/ajv-keywords": { "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^6.9.1" + } }, - "ansi-regex": { + "node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "ansi-styles": { + "node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "license": "ISC", + "optional": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" } }, - "argparse": { + "node_modules/argparse": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "license": "Python-2.0" }, - "aria-query": { + "node_modules/aria-query": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", - "requires": { + "license": "Apache-2.0", + "dependencies": { "dequal": "^2.0.3" } }, - "array-buffer-byte-length": { + "node_modules/array-buffer-byte-length": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "array-includes": { + "node_modules/array-includes": { "version": "3.1.7", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", - "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "array-union": { + "node_modules/array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "array.prototype.findlastindex": { + "node_modules/array.prototype.findlastindex": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "array.prototype.flat": { + "node_modules/array.prototype.flat": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", - "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "array.prototype.flatmap": { + "node_modules/array.prototype.flatmap": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "array.prototype.tosorted": { + "node_modules/array.prototype.tosorted": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz", - "integrity": "sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", @@ -5770,11 +2844,10 @@ "get-intrinsic": "^1.2.1" } }, - "arraybuffer.prototype.slice": { + "node_modules/arraybuffer.prototype.slice": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", - "requires": { + "license": "MIT", + "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -5782,334 +2855,515 @@ "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "ast-types-flow": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", - "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==" + "node_modules/ast-types-flow": { + "version": "0.0.7", + "license": "ISC" }, - "asynciterator.prototype": { + "node_modules/asynciterator.prototype": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", - "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", - "requires": { + "license": "MIT", + "dependencies": { "has-symbols": "^1.0.3" } }, - "available-typed-arrays": { + "node_modules/available-typed-arrays": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "axe-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", - "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==" + "node_modules/axe-core": { + "version": "4.8.2", + "license": "MPL-2.0", + "engines": { + "node": ">=4" + } }, - "axobject-query": { + "node_modules/axobject-query": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", - "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", - "requires": { + "license": "Apache-2.0", + "dependencies": { "dequal": "^2.0.3" } }, - "balanced-match": { + "node_modules/babel-plugin-polyfill-corejs2": { + "version": "0.4.5", + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.2", + "semver": "^6.3.1" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/babel-plugin-polyfill-corejs3": { + "version": "0.8.4", + "license": "MIT", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.4.2", + "core-js-compat": "^3.32.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-polyfill-regenerator": { + "version": "0.5.2", + "license": "MIT", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.4.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "license": "MIT" }, - "big.js": { + "node_modules/big.js": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=8" + } }, - "brace-expansion": { + "node_modules/brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { + "license": "MIT", + "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "braces": { + "node_modules/braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { + "license": "MIT", + "dependencies": { "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" } }, -<<<<<<< HEAD -======= - "browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", - "dev": true, - "peer": true, - "requires": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", + "node_modules/browserslist": { + "version": "4.22.1", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", + "node-releases": "^2.0.13", "update-browserslist-db": "^1.0.13" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "buffer-from": { + "node_modules/buffer-from": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true, + "license": "MIT", "peer": true }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "bufferutil": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", - "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==", - "requires": { + "node_modules/bufferutil": { + "version": "4.0.7", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" } }, - "busboy": { + "node_modules/busboy": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "requires": { + "dependencies": { "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" } }, - "call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", - "requires": { - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "node_modules/call-bind": { + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "callsites": { + "node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "camelize": { + "node_modules/camelize": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", - "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "caniuse-lite": { - "version": "1.0.30001599", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz", - "integrity": "sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==" + "node_modules/caniuse-lite": { + "version": "1.0.30001546", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" }, - "chalk": { + "node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT", + "optional": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "license": "ISC", + "optional": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.0" } }, - "client-only": { + "node_modules/client-only": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", - "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==" + "license": "MIT" }, - "clsx": { + "node_modules/clsx": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==" + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "color-convert": { + "node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, - "color-name": { + "node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "license": "MIT" + }, + "node_modules/commander": { + "version": "4.1.1", + "license": "MIT", + "engines": { + "node": ">= 6" + } }, - "concat-map": { + "node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "license": "MIT" }, - "confusing-browser-globals": { + "node_modules/confusing-browser-globals": { "version": "1.0.11", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", - "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "license": "MIT" + }, + "node_modules/core-js-compat": { + "version": "3.33.0", + "license": "MIT", + "dependencies": { + "browserslist": "^4.22.1" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } }, - "cross-spawn": { + "node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" } }, - "css-color-keywords": { + "node_modules/css-color-keywords": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz", - "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==" + "license": "ISC", + "engines": { + "node": ">=4" + } }, - "css-to-react-native": { + "node_modules/css-to-react-native": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz", - "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==", - "requires": { + "license": "MIT", + "dependencies": { "camelize": "^1.0.0", "css-color-keywords": "^1.0.0", "postcss-value-parser": "^4.0.2" } }, - "csstype": { + "node_modules/csstype": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" + "license": "MIT" }, - "d": { + "node_modules/d": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", - "requires": { + "license": "ISC", + "dependencies": { "es5-ext": "^0.10.50", "type": "^1.0.1" } }, - "damerau-levenshtein": { + "node_modules/damerau-levenshtein": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==" + "license": "BSD-2-Clause" }, - "debug": { + "node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { + "license": "MIT", + "dependencies": { "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "deep-is": { + "node_modules/deep-is": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "license": "MIT" }, - "define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", - "requires": { + "node_modules/define-data-property": { + "version": "1.1.0", + "license": "MIT", + "dependencies": { "get-intrinsic": "^1.2.1", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" } }, - "define-properties": { + "node_modules/define-properties": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "requires": { + "license": "MIT", + "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "dequal": { + "node_modules/dequal": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==" + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "dir-glob": { + "node_modules/dir-glob": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "requires": { + "license": "MIT", + "dependencies": { "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "doctrine": { + "node_modules/doctrine": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { + "license": "Apache-2.0", + "dependencies": { "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" } }, - "dotenv": { + "node_modules/dotenv": { "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==" - }, -<<<<<<< HEAD -======= - "electron-to-chromium": { - "version": "1.4.710", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.710.tgz", - "integrity": "sha512-w+9yAVHoHhysCa+gln7AzbO9CdjFcL/wN/5dd+XW/Msl2d/4+WisEaCF1nty0xbAKaxdaJfgLB2296U7zZB7BA==", - "dev": true, - "peer": true + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/motdotla/dotenv?sponsor=1" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.544", + "license": "ISC" }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "emoji-regex": { + "node_modules/emoji-regex": { "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "license": "MIT" }, - "emojis-list": { + "node_modules/emojis-list": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } }, - "enhanced-resolve": { + "node_modules/enhanced-resolve": { "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", - "requires": { + "license": "MIT", + "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" } }, - "es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", - "requires": { + "node_modules/es-abstract": { + "version": "1.22.2", + "license": "MIT", + "dependencies": { "array-buffer-byte-length": "^1.0.0", "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", + "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", + "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", + "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -6119,7 +3373,7 @@ "is-string": "^1.0.7", "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.5.1", @@ -6133,14 +3387,19 @@ "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "es-iterator-helpers": { + "node_modules/es-iterator-helpers": { "version": "1.0.15", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", - "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", - "requires": { + "license": "MIT", + "dependencies": { "asynciterator.prototype": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.1", @@ -6157,104 +3416,104 @@ "safe-array-concat": "^1.0.1" } }, -<<<<<<< HEAD -======= - "es-module-lexer": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.2.tgz", - "integrity": "sha512-7nOqkomXZEaxUDJw21XZNtRk739QvrPSoZoRtbsEfcii00vdzZUh6zh1CQwHhrib8MdEtJfv5rJiGeb4KuV/vw==", + "node_modules/es-module-lexer": { + "version": "1.3.1", "dev": true, + "license": "MIT", "peer": true }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", - "requires": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "node_modules/es-set-tostringtag": { + "version": "2.0.1", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" } }, - "es-shim-unscopables": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", - "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", - "requires": { - "hasown": "^2.0.0" + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "has": "^1.0.3" } }, - "es-to-primitive": { + "node_modules/es-to-primitive": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "requires": { + "license": "MIT", + "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "es5-ext": { - "version": "0.10.64", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", - "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", - "requires": { + "node_modules/es5-ext": { + "version": "0.10.62", + "hasInstallScript": true, + "license": "ISC", + "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", - "esniff": "^2.0.1", "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" } }, - "es6-iterator": { + "node_modules/es6-iterator": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", - "requires": { + "license": "MIT", + "dependencies": { "d": "1", "es5-ext": "^0.10.35", "es6-symbol": "^3.1.1" } }, - "es6-symbol": { + "node_modules/es6-symbol": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", - "requires": { + "license": "ISC", + "dependencies": { "d": "^1.0.1", "ext": "^1.1.2" } }, -<<<<<<< HEAD -======= - "escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "peer": true + "node_modules/escalade": { + "version": "3.1.1", + "license": "MIT", + "engines": { + "node": ">=6" + } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "escape-string-regexp": { + "node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "8.53.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz", - "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==", - "dev": true, - "requires": { + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "8.51.0", + "license": "MIT", + "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.3", - "@eslint/js": "8.53.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/eslintrc": "^2.1.2", + "@eslint/js": "8.51.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -6286,55 +3545,66 @@ "strip-ansi": "^6.0.1", "text-table": "^0.2.0" }, - "dependencies": { - "eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - } + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "eslint-config-airbnb": { + "node_modules/eslint-config-airbnb": { "version": "19.0.4", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz", - "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "eslint-config-airbnb-base": "^15.0.0", "object.assign": "^4.1.2", "object.entries": "^1.1.5" + }, + "engines": { + "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react-hooks": "^4.3.0" } }, - "eslint-config-airbnb-base": { + "node_modules/eslint-config-airbnb-base": { "version": "15.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz", - "integrity": "sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "confusing-browser-globals": "^1.0.10", "object.assign": "^4.1.2", "object.entries": "^1.1.5", "semver": "^6.3.0" }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true - } + "engines": { + "node": "^10.12.0 || >=12.0.0" + }, + "peerDependencies": { + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.2" + } + }, + "node_modules/eslint-config-airbnb-base/node_modules/semver": { + "version": "6.3.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "eslint-config-next": { + "node_modules/eslint-config-next": { "version": "13.5.2", - "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.5.2.tgz", - "integrity": "sha512-kCF7k7fHBtFtxfP6J6AP6Mo0vW3CrFeoIuoZ7NHGIvLFc/RUaIspJ6inO/R33zE1o9t/lbJgTnsqnRB++sxCUQ==", - "requires": { + "license": "MIT", + "dependencies": { "@next/eslint-plugin-next": "13.5.2", "@rushstack/eslint-patch": "^1.3.3", "@typescript-eslint/parser": "^5.4.2 || ^6.0.0", @@ -6344,39 +3614,48 @@ "eslint-plugin-jsx-a11y": "^6.7.1", "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.5.0 || 5.0.0-canary-7118f5dd7-20230705" + }, + "peerDependencies": { + "eslint": "^7.23.0 || ^8.0.0", + "typescript": ">=3.3.1" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, - "eslint-config-prettier": { + "node_modules/eslint-config-prettier": { "version": "8.10.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", - "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", - "dev": true + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } }, - "eslint-import-resolver-node": { + "node_modules/eslint-import-resolver-node": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", - "requires": { + "license": "MIT", + "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", "resolve": "^1.22.4" - }, + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "license": "MIT", "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "requires": { - "ms": "^2.1.1" - } - } + "ms": "^2.1.1" } }, - "eslint-import-resolver-typescript": { + "node_modules/eslint-import-resolver-typescript": { "version": "3.6.1", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", - "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", - "requires": { + "license": "ISC", + "dependencies": { "debug": "^4.3.4", "enhanced-resolve": "^5.12.0", "eslint-module-utils": "^2.7.4", @@ -6384,101 +3663,132 @@ "get-tsconfig": "^4.5.0", "is-core-module": "^2.11.0", "is-glob": "^4.0.3" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts" + }, + "peerDependencies": { + "eslint": "*", + "eslint-plugin-import": "*" } }, - "eslint-module-utils": { + "node_modules/eslint-module-utils": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", - "requires": { + "license": "MIT", + "dependencies": { "debug": "^3.2.7" }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "requires": { - "ms": "^2.1.1" - } + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true } } }, - "eslint-plugin-import": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", - "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", - "requires": { - "array-includes": "^3.1.7", - "array.prototype.findlastindex": "^1.2.3", - "array.prototype.flat": "^1.3.2", - "array.prototype.flatmap": "^1.3.2", + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.28.1", + "license": "MIT", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.findlastindex": "^1.2.2", + "array.prototype.flat": "^1.3.1", + "array.prototype.flatmap": "^1.3.1", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.9", + "eslint-import-resolver-node": "^0.3.7", "eslint-module-utils": "^2.8.0", - "hasown": "^2.0.0", - "is-core-module": "^2.13.1", + "has": "^1.0.3", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.7", - "object.groupby": "^1.0.1", - "object.values": "^1.1.7", + "object.fromentries": "^2.0.6", + "object.groupby": "^1.0.0", + "object.values": "^1.1.6", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "license": "MIT", "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "requires": { - "ms": "^2.1.1" - } - }, - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "requires": { - "esutils": "^2.0.2" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - } + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "eslint-plugin-jsx-a11y": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz", - "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==", - "requires": { - "@babel/runtime": "^7.23.2", - "aria-query": "^5.3.0", - "array-includes": "^3.1.7", - "array.prototype.flatmap": "^1.3.2", - "ast-types-flow": "^0.0.8", - "axe-core": "=4.7.0", - "axobject-query": "^3.2.1", + "node_modules/eslint-plugin-jsx-a11y": { + "version": "6.7.1", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.20.7", + "aria-query": "^5.1.3", + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "ast-types-flow": "^0.0.7", + "axe-core": "^4.6.2", + "axobject-query": "^3.1.1", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", - "es-iterator-helpers": "^1.0.15", - "hasown": "^2.0.0", - "jsx-ast-utils": "^3.3.5", - "language-tags": "^1.0.9", + "has": "^1.0.3", + "jsx-ast-utils": "^3.3.3", + "language-tags": "=1.0.5", "minimatch": "^3.1.2", - "object.entries": "^1.1.7", - "object.fromentries": "^2.0.7" + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=4.0" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" } }, - "eslint-plugin-react": { + "node_modules/eslint-plugin-react": { "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", - "requires": { + "license": "MIT", + "dependencies": { "array-includes": "^3.1.6", "array.prototype.flatmap": "^1.3.1", "array.prototype.tosorted": "^1.1.1", @@ -6496,684 +3806,878 @@ "semver": "^6.3.1", "string.prototype.matchall": "^4.0.8" }, - "dependencies": { - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "requires": { - "esutils": "^2.0.2" - } - }, - "resolve": { - "version": "2.0.0-next.5", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", - "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", - "requires": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - } + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, - "eslint-plugin-react-hooks": { + "node_modules/eslint-plugin-react-hooks": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==" + "license": "MIT", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "license": "Apache-2.0", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.4", + "license": "MIT", + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-plugin-react/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } }, - "eslint-scope": { + "node_modules/eslint-scope": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" }, - "dependencies": { - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - } + "engines": { + "node": ">=8.0.0" } }, - "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==" + "node_modules/eslint-scope/node_modules/estraverse": { + "version": "4.3.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } }, - "esniff": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", - "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", - "requires": { - "d": "^1.0.1", - "es5-ext": "^0.10.62", - "event-emitter": "^0.3.5", - "type": "^2.7.2" + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.2.2", + "license": "BSD-2-Clause", "dependencies": { - "type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" - } + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "espree": { + "node_modules/espree": { "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, - "esquery": { + "node_modules/esquery": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "requires": { + "license": "BSD-3-Clause", + "dependencies": { "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" } }, - "esrecurse": { + "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" } }, - "estraverse": { + "node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } }, - "esutils": { + "node_modules/esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, -<<<<<<< HEAD -======= - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", - "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" } }, - "events": { + "node_modules/events": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, - "peer": true + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.8.x" + } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "ext": { + "node_modules/ext": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", - "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", - "requires": { - "type": "^2.7.2" - }, + "license": "ISC", "dependencies": { - "type": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", - "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" - } + "type": "^2.7.2" } }, - "fast-deep-equal": { + "node_modules/ext/node_modules/type": { + "version": "2.7.2", + "license": "ISC" + }, + "node_modules/fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "requires": { + "license": "MIT" + }, + "node_modules/fast-glob": { + "version": "3.3.1", + "license": "MIT", + "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.4" }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "license": "ISC", "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "requires": { - "is-glob": "^4.0.1" - } - } + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" } }, - "fast-json-stable-stringify": { + "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "license": "MIT" }, - "fast-levenshtein": { + "node_modules/fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "license": "MIT" }, - "fastq": { + "node_modules/fastq": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", - "requires": { + "license": "ISC", + "dependencies": { "reusify": "^1.0.4" } }, - "file-entry-cache": { + "node_modules/file-entry-cache": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" } }, - "file-loader": { + "node_modules/file-loader": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" } }, - "fill-range": { + "node_modules/fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { + "license": "MIT", + "dependencies": { "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, - "find-up": { + "node_modules/find-up": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "requires": { + "node_modules/flat-cache": { + "version": "3.1.1", + "license": "MIT", + "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", "rimraf": "^3.0.2" + }, + "engines": { + "node": ">=12.0.0" } }, - "flatted": { + "node_modules/flatted": { "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", - "dev": true + "license": "ISC" }, - "for-each": { + "node_modules/for-each": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", - "requires": { + "license": "MIT", + "dependencies": { "is-callable": "^1.1.3" } }, - "fs.realpath": { + "node_modules/fs-readdir-recursive": { + "version": "1.1.0", + "license": "MIT" + }, + "node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + "license": "ISC" }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" + "node_modules/fsevents": { + "version": "2.3.3", + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "license": "MIT" }, - "function.prototype.name": { + "node_modules/function.prototype.name": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "functions-have-names": { + "node_modules/functions-have-names": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" - }, - "get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", - "requires": { - "function-bind": "^1.1.2", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.1", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "get-symbol-description": { + "node_modules/get-symbol-description": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "get-tsconfig": { + "node_modules/get-tsconfig": { "version": "4.7.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", - "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", - "requires": { + "license": "MIT", + "dependencies": { "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" } }, - "glob": { + "node_modules/glob": { "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "requires": { + "license": "ISC", + "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "glob-parent": { + "node_modules/glob-parent": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { + "license": "ISC", + "dependencies": { "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" } }, - "glob-to-regexp": { + "node_modules/glob-to-regexp": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + "license": "BSD-2-Clause" }, - "globals": { + "node_modules/globals": { "version": "13.23.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", - "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "globalthis": { + "node_modules/globalthis": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", - "requires": { + "license": "MIT", + "dependencies": { "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "globby": { + "node_modules/globby": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "requires": { + "license": "MIT", + "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "gopd": { + "node_modules/gopd": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "requires": { + "license": "MIT", + "dependencies": { "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "graceful-fs": { + "node_modules/graceful-fs": { "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + "license": "ISC" }, - "graphemer": { + "node_modules/graphemer": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "license": "MIT" + }, + "node_modules/has": { + "version": "1.0.4", + "license": "MIT", + "engines": { + "node": ">= 0.4.0" + } }, - "has-bigints": { + "node_modules/has-bigints": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "has-flag": { + "node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", - "requires": { - "get-intrinsic": "^1.2.2" + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "has-proto": { + "node_modules/has-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "has-symbols": { + "node_modules/has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "has-tostringtag": { + "node_modules/has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "requires": { + "license": "MIT", + "dependencies": { "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", - "requires": { - "function-bind": "^1.1.2" - } - }, - "ignore": { + "node_modules/ignore": { "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==" + "license": "MIT", + "engines": { + "node": ">= 4" + } }, - "import-fresh": { + "node_modules/import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "imurmurhash": { + "node_modules/imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } }, - "inflight": { + "node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "requires": { + "license": "ISC", + "dependencies": { "once": "^1.3.0", "wrappy": "1" } }, - "inherits": { + "node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "license": "ISC" }, - "internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", - "requires": { - "get-intrinsic": "^1.2.2", - "hasown": "^2.0.0", + "node_modules/internal-slot": { + "version": "1.0.5", + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" } }, - "is-array-buffer": { + "node_modules/is-array-buffer": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.0", "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-async-function": { + "node_modules/is-async-function": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", - "requires": { + "license": "MIT", + "dependencies": { "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-bigint": { + "node_modules/is-bigint": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "requires": { + "license": "MIT", + "dependencies": { "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "license": "MIT", + "optional": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" } }, - "is-boolean-object": { + "node_modules/is-boolean-object": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-callable": { + "node_modules/is-callable": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "requires": { - "hasown": "^2.0.0" + "node_modules/is-core-module": { + "version": "2.13.0", + "license": "MIT", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-date-object": { + "node_modules/is-date-object": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", - "requires": { + "license": "MIT", + "dependencies": { "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-extglob": { + "node_modules/is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, - "is-finalizationregistry": { + "node_modules/is-finalizationregistry": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-generator-function": { + "node_modules/is-generator-function": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", - "requires": { + "license": "MIT", + "dependencies": { "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-glob": { + "node_modules/is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { + "license": "MIT", + "dependencies": { "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" } }, - "is-map": { + "node_modules/is-map": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "is-negative-zero": { + "node_modules/is-negative-zero": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "is-number": { + "node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } }, - "is-number-object": { + "node_modules/is-number-object": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", - "requires": { + "license": "MIT", + "dependencies": { "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-path-inside": { + "node_modules/is-path-inside": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "is-regex": { + "node_modules/is-regex": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-set": { + "node_modules/is-set": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "is-shared-array-buffer": { + "node_modules/is-shared-array-buffer": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-string": { + "node_modules/is-string": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "requires": { + "license": "MIT", + "dependencies": { "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-symbol": { + "node_modules/is-symbol": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "requires": { + "license": "MIT", + "dependencies": { "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-typed-array": { + "node_modules/is-typed-array": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", - "requires": { + "license": "MIT", + "dependencies": { "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-typedarray": { + "node_modules/is-typedarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" + "license": "MIT" }, - "is-weakmap": { + "node_modules/is-weakmap": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "is-weakref": { + "node_modules/is-weakref": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "is-weakset": { + "node_modules/is-weakset": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "isarray": { + "node_modules/isarray": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + "license": "MIT" }, - "isexe": { + "node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "license": "ISC" }, - "iterator.prototype": { + "node_modules/iterator.prototype": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", - "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", - "requires": { + "license": "MIT", + "dependencies": { "define-properties": "^1.2.1", "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", @@ -7181,694 +4685,1119 @@ "set-function-name": "^2.0.1" } }, - "js-tokens": { + "node_modules/jest-worker": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "license": "MIT" }, - "js-yaml": { + "node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "license": "MIT", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" } }, - "json-buffer": { + "node_modules/json-buffer": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "license": "MIT" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "peer": true }, - "json-schema-traverse": { + "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "license": "MIT" }, - "json-stable-stringify-without-jsonify": { + "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "license": "MIT" }, - "json5": { + "node_modules/json5": { "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } }, - "jsx-ast-utils": { + "node_modules/jsx-ast-utils": { "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", - "requires": { + "license": "MIT", + "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", "object.assign": "^4.1.4", "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" } }, - "keyv": { + "node_modules/keyv": { "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "json-buffer": "3.0.1" } }, - "language-subtag-registry": { + "node_modules/language-subtag-registry": { "version": "0.3.22", - "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", - "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==" + "license": "CC0-1.0" }, - "language-tags": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", - "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", - "requires": { - "language-subtag-registry": "^0.3.20" + "node_modules/language-tags": { + "version": "1.0.5", + "license": "MIT", + "dependencies": { + "language-subtag-registry": "~0.3.2" } }, - "levn": { + "node_modules/levn": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/loader-runner": { + "version": "4.3.0", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.11.5" } }, - "loader-utils": { + "node_modules/loader-utils": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" } }, - "locate-path": { + "node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "lodash.merge": { + "node_modules/lodash.debounce": { + "version": "4.0.8", + "license": "MIT" + }, + "node_modules/lodash.merge": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "license": "MIT" }, - "loose-envify": { + "node_modules/loose-envify": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { + "license": "MIT", + "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" } }, - "lru-cache": { + "node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { + "license": "ISC", + "dependencies": { "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/make-dir": { + "version": "2.1.0", + "license": "MIT", + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "5.7.2", + "license": "ISC", + "bin": { + "semver": "bin/semver" } }, - "merge2": { + "node_modules/merge-stream": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + "license": "MIT", + "engines": { + "node": ">= 8" + } }, - "micromatch": { + "node_modules/micromatch": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "requires": { + "license": "MIT", + "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.6" } }, - "minimatch": { + "node_modules/mime-types": { + "version": "2.1.35", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "requires": { + "license": "ISC", + "dependencies": { "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" } }, - "minimist": { + "node_modules/minimist": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "ms": { + "node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "license": "MIT" }, - "nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==" + "node_modules/nanoid": { + "version": "3.3.6", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } }, - "natural-compare": { + "node_modules/natural-compare": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "license": "MIT" }, - "natural-compare-lite": { + "node_modules/natural-compare-lite": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "next": { - "version": "13.5.6", - "resolved": "https://registry.npmjs.org/next/-/next-13.5.6.tgz", - "integrity": "sha512-Y2wTcTbO4WwEsVb4A8VSnOsG1I9ok+h74q0ZdxkwM3EODqrs4pasq7O0iUxbcS9VtWMicG7f3+HAj0r1+NtKSw==", - "requires": { - "@next/env": "13.5.6", - "@next/swc-darwin-arm64": "13.5.6", - "@next/swc-darwin-x64": "13.5.6", - "@next/swc-linux-arm64-gnu": "13.5.6", - "@next/swc-linux-arm64-musl": "13.5.6", - "@next/swc-linux-x64-gnu": "13.5.6", - "@next/swc-linux-x64-musl": "13.5.6", - "@next/swc-win32-arm64-msvc": "13.5.6", - "@next/swc-win32-ia32-msvc": "13.5.6", - "@next/swc-win32-x64-msvc": "13.5.6", + "dev": true, + "license": "MIT" + }, + "node_modules/neo-async": { + "version": "2.6.2", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/next": { + "version": "13.5.4", + "license": "MIT", + "dependencies": { + "@next/env": "13.5.4", "@swc/helpers": "0.5.2", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001406", "postcss": "8.4.31", "styled-jsx": "5.1.1", "watchpack": "2.4.0" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": ">=16.14.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "13.5.4", + "@next/swc-darwin-x64": "13.5.4", + "@next/swc-linux-arm64-gnu": "13.5.4", + "@next/swc-linux-arm64-musl": "13.5.4", + "@next/swc-linux-x64-gnu": "13.5.4", + "@next/swc-linux-x64-musl": "13.5.4", + "@next/swc-win32-arm64-msvc": "13.5.4", + "@next/swc-win32-ia32-msvc": "13.5.4", + "@next/swc-win32-x64-msvc": "13.5.4" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "sass": { + "optional": true + } } }, - "next-google-fonts": { + "node_modules/next-google-fonts": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/next-google-fonts/-/next-google-fonts-2.2.0.tgz", - "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==" + "integrity": "sha512-TCtNp+uu0vof2X8Xfptfw96Unc3zsUekBY2l4g2mGAX+U8QO/yfAaEioGhFCwU05M8NbMgwP5C8V40Vtwp87iQ==", + "deprecated": "As of Next.js 10.2, Google Fonts are automatically optimized! For more info, see https://github.com/joe-bell/next-google-fonts", + "peerDependencies": { + "next": ">= 10.0.7", + "react": ">= 17.0.1", + "react-dom": ">= 17.0.1" + } }, - "next-tick": { + "node_modules/next-tick": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==" + "license": "ISC" }, - "node-gyp-build": { + "node_modules/node-gyp-build": { "version": "4.6.1", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", - "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==" - }, -<<<<<<< HEAD -======= - "node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true, - "peer": true + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/node-releases": { + "version": "2.0.13", + "license": "MIT" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.10.0" + } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "object-assign": { + "node_modules/object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, - "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "node_modules/object-inspect": { + "version": "1.12.3", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "object-keys": { + "node_modules/object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + } }, - "object.assign": { + "node_modules/object.assign": { "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "object.entries": { + "node_modules/object.entries": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", - "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" } }, - "object.fromentries": { + "node_modules/object.fromentries": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", - "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "object.groupby": { + "node_modules/object.groupby": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1" } }, - "object.hasown": { + "node_modules/object.hasown": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", - "requires": { + "license": "MIT", + "dependencies": { "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "object.values": { + "node_modules/object.values": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", - "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "once": { + "node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "requires": { + "license": "ISC", + "dependencies": { "wrappy": "1" } }, - "optionator": { + "node_modules/optionator": { "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" } }, - "p-limit": { + "node_modules/p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "p-locate": { + "node_modules/p-locate": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "parent-module": { + "node_modules/parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" } }, - "path-exists": { + "node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "path-is-absolute": { + "node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } }, - "path-key": { + "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "path-parse": { + "node_modules/path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "license": "MIT" }, - "path-type": { + "node_modules/path-type": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "picocolors": { + "node_modules/picocolors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "license": "ISC" }, - "picomatch": { + "node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } }, - "postcss": { + "node_modules/pify": { + "version": "4.0.1", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/postcss": { "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", - "requires": { + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" } }, - "postcss-value-parser": { + "node_modules/postcss-value-parser": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + "license": "MIT" }, - "prelude-ls": { + "node_modules/prelude-ls": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } }, - "prettier": { + "node_modules/prettier": { "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "dev": true + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } }, - "prop-types": { + "node_modules/prop-types": { "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "requires": { + "license": "MIT", + "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, - "punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true + "node_modules/punycode": { + "version": "2.3.0", + "license": "MIT", + "engines": { + "node": ">=6" + } }, - "queue-microtask": { + "node_modules/queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/randombytes": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } }, - "react": { + "node_modules/react": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "requires": { + "license": "MIT", + "dependencies": { "loose-envify": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" } }, - "react-dom": { + "node_modules/react-dom": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "requires": { + "license": "MIT", + "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" + }, + "peerDependencies": { + "react": "^18.2.0" } }, - "react-feather": { + "node_modules/react-feather": { "version": "2.0.10", - "resolved": "https://registry.npmjs.org/react-feather/-/react-feather-2.0.10.tgz", - "integrity": "sha512-BLhukwJ+Z92Nmdcs+EMw6dy1Z/VLiJTzEQACDUEnWMClhYnFykJCGWQx+NmwP/qQHGX/5CzQ+TGi8ofg2+HzVQ==", - "requires": { + "license": "MIT", + "dependencies": { "prop-types": "^15.7.2" + }, + "peerDependencies": { + "react": ">=16.8.6" } }, - "react-is": { + "node_modules/react-is": { "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "license": "MIT" }, - "react-router": { + "node_modules/react-router": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz", - "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==", - "requires": { + "license": "MIT", + "dependencies": { "@remix-run/router": "1.10.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" } }, - "react-router-dom": { + "node_modules/react-router-dom": { "version": "6.17.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz", - "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==", - "requires": { + "license": "MIT", + "dependencies": { "@remix-run/router": "1.10.0", "react-router": "6.17.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" } }, - "react-toastify": { + "node_modules/react-toastify": { "version": "9.1.3", - "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz", - "integrity": "sha512-fPfb8ghtn/XMxw3LkxQBk3IyagNpF/LIKjOBflbexr2AWxAH1MJgvnESwEwBn9liLFXgTKWgBSdZpw9m4OTHTg==", - "requires": { + "license": "MIT", + "dependencies": { "clsx": "^1.1.1" + }, + "peerDependencies": { + "react": ">=16", + "react-dom": ">=16" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "license": "MIT", + "optional": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" } }, - "reflect.getprototypeof": { + "node_modules/reflect.getprototypeof": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", - "integrity": "sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "regenerator-runtime": { + "node_modules/regenerate": { + "version": "1.4.2", + "license": "MIT" + }, + "node_modules/regenerate-unicode-properties": { + "version": "10.1.1", + "license": "MIT", + "dependencies": { + "regenerate": "^1.4.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regenerator-runtime": { "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + "license": "MIT" + }, + "node_modules/regenerator-transform": { + "version": "0.15.2", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.8.4" + } }, - "regexp.prototype.flags": { + "node_modules/regexp.prototype.flags": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "set-function-name": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpu-core": { + "version": "5.3.2", + "license": "MIT", + "dependencies": { + "@babel/regjsgen": "^0.8.0", + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^10.1.0", + "regjsparser": "^0.9.1", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regjsparser": { + "version": "0.9.1", + "license": "BSD-2-Clause", + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" } }, - "resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "requires": { + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/resolve": { + "version": "1.22.6", + "license": "MIT", + "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "resolve-from": { + "node_modules/resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=4" + } }, - "resolve-pkg-maps": { + "node_modules/resolve-pkg-maps": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==" + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } }, - "reusify": { + "node_modules/reusify": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + "license": "MIT", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } }, - "rimraf": { + "node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { + "license": "ISC", + "dependencies": { "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "run-parallel": { + "node_modules/run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "requires": { + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { "queue-microtask": "^1.2.2" } }, - "safe-array-concat": { + "node_modules/safe-array-concat": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", - "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "safe-regex-test": { + "node_modules/safe-buffer": { + "version": "5.2.1", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peer": true + }, + "node_modules/safe-regex-test": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "scheduler": { + "node_modules/scheduler": { "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "requires": { + "license": "MIT", + "dependencies": { "loose-envify": "^1.1.0" } }, - "schema-utils": { + "node_modules/schema-utils": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, - "semver": { + "node_modules/semver": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "requires": { + "license": "ISC", + "dependencies": { "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, -<<<<<<< HEAD -======= - "serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "node_modules/serialize-javascript": { + "version": "6.0.1", "dev": true, + "license": "BSD-3-Clause", "peer": true, - "requires": { + "dependencies": { "randombytes": "^2.1.0" } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "set-function-length": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", - "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", - "requires": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" - } - }, - "set-function-name": { + "node_modules/set-function-name": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", - "requires": { + "license": "MIT", + "dependencies": { "define-data-property": "^1.0.1", "functions-have-names": "^1.2.3", "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" } }, - "shallowequal": { + "node_modules/shallowequal": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + "license": "MIT" }, - "shebang-command": { + "node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" } }, - "shebang-regex": { + "node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=8" + } }, - "side-channel": { + "node_modules/side-channel": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "slash": { + "node_modules/slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "engines": { + "node": ">=0.10.0" + } }, - "source-map-js": { + "node_modules/source-map-js": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } }, - "streamsearch": { + "node_modules/streamsearch": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==" + "engines": { + "node": ">=10.0.0" + } }, - "string.prototype.matchall": { + "node_modules/string.prototype.matchall": { "version": "4.0.10", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", - "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", @@ -7878,332 +5807,514 @@ "regexp.prototype.flags": "^1.5.0", "set-function-name": "^2.0.0", "side-channel": "^1.0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "string.prototype.trim": { + "node_modules/string.prototype.trim": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", - "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "string.prototype.trimend": { + "node_modules/string.prototype.trimend": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", - "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "string.prototype.trimstart": { + "node_modules/string.prototype.trimstart": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", - "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "strip-ansi": { + "node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, - "strip-bom": { + "node_modules/strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==" + "license": "MIT", + "engines": { + "node": ">=4" + } }, - "strip-json-comments": { + "node_modules/strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "styled-components": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.1.tgz", - "integrity": "sha512-cpZZP5RrKRIClBW5Eby4JM1wElLVP4NQrJbJ0h10TidTyJf4SIIwa3zLXOoPb4gJi8MsJ8mjq5mu2IrEhZIAcQ==", - "requires": { + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/styled-components": { + "version": "6.0.8", + "license": "MIT", + "dependencies": { + "@babel/cli": "^7.21.0", + "@babel/core": "^7.21.0", + "@babel/helper-module-imports": "^7.18.6", + "@babel/plugin-external-helpers": "^7.18.6", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-object-rest-spread": "^7.20.7", + "@babel/preset-env": "^7.20.2", + "@babel/preset-react": "^7.18.6", + "@babel/preset-typescript": "^7.21.0", + "@babel/traverse": "^7.21.2", "@emotion/is-prop-valid": "^1.2.1", "@emotion/unitless": "^0.8.0", "@types/stylis": "^4.0.2", "css-to-react-native": "^3.2.0", "csstype": "^3.1.2", - "postcss": "^8.4.31", + "postcss": "^8.4.23", "shallowequal": "^1.1.0", "stylis": "^4.3.0", "tslib": "^2.5.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/styled-components" + }, + "peerDependencies": { + "babel-plugin-styled-components": ">= 2", + "react": ">= 16.8.0", + "react-dom": ">= 16.8.0" + }, + "peerDependenciesMeta": { + "babel-plugin-styled-components": { + "optional": true + } } }, - "styled-jsx": { + "node_modules/styled-jsx": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz", - "integrity": "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==", - "requires": { + "license": "MIT", + "dependencies": { "client-only": "0.0.1" + }, + "engines": { + "node": ">= 12.0.0" + }, + "peerDependencies": { + "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } } }, - "stylis": { + "node_modules/stylis": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.0.tgz", - "integrity": "sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==" + "license": "MIT" }, - "supports-color": { + "node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, - "supports-preserve-symlinks-flag": { + "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "tapable": { + "node_modules/tapable": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" - }, -<<<<<<< HEAD -======= - "terser": { - "version": "5.29.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz", - "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/terser": { + "version": "5.21.0", "dev": true, + "license": "BSD-2-Clause", "peer": true, - "requires": { + "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.9", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.17", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", "dev": true, - "peer": true, - "requires": { - "@jridgewell/trace-mapping": "^0.3.20", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" - } + "license": "MIT", + "peer": true }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "text-table": { + "node_modules/text-table": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "license": "MIT" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "license": "MIT", + "engines": { + "node": ">=4" + } }, - "to-regex-range": { + "node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { + "license": "MIT", + "dependencies": { "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" } }, - "tr46": { + "node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "license": "MIT" }, - "tsconfig-paths": { + "node_modules/tsconfig-paths": { "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", - "requires": { + "license": "MIT", + "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", "minimist": "^1.2.6", "strip-bom": "^3.0.0" - }, + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "license": "MIT", "dependencies": { - "json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "requires": { - "minimist": "^1.2.0" - } - } + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" } }, - "tslib": { + "node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "license": "0BSD" }, - "tsutils": { + "node_modules/tsutils": { "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "requires": { + "license": "MIT", + "dependencies": { "tslib": "^1.8.1" }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, - "type": { + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "license": "0BSD" + }, + "node_modules/type": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", - "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" + "license": "ISC" }, - "type-check": { + "node_modules/type-check": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { + "license": "MIT", + "dependencies": { "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" } }, - "type-fest": { + "node_modules/type-fest": { "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, - "typed-array-buffer": { + "node_modules/typed-array-buffer": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1", "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" } }, - "typed-array-byte-length": { + "node_modules/typed-array-byte-length": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", "has-proto": "^1.0.1", "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "typed-array-byte-offset": { + "node_modules/typed-array-byte-offset": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", - "requires": { + "license": "MIT", + "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "for-each": "^0.3.3", "has-proto": "^1.0.1", "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "typed-array-length": { + "node_modules/typed-array-length": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "typedarray-to-buffer": { + "node_modules/typedarray-to-buffer": { "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { + "license": "MIT", + "dependencies": { "is-typedarray": "^1.0.0" } }, - "typescript": { + "node_modules/typescript": { "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } }, - "unbox-primitive": { + "node_modules/unbox-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", - "requires": { + "license": "MIT", + "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", "has-symbols": "^1.0.3", "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unicode-canonical-property-names-ecmascript": { + "version": "2.0.0", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-ecmascript": { + "version": "2.0.0", + "license": "MIT", + "dependencies": { + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-value-ecmascript": { + "version": "2.1.0", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-property-aliases-ecmascript": { + "version": "2.1.0", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" } }, - "uri-js": { + "node_modules/uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { + "license": "BSD-2-Clause", + "dependencies": { "punycode": "^2.1.0" } }, - "utf-8-validate": { + "node_modules/utf-8-validate": { "version": "5.0.10", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", - "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", - "requires": { + "hasInstallScript": true, + "license": "MIT", + "dependencies": { "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" } }, - "watchpack": { + "node_modules/watchpack": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "requires": { + "license": "MIT", + "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" } }, - "webidl-conversions": { + "node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, -<<<<<<< HEAD -======= - "webpack": { - "version": "5.90.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.3.tgz", - "integrity": "sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==", + "license": "BSD-2-Clause" + }, + "node_modules/webpack": { + "version": "5.88.2", "dev": true, + "license": "MIT", "peer": true, - "requires": { + "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.5", + "@types/estree": "^1.0.0", "@webassemblyjs/ast": "^1.11.5", "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.21.10", + "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", @@ -8217,24 +6328,39 @@ "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.10", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } } }, - "webpack-sources": { + "node_modules/webpack-sources": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", "dev": true, - "peer": true + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10.13.0" + } }, ->>>>>>> 3136b80d876d15fd5e19204d4adc9b4fe012ffd2 - "websocket": { + "node_modules/websocket": { "version": "1.0.34", - "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.34.tgz", - "integrity": "sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==", - "requires": { + "license": "Apache-2.0", + "dependencies": { "bufferutil": "^4.0.1", "debug": "^2.2.0", "es5-ext": "^0.10.50", @@ -8242,57 +6368,60 @@ "utf-8-validate": "^5.0.2", "yaeti": "^0.0.6" }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/websocket/node_modules/debug": { + "version": "2.6.9", + "license": "MIT", "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" - } + "ms": "2.0.0" } }, - "whatwg-url": { + "node_modules/websocket/node_modules/ms": { + "version": "2.0.0", + "license": "MIT" + }, + "node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "requires": { + "license": "MIT", + "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, - "which": { + "node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { + "license": "ISC", + "dependencies": { "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" } }, - "which-boxed-primitive": { + "node_modules/which-boxed-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", - "requires": { + "license": "MIT", + "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", "is-number-object": "^1.0.4", "is-string": "^1.0.5", "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "which-builtin-type": { + "node_modules/which-builtin-type": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", - "requires": { + "license": "MIT", + "dependencies": { "function.prototype.name": "^1.1.5", "has-tostringtag": "^1.0.0", "is-async-function": "^2.0.0", @@ -8305,51 +6434,68 @@ "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "which-collection": { + "node_modules/which-collection": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", - "requires": { + "license": "MIT", + "dependencies": { "is-map": "^2.0.1", "is-set": "^2.0.1", "is-weakmap": "^2.0.1", "is-weakset": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", - "requires": { + "node_modules/which-typed-array": { + "version": "1.1.11", + "license": "MIT", + "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "wrappy": { + "node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "license": "ISC" }, - "yaeti": { + "node_modules/yaeti": { "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha512-MvQa//+KcZCUkBTIC9blM+CU9J2GzuTytsOUwf2lidtvkx/6gnEp1QvJv34t9vdjhFmha/mUiNDbN0D0mJWdug==" + "license": "MIT", + "engines": { + "node": ">=0.10.32" + } }, - "yallist": { + "node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "license": "ISC" }, - "yocto-queue": { + "node_modules/yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } } } } From 94fb56d0f06c4c35b33005cd0bfeada665c0147d Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 2 Apr 2024 16:41:39 -0700 Subject: [PATCH 097/101] Eslint --- src/app/orderPage/page.tsx | 1 - src/app/pickup/page.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index 77a2b09b..441b441d 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -3,7 +3,6 @@ import { useState, useEffect } from 'react'; import { Body1, Body2 } from '@/styles/fonts'; import { useSearchParams } from 'next/navigation'; -import { useSearchParams } from 'next/navigation'; import BackButton from '../../components/BackButton/BackButton'; import { diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 594c8c33..fa4af937 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -6,7 +6,7 @@ import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import { Normal700Text, Heading4Bold } from '@/styles/fonts'; +import {Heading4Bold } from '@/styles/fonts'; import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; From 585c4d0efcdb20a8b6cd5b8f68593f6c4e913d8f Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Tue, 2 Apr 2024 16:43:24 -0700 Subject: [PATCH 098/101] prettier --- src/app/pickup/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fa4af937..69150f06 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -6,7 +6,7 @@ import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import {Heading4Bold } from '@/styles/fonts'; +import { Heading4Bold } from '@/styles/fonts'; import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; From 68cc86a2f93de49f2a34de703d59584b8ee597df Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Wed, 3 Apr 2024 19:27:49 -0700 Subject: [PATCH 099/101] chore: fixedAddress --- package-lock.json | 274 ++++++++++++++++++++++- src/api/supabase/queries/user_queries.ts | 2 +- src/app/delivery/page.tsx | 24 +- 3 files changed, 293 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6307458..033dd29f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3457,12 +3457,14 @@ } }, "node_modules/es5-ext": { - "version": "0.10.62", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "hasInstallScript": true, - "license": "ISC", "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" }, "engines": { @@ -3899,6 +3901,25 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esniff/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, "node_modules/espree": { "version": "9.6.1", "license": "BSD-2-Clause", @@ -3948,6 +3969,15 @@ "node": ">=0.10.0" } }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, "node_modules/events": { "version": "3.3.0", "dev": true, @@ -5045,6 +5075,126 @@ "version": "1.1.0", "license": "ISC" }, + "node_modules/next/node_modules/@next/swc-darwin-x64": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz", + "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-linux-arm64-gnu": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz", + "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-linux-arm64-musl": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz", + "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-linux-x64-gnu": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz", + "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-linux-x64-musl": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz", + "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-win32-arm64-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz", + "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-win32-ia32-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz", + "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/next/node_modules/@next/swc-win32-x64-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz", + "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/node-gyp-build": { "version": "4.6.1", "license": "MIT", @@ -6496,6 +6646,126 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz", + "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz", + "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz", + "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz", + "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz", + "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz", + "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-ia32-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz", + "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "13.5.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz", + "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } } } } diff --git a/src/api/supabase/queries/user_queries.ts b/src/api/supabase/queries/user_queries.ts index d06a0ed6..a3ba8847 100644 --- a/src/api/supabase/queries/user_queries.ts +++ b/src/api/supabase/queries/user_queries.ts @@ -119,7 +119,7 @@ export async function fetchUserAddress(uuid: string) { .eq('user_id', uuid) .single(); - console.log('test', error); + console.log('test', user); if (error) { console.error('Error fetching user data:', error); diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index c0688332..9890409f 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -2,13 +2,17 @@ import React, { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; +import { + fetchUser, + fetchUserAddress, +} from '@/api/supabase/queries/user_queries'; import BackButton from '../../components/BackButton/BackButton'; import { fetchCartItemsWithQuantity, totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import { ProductWithQuantity } from '../../schema/schema'; +import { ProductWithQuantity, User, Address } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; import NavBar from '../../components/NavBarFolder/NavBar'; import { @@ -22,13 +26,21 @@ import { export default function App() { const [numberOfItems, setNumberOfItems] = useState(0); const [cart, setCart] = useState([]); + const [Profile, setProfile] = useState(); + const [UserAddress, setUserAddress] = useState
(); const router = useRouter(); useEffect(() => { async function fetchProducts() { setNumberOfItems(await totalNumberOfItemsInCart()); setCart(await fetchCartItemsWithQuantity()); } - + async function fetchUserData() { + const data = await fetchUser(); // change the function to grab the cartItems as products + setProfile(data); + const address = await fetchUserAddress(data.id); + setUserAddress(address); + } + fetchUserData(); fetchProducts(); }, []); @@ -42,9 +54,13 @@ export default function App() { Shipping Name - Ethan Auyeung + + {Profile?.first_name + ' ' + Profile?.last_name} + Address - 123 Telegraph Ave + + {UserAddress?.street}, {UserAddress?.city}, {UserAddress?.zipcode} + From 1526d0b993df8698ccdfac79d33f18e1c8abab1f Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Wed, 3 Apr 2024 19:32:29 -0700 Subject: [PATCH 100/101] fixedEslint --- src/app/delivery/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 9890409f..d6ceecde 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -55,7 +55,7 @@ export default function App() { Name - {Profile?.first_name + ' ' + Profile?.last_name} + {`${Profile?.first_name } ${ Profile?.last_name}`} Address From e8eac8e89d85322d665017bb91c1535952449325 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Wed, 3 Apr 2024 19:33:50 -0700 Subject: [PATCH 101/101] check --- src/app/delivery/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index d6ceecde..cd2534da 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -55,7 +55,7 @@ export default function App() { Name - {`${Profile?.first_name } ${ Profile?.last_name}`} + {`${Profile?.first_name} ${Profile?.last_name}`} Address
+
+ Order No. {orderNumber} + viewOrder(orderNumber)}> + View Order + + +
- return ( -
-
-
{formatDate(date)}
-
Order No. {orderNumber}
-
- {status === 'Confirmed' ? '✓' : '✗'} {status} + + {formatDate(date)} + + + + {'Order Rejected'} + +
+ ); + } + if (order.status === OrderStatus.OrderApproved) { + return ( +
+
+ Order No. {orderNumber} + viewOrder(orderNumber)}> + View Order + +
+ + + {formatDate(date)} + + + + {'Order Approved'} + +
+ ); + } + if (order.status === OrderStatus.OrderSubmitted) { + return ( +
+
+ Order No. {orderNumber} + viewOrder(orderNumber)}> + View Order + + +
+ + + {formatDate(date)} + + + + {'Order Submitted'} +
- viewOrder(orderNumber)}> - {/** DO NOT USE IMAGE Please use the icon in the feather library! */} - View order - -
- ); + ); + } } diff --git a/src/components/OrderHistory/OrderStatusValues.tsx b/src/components/OrderHistory/OrderStatusValues.tsx new file mode 100644 index 00000000..a0b6002c --- /dev/null +++ b/src/components/OrderHistory/OrderStatusValues.tsx @@ -0,0 +1,14 @@ +export const Status = { + rejected: { + lastname: 'Doe', + firstname: 'Jane', + }, + submitted: { + lastname: 'Doe', + firstname: 'Jane', + }, + confirmed: { + lastname: 'Smith', + firstname: 'Jane', + }, +}; diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index f6eee23f..0e435857 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -1,7 +1,7 @@ // styles.ts import styled from 'styled-components'; import COLORS from '../../styles/colors'; - +import { X, Check, Loader } from 'react-feather'; export const containerStyle = styled.div` width: 250px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; @@ -35,17 +35,15 @@ export const ViewOrderButton = styled.button` color: var(--Black, #101010); text-align: right; text-overflow: ellipsis; - font-family: 'Public Sans', sans-serif; - font-size: 15px; - font-style: normal; - font-weight: 400; line-height: normal; - text-decoration-line: underline; background: none; border: none; cursor: pointer; display: flex; align-items: center; + &:hover { + text-decoration: underline; + } `; export const ArrowIcon = styled.div` @@ -86,8 +84,8 @@ export const ImageContainer = styled.div` `; export const GalleryImage = styled.img` - max-height: 115px; - max-width: 115px; + height: 115px; + width: 115px; display: block; `; @@ -96,3 +94,51 @@ export const RowDiv = styled.div` height: 400px; margin-bottom: 50px; `; + +export const OrderStatusDiv = styled.div` + width: 300px; + height: 35px; + background: var(--Light-Red, #fdd); + display: flex; + justify-content: center; + align-items: center; + border-radius: 20px; + margin-top: 15px; +`; + +export const OrderStatusApprovedDiv = styled.div` + width: 300px; + height: 35px; + background: var(--Lime-Green, #cee8be); + display: flex; + justify-content: center; + align-items: center; + border-radius: 20px; + margin-top: 15px; +`; + +export const OrderStatusSubmittedDiv = styled.div` + width: 300px; + height: 35px; + background: var(--Baby-Blue, #c7ddff); + display: flex; + justify-content: center; + align-items: center; + border-radius: 20px; + margin-top: 15px; +`; + +export const CrossStyled = styled(X)` + stroke-width: 5px; + margin-right: 10px; +`; + +export const CheckStyled = styled(Check)` + stroke-width: 5px; + margin-right: 10px; +`; + +export const LoaderStyled = styled(Loader)` + stroke-width: 3px; + margin-right: 10px; +`; diff --git a/src/schema/schema.ts b/src/schema/schema.ts index 66515a9f..4048f555 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -16,12 +16,9 @@ export type User = { }; export enum OrderStatus { - ApprovalInProgress = 'Approval in Progress', - OrderApproved = 'Order Approved', - OrderProcessing = 'Order Processing', - ReadyForPickup = 'Ready for Pickup', - OutForDelivery = 'Out for Delivery', - Completed = 'Completed', + OrderRejected = 'Rejected', + OrderApproved = 'Confirmed', + OrderSubmitted = 'Submitted', } export type Order = { diff --git a/src/styles/fonts.tsx b/src/styles/fonts.tsx index 1b06d782..13b4a01a 100644 --- a/src/styles/fonts.tsx +++ b/src/styles/fonts.tsx @@ -132,3 +132,11 @@ export const Body3 = styled.p` font-weight: 400; line-height: normal; `; + +export const OrderStatusFont = styled.p` + font-family: 'Public Sans', sans-serif; + font-size: 20px; + font-style: normal; + font-weight: 700; + line-height: normal; +`; From 823687e4abe76d4b9a1d2605f97e40113202ab6e Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Tue, 19 Mar 2024 01:11:24 -0700 Subject: [PATCH 064/101] buyankhuu'sEdits --- src/api/supabase/queries/order_queries.ts | 2 +- src/app/delivery/page.tsx | 2 - src/app/orderHistory/page.tsx | 4 +- src/app/orderPage/page.tsx | 18 +++--- src/app/pickup/page.tsx | 61 +++++++------------ src/app/pickup/styles.ts | 7 ++- .../OrderHistory/OrderHistoryText.tsx | 9 +-- .../OrderHistory/OrderStatusValues.tsx | 14 ----- src/components/OrderHistory/styles.ts | 3 +- .../OrderSummaryFolder/OrderSummary.tsx | 45 ++++++++------ src/components/OrderSummaryFolder/styles.ts | 38 ++++++++---- src/components/PickUpFolder/PickupButton.tsx | 26 -------- 12 files changed, 98 insertions(+), 131 deletions(-) delete mode 100644 src/components/OrderHistory/OrderStatusValues.tsx delete mode 100644 src/components/PickUpFolder/PickupButton.tsx diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index cb3c1b31..2435e3cd 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -236,4 +236,4 @@ export async function fetchOrderProductsbyOrderId( ); return orderProducts; -} +} diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index a4f3c252..c0688332 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -19,8 +19,6 @@ import { InformationText, } from './styles'; - - export default function App() { const [numberOfItems, setNumberOfItems] = useState(0); const [cart, setCart] = useState([]); diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 7a7b2675..00c64b20 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -1,10 +1,10 @@ 'use client'; import React, { useEffect, useState } from 'react'; +import { Heading1 } from '@/styles/fonts'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; -import Footer from '../../components/FooterFolder/Footer'; -import { Heading1 } from '@/styles/fonts'; + import { OrderHistoryContainer, OutterBox, diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index 662c6bd3..d25310a1 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -56,7 +56,6 @@ export default function OrderPage() { const [orders, setOrders] = useState([]); const searchParams = useSearchParams(); const orderIDFromSearch = searchParams.get('orderID'); - console.log(orderIDFromSearch); let currOrderId = 0; if (orderIDFromSearch !== null) { currOrderId = parseInt(orderIDFromSearch, 10); @@ -66,16 +65,15 @@ export default function OrderPage() { const [order, setOrder] = useState(); - async function fetchProducts() { - const data = (await fetchOrderProductsbyOrderId( - currOrderId, - )) as ProductWithQuantity[]; - const currOrder = await getOrderById(currOrderId); - setOrders(data); - setOrder(currOrder); - } - useEffect(() => { + async function fetchProducts() { + const data = (await fetchOrderProductsbyOrderId( + currOrderId, + )) as ProductWithQuantity[]; + const currOrder = await getOrderById(currOrderId); + setOrders(data); + setOrder(currOrder); + } fetchProducts(); }, []); diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 22a02c4f..e1786ae2 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -4,13 +4,13 @@ import { ArrowLeft } from 'react-feather'; import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; -import { useState, useEffect, SetStateAction } from 'react'; +import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; -import { Normal700Text } from '@/styles/fonts'; +import { Normal700Text, Heading4Bold } from '@/styles/fonts'; import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; - +import NavBar from '../../components/NavBarFolder/NavBar'; import { HeaderShiftLeft, OrderSummaryDiv, @@ -20,7 +20,6 @@ import { WhiteBackgroundDiv, BackDiv, Backtext, - NavBarMovedUP, PageDiv, CheckoutButton, ItemSummaryDiv, @@ -64,9 +63,8 @@ export default function Pickup() { const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); - const [Profile, setProfile] = useState(); - + const [selectedPickupIndex, setSelectedPickupIndex] = useState(0); useEffect(() => { async function fetchProducts() { const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products @@ -88,16 +86,13 @@ export default function Pickup() { fetchUserData(); }, []); - const [selectedPickupIndex, setSelectedPickupIndex] = useState(null); - - const handleButtonClick = (index: SetStateAction) => { + const handleButtonClick = (index: number) => { setSelectedPickupIndex(index); }; return (
- - + router.push('/cart')}> @@ -105,26 +100,26 @@ export default function Pickup() { Back - + Pick Up - - Name + + Name {Profile?.first_name} {Profile?.last_name} - Phone Number + Phone Number {Profile?.phone_numbers} -
- Pick Up Time +
+ Time Slot Pick Up times: 10:00 AM - 12:00 PM
-
- {Time.map((time, index) => ( +
+ {Time.map(time => ( handleButtonClick(index)} + key={time.id} + $isSelected={selectedPickupIndex === time.id} + onClick={() => handleButtonClick(time.id)} >
{String( @@ -168,25 +163,13 @@ export default function Pickup() { { - // Add the pickup ID to the order - const pickupId = - selectedPickupIndex !== null - ? Time[selectedPickupIndex]?.id - : null; - if (pickupId) { - await updateCartPickupId(pickupId); - - // Add your code here to update the order with the pickup ID - // For example: - // const updatedOrder = await updateOrderWithPickupId(orderId, pickupId); - // console.log(updatedOrder); + if (selectedPickupIndex !== 0) { + await updateCartPickupId(selectedPickupIndex); + router.push('/orderConfirmationPickUp'); + } else { + // handle the case where they didn't select a time! } - router.push('/orderConfirmationPickUp'); }} > Checkout diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index f66c2120..35365312 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -29,8 +29,9 @@ export const PickupContent = styled.div` padding-left: 20px; `; -export const PickupTimeButton = styled.button` - background: {COLORS.periwinkle}; +export const PickupTimeButton = styled.button<{ $isSelected?: boolean }>` + background: ${props => + props.$isSelected ? COLORS.periwinkle : COLORS.lightGrey}; height: 124px; width: 242px; margin-top: 20px; @@ -156,6 +157,8 @@ export const LabelBox = styled.div` export const PageDiv = styled.div` display: flex; flex-flow: row; + width: 100%; + justify-content: space-around; `; export const OrderSummaryDiv = styled.div` diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index d4773b35..8f118510 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import querystring from 'querystring'; +import { Heading4Bold, Body1, OrderStatusFont } from '@/styles/fonts'; import { ViewOrderButton, ArrowIcon, @@ -12,8 +13,8 @@ import { OrderStatusSubmittedDiv, LoaderStyled, } from './styles'; // Adjust the import path as necessary -import { Heading4Bold, Body1, OrderStatusFont } from '@/styles/fonts'; import { Order, OrderStatus } from '../../schema/schema'; + function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', @@ -75,7 +76,7 @@ export default function OrderDetails(props: OrderDetailsProps) { - {'Order Rejected'} + Order Rejected
); @@ -116,7 +117,7 @@ export default function OrderDetails(props: OrderDetailsProps) { - {'Order Approved'} + Order Approved
); @@ -157,7 +158,7 @@ export default function OrderDetails(props: OrderDetailsProps) { - {'Order Submitted'} + Order Submitted
); diff --git a/src/components/OrderHistory/OrderStatusValues.tsx b/src/components/OrderHistory/OrderStatusValues.tsx deleted file mode 100644 index a0b6002c..00000000 --- a/src/components/OrderHistory/OrderStatusValues.tsx +++ /dev/null @@ -1,14 +0,0 @@ -export const Status = { - rejected: { - lastname: 'Doe', - firstname: 'Jane', - }, - submitted: { - lastname: 'Doe', - firstname: 'Jane', - }, - confirmed: { - lastname: 'Smith', - firstname: 'Jane', - }, -}; diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index 0e435857..7dc8a777 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -1,7 +1,8 @@ // styles.ts import styled from 'styled-components'; -import COLORS from '../../styles/colors'; import { X, Check, Loader } from 'react-feather'; +import COLORS from '../../styles/colors'; + export const containerStyle = styled.div` width: 250px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; diff --git a/src/components/OrderSummaryFolder/OrderSummary.tsx b/src/components/OrderSummaryFolder/OrderSummary.tsx index b0a482d8..8197a0dd 100644 --- a/src/components/OrderSummaryFolder/OrderSummary.tsx +++ b/src/components/OrderSummaryFolder/OrderSummary.tsx @@ -1,17 +1,16 @@ 'use client'; +import { Body1, Body2, Heading2Bold, Body1Bold } from '@/styles/fonts'; import { - HeaderShiftLeft, OrderSummaryDiv, HeaderShiftRight, OrderTotalDiv, - PShiftLeft, WhiteBackgroundDiv, + AlignItemCenter, ItemSummaryDiv, - Qty, - PShiftRight, + OrderSummaryHeaderDiv, + ItemNameDiv, } from './styles'; - import { ProductWithQuantity } from '../../schema/schema'; export default function OrderSummary(props: { @@ -22,20 +21,28 @@ export default function OrderSummary(props: { return ( - Order Summary - Qty. - - {cart.map(cartItem => ( - - {cartItem.name} - {cartItem.quantity} - - ))} - - - Order Total - {numberOfItems} - + Order Summary + + + Product Name + Qty. + + + {cart.map(cartItem => ( + + + {cartItem.name} + + + {cartItem.quantity} + + ))} + + + Order Total + {numberOfItems} + + ); } diff --git a/src/components/OrderSummaryFolder/styles.ts b/src/components/OrderSummaryFolder/styles.ts index 5750d04e..3cebb013 100644 --- a/src/components/OrderSummaryFolder/styles.ts +++ b/src/components/OrderSummaryFolder/styles.ts @@ -2,8 +2,11 @@ import styled from 'styled-components'; export const OrderSummaryDiv = styled.div` overflow: scroll; - width: 350px; + width: 300px; height: 300px; + display: flex; + flex-direction: column; + justify-content: space-between; `; export const ItemSummaryDiv = styled.div` @@ -11,30 +14,27 @@ export const ItemSummaryDiv = styled.div` flex-direction: row; margin-bottom: 20px; justify-content: space-between; - padding-left: 10px; - padding-right: 10px; `; export const OrderTotalDiv = styled.div` height: 50px; - padding-top: 10px; - width: 350px; - padding-left: 0px; + padding-top: 5px; + width: 100%; border-top: 1px black solid; display: flex; flex-flow: row; + align-items: center; justify-content: space-between; `; export const Qty = styled.p` width: 100%; - padding-left: 290px; `; export const WhiteBackgroundDiv = styled.div` border-radius: 8px; background: var(--White, #fff); - height: 430px; + height: 480px; width: 350px; padding-top: 20px; @@ -49,10 +49,26 @@ export const PShiftRight = styled.p` margin-right: 30px; `; -export const HeaderShiftLeft = styled.h2` +export const PShiftLeft = styled.p` margin-left: 15px; `; -export const PShiftLeft = styled.p` - margin-left: 15px; +export const OrderSummaryHeaderDiv = styled.div` + display: flex; + width: 300px; + justify-content: space-between; + align-items: center; + flex-direction: row; + margin-bottom: 10px; +`; + +export const ItemNameDiv = styled.div` + width: 200px; + overflow: hidden; + height: 25px; +`; + +export const AlignItemCenter = styled.div` + margin-left: 10px; + margin-top: 10px; `; diff --git a/src/components/PickUpFolder/PickupButton.tsx b/src/components/PickUpFolder/PickupButton.tsx deleted file mode 100644 index 065634ae..00000000 --- a/src/components/PickUpFolder/PickupButton.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { useState } from 'react'; - -function PickupButton({ - day, - date, - start, - end, -}: { - day: string; - date: string; - start: string; - end: string; -}) { - const [isSelected, setIsSelected] = useState(false); - - const defaultStyle = 'bg-[#4b711d]/[0.13] text-[#4B711D] border-[#547829]'; - const selectedStyle = 'bg-[#547829] text-white border-[#547829]'; - - const handleClick = () => { - setIsSelected(!isSelected); - }; - - return
- View order + View order
); From 75c8350764a4c5d4e58f0dedfc2cab65187312b2 Mon Sep 17 00:00:00 2001 From: kevinjcai Date: Tue, 20 Feb 2024 00:33:56 -0800 Subject: [PATCH 073/101] prettier --- src/app/orderHistory/page.tsx | 19 ++++++---- src/app/orderHistory/styles.ts | 20 +++++----- src/components/OrderHistory/ImageCarousel.tsx | 37 ++++++++++++------- .../OrderHistory/OrderHistoryBox.tsx | 30 ++++++++------- .../OrderHistory/OrderHistoryText.tsx | 11 +++++- src/components/OrderHistory/styles.ts | 4 +- 6 files changed, 70 insertions(+), 51 deletions(-) diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 65d3c7e1..afd4554c 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -2,11 +2,16 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; -import {fetchOrderIdsByUserIdSorted} from '../../api/supabase/queries/order_queries'; -import { GlobalStyle, OrderHistoryContainer, OutterBox, FooterMoved, NavBarMovedUP } from './styles'; +import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import { + GlobalStyle, + OrderHistoryContainer, + OutterBox, + FooterMoved, + NavBarMovedUP, +} from './styles'; import BackButton from '../../components/BackButton/BackButton'; - function OrderHistory() { const [orderIds, setOrderIds] = useState([]); @@ -21,11 +26,11 @@ function OrderHistory() { return (
- + - -

Order History

+ +

Order History

{orderIds.length > 0 ? ( @@ -42,4 +47,4 @@ function OrderHistory() { ); } -export default OrderHistory; \ No newline at end of file +export default OrderHistory; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 84c13161..f35c36b1 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -4,7 +4,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const FooterMoved = styled(Footer)` transform: translateY(50px); `; @@ -26,17 +25,16 @@ export const OutterBox = styled.div` margin-left: 500px; `; - export const OrderHistoryContainer = styled.div` -display: flex; -flex-direction: column; -border-radius: 10px; -background: var(--White, #fff); -box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); -width: 900px; -height: 1021px; -overflow: scroll; -margin-top: 10px; + display: flex; + flex-direction: column; + border-radius: 10px; + background: var(--White, #fff); + box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); + width: 900px; + height: 1021px; + overflow: scroll; + margin-top: 10px; `; export const OrderHistoryBox = styled.div` diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index 1ed6e678..cfca61fb 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -9,21 +9,30 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+
{images.map((image, index) => ( -
- {`Gallery +
+ {`Gallery
))}
diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 0e9ea7dd..870344a8 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -2,8 +2,11 @@ // Importing the required components and styles import React, { useState, useEffect } from 'react'; -import { Order, Product} from '../../schema/schema'; -import {getOrderById, fetchProductsFromOrder } from '../../api/supabase/queries/order_queries'; +import { Order, Product } from '../../schema/schema'; +import { + getOrderById, + fetchProductsFromOrder, +} from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; @@ -11,7 +14,9 @@ interface OrderDetailsWithProductsProps { orderId: number; } -export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithProductsProps) { +export default function OrderDetailsWithProducts({ + orderId, +}: OrderDetailsWithProductsProps) { const [order, setOrder] = useState(null); const [products, setProducts] = useState([]); const [loading, setLoading] = useState(true); @@ -24,8 +29,7 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr const fetchedProducts = await fetchProductsFromOrder(orderId); setOrder(fetchedOrder); setProducts(fetchedProducts); - } - finally { + } finally { setLoading(false); } }; @@ -41,20 +45,18 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr return
Order not found.
; } - - const imageUrls = products.map(product => product.photo); return (
- - + +
); -} \ No newline at end of file +} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 99404b71..a7d9e8a6 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -18,7 +18,14 @@ export default function OrderDetails(props: OrderDetailsProps) { }; return ( -
+
{date}
Order No. {orderNumber}
@@ -27,7 +34,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index acb126f8..862f7cc8 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -2,7 +2,6 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; - export const containerStyle = styled.div` width: 250px; height: 250px; @@ -32,7 +31,6 @@ export const viewButtonStyle = { // Add more styles as needed }; - export const ViewOrderButton = styled.button` overflow: hidden; color: var(--Black, #101010); @@ -56,4 +54,4 @@ export const ArrowIcon = styled.img` width: 16px; // Set width as needed height: 16px; // Set height as needed // No need to set color since it's an img element -`; \ No newline at end of file +`; From 2bc4fbd3a9e89ad415accadaa0bc6178da5ccda9 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:03:54 -0700 Subject: [PATCH 074/101] rebase4 --- holder.zip | Bin 0 -> 48762 bytes src/api/supabase/queries/pickup_queries.ts | 17 ++++++ src/app/login/styles.ts | 6 ++ src/app/orderHistory/styles.ts | 20 ++++--- src/app/pickup/page.tsx | 53 +++++++++++++++--- src/components/OrderHistory/ImageCarousel.tsx | 29 +++------- .../OrderHistory/OrderHistoryBox.tsx | 1 + .../OrderHistory/OrderHistoryText.tsx | 8 ++- src/components/OrderHistory/styles.ts | 41 ++++++++++++-- src/schema/schema.ts | 4 +- 10 files changed, 135 insertions(+), 44 deletions(-) create mode 100644 holder.zip diff --git a/holder.zip b/holder.zip new file mode 100644 index 0000000000000000000000000000000000000000..f73e7a51dab44fcbcef02776374442c3af33e72d GIT binary patch literal 48762 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 { } return getTimes; } + +/** + * + * @returns 2 most recent pickup times + */ +export async function fetchNRecentPickupTimes(n: number): Promise { + const { data: getTimes, error } = await supabase + .from('pickup_times') + .select('*') + .order('start_time', { ascending: false }) + .limit(n); + + if (error) { + throw new Error(`Error fetching pickup times: ${error.message}`); + } + return getTimes; +} \ No newline at end of file diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index 273a4576..bebc6654 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -3,6 +3,12 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const LoginBox = styled.div` + flex-direction: column; + justify-content: center; + align-items: center; + position: fixed; + display: flex; + flex-direction: column; width: 500px; height: 420px; border: 1px solid ${COLORS.neutralGrey}; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f35c36b1..6706fc2e 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -6,6 +6,9 @@ import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` transform: translateY(50px); + position: fixed; + left: 0; + bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` @@ -18,30 +21,32 @@ export const GlobalStyle = createGlobalStyle` color: black; overflow: visible; } + `; export const OutterBox = styled.div` width: 900px; - margin-left: 500px; + margin: 0 auto; // This will center the OutterBox `; export const OrderHistoryContainer = styled.div` display: flex; flex-direction: column; + align-items: center; border-radius: 10px; background: var(--White, #fff); box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); - width: 900px; - height: 1021px; + width: 800px; // Width of the outer box + height: 700px; overflow: scroll; margin-top: 10px; + padding: 0; // Ensure there's no padding pushing the internal boxes inward `; export const OrderHistoryBox = styled.div` - width: 80%; - max-width: 960px; // Adjust to match the design width - margin: 20px 0; // Spacing between the orders - padding: 30px; // Inner spacing + width: 100%; // Make internal box take full width of the container + margin: 20px 0; // Keep vertical spacing between orders + padding: 30px; // Inner spacing for content inside the box border-radius: 8px; background: #fff; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); @@ -50,3 +55,4 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; + diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index b9ff1559..7be1611f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,12 +2,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites } from '@/api/supabase/queries/user_queries'; +import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product } from '@/schema/schema'; +import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; +import { Pickup, Product, User } from '@/schema/schema'; + import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, @@ -31,24 +32,52 @@ import { PickupTimeButton, } from './styles'; + +function DateInfoComponent({ date }: { date: Date }) { + const dayOfWeek = date.getDay; + console.log(dayOfWeek); + const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; + + + return { + dayOfWeek, + dateAsMonthDay + }; +} + + +// + export default function Pickup() { const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); + const [Profile, setProfile] = useState(); + + useEffect(() => { async function fetchProducts() { const data = await arrayOfFavorites(); // change the function to grab the cartItems as products setCart(data); } async function fetchTimes() { - const data = await fetchRecentPickupTimes(); // change the function to grab the cartItems as products + const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); console.log(Time); } fetchProducts(); fetchTimes(); }, []); + + useEffect(() => { + async function fetchUserData() { + const data = await fetchUser(); // change the function to grab the cartItems as products + setProfile(data); + } + fetchUserData(); + }, []); + return (
@@ -65,12 +94,20 @@ export default function Pickup() { Pick Up Name - Ethan Auyeung + {Profile?.first_name} {Profile?.last_name} Phone Number - +1 123-456-7890 - + {Profile?.phone_numbers} + {/* */} - Time + + {Times.length > 0 && ( + <> +
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
+
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
+ + )} + +
Location: 3170 23rd Street, San Francisco, CA 94110
diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cfca61fb..cdd94bea 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,5 +1,7 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; +import {GalleryContainer, ImageContainer, GalleryImage} from './styles' + interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -9,32 +11,15 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+ {images.map((image, index) => ( -
- + -
+ ))} -
+ ); } diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 870344a8..b71090e5 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,6 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; +import { OrderDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index a7d9e8a6..6fb4aa3f 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -2,6 +2,12 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary +function formatDate(isoString: string) { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(isoString); + return date.toLocaleDateString('en-US', options); +} + interface OrderDetailsProps { date: string; orderNumber: string; @@ -27,7 +33,7 @@ export default function OrderDetails(props: OrderDetailsProps) { }} >
-
{date}
+
{formatDate(date)}
Order No. {orderNumber}
{status === 'Confirmed' ? '✓' : '✗'} {status} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index 862f7cc8..bd22fa0f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -3,12 +3,11 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const containerStyle = styled.div` - width: 250px; + width: 250px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; - margin-right: 130px; - margin-left: 30px; + margin-right: auto; // Center the container if that's the intention + margin-left: auto; // Center the container if that's the intention color: ${COLORS.black}; - text-align: center; font-family: Public Sans; font-size: 20px; font-style: normal; @@ -55,3 +54,37 @@ export const ArrowIcon = styled.img` height: 16px; // Set height as needed // No need to set color since it's an img element `; + +export const OrderDiv = styled.div` + display: flex; + flex-direction: row; + align-items: start; + justify-content: space-between; // Changed to space-between to align items to the edges + width: 100%; + margin-bottom: 50px; + margin-top: 30px; + padding-left: 30px; // Adjust as necessary to align with the left edge + padding-right: 130px; // Adjust as necessary to align with the right edge +`; +export const GalleryContainer = styled.div` + display: flex; + overflow-x: auto; + gap: 10px; + padding: 10px; +`; + +export const ImageContainer = styled.div` + flex: 0 0 auto; + background-color: var(--Greyish, #e6e6e6); + width: 124px; + height: 124px; + display: flex; + justify-content: center; + align-items: center; +`; + +export const GalleryImage = styled.img` + max-height: 115px; + max-width: 115px; + display: block; +`; \ No newline at end of file diff --git a/src/schema/schema.ts b/src/schema/schema.ts index fd434377..becf8e93 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -11,8 +11,8 @@ export type User = { address_id: string; // UUID fav_items: number[]; // JSONB with item as key and quantity as value num_pets: number; // Integer value containing number of pets - phone_number: string; // User's phone number for pick up orders - pet_prescription: number[]; // JSONB with pet_name as key and perscription as value + phone_numbers: string; // User's phone number for pick up orders + pet_prescription: string[]; // JSONB with pet_name as key and perscription as value }; export enum OrderStatus { From 3a1b100d0e8a2d1f2a8935618f17c8ea7aa3ce90 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:05:12 -0700 Subject: [PATCH 075/101] check --- src/api/supabase/queries/order_queries.ts | 37 +++++++++++ src/app/pickup/page.tsx | 76 ++++++++++++++++------- src/app/pickup/styles.ts | 4 +- 3 files changed, 94 insertions(+), 23 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 29adae50..c501a732 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -33,6 +33,7 @@ export async function createOrder() { .insert({ user_id: user.id }) .select('*') .single(); + if (error) { throw new Error(`Error creating order: ${error.message}`); } @@ -201,3 +202,39 @@ export async function fetchRecentOrderProducts(): Promise { return orderProducts; } + +/** + * gets all orders by user id and sorted it by creation data + * @param Order[] - An array of Order objects. + * @returns Promise - An array of Order objects. + */ +export async function fetchCurrentOrdersByUser(): Promise { + const user = await fetchUser(); + const userCartId = user.cart_id; + const { data, error } = await supabase + .from('order') + .select('*') + .eq('id', userCartId); + + if (error) { + throw new Error(`Error fetching orders for user: ${error.message}`); + } + + return data; +} + +export async function updateOrderPickupId(orderId: number, pickupId: number) { + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', orderId); +} + +export async function updateCartPickupId(pickupId: number) { + const user = await fetchUser(); + const cartId = user.cart_id; + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', cartId); +} diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 7be1611f..fe06211d 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -3,11 +3,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import { useState, useEffect } from 'react'; +import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product, User } from '@/schema/schema'; +import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; +import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -33,14 +35,20 @@ import { } from './styles'; -function DateInfoComponent({ date }: { date: Date }) { - const dayOfWeek = date.getDay; - console.log(dayOfWeek); - const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; +function DateInfoComponent(date: string) { + const date1 = new Date(date.date); + + + + const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const getDayOfWeek = daysOfWeek[date1.getDay()]; + + const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); + return { - dayOfWeek, + getDayOfWeek, dateAsMonthDay }; } @@ -49,7 +57,7 @@ function DateInfoComponent({ date }: { date: Date }) { // export default function Pickup() { - const [Cart, setCart] = useState([]); + const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); @@ -58,7 +66,7 @@ export default function Pickup() { useEffect(() => { async function fetchProducts() { - const data = await arrayOfFavorites(); // change the function to grab the cartItems as products + const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products setCart(data); } async function fetchTimes() { @@ -78,6 +86,12 @@ export default function Pickup() { fetchUserData(); }, []); + const [selectedPickupIndex, setSelectedPickupIndex] = useState(null); + + const handleButtonClick = (index: SetStateAction) => { + setSelectedPickupIndex(index); + }; + return (
@@ -99,14 +113,18 @@ export default function Pickup() { {Profile?.phone_numbers} {/* */} - - {Times.length > 0 && ( - <> -
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
-
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
- - )} - +
+ {Time.map((time, index) => ( + handleButtonClick(index)} + > +
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
+
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+ + ))} +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -128,16 +146,30 @@ export default function Pickup() { - 10 + {Cart.reduce((acc, item) => acc + item.quantity, 0)} router.push('/orderConfirmationPickUp')} - > - Place Order - + // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace + // it with an empty cart convettying it to an order and then redirecting to the order + // confirmation page + onClick={async () => { + // Add the pickup ID to the order + const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + if (pickupId) { + await updateCartPickupId(pickupId); + + // Add your code here to update the order with the pickup ID + // For example: + // const updatedOrder = await updateOrderWithPickupId(orderId, pickupId); + // console.log(updatedOrder); + } + router.push('/orderConfirmationPickUp'); + }}> + Checkout +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 38798988..2573345a 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,6 +6,7 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; + export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -30,7 +31,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - background: ${COLORS.lightGrey}; + + background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; height: 124px; width: 242px; From 8b1a431fad8e7d531993393b5776f4c9c9586ff5 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Sat, 9 Mar 2024 19:41:25 -0800 Subject: [PATCH 076/101] WIP --- src/app/pickup/page.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fe06211d..fc70381e 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -155,6 +155,7 @@ export default function Pickup() { // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace // it with an empty cart convettying it to an order and then redirecting to the order // confirmation page + onClick={async () => { // Add the pickup ID to the order const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; From ea0a47a3189c3e5e5ff26410800750ded16eab65 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Sun, 3 Mar 2024 22:38:19 -0800 Subject: [PATCH 077/101] buyankhuu's Edit --- src/app/orderHistory/page.tsx | 5 ++--- src/app/orderHistory/styles.ts | 9 +------- .../OrderHistory/OrderHistoryBox.tsx | 22 +++++++++---------- .../OrderHistory/OrderHistoryText.tsx | 7 +++++- src/components/OrderHistory/styles.ts | 8 ++++++- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index afd4554c..104dfcae 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import Footer from '../../components/FooterFolder/Footer'; import { GlobalStyle, OrderHistoryContainer, @@ -27,11 +28,9 @@ function OrderHistory() { return (
-

Order History

- {orderIds.length > 0 ? ( orderIds.map((orderId: number) => ( @@ -42,7 +41,7 @@ function OrderHistory() { )} - +
); } diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6706fc2e..3e2047c8 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -15,14 +15,7 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; -export const GlobalStyle = createGlobalStyle` - body { - background:white; - color: black; - overflow: visible; - } - -`; + export const OutterBox = styled.div` width: 900px; diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index b71090e5..feb7f8da 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv } from './styles'; +import { OrderDiv, RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; @@ -46,18 +46,16 @@ export default function OrderDetailsWithProducts({ return
Order not found.
; } - const imageUrls = products.map(product => product.photo); + const imageUrls = products.map(product => product.photo).slice(0, 3); return ( -
-
- - -
-
+ + + + ); } diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 6fb4aa3f..bf1187a0 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -3,7 +3,11 @@ import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary function formatDate(isoString: string) { - const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const options: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric', + }; const date = new Date(isoString); return date.toLocaleDateString('en-US', options); } @@ -40,6 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
+ {/**DO NOT USE IMAGE Please use the icon in the feather library! */} View order
diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index bd22fa0f..a59e2442 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -87,4 +87,10 @@ export const GalleryImage = styled.img` max-height: 115px; max-width: 115px; display: block; -`; \ No newline at end of file +`; + +export const RowDiv = styled.div` + width: 700px; + height: 400px; + margin-bottom: 50px; +`; From 3ffaf3284ba12de2f05a50f379a7ace445ceaee7 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 14:06:26 -0700 Subject: [PATCH 078/101] WIP --- src/api/supabase/queries/pickup_queries.ts | 2 +- src/app/delivery/page.tsx | 6 +- src/app/orderConfirmationDelivery/page.tsx | 2 - src/app/orderConfirmationPickUp/page.tsx | 3 - src/app/orderHistory/page.tsx | 2 - src/app/orderHistory/styles.ts | 5 +- src/app/pickup/page.tsx | 81 ++++++++++++------- src/app/pickup/styles.ts | 5 +- src/components/OrderHistory/ImageCarousel.tsx | 8 +- .../OrderHistory/OrderHistoryBox.tsx | 2 +- .../OrderHistory/OrderHistoryText.tsx | 2 +- 11 files changed, 61 insertions(+), 57 deletions(-) diff --git a/src/api/supabase/queries/pickup_queries.ts b/src/api/supabase/queries/pickup_queries.ts index b43eff84..df2dfcb0 100644 --- a/src/api/supabase/queries/pickup_queries.ts +++ b/src/api/supabase/queries/pickup_queries.ts @@ -66,4 +66,4 @@ export async function fetchNRecentPickupTimes(n: number): Promise { throw new Error(`Error fetching pickup times: ${error.message}`); } return getTimes; -} \ No newline at end of file +} diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 2b794d7c..34d9ec66 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,19 +8,15 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import { fetchRecentOrderProducts } from '../../api/supabase/queries/order_queries'; -import { OrderProduct, ProductWithQuantity } from '../../schema/schema'; +import {ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; -import ItemRows from './itemRows'; import NavBar from '../../components/NavBarFolder/NavBar'; import { DeliveryContainer, OrderContainer, - OrderSummaryText, OrderButton, InformationContainer, InformationText, - QtyText, } from './styles'; export default function App() { diff --git a/src/app/orderConfirmationDelivery/page.tsx b/src/app/orderConfirmationDelivery/page.tsx index 412e9231..af027295 100644 --- a/src/app/orderConfirmationDelivery/page.tsx +++ b/src/app/orderConfirmationDelivery/page.tsx @@ -16,12 +16,10 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import { FavoriteDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, CenterBox, AddressDiv, diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx index 4cf471d9..65b42154 100644 --- a/src/app/orderConfirmationPickUp/page.tsx +++ b/src/app/orderConfirmationPickUp/page.tsx @@ -16,14 +16,11 @@ import { FavoriteDiv, ColDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, - PickUpText, CenterBox, AddressDiv, } from './styles'; diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 104dfcae..bff5b701 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -5,10 +5,8 @@ import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistory import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; import { - GlobalStyle, OrderHistoryContainer, OutterBox, - FooterMoved, NavBarMovedUP, } from './styles'; import BackButton from '../../components/BackButton/BackButton'; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 3e2047c8..f62918e2 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -1,5 +1,5 @@ // styles.ts (for styled-components) -import styled, { createGlobalStyle } from 'styled-components'; +import styled from 'styled-components'; import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; @@ -15,8 +15,6 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; - - export const OutterBox = styled.div` width: 900px; margin: 0 auto; // This will center the OutterBox @@ -48,4 +46,3 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; - diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fc70381e..ccb1987f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,14 +2,18 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { + fetchUser, +} from '@/api/supabase/queries/user_queries'; +import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; -import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; +import { + fetchNRecentPickupTimes, +} from '@/api/supabase/queries/pickup_queries'; +import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; +import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -34,26 +38,31 @@ import { PickupTimeButton, } from './styles'; - function DateInfoComponent(date: string) { const date1 = new Date(date.date); - - - const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const daysOfWeek = [ + 'Sunday', + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + ]; const getDayOfWeek = daysOfWeek[date1.getDay()]; - const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); - - + const dateAsMonthDay = date1.toLocaleDateString(undefined, { + month: 'long', + day: 'numeric', + }); return { getDayOfWeek, - dateAsMonthDay + dateAsMonthDay, }; } - // export default function Pickup() { @@ -63,7 +72,6 @@ export default function Pickup() { const [Profile, setProfile] = useState(); - useEffect(() => { async function fetchProducts() { const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products @@ -77,7 +85,7 @@ export default function Pickup() { fetchProducts(); fetchTimes(); }, []); - + useEffect(() => { async function fetchUserData() { const data = await fetchUser(); // change the function to grab the cartItems as products @@ -92,7 +100,6 @@ export default function Pickup() { setSelectedPickupIndex(index); }; - return (
@@ -108,7 +115,9 @@ export default function Pickup() { Pick Up Name - {Profile?.first_name} {Profile?.last_name} + + {Profile?.first_name} {Profile?.last_name} + Phone Number {Profile?.phone_numbers} {/* */} @@ -116,16 +125,26 @@ export default function Pickup() {
{Time.map((time, index) => ( handleButtonClick(index)} > -
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
-
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+
+ {String( + DateInfoComponent({ date: time.start_time }) + ?.getDayOfWeek, + )} +
+
+ { + DateInfoComponent({ date: time.start_time }) + ?.dateAsMonthDay + } +
))}
- +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -152,13 +171,16 @@ export default function Pickup() { { // Add the pickup ID to the order - const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + const pickupId = + selectedPickupIndex !== null + ? Time[selectedPickupIndex]?.id + : null; if (pickupId) { await updateCartPickupId(pickupId); @@ -168,9 +190,10 @@ export default function Pickup() { // console.log(updatedOrder); } router.push('/orderConfirmationPickUp'); - }}> + }} + > Checkout - +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 2573345a..519eeb63 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,7 +6,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -31,8 +30,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - - background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; + background: ${props => + props.isSelected ? COLORS.periwinkle : COLORS.lightGrey}; height: 124px; width: 242px; diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cdd94bea..159adb28 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,7 +1,6 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; -import {GalleryContainer, ImageContainer, GalleryImage} from './styles' - +import { GalleryContainer, ImageContainer, GalleryImage } from './styles'; interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -14,10 +13,7 @@ export default function ImageGallery(props: ImageGalleryProps) { {images.map((image, index) => ( - + ))} diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index feb7f8da..4e9f1962 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv, RowDiv } from './styles'; +import {RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index bf1187a0..d6d2ef07 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -44,7 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- {/**DO NOT USE IMAGE Please use the icon in the feather library! */} + {/** DO NOT USE IMAGE Please use the icon in the feather library! */} View order
From f42004ba6cad184ca3caf153025b9f3fae8a358c Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:36:05 -0700 Subject: [PATCH 079/101] WIP --- src/app/orderHistory/styles.ts | 4 +--- src/app/pickup/page.tsx | 7 +++++-- src/components/OrderHistory/OrderHistoryText.tsx | 3 ++- src/components/OrderHistory/styles.ts | 10 ++++++---- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f62918e2..6fe1a260 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,10 +5,8 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - transform: translateY(50px); - position: fixed; + left: 0; - bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index ccb1987f..a7f3bd44 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -120,8 +120,11 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers} - {/* */} - +
+ Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM +
+
{Time.map((time, index) => ( {/** DO NOT USE IMAGE Please use the icon in the feather library! */} - View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index a59e2442..f6eee23f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -48,11 +48,13 @@ export const ViewOrderButton = styled.button` align-items: center; `; -export const ArrowIcon = styled.img` +export const ArrowIcon = styled.div` + width: 0; + height: 0; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; + border-left: 5px solid var(--Black, #101010); margin-left: 5px; - width: 16px; // Set width as needed - height: 16px; // Set height as needed - // No need to set color since it's an img element `; export const OrderDiv = styled.div` From 2e99ceac7ee6e3f805918999ecc1f482e1173cc8 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:37:22 -0700 Subject: [PATCH 080/101] WIP --- src/app/delivery/page.tsx | 2 +- src/app/orderHistory/page.tsx | 6 +----- src/app/orderHistory/styles.ts | 1 - src/app/pickup/page.tsx | 16 +++++----------- src/components/OrderHistory/OrderHistoryBox.tsx | 2 +- src/components/OrderHistory/OrderHistoryText.tsx | 1 - 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 34d9ec66..c0688332 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,7 +8,7 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import {ProductWithQuantity } from '../../schema/schema'; +import { ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; import NavBar from '../../components/NavBarFolder/NavBar'; import { diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index bff5b701..dbd474c1 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -4,11 +4,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; -import { - OrderHistoryContainer, - OutterBox, - NavBarMovedUP, -} from './styles'; +import { OrderHistoryContainer, OutterBox, NavBarMovedUP } from './styles'; import BackButton from '../../components/BackButton/BackButton'; function OrderHistory() { diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6fe1a260..543a736b 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -5,7 +5,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` - left: 0; `; diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index a7f3bd44..441d3f1b 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,20 +2,15 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { - fetchUser, -} from '@/api/supabase/queries/user_queries'; +import { fetchUser } from '@/api/supabase/queries/user_queries'; import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { - fetchNRecentPickupTimes, -} from '@/api/supabase/queries/pickup_queries'; +import { fetchNRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; -import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, OrderSummaryDiv, @@ -80,7 +75,6 @@ export default function Pickup() { async function fetchTimes() { const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); - console.log(Time); } fetchProducts(); fetchTimes(); @@ -121,10 +115,10 @@ export default function Pickup() { Phone Number {Profile?.phone_numbers}
- Pick Up Time - Pick Up times: 10:00 AM - 12:00 PM + Pick Up Time + Pick Up times: 10:00 AM - 12:00 PM
- +
{Time.map((time, index) => ( Date: Wed, 13 Mar 2024 17:42:16 -0700 Subject: [PATCH 081/101] WIP --- src/app/pickup/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 441d3f1b..392868fd 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,8 +33,8 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: string) { - const date1 = new Date(date.date); +function DateInfoComponent(date: { date: unknown; }) { + const date1 = new Date(date.date as string); const daysOfWeek = [ 'Sunday', From 5cb0e6f84f1d1731da8c7d1871f9340042b2e770 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 17:43:18 -0700 Subject: [PATCH 082/101] prettier --- src/app/pickup/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 392868fd..22a02c4f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -33,7 +33,7 @@ import { PickupTimeButton, } from './styles'; -function DateInfoComponent(date: { date: unknown; }) { +function DateInfoComponent(date: { date: unknown }) { const date1 = new Date(date.date as string); const daysOfWeek = [ From 60490f0e08c3795c824c83e3536aea21f5583811 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:14:40 -0700 Subject: [PATCH 083/101] RebasedVersion --- src/api/supabase/queries/order_queries.ts | 42 ++++++++++++++++++++++- src/app/pickup/styles.ts | 3 +- src/app/profileScreen/page.tsx | 2 +- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index c501a732..b9296a2d 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -1,7 +1,12 @@ /* eslint-disable no-console */ // -import { Order, OrderProduct, Product } from '../../../schema/schema'; +import { + Order, + OrderProduct, + Product, + ProductWithQuantity, +} from '../../../schema/schema'; import { fetchUser } from './user_queries'; import { fetchProductByID } from './product_queries'; import supabase from '../createClient'; @@ -238,3 +243,38 @@ export async function updateCartPickupId(pickupId: number) { .update({ pickup_time_id: pickupId }) .eq('id', cartId); } + +export async function fetchProductWithQuantityById( + productId: number, +): Promise { + const { data: orderProduct, error } = await supabase + .from('product') + .select('*') + .eq('id', productId) + .single(); + if (error) { + throw new Error(`Error fetching order product: ${error.message}`); + } + return orderProduct; +} + +export async function fetchOrderProductsbyOrderId( + orderId: number, +): Promise { + const order = await getOrderById(orderId); + const orderProductIds = order.order_product_id_array; + + const newOrderProducts = await Promise.all( + orderProductIds.map(orderProductId => + fetchOrderProductById(orderProductId), + ), + ); + console.log(newOrderProducts); + const orderProducts = await Promise.all( + newOrderProducts.map(async orderProduct => + fetchProductWithQuantityById(orderProduct.product_id), + ), + ); + + return orderProducts; +} diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 519eeb63..d076c943 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -30,8 +30,7 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - background: ${props => - props.isSelected ? COLORS.periwinkle : COLORS.lightGrey}; + background: {COLORS.periwinkle}; height: 124px; width: 242px; diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx index 48e2c696..7ac86512 100644 --- a/src/app/profileScreen/page.tsx +++ b/src/app/profileScreen/page.tsx @@ -88,7 +88,7 @@ function OrderHistorySection() { Order History - + From af8398fa7f226f8784720e59b7b1354c5018c348 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 02:17:27 -0700 Subject: [PATCH 084/101] fixedRouting --- src/app/orderPage/page.tsx | 17 +++++++++++++---- .../OrderHistory/OrderHistoryText.tsx | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/orderPage/page.tsx b/src/app/orderPage/page.tsx index 5e5562b6..f54e8ff5 100644 --- a/src/app/orderPage/page.tsx +++ b/src/app/orderPage/page.tsx @@ -24,7 +24,7 @@ import { } from './styles'; import { ProductWithQuantity, Order } from '../../schema/schema'; - +import { useSearchParams } from 'next/navigation'; function formatDate(date: string | undefined): string { if (!date) return ''; @@ -51,9 +51,18 @@ function formatDate(date: string | undefined): string { return `${month} ${day}, ${year}`; } -export default function FavoritesPage() { +export default function OrderPage() { const [orders, setOrders] = useState([]); - const currOrderId = 32; + const searchParams = useSearchParams(); + const orderIDFromSearch = searchParams.get('orderID'); + console.log(orderIDFromSearch); + let currOrderId = 0; + if (orderIDFromSearch !== null) { + currOrderId = parseInt(orderIDFromSearch); + } else { + currOrderId = 32; + } + const [order, setOrder] = useState(); async function fetchProducts() { @@ -75,7 +84,7 @@ export default function FavoritesPage() { - + {formatDate(order?.created_at)} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 48313d90..3cad5c40 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary - +import querystring from 'querystring'; function formatDate(isoString: string) { const options: Intl.DateTimeFormatOptions = { year: 'numeric', @@ -22,9 +22,9 @@ export default function OrderDetails(props: OrderDetailsProps) { const { date, orderNumber, status } = props; const router = useRouter(); - const viewOrder = () => { - // Navigate to the order details page - router.push(`/order/${orderNumber}`); + const viewOrder = (orderID: string) => { + const queryString = querystring.stringify({ orderID }); + router.push(`/orderPage?${queryString}`); }; return ( @@ -43,7 +43,7 @@ export default function OrderDetails(props: OrderDetailsProps) { {status === 'Confirmed' ? '✓' : '✗'} {status}
- + - -

Order History

+ +

Order History

{orderIds.length > 0 ? ( @@ -42,4 +47,4 @@ function OrderHistory() { ); } -export default OrderHistory; \ No newline at end of file +export default OrderHistory; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 84c13161..f35c36b1 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -4,7 +4,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const FooterMoved = styled(Footer)` transform: translateY(50px); `; @@ -26,17 +25,16 @@ export const OutterBox = styled.div` margin-left: 500px; `; - export const OrderHistoryContainer = styled.div` -display: flex; -flex-direction: column; -border-radius: 10px; -background: var(--White, #fff); -box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); -width: 900px; -height: 1021px; -overflow: scroll; -margin-top: 10px; + display: flex; + flex-direction: column; + border-radius: 10px; + background: var(--White, #fff); + box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); + width: 900px; + height: 1021px; + overflow: scroll; + margin-top: 10px; `; export const OrderHistoryBox = styled.div` diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index 1ed6e678..cfca61fb 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -9,21 +9,30 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+
{images.map((image, index) => ( -
- {`Gallery +
+ {`Gallery
))}
diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 0e9ea7dd..870344a8 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -2,8 +2,11 @@ // Importing the required components and styles import React, { useState, useEffect } from 'react'; -import { Order, Product} from '../../schema/schema'; -import {getOrderById, fetchProductsFromOrder } from '../../api/supabase/queries/order_queries'; +import { Order, Product } from '../../schema/schema'; +import { + getOrderById, + fetchProductsFromOrder, +} from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; @@ -11,7 +14,9 @@ interface OrderDetailsWithProductsProps { orderId: number; } -export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithProductsProps) { +export default function OrderDetailsWithProducts({ + orderId, +}: OrderDetailsWithProductsProps) { const [order, setOrder] = useState(null); const [products, setProducts] = useState([]); const [loading, setLoading] = useState(true); @@ -24,8 +29,7 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr const fetchedProducts = await fetchProductsFromOrder(orderId); setOrder(fetchedOrder); setProducts(fetchedProducts); - } - finally { + } finally { setLoading(false); } }; @@ -41,20 +45,18 @@ export default function OrderDetailsWithProducts({ orderId }: OrderDetailsWithPr return
Order not found.
; } - - const imageUrls = products.map(product => product.photo); return (
- - + +
); -} \ No newline at end of file +} diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 99404b71..a7d9e8a6 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -18,7 +18,14 @@ export default function OrderDetails(props: OrderDetailsProps) { }; return ( -
+
{date}
Order No. {orderNumber}
@@ -27,7 +34,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- View order + View order
); diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index acb126f8..862f7cc8 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -2,7 +2,6 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; - export const containerStyle = styled.div` width: 250px; height: 250px; @@ -32,7 +31,6 @@ export const viewButtonStyle = { // Add more styles as needed }; - export const ViewOrderButton = styled.button` overflow: hidden; color: var(--Black, #101010); @@ -56,4 +54,4 @@ export const ArrowIcon = styled.img` width: 16px; // Set width as needed height: 16px; // Set height as needed // No need to set color since it's an img element -`; \ No newline at end of file +`; From 596b44f2297a5bf9519f04b1d97cff8b905d4a7b Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:02:38 -0700 Subject: [PATCH 021/101] rebase3 --- src/api/supabase/queries/order_queries.ts | 45 ++++++----------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index ba2d5233..90a11f7c 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -143,43 +143,20 @@ export async function fetchProductsFromOrder( return fetchedProducts; } -export async function fetchOrderProductsbyOrderId( - orderId: number, -): Promise { - const order = await getOrderById(orderId); - const orderProductIds = order.order_product_id_array; +export async function fetchRecentOrderProducts(): Promise { + const order = await fetchNOrdersByUserIdSorted(1); + const orderProductIds = order[0].order_product_id_array; - const newOrderProducts = await Promise.all( - orderProductIds.map(orderProductId => - fetchOrderProductById(orderProductId), - ), - ); - console.log(newOrderProducts); const orderProducts = await Promise.all( - newOrderProducts.map(async orderProduct => - fetchProductWithQuantityById(orderProduct.product_id), - ), + orderProductIds.map(async orderProductId => { + try { + const orderProduct = await fetchOrderProductById(orderProductId); + return orderProduct; + } catch (error) { + throw new Error(`Error fetching order product array.`); + } + }), ); return orderProducts; } - -/** - * gets all orders by user id and sorted it by creation data - * @param Order[] - An array of Order objects. - * @returns Promise - An array of Order objects. - */ -export async function fetchCurrentOrdersByUser(): Promise { - const user = await fetchUser(); - const userCartId = user.cart_id; - const { data, error } = await supabase - .from('order') - .select('*') - .eq('id', userCartId); - - if (error) { - throw new Error(`Error fetching orders for user: ${error.message}`); - } - - return data; -} From 44323ec01117345f03d4e531e62264badca76727 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:03:54 -0700 Subject: [PATCH 022/101] rebase4 --- holder.zip | Bin 0 -> 48762 bytes src/api/supabase/queries/pickup_queries.ts | 17 ++++++ src/app/login/styles.ts | 6 ++ src/app/orderHistory/styles.ts | 20 ++++--- src/app/pickup/page.tsx | 53 +++++++++++++++--- src/components/OrderHistory/ImageCarousel.tsx | 29 +++------- .../OrderHistory/OrderHistoryBox.tsx | 1 + .../OrderHistory/OrderHistoryText.tsx | 8 ++- src/components/OrderHistory/styles.ts | 41 ++++++++++++-- src/schema/schema.ts | 4 +- 10 files changed, 135 insertions(+), 44 deletions(-) create mode 100644 holder.zip diff --git a/holder.zip b/holder.zip new file mode 100644 index 0000000000000000000000000000000000000000..f73e7a51dab44fcbcef02776374442c3af33e72d GIT binary patch literal 48762 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 { } return getTimes; } + +/** + * + * @returns 2 most recent pickup times + */ +export async function fetchNRecentPickupTimes(n: number): Promise { + const { data: getTimes, error } = await supabase + .from('pickup_times') + .select('*') + .order('start_time', { ascending: false }) + .limit(n); + + if (error) { + throw new Error(`Error fetching pickup times: ${error.message}`); + } + return getTimes; +} \ No newline at end of file diff --git a/src/app/login/styles.ts b/src/app/login/styles.ts index 7a51d8e3..51b5fb90 100644 --- a/src/app/login/styles.ts +++ b/src/app/login/styles.ts @@ -3,6 +3,12 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const LoginBox = styled.div` + flex-direction: column; + justify-content: center; + align-items: center; + position: fixed; + display: flex; + flex-direction: column; width: 500px; height: 420px; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index f35c36b1..6706fc2e 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -6,6 +6,9 @@ import Footer from '../../components/FooterFolder/Footer'; export const FooterMoved = styled(Footer)` transform: translateY(50px); + position: fixed; + left: 0; + bottom: 50px; `; export const NavBarMovedUP = styled(NavBar)` @@ -18,30 +21,32 @@ export const GlobalStyle = createGlobalStyle` color: black; overflow: visible; } + `; export const OutterBox = styled.div` width: 900px; - margin-left: 500px; + margin: 0 auto; // This will center the OutterBox `; export const OrderHistoryContainer = styled.div` display: flex; flex-direction: column; + align-items: center; border-radius: 10px; background: var(--White, #fff); box-shadow: 0px 1px 4px 1px rgba(0, 0, 0, 0.2); - width: 900px; - height: 1021px; + width: 800px; // Width of the outer box + height: 700px; overflow: scroll; margin-top: 10px; + padding: 0; // Ensure there's no padding pushing the internal boxes inward `; export const OrderHistoryBox = styled.div` - width: 80%; - max-width: 960px; // Adjust to match the design width - margin: 20px 0; // Spacing between the orders - padding: 30px; // Inner spacing + width: 100%; // Make internal box take full width of the container + margin: 20px 0; // Keep vertical spacing between orders + padding: 30px; // Inner spacing for content inside the box border-radius: 8px; background: #fff; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); @@ -50,3 +55,4 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; + diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index b9ff1559..7be1611f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,12 +2,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites } from '@/api/supabase/queries/user_queries'; +import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; import { useState, useEffect } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes } from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product } from '@/schema/schema'; +import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; +import { Pickup, Product, User } from '@/schema/schema'; + import PickupButton from '@/components/PickUpFolder/PickupButton'; import { HeaderShiftLeft, @@ -31,24 +32,52 @@ import { PickupTimeButton, } from './styles'; + +function DateInfoComponent({ date }: { date: Date }) { + const dayOfWeek = date.getDay; + console.log(dayOfWeek); + const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; + + + return { + dayOfWeek, + dateAsMonthDay + }; +} + + +// + export default function Pickup() { const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); + const [Profile, setProfile] = useState(); + + useEffect(() => { async function fetchProducts() { const data = await arrayOfFavorites(); // change the function to grab the cartItems as products setCart(data); } async function fetchTimes() { - const data = await fetchRecentPickupTimes(); // change the function to grab the cartItems as products + const data = await fetchNRecentPickupTimes(2); // change the function to grab the cartItems as products setTimes(data); console.log(Time); } fetchProducts(); fetchTimes(); }, []); + + useEffect(() => { + async function fetchUserData() { + const data = await fetchUser(); // change the function to grab the cartItems as products + setProfile(data); + } + fetchUserData(); + }, []); + return (
@@ -65,12 +94,20 @@ export default function Pickup() { Pick Up Name - Ethan Auyeung + {Profile?.first_name} {Profile?.last_name} Phone Number - +1 123-456-7890 - + {Profile?.phone_numbers} + {/* */} - Time + + {Times.length > 0 && ( + <> +
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
+
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
+ + )} + +
Location: 3170 23rd Street, San Francisco, CA 94110
diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cfca61fb..cdd94bea 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,5 +1,7 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; +import {GalleryContainer, ImageContainer, GalleryImage} from './styles' + interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -9,32 +11,15 @@ export default function ImageGallery(props: ImageGalleryProps) { const { images } = props; return ( -
+ {images.map((image, index) => ( -
- + -
+ ))} -
+ ); } diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index 870344a8..b71090e5 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,6 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; +import { OrderDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index a7d9e8a6..6fb4aa3f 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -2,6 +2,12 @@ import React from 'react'; import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary +function formatDate(isoString: string) { + const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const date = new Date(isoString); + return date.toLocaleDateString('en-US', options); +} + interface OrderDetailsProps { date: string; orderNumber: string; @@ -27,7 +33,7 @@ export default function OrderDetails(props: OrderDetailsProps) { }} >
-
{date}
+
{formatDate(date)}
Order No. {orderNumber}
{status === 'Confirmed' ? '✓' : '✗'} {status} diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index 862f7cc8..bd22fa0f 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -3,12 +3,11 @@ import styled from 'styled-components'; import COLORS from '../../styles/colors'; export const containerStyle = styled.div` - width: 250px; + width: 250px; // This width might be too small if it's meant to contain the OrderDiv height: 250px; - margin-right: 130px; - margin-left: 30px; + margin-right: auto; // Center the container if that's the intention + margin-left: auto; // Center the container if that's the intention color: ${COLORS.black}; - text-align: center; font-family: Public Sans; font-size: 20px; font-style: normal; @@ -55,3 +54,37 @@ export const ArrowIcon = styled.img` height: 16px; // Set height as needed // No need to set color since it's an img element `; + +export const OrderDiv = styled.div` + display: flex; + flex-direction: row; + align-items: start; + justify-content: space-between; // Changed to space-between to align items to the edges + width: 100%; + margin-bottom: 50px; + margin-top: 30px; + padding-left: 30px; // Adjust as necessary to align with the left edge + padding-right: 130px; // Adjust as necessary to align with the right edge +`; +export const GalleryContainer = styled.div` + display: flex; + overflow-x: auto; + gap: 10px; + padding: 10px; +`; + +export const ImageContainer = styled.div` + flex: 0 0 auto; + background-color: var(--Greyish, #e6e6e6); + width: 124px; + height: 124px; + display: flex; + justify-content: center; + align-items: center; +`; + +export const GalleryImage = styled.img` + max-height: 115px; + max-width: 115px; + display: block; +`; \ No newline at end of file diff --git a/src/schema/schema.ts b/src/schema/schema.ts index 51a028ba..66515a9f 100644 --- a/src/schema/schema.ts +++ b/src/schema/schema.ts @@ -11,8 +11,8 @@ export type User = { address_id: string; // UUID fav_items: number[]; // JSONB with item as key and quantity as value num_pets: number; // Integer value containing number of pets - phone_number: string; // User's phone number for pick up orders - pet_prescription: number[]; // JSONB with pet_name as key and perscription as value + phone_numbers: string; // User's phone number for pick up orders + pet_prescription: string[]; // JSONB with pet_name as key and perscription as value }; export enum OrderStatus { From 84e5c7fbe0fb6b8490798e7e7d2623f488348d30 Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Thu, 14 Mar 2024 01:05:12 -0700 Subject: [PATCH 023/101] check --- src/api/supabase/queries/order_queries.ts | 37 +++++++++++ src/app/pickup/page.tsx | 76 ++++++++++++++++------- src/app/pickup/styles.ts | 4 +- 3 files changed, 94 insertions(+), 23 deletions(-) diff --git a/src/api/supabase/queries/order_queries.ts b/src/api/supabase/queries/order_queries.ts index 90a11f7c..c740a606 100644 --- a/src/api/supabase/queries/order_queries.ts +++ b/src/api/supabase/queries/order_queries.ts @@ -33,6 +33,7 @@ export async function createOrder() { .insert({ user_id: user.id }) .select('*') .single(); + if (error) { throw new Error(`Error creating order: ${error.message}`); } @@ -160,3 +161,39 @@ export async function fetchRecentOrderProducts(): Promise { return orderProducts; } + +/** + * gets all orders by user id and sorted it by creation data + * @param Order[] - An array of Order objects. + * @returns Promise - An array of Order objects. + */ +export async function fetchCurrentOrdersByUser(): Promise { + const user = await fetchUser(); + const userCartId = user.cart_id; + const { data, error } = await supabase + .from('order') + .select('*') + .eq('id', userCartId); + + if (error) { + throw new Error(`Error fetching orders for user: ${error.message}`); + } + + return data; +} + +export async function updateOrderPickupId(orderId: number, pickupId: number) { + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', orderId); +} + +export async function updateCartPickupId(pickupId: number) { + const user = await fetchUser(); + const cartId = user.cart_id; + await supabase + .from('order') + .update({ pickup_time_id: pickupId }) + .eq('id', cartId); +} diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index 7be1611f..fe06211d 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -3,11 +3,13 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import { useState, useEffect } from 'react'; +import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import { Pickup, Product, User } from '@/schema/schema'; +import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; +import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -33,14 +35,20 @@ import { } from './styles'; -function DateInfoComponent({ date }: { date: Date }) { - const dayOfWeek = date.getDay; - console.log(dayOfWeek); - const dateAsMonthDay = `${date.getDate }/${ date.getMonth }${1}`; +function DateInfoComponent(date: string) { + const date1 = new Date(date.date); + + + + const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const getDayOfWeek = daysOfWeek[date1.getDay()]; + + const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); + return { - dayOfWeek, + getDayOfWeek, dateAsMonthDay }; } @@ -49,7 +57,7 @@ function DateInfoComponent({ date }: { date: Date }) { // export default function Pickup() { - const [Cart, setCart] = useState([]); + const [Cart, setCart] = useState([]); const router = useRouter(); const [Time, setTimes] = useState([]); @@ -58,7 +66,7 @@ export default function Pickup() { useEffect(() => { async function fetchProducts() { - const data = await arrayOfFavorites(); // change the function to grab the cartItems as products + const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products setCart(data); } async function fetchTimes() { @@ -78,6 +86,12 @@ export default function Pickup() { fetchUserData(); }, []); + const [selectedPickupIndex, setSelectedPickupIndex] = useState(null); + + const handleButtonClick = (index: SetStateAction) => { + setSelectedPickupIndex(index); + }; + return (
@@ -99,14 +113,18 @@ export default function Pickup() { {Profile?.phone_numbers} {/* */} - - {Times.length > 0 && ( - <> -
{DateInfoComponent({ date: Times[0].start_time })?.dayOfWeek}
-
{DateInfoComponent({ date: Times[0].start_time })?.dateAsMonthDay}
- - )} - +
+ {Time.map((time, index) => ( + handleButtonClick(index)} + > +
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
+
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+ + ))} +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -128,16 +146,30 @@ export default function Pickup() { - 10 + {Cart.reduce((acc, item) => acc + item.quantity, 0)} router.push('/orderConfirmationPickUp')} - > - Place Order - + // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace + // it with an empty cart convettying it to an order and then redirecting to the order + // confirmation page + onClick={async () => { + // Add the pickup ID to the order + const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + if (pickupId) { + await updateCartPickupId(pickupId); + + // Add your code here to update the order with the pickup ID + // For example: + // const updatedOrder = await updateOrderWithPickupId(orderId, pickupId); + // console.log(updatedOrder); + } + router.push('/orderConfirmationPickUp'); + }}> + Checkout +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 38798988..2573345a 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,6 +6,7 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; + export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -30,7 +31,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - background: ${COLORS.lightGrey}; + + background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; height: 124px; width: 242px; From 89d731880acf5561a92ca646847ca8e327481583 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Sat, 9 Mar 2024 19:41:25 -0800 Subject: [PATCH 024/101] WIP --- src/app/pickup/page.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fe06211d..fc70381e 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -155,6 +155,7 @@ export default function Pickup() { // TODO add the pick up ID to the order add the checkout feature that will clear the current users art and replace // it with an empty cart convettying it to an order and then redirecting to the order // confirmation page + onClick={async () => { // Add the pickup ID to the order const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; From d87046d3159be02acf01fc0943231d2a1d0bf30e Mon Sep 17 00:00:00 2001 From: Buyankhuu Tsolmonkhuu Date: Sun, 3 Mar 2024 22:38:19 -0800 Subject: [PATCH 025/101] buyankhuu's Edit --- src/app/orderHistory/page.tsx | 5 ++--- src/app/orderHistory/styles.ts | 9 +------- .../OrderHistory/OrderHistoryBox.tsx | 22 +++++++++---------- .../OrderHistory/OrderHistoryText.tsx | 7 +++++- src/components/OrderHistory/styles.ts | 8 ++++++- 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index afd4554c..104dfcae 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react'; import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistoryBox'; import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; +import Footer from '../../components/FooterFolder/Footer'; import { GlobalStyle, OrderHistoryContainer, @@ -27,11 +28,9 @@ function OrderHistory() { return (
-

Order History

- {orderIds.length > 0 ? ( orderIds.map((orderId: number) => ( @@ -42,7 +41,7 @@ function OrderHistory() { )} - +
); } diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 6706fc2e..3e2047c8 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -15,14 +15,7 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; -export const GlobalStyle = createGlobalStyle` - body { - background:white; - color: black; - overflow: visible; - } - -`; + export const OutterBox = styled.div` width: 900px; diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index b71090e5..feb7f8da 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv } from './styles'; +import { OrderDiv, RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; @@ -46,18 +46,16 @@ export default function OrderDetailsWithProducts({ return
Order not found.
; } - const imageUrls = products.map(product => product.photo); + const imageUrls = products.map(product => product.photo).slice(0, 3); return ( -
-
- - -
-
+ + + + ); } diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index 6fb4aa3f..bf1187a0 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -3,7 +3,11 @@ import { useRouter } from 'next/navigation'; import { ViewOrderButton, ArrowIcon } from './styles'; // Adjust the import path as necessary function formatDate(isoString: string) { - const options: Intl.DateTimeFormatOptions = { year: 'numeric', month: 'long', day: 'numeric' }; + const options: Intl.DateTimeFormatOptions = { + year: 'numeric', + month: 'long', + day: 'numeric', + }; const date = new Date(isoString); return date.toLocaleDateString('en-US', options); } @@ -40,6 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
+ {/**DO NOT USE IMAGE Please use the icon in the feather library! */} View order
diff --git a/src/components/OrderHistory/styles.ts b/src/components/OrderHistory/styles.ts index bd22fa0f..a59e2442 100644 --- a/src/components/OrderHistory/styles.ts +++ b/src/components/OrderHistory/styles.ts @@ -87,4 +87,10 @@ export const GalleryImage = styled.img` max-height: 115px; max-width: 115px; display: block; -`; \ No newline at end of file +`; + +export const RowDiv = styled.div` + width: 700px; + height: 400px; + margin-bottom: 50px; +`; From 7a7dd5d8e679b455b84dc2f02ca7d4a0c659d4d7 Mon Sep 17 00:00:00 2001 From: Kevin Cai Date: Wed, 13 Mar 2024 14:06:26 -0700 Subject: [PATCH 026/101] WIP --- src/api/supabase/queries/pickup_queries.ts | 2 +- src/app/delivery/page.tsx | 6 +- src/app/orderConfirmationDelivery/page.tsx | 2 - src/app/orderConfirmationPickUp/page.tsx | 3 - src/app/orderHistory/page.tsx | 2 - src/app/orderHistory/styles.ts | 5 +- src/app/pickup/page.tsx | 81 ++++++++++++------- src/app/pickup/styles.ts | 5 +- src/components/OrderHistory/ImageCarousel.tsx | 8 +- .../OrderHistory/OrderHistoryBox.tsx | 2 +- .../OrderHistory/OrderHistoryText.tsx | 2 +- 11 files changed, 61 insertions(+), 57 deletions(-) diff --git a/src/api/supabase/queries/pickup_queries.ts b/src/api/supabase/queries/pickup_queries.ts index b43eff84..df2dfcb0 100644 --- a/src/api/supabase/queries/pickup_queries.ts +++ b/src/api/supabase/queries/pickup_queries.ts @@ -66,4 +66,4 @@ export async function fetchNRecentPickupTimes(n: number): Promise { throw new Error(`Error fetching pickup times: ${error.message}`); } return getTimes; -} \ No newline at end of file +} diff --git a/src/app/delivery/page.tsx b/src/app/delivery/page.tsx index 2b794d7c..34d9ec66 100644 --- a/src/app/delivery/page.tsx +++ b/src/app/delivery/page.tsx @@ -8,19 +8,15 @@ import { totalNumberOfItemsInCart, } from '../../api/supabase/queries/cart_queries'; import { Normal700Text } from '../../styles/fonts'; -import { fetchRecentOrderProducts } from '../../api/supabase/queries/order_queries'; -import { OrderProduct, ProductWithQuantity } from '../../schema/schema'; +import {ProductWithQuantity } from '../../schema/schema'; import OrderSummary from '../../components/OrderSummaryFolder/OrderSummary'; -import ItemRows from './itemRows'; import NavBar from '../../components/NavBarFolder/NavBar'; import { DeliveryContainer, OrderContainer, - OrderSummaryText, OrderButton, InformationContainer, InformationText, - QtyText, } from './styles'; export default function App() { diff --git a/src/app/orderConfirmationDelivery/page.tsx b/src/app/orderConfirmationDelivery/page.tsx index 412e9231..af027295 100644 --- a/src/app/orderConfirmationDelivery/page.tsx +++ b/src/app/orderConfirmationDelivery/page.tsx @@ -16,12 +16,10 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import { FavoriteDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, CenterBox, AddressDiv, diff --git a/src/app/orderConfirmationPickUp/page.tsx b/src/app/orderConfirmationPickUp/page.tsx index 4cf471d9..65b42154 100644 --- a/src/app/orderConfirmationPickUp/page.tsx +++ b/src/app/orderConfirmationPickUp/page.tsx @@ -16,14 +16,11 @@ import { FavoriteDiv, ColDiv, OutterFavoriteDiv, - HeaderText, OutterBox, Label, LabelBox, ScrollDiv, - AddressText, DateText, - PickUpText, CenterBox, AddressDiv, } from './styles'; diff --git a/src/app/orderHistory/page.tsx b/src/app/orderHistory/page.tsx index 104dfcae..bff5b701 100644 --- a/src/app/orderHistory/page.tsx +++ b/src/app/orderHistory/page.tsx @@ -5,10 +5,8 @@ import OrderDetailsWithProducts from '../../components/OrderHistory/OrderHistory import { fetchOrderIdsByUserIdSorted } from '../../api/supabase/queries/order_queries'; import Footer from '../../components/FooterFolder/Footer'; import { - GlobalStyle, OrderHistoryContainer, OutterBox, - FooterMoved, NavBarMovedUP, } from './styles'; import BackButton from '../../components/BackButton/BackButton'; diff --git a/src/app/orderHistory/styles.ts b/src/app/orderHistory/styles.ts index 3e2047c8..f62918e2 100644 --- a/src/app/orderHistory/styles.ts +++ b/src/app/orderHistory/styles.ts @@ -1,5 +1,5 @@ // styles.ts (for styled-components) -import styled, { createGlobalStyle } from 'styled-components'; +import styled from 'styled-components'; import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; @@ -15,8 +15,6 @@ export const NavBarMovedUP = styled(NavBar)` position: relative; `; - - export const OutterBox = styled.div` width: 900px; margin: 0 auto; // This will center the OutterBox @@ -48,4 +46,3 @@ export const OrderHistoryBox = styled.div` gap: 20px; overflow-y: auto; `; - diff --git a/src/app/pickup/page.tsx b/src/app/pickup/page.tsx index fc70381e..ccb1987f 100644 --- a/src/app/pickup/page.tsx +++ b/src/app/pickup/page.tsx @@ -2,14 +2,18 @@ // import { GlobalStyle } from "@/styles/components"; import { ArrowLeft } from 'react-feather'; -import { arrayOfFavorites, fetchUser } from '@/api/supabase/queries/user_queries'; -import {fetchCartItemsWithQuantity} from '@/api/supabase/queries/cart_queries'; +import { + fetchUser, +} from '@/api/supabase/queries/user_queries'; +import { fetchCartItemsWithQuantity } from '@/api/supabase/queries/cart_queries'; import { useState, useEffect, SetStateAction } from 'react'; import { useRouter } from 'next/navigation'; import { Normal700Text } from '@/styles/fonts'; -import { fetchRecentPickupTimes ,fetchNRecentPickupTimes} from '@/api/supabase/queries/pickup_queries'; -import {updateCartPickupId} from '@/api/supabase/queries/order_queries'; -import { Pickup, Product, User, ProductWithQuantity } from '@/schema/schema'; +import { + fetchNRecentPickupTimes, +} from '@/api/supabase/queries/pickup_queries'; +import { updateCartPickupId } from '@/api/supabase/queries/order_queries'; +import { Pickup, User, ProductWithQuantity } from '@/schema/schema'; import PickupButton from '@/components/PickUpFolder/PickupButton'; import { @@ -34,26 +38,31 @@ import { PickupTimeButton, } from './styles'; - function DateInfoComponent(date: string) { const date1 = new Date(date.date); - - - const daysOfWeek = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + const daysOfWeek = [ + 'Sunday', + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + ]; const getDayOfWeek = daysOfWeek[date1.getDay()]; - const dateAsMonthDay = date1.toLocaleDateString(undefined, { month: 'long', day: 'numeric' }); - - + const dateAsMonthDay = date1.toLocaleDateString(undefined, { + month: 'long', + day: 'numeric', + }); return { getDayOfWeek, - dateAsMonthDay + dateAsMonthDay, }; } - // export default function Pickup() { @@ -63,7 +72,6 @@ export default function Pickup() { const [Profile, setProfile] = useState(); - useEffect(() => { async function fetchProducts() { const data = await fetchCartItemsWithQuantity(); // change the function to grab the cartItems as products @@ -77,7 +85,7 @@ export default function Pickup() { fetchProducts(); fetchTimes(); }, []); - + useEffect(() => { async function fetchUserData() { const data = await fetchUser(); // change the function to grab the cartItems as products @@ -92,7 +100,6 @@ export default function Pickup() { setSelectedPickupIndex(index); }; - return (
@@ -108,7 +115,9 @@ export default function Pickup() { Pick Up Name - {Profile?.first_name} {Profile?.last_name} + + {Profile?.first_name} {Profile?.last_name} + Phone Number {Profile?.phone_numbers} {/* */} @@ -116,16 +125,26 @@ export default function Pickup() {
{Time.map((time, index) => ( handleButtonClick(index)} > -
{String(DateInfoComponent({ date: time.start_time })?.getDayOfWeek)}
-
{DateInfoComponent({ date: time.start_time })?.dateAsMonthDay}
+
+ {String( + DateInfoComponent({ date: time.start_time }) + ?.getDayOfWeek, + )} +
+
+ { + DateInfoComponent({ date: time.start_time }) + ?.dateAsMonthDay + } +
))}
- +
Location: 3170 23rd Street, San Francisco, CA 94110
@@ -152,13 +171,16 @@ export default function Pickup() { { // Add the pickup ID to the order - const pickupId = selectedPickupIndex !== null ? Time[selectedPickupIndex]?.id : null; + const pickupId = + selectedPickupIndex !== null + ? Time[selectedPickupIndex]?.id + : null; if (pickupId) { await updateCartPickupId(pickupId); @@ -168,9 +190,10 @@ export default function Pickup() { // console.log(updatedOrder); } router.push('/orderConfirmationPickUp'); - }}> + }} + > Checkout - +
diff --git a/src/app/pickup/styles.ts b/src/app/pickup/styles.ts index 2573345a..519eeb63 100644 --- a/src/app/pickup/styles.ts +++ b/src/app/pickup/styles.ts @@ -6,7 +6,6 @@ import NavBar from '../../components/NavBarFolder/NavBar'; import Footer from '../../components/FooterFolder/Footer'; - export const PickupContainer = styled.div` width: 730px; height: 400px; @@ -31,8 +30,8 @@ export const PickupContent = styled.div` `; export const PickupTimeButton = styled.button` - - background: ${(props) => (props.isSelected ? COLORS.periwinkle : COLORS.lightGrey)}; + background: ${props => + props.isSelected ? COLORS.periwinkle : COLORS.lightGrey}; height: 124px; width: 242px; diff --git a/src/components/OrderHistory/ImageCarousel.tsx b/src/components/OrderHistory/ImageCarousel.tsx index cdd94bea..159adb28 100644 --- a/src/components/OrderHistory/ImageCarousel.tsx +++ b/src/components/OrderHistory/ImageCarousel.tsx @@ -1,7 +1,6 @@ /* eslint-disable react/no-array-index-key */ import React from 'react'; -import {GalleryContainer, ImageContainer, GalleryImage} from './styles' - +import { GalleryContainer, ImageContainer, GalleryImage } from './styles'; interface ImageGalleryProps { images: string[]; // Array of image URLs @@ -14,10 +13,7 @@ export default function ImageGallery(props: ImageGalleryProps) { {images.map((image, index) => ( - + ))} diff --git a/src/components/OrderHistory/OrderHistoryBox.tsx b/src/components/OrderHistory/OrderHistoryBox.tsx index feb7f8da..4e9f1962 100644 --- a/src/components/OrderHistory/OrderHistoryBox.tsx +++ b/src/components/OrderHistory/OrderHistoryBox.tsx @@ -9,7 +9,7 @@ import { } from '../../api/supabase/queries/order_queries'; import ImageCarousel from './ImageCarousel'; import OrderHistoryText from './OrderHistoryText'; -import { OrderDiv, RowDiv } from './styles'; +import {RowDiv } from './styles'; interface OrderDetailsWithProductsProps { orderId: number; diff --git a/src/components/OrderHistory/OrderHistoryText.tsx b/src/components/OrderHistory/OrderHistoryText.tsx index bf1187a0..d6d2ef07 100644 --- a/src/components/OrderHistory/OrderHistoryText.tsx +++ b/src/components/OrderHistory/OrderHistoryText.tsx @@ -44,7 +44,7 @@ export default function OrderDetails(props: OrderDetailsProps) {
- {/**DO NOT USE IMAGE Please use the icon in the feather library! */} + {/** DO NOT USE IMAGE Please use the icon in the feather library! */} View order