From 587f183ffa5cb7a38ab1114766c0e646a5b96e09 Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Wed, 18 Dec 2024 13:51:12 -0500 Subject: [PATCH] more fises --- package-lock.json | 105 ++++++++++--------- package.json | 4 +- src/app/Builder/page.tsx | 2 +- src/app/Products/barrels/page.tsx | 8 +- src/app/Products/loading.tsx | 6 ++ src/app/components/Loading/loading.tsx | 6 ++ src/app/components/TestProductPage/index.tsx | 8 ++ src/components/Copyright/index.tsx | 8 +- src/components/Disclosure/index.tsx | 2 +- src/components/SortTable/index.tsx | 10 +- src/components/newsletter/index.tsx | 6 +- src/db/queries/PSA/index.ts | 4 +- src/db/queries/Products/index.ts | 10 +- 13 files changed, 112 insertions(+), 67 deletions(-) create mode 100644 src/app/Products/loading.tsx create mode 100644 src/app/components/Loading/loading.tsx create mode 100644 src/app/components/TestProductPage/index.tsx diff --git a/package-lock.json b/package-lock.json index 62146c8..ad43edc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "fontsource-roboto": "^4.0.0", "framer-motion": "^11.11.17", "lucide-react": "^0.460.0", - "next": "15.0.3", + "next": "15.1.0", "next-themes": "^0.4.3", "pg": "^8.13.1", "react": "18.2.0", @@ -2465,9 +2465,10 @@ } }, "node_modules/@next/env": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/env/-/env-15.0.3.tgz", - "integrity": "sha512-t9Xy32pjNOvVn2AS+Utt6VmyrshbpfUMhIjFO60gI58deSo/KgLOp31XZ4O+kY/Is8WAGYwA5gR7kOb1eORDBA==" + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/env/-/env-15.1.0.tgz", + "integrity": "sha512-UcCO481cROsqJuszPPXJnb7GGuLq617ve4xuAyyNG4VSSocJNtMU5Fsx+Lp6mlN8c7W58aZLc5y6D/2xNmaK+w==", + "license": "MIT" }, "node_modules/@next/eslint-plugin-next": { "version": "15.0.3", @@ -2479,12 +2480,13 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.0.3.tgz", - "integrity": "sha512-s3Q/NOorCsLYdCKvQlWU+a+GeAd3C8Rb3L1YnetsgwXzhc3UTWrtQpB/3eCjFOdGUj5QmXfRak12uocd1ZiiQw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.1.0.tgz", + "integrity": "sha512-ZU8d7xxpX14uIaFC3nsr4L++5ZS/AkWDm1PzPO6gD9xWhFkOj2hzSbSIxoncsnlJXB1CbLOfGVN4Zk9tg83PUw==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2494,12 +2496,13 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.0.3.tgz", - "integrity": "sha512-Zxl/TwyXVZPCFSf0u2BNj5sE0F2uR6iSKxWpq4Wlk/Sv9Ob6YCKByQTkV2y6BCic+fkabp9190hyrDdPA/dNrw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.1.0.tgz", + "integrity": "sha512-DQ3RiUoW2XC9FcSM4ffpfndq1EsLV0fj0/UY33i7eklW5akPUCo6OX2qkcLXZ3jyPdo4sf2flwAED3AAq3Om2Q==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2509,12 +2512,13 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.0.3.tgz", - "integrity": "sha512-T5+gg2EwpsY3OoaLxUIofmMb7ohAUlcNZW0fPQ6YAutaWJaxt1Z1h+8zdl4FRIOr5ABAAhXtBcpkZNwUcKI2fw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.1.0.tgz", + "integrity": "sha512-M+vhTovRS2F//LMx9KtxbkWk627l5Q7AqXWWWrfIzNIaUFiz2/NkOFkxCFyNyGACi5YbA8aekzCLtbDyfF/v5Q==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -2524,12 +2528,13 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.0.3.tgz", - "integrity": "sha512-WkAk6R60mwDjH4lG/JBpb2xHl2/0Vj0ZRu1TIzWuOYfQ9tt9NFsIinI1Epma77JVgy81F32X/AeD+B2cBu/YQA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.1.0.tgz", + "integrity": "sha512-Qn6vOuwaTCx3pNwygpSGtdIu0TfS1KiaYLYXLH5zq1scoTXdwYfdZtwvJTpB1WrLgiQE2Ne2kt8MZok3HlFqmg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -2539,12 +2544,13 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.0.3.tgz", - "integrity": "sha512-gWL/Cta1aPVqIGgDb6nxkqy06DkwJ9gAnKORdHWX1QBbSZZB+biFYPFti8aKIQL7otCE1pjyPaXpFzGeG2OS2w==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.1.0.tgz", + "integrity": "sha512-yeNh9ofMqzOZ5yTOk+2rwncBzucc6a1lyqtg8xZv0rH5znyjxHOWsoUtSq4cUTeeBIiXXX51QOOe+VoCjdXJRw==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -2554,12 +2560,13 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.0.3.tgz", - "integrity": "sha512-QQEMwFd8r7C0GxQS62Zcdy6GKx999I/rTO2ubdXEe+MlZk9ZiinsrjwoiBL5/57tfyjikgh6GOU2WRQVUej3UA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.1.0.tgz", + "integrity": "sha512-t9IfNkHQs/uKgPoyEtU912MG6a1j7Had37cSUyLTKx9MnUpjj+ZDKw9OyqTI9OwIIv0wmkr1pkZy+3T5pxhJPg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -2569,12 +2576,13 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.0.3.tgz", - "integrity": "sha512-9TEp47AAd/ms9fPNgtgnT7F3M1Hf7koIYYWCMQ9neOwjbVWJsHZxrFbI3iEDJ8rf1TDGpmHbKxXf2IFpAvheIQ==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.1.0.tgz", + "integrity": "sha512-WEAoHyG14t5sTavZa1c6BnOIEukll9iqFRTavqRVPfYmfegOAd5MaZfXgOGG6kGo1RduyGdTHD4+YZQSdsNZXg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -2584,12 +2592,13 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.0.3.tgz", - "integrity": "sha512-VNAz+HN4OGgvZs6MOoVfnn41kBzT+M+tB+OK4cww6DNyWS6wKaDpaAm/qLeOUbnMh0oVx1+mg0uoYARF69dJyA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.1.0.tgz", + "integrity": "sha512-J1YdKuJv9xcixzXR24Dv+4SaDKc2jj31IVUEMdO5xJivMTXuE6MAdIi4qPjSymHuFG8O5wbfWKnhJUcHHpj5CA==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -2876,11 +2885,12 @@ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==" }, "node_modules/@swc/helpers": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.13.tgz", - "integrity": "sha512-UoKGxQ3r5kYI9dALKJapMmuK+1zWM/H17Z1+iwnNmzcJRnfFuevZs375TA5rW31pu4BS4NoSy1fRsexDXfWn5w==", + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", + "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==", + "license": "Apache-2.0", "dependencies": { - "tslib": "^2.4.0" + "tslib": "^2.8.0" } }, "node_modules/@tanstack/react-virtual": { @@ -6780,13 +6790,14 @@ "dev": true }, "node_modules/next": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/next/-/next-15.0.3.tgz", - "integrity": "sha512-ontCbCRKJUIoivAdGB34yCaOcPgYXr9AAkV/IwqFfWWTXEPUgLYkSkqBhIk9KK7gGmgjc64B+RdoeIDM13Irnw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/next/-/next-15.1.0.tgz", + "integrity": "sha512-QKhzt6Y8rgLNlj30izdMbxAwjHMFANnLwDwZ+WQh5sMhyt4lEBqDK9QpvWHtIM4rINKPoJ8aiRZKg5ULSybVHw==", + "license": "MIT", "dependencies": { - "@next/env": "15.0.3", + "@next/env": "15.1.0", "@swc/counter": "0.1.3", - "@swc/helpers": "0.5.13", + "@swc/helpers": "0.5.15", "busboy": "1.6.0", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", @@ -6799,22 +6810,22 @@ "node": "^18.18.0 || ^19.8.0 || >= 20.0.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "15.0.3", - "@next/swc-darwin-x64": "15.0.3", - "@next/swc-linux-arm64-gnu": "15.0.3", - "@next/swc-linux-arm64-musl": "15.0.3", - "@next/swc-linux-x64-gnu": "15.0.3", - "@next/swc-linux-x64-musl": "15.0.3", - "@next/swc-win32-arm64-msvc": "15.0.3", - "@next/swc-win32-x64-msvc": "15.0.3", + "@next/swc-darwin-arm64": "15.1.0", + "@next/swc-darwin-x64": "15.1.0", + "@next/swc-linux-arm64-gnu": "15.1.0", + "@next/swc-linux-arm64-musl": "15.1.0", + "@next/swc-linux-x64-gnu": "15.1.0", + "@next/swc-linux-x64-musl": "15.1.0", + "@next/swc-win32-arm64-msvc": "15.1.0", + "@next/swc-win32-x64-msvc": "15.1.0", "sharp": "^0.33.5" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", "@playwright/test": "^1.41.2", "babel-plugin-react-compiler": "*", - "react": "^18.2.0 || 19.0.0-rc-66855b96-20241106", - "react-dom": "^18.2.0 || 19.0.0-rc-66855b96-20241106", + "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", + "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", "sass": "^1.3.0" }, "peerDependenciesMeta": { diff --git a/package.json b/package.json index 03a9656..2515dc4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.2.0", "private": "true", "scripts": { - "dev": "next dev", + "dev": "next dev --turbopack", "build": "next build", "start": "next start", "lint": "next lint" @@ -28,7 +28,7 @@ "fontsource-roboto": "^4.0.0", "framer-motion": "^11.11.17", "lucide-react": "^0.460.0", - "next": "15.0.3", + "next": "15.1.0", "next-themes": "^0.4.3", "pg": "^8.13.1", "react": "18.2.0", diff --git a/src/app/Builder/page.tsx b/src/app/Builder/page.tsx index 8791ff6..9b8e50c 100644 --- a/src/app/Builder/page.tsx +++ b/src/app/Builder/page.tsx @@ -1,6 +1,6 @@ import { ChevronDownIcon } from "@heroicons/react/20/solid"; import { getPSA, getLowerBuildKits, getGrips } from "@queries/PSA"; -import { psa } from "@db/schema/Psa"; +import { psa } from "@schemas/schema"; import partTypes from "src/data/parts_cats.json"; export default async function BuilderPage() { diff --git a/src/app/Products/barrels/page.tsx b/src/app/Products/barrels/page.tsx index 5f5b022..7d46b5f 100644 --- a/src/app/Products/barrels/page.tsx +++ b/src/app/Products/barrels/page.tsx @@ -2,6 +2,8 @@ import { getProductType } from "@queries/PSA"; import styles from '../styles.module.css'; import PageHero from "@src/components/PageHero"; import SortTable from "@src/components/SortTable"; +import { Suspense } from "react"; +import Loading from "@src/app/components/Loading/loading"; export default async function BarrelsPage() { const data = await getProductType('Barrels'); @@ -9,9 +11,13 @@ export default async function BarrelsPage() { return (
+
- + + +
+
); } \ No newline at end of file diff --git a/src/app/Products/loading.tsx b/src/app/Products/loading.tsx new file mode 100644 index 0000000..07e872e --- /dev/null +++ b/src/app/Products/loading.tsx @@ -0,0 +1,6 @@ +const Loading = async () => { + return ( +
Loading...
); +} + +export default Loading; \ No newline at end of file diff --git a/src/app/components/Loading/loading.tsx b/src/app/components/Loading/loading.tsx new file mode 100644 index 0000000..07e872e --- /dev/null +++ b/src/app/components/Loading/loading.tsx @@ -0,0 +1,6 @@ +const Loading = async () => { + return ( +
Loading...
); +} + +export default Loading; \ No newline at end of file diff --git a/src/app/components/TestProductPage/index.tsx b/src/app/components/TestProductPage/index.tsx new file mode 100644 index 0000000..4bf3b5a --- /dev/null +++ b/src/app/components/TestProductPage/index.tsx @@ -0,0 +1,8 @@ +'use server' +export const TestProductPage = async (props: any) => { + return ( +
+ {props.data.modelnumber} +
+ ); +} \ No newline at end of file diff --git a/src/components/Copyright/index.tsx b/src/components/Copyright/index.tsx index 36191e5..b81f3db 100644 --- a/src/components/Copyright/index.tsx +++ b/src/components/Copyright/index.tsx @@ -1,10 +1,8 @@ import React, { Component } from 'react'; import constants from '@lib/constants'; -import Typography from '@mui/material/Typography'; -import MuiLink from '@mui/material/Link'; -import styles from './styles.module.css' -import Link from 'next/link' -import styled from '@emotion/styled' +import styles from './styles.module.css'; +import Link from 'next/link'; +import styled from '@emotion/styled'; export default class Copyright extends Component { diff --git a/src/components/Disclosure/index.tsx b/src/components/Disclosure/index.tsx index de764be..7c61c02 100644 --- a/src/components/Disclosure/index.tsx +++ b/src/components/Disclosure/index.tsx @@ -5,7 +5,7 @@ import styles from './styles.module.css'; import constants from '@lib/constants' import {SITE_CONT_TYPE} from '@lib/constants' -export default function Disclosure(props) { +export default function Disclosure(props:any) { return ( diff --git a/src/components/SortTable/index.tsx b/src/components/SortTable/index.tsx index b9b0e65..964e18b 100644 --- a/src/components/SortTable/index.tsx +++ b/src/components/SortTable/index.tsx @@ -3,10 +3,13 @@ import { PlusCircleIcon } from "@heroicons/react/20/solid"; import Image from "next/image"; import Link from "next/link"; +import { TestProductPage } from "../../app/components/TestProductPage"; +import { Suspense } from "react"; export default async function SortTable(props: any) { return (
+
@@ -125,13 +128,18 @@ export default async function SortTable(props: any) { /> - + + + + ))} +
+ ); } diff --git a/src/components/newsletter/index.tsx b/src/components/newsletter/index.tsx index 362634a..fa87bb7 100644 --- a/src/components/newsletter/index.tsx +++ b/src/components/newsletter/index.tsx @@ -1,3 +1,5 @@ +import Link from "next/link"; + export default function Newsletter() { return (
@@ -28,9 +30,9 @@ export default function Newsletter() {

We care about your data. Read our{' '} - + privacy policy - + .

diff --git a/src/db/queries/PSA/index.ts b/src/db/queries/PSA/index.ts index 3d8d7b8..a27ee83 100644 --- a/src/db/queries/PSA/index.ts +++ b/src/db/queries/PSA/index.ts @@ -26,7 +26,7 @@ export async function getLowerBuildKits(page = 1) { } export async function getARCompleteLowers(page = 1) { - const limit = 40; + const limit = 240; const offset = (page - 1) * limit; return await db.select() @@ -39,7 +39,7 @@ export async function getARCompleteLowers(page = 1) { export async function getProductType(productType : any, page = 1) { const limit = 40; const offset = (page - 1) * limit; - + await new Promise((resolve) => setTimeout(resolve,1000)); return await db.select() .from(psa) .limit(limit) diff --git a/src/db/queries/Products/index.ts b/src/db/queries/Products/index.ts index b79d8f1..6e2b81c 100644 --- a/src/db/queries/Products/index.ts +++ b/src/db/queries/Products/index.ts @@ -1,25 +1,25 @@ // db/queries.ts "use server"; import { eq, not , asc} from "drizzle-orm"; -import { Product } from '@schemas/Product'; +import { products } from '@schemas/schema'; import { db } from '../../index'; // Fetch all products export async function getAllProducts() { - return await db.select().from(Product); + return await db.select().from(products); } // Add a new product export async function addProduct() { - return await db.insert(Product).values({ }).returning(); + return await db.insert(products).values({ }).returning(); } // Update a Product export async function updateProduct( ) { - return await db.update(Product).set({ }).where(eq(Product.id, id)); + return await db.update(products).set({ }).where(eq(Product.id, id)); } // Delete a product export async function deleteProduct(id: number) { - return await db.delete(Product).where(eq(Product.id, id)); + return await db.delete(products).where(eq(products.id, id)); } \ No newline at end of file