From 8a40e08e41a7fdad172e5ffaebb7f791ec66f4e5 Mon Sep 17 00:00:00 2001
From: Samantha Kellow <sammii.h@icloud.com>
Date: Tue, 23 Apr 2024 20:37:35 +0100
Subject: [PATCH] =?UTF-8?q?moving=20ui=20components=20to=20own=20folder=20?=
 =?UTF-8?q?=F0=9F=A7=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/page.tsx                                  | 5 +----
 components/cart/add-to-cart.tsx               | 2 +-
 components/cart/delete-item-button.tsx        | 2 +-
 components/cart/edit-item-quantity-button.tsx | 2 +-
 components/cart/modal.tsx                     | 2 +-
 components/grid/tile.tsx                      | 2 +-
 components/layout/footer.tsx                  | 2 +-
 components/layout/navbar/index.tsx            | 2 +-
 components/product/variant-details.tsx        | 2 +-
 components/{ => ui}/carousel.tsx              | 4 +++-
 components/{ => ui}/combox.tsx                | 0
 components/{ => ui}/label.tsx                 | 3 ++-
 components/{ => ui}/loading-dots.tsx          | 0
 components/{ => ui}/logo-square.tsx           | 2 +-
 components/{ => ui}/logo-type.tsx             | 0
 components/{ => ui}/price.tsx                 | 0
 components/{ => ui}/prose.tsx                 | 0
 17 files changed, 15 insertions(+), 15 deletions(-)
 rename components/{ => ui}/carousel.tsx (92%)
 rename components/{ => ui}/combox.tsx (100%)
 rename components/{ => ui}/label.tsx (87%)
 rename components/{ => ui}/loading-dots.tsx (100%)
 rename components/{ => ui}/logo-square.tsx (93%)
 rename components/{ => ui}/logo-type.tsx (100%)
 rename components/{ => ui}/price.tsx (100%)
 rename components/{ => ui}/prose.tsx (100%)

diff --git a/app/page.tsx b/app/page.tsx
index 1a60d5cb5..2de70d687 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,8 +1,5 @@
-import { Button } from '@/components/ui/button';
-import { Carousel } from 'components/carousel';
-import { GridTileImage } from 'components/grid/tile';
 import Footer from 'components/layout/footer';
-import Link from 'next/link';
+import { Carousel } from 'components/ui/carousel';
 import { Suspense } from 'react';
 
 export const runtime = 'edge';
diff --git a/components/cart/add-to-cart.tsx b/components/cart/add-to-cart.tsx
index 1931b08ac..f8997d5d4 100644
--- a/components/cart/add-to-cart.tsx
+++ b/components/cart/add-to-cart.tsx
@@ -3,7 +3,7 @@
 import { PlusIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import { addItem } from 'components/cart/actions';
-import LoadingDots from 'components/loading-dots';
+import LoadingDots from 'components/ui/loading-dots';
 import { ProductVariant } from 'lib/shopify/types';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { useEffect, useState, useTransition } from 'react';
diff --git a/components/cart/delete-item-button.tsx b/components/cart/delete-item-button.tsx
index f279f178d..7308fe24d 100644
--- a/components/cart/delete-item-button.tsx
+++ b/components/cart/delete-item-button.tsx
@@ -1,5 +1,5 @@
 import { XMarkIcon } from '@heroicons/react/24/outline';
-import LoadingDots from 'components/loading-dots';
+import LoadingDots from 'components/ui/loading-dots';
 import { useRouter } from 'next/navigation';
 
 import clsx from 'clsx';
diff --git a/components/cart/edit-item-quantity-button.tsx b/components/cart/edit-item-quantity-button.tsx
index 8b1553f73..288b9a0a7 100644
--- a/components/cart/edit-item-quantity-button.tsx
+++ b/components/cart/edit-item-quantity-button.tsx
@@ -4,7 +4,7 @@ import { useTransition } from 'react';
 import { MinusIcon, PlusIcon } from '@heroicons/react/24/outline';
 import clsx from 'clsx';
 import { removeItem, updateItemQuantity } from 'components/cart/actions';
-import LoadingDots from 'components/loading-dots';
+import LoadingDots from 'components/ui/loading-dots';
 import type { CartItem } from 'lib/shopify/types';
 
 export default function EditItemQuantityButton({
diff --git a/components/cart/modal.tsx b/components/cart/modal.tsx
index 4a6ffd0cb..09d4217ac 100644
--- a/components/cart/modal.tsx
+++ b/components/cart/modal.tsx
@@ -2,7 +2,7 @@
 
 import { Dialog, Transition } from '@headlessui/react';
 import { ShoppingCartIcon } from '@heroicons/react/24/outline';
-import Price from 'components/price';
+import Price from 'components/ui/price';
 import { DEFAULT_OPTION } from 'lib/constants';
 import type { Cart } from 'lib/shopify/types';
 import { createUrl } from 'lib/utils';
diff --git a/components/grid/tile.tsx b/components/grid/tile.tsx
index 98e37610f..f4602e73e 100644
--- a/components/grid/tile.tsx
+++ b/components/grid/tile.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import Image from 'next/image';
-import Label from '../label';
+import Label from '../ui/label';
 
 export function GridTileImage({
   isInteractive = true,
diff --git a/components/layout/footer.tsx b/components/layout/footer.tsx
index f334c77aa..2b33a1124 100644
--- a/components/layout/footer.tsx
+++ b/components/layout/footer.tsx
@@ -1,7 +1,7 @@
 import Link from 'next/link';
 
 import FooterMenu from 'components/layout/footer-menu';
-import LogoSquare from 'components/logo-square';
+import LogoSquare from 'components/ui/logo-square';
 import { getMenu } from 'lib/shopify';
 import { Suspense } from 'react';
 
diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx
index 0fb602e9f..719bcdb8f 100644
--- a/components/layout/navbar/index.tsx
+++ b/components/layout/navbar/index.tsx
@@ -1,6 +1,6 @@
 import Cart from 'components/cart';
 import OpenCart from 'components/cart/open-cart';
-import LogoType from 'components/logo-type';
+import LogoType from 'components/ui/logo-type';
 import { getMenu } from 'lib/shopify';
 import { Menu } from 'lib/shopify/types';
 import Link from 'next/link';
diff --git a/components/product/variant-details.tsx b/components/product/variant-details.tsx
index e98f3e5a7..1d98f8223 100644
--- a/components/product/variant-details.tsx
+++ b/components/product/variant-details.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import Price from "components/price";
+import Price from "components/ui/price";
 import { Product, ProductVariant } from "lib/shopify/types";
 import { useState } from "react";
 import { VariantSelector } from "./variant-selector";
diff --git a/components/carousel.tsx b/components/ui/carousel.tsx
similarity index 92%
rename from components/carousel.tsx
rename to components/ui/carousel.tsx
index 24a24cfc1..1b7f956ad 100644
--- a/components/carousel.tsx
+++ b/components/ui/carousel.tsx
@@ -1,10 +1,12 @@
 import { getCollectionProducts } from 'lib/shopify';
 import Link from 'next/link';
-import { GridTileImage } from './grid/tile';
+import { GridTileImage } from '../grid/tile';
 
 export async function Carousel() {
   // Collections that start with `hidden-*` are hidden from the search page.
   const products = await getCollectionProducts({ collection: 'hidden-homepage-carousel' });
+  console.log("🐡🐠🐬 products", products);
+  
 
   if (!products?.length) return null;
 
diff --git a/components/combox.tsx b/components/ui/combox.tsx
similarity index 100%
rename from components/combox.tsx
rename to components/ui/combox.tsx
diff --git a/components/label.tsx b/components/ui/label.tsx
similarity index 87%
rename from components/label.tsx
rename to components/ui/label.tsx
index 218a72506..1ca123123 100644
--- a/components/label.tsx
+++ b/components/ui/label.tsx
@@ -21,7 +21,8 @@ const Label = ({
       <div className="flex items-center rounded-full border bg-white/70 p-1 text-[10px] font-semibold text-black backdrop-blur-md @[275px]/label:text-xs dark:border-neutral-800 dark:bg-black/70 dark:text-white">
         <h3 className="mr-4 inline pl-2 leading-none tracking-tight">{title}</h3>
         <Price
-          className="flex-none rounded-full bg-gray-600 p-2 text-white"
+          // className="flex-none rounded-full bg-gray-600 p-2 text-white"
+          className="flex-none text-gray-600 text-bold"
           amount={amount}
           currencyCode={currencyCode}
           currencyCodeClassName="hidden @[275px]/label:inline"
diff --git a/components/loading-dots.tsx b/components/ui/loading-dots.tsx
similarity index 100%
rename from components/loading-dots.tsx
rename to components/ui/loading-dots.tsx
diff --git a/components/logo-square.tsx b/components/ui/logo-square.tsx
similarity index 93%
rename from components/logo-square.tsx
rename to components/ui/logo-square.tsx
index eccf5cba7..483c3319d 100644
--- a/components/logo-square.tsx
+++ b/components/ui/logo-square.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import LogoIcon from './icons/logo';
+import LogoIcon from '../icons/logo';
 
 export default function LogoSquare({ size }: { size?: 'sm' | undefined }) {
   return (
diff --git a/components/logo-type.tsx b/components/ui/logo-type.tsx
similarity index 100%
rename from components/logo-type.tsx
rename to components/ui/logo-type.tsx
diff --git a/components/price.tsx b/components/ui/price.tsx
similarity index 100%
rename from components/price.tsx
rename to components/ui/price.tsx
diff --git a/components/prose.tsx b/components/ui/prose.tsx
similarity index 100%
rename from components/prose.tsx
rename to components/ui/prose.tsx