Merge branch 'develop' of ssh://gitea.gofwd.group:2225/dstrawsb/ballistic-builder into develop

src/app/Builder/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 
 
 export default function BuilderPage() {
@@ -28,7 +27,7 @@ export default function BuilderPage() {
             <td></td>
             <td>Palmetto State</td>
             <td>101.99</td>
-            <td><Button>Buy Item</Button></td>
+            <td><button>Buy Item</button></td>
           </tr>
           
         </tbody>

src/app/Products/barrels/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getPSA, getLowerBuildKits, getProductType } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -29,7 +28,7 @@ export default async function BarrelsPage() {
                 <td className='text-slate-800'>{psa.modelnumber}</td>
                 <td className="text-slate-800 flex items-center gap-2">
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="outline">Buy</Button>
+                  <button >Buy</button>
                 </td>
               </tr>
             ))}

src/app/Products/grips/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getPSA, getLowerBuildKits, getGrips } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -31,7 +30,7 @@ export default async function GripsPage() {
                 <td className='text-slate-800'>{psa.retailPrice}</td>
                 <td className="text-slate-800 flex items-center gap-2">
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="default">Buy</Button>
+                  <button>Buy</button>
                 </td>
               </tr>
             ))}

src/app/Products/handguards/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getPSA, getLowerBuildKits, getARHandGuards } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -29,7 +28,7 @@ export default async function HamdGuardsPage() {
                 <td className='text-slate-800'>{psa.modelnumber}</td>
                 <td className='text-slate-800 flex items-center gap-2'>
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="outline">Buy</Button>
+                  <button >Buy</button>
                 </td>
               </tr>
             ))}

src/app/Products/lowers/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getARCompleteLowers, getProductType } from "@queries/PSA";
 import partTypes from 'src/data/parts_cats.json';
 import { psa } from "@db/schema/Psa";
@@ -39,7 +38,7 @@ export default async function LowerReceiverPage() {
                   ${Number(psa.salePrice).toFixed(2)}
                   {/* I dont think this is exactly correct but works for now? */}
                   <Link href={psa.buyLink} passHref={true}>
-                    <Button variant="default">Buy</Button>
+                    <button >Buy</button>
                   </Link>
                 </td>
               </tr>

src/app/Products/muzzle-devices/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getMuzzleDevices } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -29,7 +28,7 @@ export default async function MuzzleDevices() {
                 <td className='text-slate-800'>{psa.modelnumber}</td>
                 <td className='text-slate-800 flex items-center gap-2'>
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="outline">Buy</Button>
+                  <button >Buy</button>
                 </td>
               </tr>
             ))}

src/app/Products/parts/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getPSA, getLowerBuildKits, getProductType} from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -26,7 +25,7 @@ export default async function GripsPage() {
               <td>{psa.modelnumber}</td>
               <td className="flex items-center gap-2">
                 ${Number(psa.salePrice).toFixed(2)}
-                <Button variant="outline">Buy</Button>
+                <button >Buy</button>
               </td>
             </tr>
           ))}

src/app/Products/stocks/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getStocks } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -29,7 +28,7 @@ export default async function StocksPage() {
                 <td className='text-slate-800'>{psa.modelnumber}</td>
                 <td className='text-slate-800 flex items-center gap-2'>
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="outline">Buy</Button>
+                  <button >Buy</button>
                 </td>
               </tr>
             ))}

src/app/Products/triggers/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getARTriggers} from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import partTypes from 'src/data/parts_cats.json';
@@ -29,7 +28,7 @@ export default async function TriggersPage() {
               <td className='text-slate-800'>{psa.modelnumber}</td>
               <td className='text-slate-800 flex items-center gap-2'>
                 ${Number(psa.salePrice).toFixed(2)}
-                <Button variant="outline">Buy</Button>
+                <button>Buy</button>
               </td>
             </tr>
           ))}

src/app/Products/uppers/page.tsx

@@ -1,4 +1,3 @@
-import { Button } from "@components/ui/button";
 import { getPSA, getUpperReciever } from "@queries/PSA";
 import { psa } from '@db/schema/Psa';
 import styles from '../styles.module.css';
@@ -28,7 +27,7 @@ export default async function UpperReceiverPage() {
                 <td className='text-slate-800'>{psa.modelnumber}</td>
                 <td className='text-slate-800 flex items-center gap-2'>
                   ${Number(psa.salePrice).toFixed(2)}
-                  <Button variant="outline">Buy</Button>
+                  <button >Buy</button>
                 </td>
               </tr>
             ))}

src/app/layout.tsx

@@ -1,4 +1,4 @@
-import { Provider } from "../components/ui/provider"
+//import { Provider } from "../components/ui/provider"
 import "../styles/globals.css";
 import Navbar from "../components/Navbar";
 import PopNav from "@src/components/PopNav/page";
@@ -22,10 +22,10 @@ export default function RootLayout(props: { children: React.ReactNode }) {
   return (
     <html suppressHydrationWarning className={inter.className}>
       <body className="bg-slate-200	">
-        <Provider>      
+       
           <Navbar />
           <PopNav />
-        {children}</Provider>
+        {children}
       </body>
     </html>
   )