diff --git a/src/app/Products/barrels/page.tsx b/src/app/Products/barrels/page.tsx
index 5ff2fcb..5f5b022 100644
--- a/src/app/Products/barrels/page.tsx
+++ b/src/app/Products/barrels/page.tsx
@@ -1,8 +1,6 @@
import { getProductType } from "@queries/PSA";
-import partTypes from 'src/data/parts_cats.json';
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function BarrelsPage() {
diff --git a/src/app/Products/grips/page.tsx b/src/app/Products/grips/page.tsx
index 848e80d..6bb9654 100644
--- a/src/app/Products/grips/page.tsx
+++ b/src/app/Products/grips/page.tsx
@@ -1,5 +1,5 @@
import { getGrips } from "@queries/PSA";
-import partTypes from 'src/data/parts_cats.json';
+
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
import SortTable from "@src/components/SortTable";
diff --git a/src/app/Products/handguards/page.tsx b/src/app/Products/handguards/page.tsx
index b79fcfb..5af9910 100644
--- a/src/app/Products/handguards/page.tsx
+++ b/src/app/Products/handguards/page.tsx
@@ -1,7 +1,6 @@
import { getARHandGuards } from "@queries/PSA";
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function HamdGuardsPage() {
diff --git a/src/app/Products/layout.tsx b/src/app/Products/layout.tsx
index f14a4d6..0c08d99 100644
--- a/src/app/Products/layout.tsx
+++ b/src/app/Products/layout.tsx
@@ -14,11 +14,9 @@ export default function RootLayout({
children: React.ReactNode;
}) {
return (
-
-
+
-
-
+
-
-
-
);
}
diff --git a/src/app/Products/lowers/page.tsx b/src/app/Products/lowers/page.tsx
index 7f0ec28..0c42326 100644
--- a/src/app/Products/lowers/page.tsx
+++ b/src/app/Products/lowers/page.tsx
@@ -1,9 +1,6 @@
-import { getARCompleteLowers, getProductType } from "@queries/PSA";
+import { getProductType } from "@queries/PSA";
import partTypes from 'src/data/parts_cats.json';
-import { psa } from "@db/schema/Psa";
import styles from "../styles.module.css";
-import PageHero from "@components/PageHero";
-import Link from "next/link";
import SortTable from "@src/components/SortTable";
export default async function LowerReceiverPage() {
diff --git a/src/app/Products/magazines/page.tsx b/src/app/Products/magazines/page.tsx
index 000d99e..f8eba77 100644
--- a/src/app/Products/magazines/page.tsx
+++ b/src/app/Products/magazines/page.tsx
@@ -1,8 +1,6 @@
import { getMags } from "@queries/PSA";
-import partTypes from 'src/data/parts_cats.json';
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function MagsPage() {
diff --git a/src/app/Products/muzzle-devices/page.tsx b/src/app/Products/muzzle-devices/page.tsx
index 8242c01..a707bb1 100644
--- a/src/app/Products/muzzle-devices/page.tsx
+++ b/src/app/Products/muzzle-devices/page.tsx
@@ -1,8 +1,6 @@
import { getMuzzleDevices } from "@queries/PSA";
-import partTypes from 'src/data/parts_cats.json';
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function MuzzleDevices() {
diff --git a/src/app/Products/parts/page.tsx b/src/app/Products/parts/page.tsx
index fdc97bb..189b312 100644
--- a/src/app/Products/parts/page.tsx
+++ b/src/app/Products/parts/page.tsx
@@ -1,7 +1,5 @@
import { getARParts } from "@queries/PSA";
-import partTypes from 'src/data/parts_cats.json';
import styles from '../styles.module.css';
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function PartsPage() {
diff --git a/src/app/Products/triggers/page.tsx b/src/app/Products/triggers/page.tsx
index e91921f..769f401 100644
--- a/src/app/Products/triggers/page.tsx
+++ b/src/app/Products/triggers/page.tsx
@@ -1,19 +1,16 @@
import { getARTriggers } from "@queries/PSA";
-import { psa } from '@db/schema/Psa';
-import partTypes from 'src/data/parts_cats.json';
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
-import ProductTable from "@src/components/ProductTable";
import SortTable from "@src/components/SortTable";
export default async function TriggersPage() {
- const psa = await getARTriggers();
+ const data = await getARTriggers();
return (
);
diff --git a/src/app/Products/uppers/page.tsx b/src/app/Products/uppers/page.tsx
index fae63f2..d555ed5 100644
--- a/src/app/Products/uppers/page.tsx
+++ b/src/app/Products/uppers/page.tsx
@@ -1,17 +1,16 @@
-import { getPSA, getUpperReciever } from "@queries/PSA";
-import { psa } from '@db/schema/Psa';
+import { getUpperReciever } from "@queries/PSA";
import styles from '../styles.module.css';
import PageHero from "@src/components/PageHero";
import ProductTable from "@src/components/ProductTable";
export default async function UpperReceiverPage() {
- const psa = await getUpperReciever();
+ const data = await getUpperReciever();
return (
);
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 254aa14..38f6acb 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -12,7 +12,7 @@ export const metadata = {
const roboto = Roboto({
weight: '400',
- subsets: ['latin'],
+ subsets: ['latin'],git s
display: 'swap',
})
@@ -23,9 +23,9 @@ export default function RootLayout(props: { children: React.ReactNode }) {
return (
-
-
-
+
+
+
{children}
diff --git a/src/db/queries/Accounts/index.ts b/src/db/queries/Accounts/index.ts
index dd256de..43efe95 100644
--- a/src/db/queries/Accounts/index.ts
+++ b/src/db/queries/Accounts/index.ts
@@ -1,7 +1,7 @@
// db/queries.ts
"use server";
import { eq, not , asc} from "drizzle-orm";
-import { Account } from '../../schema/Account'
+import { Account } from '@schemas/Account'
import { db } from '../../index';
// Fetch all account
diff --git a/src/db/queries/PSA/index.ts b/src/db/queries/PSA/index.ts
index b17a0ee..9cb7d32 100644
--- a/src/db/queries/PSA/index.ts
+++ b/src/db/queries/PSA/index.ts
@@ -1,5 +1,5 @@
import { db } from '../../index';
-import { psa } from '../../../drizzle/schema';
+import { psa } from '@schemas/Psa';
import { eq, lt, gte, ne, and, like } from 'drizzle-orm';
import CATEGORY from '@src/data/parts_cats.json';
@@ -112,6 +112,7 @@ export async function getStocksParts(page = 1) {
.where(eq(psa.fineline, "Stocks"))
.offset(offset);
}
+
export async function getUpperReciever(page = 1) {
const limit = 40;
const offset = (page - 1) * limit;
@@ -133,6 +134,7 @@ export async function getARTriggers(page = 1) {
.where(and(like(psa.fineline, "%Trigger%"), like(psa.category, "Ar Parts")))
.offset(offset);
}
+
export async function getARParts(page = 1) {
const limit = 40;
const offset = (page - 1) * limit;
@@ -143,6 +145,7 @@ export async function getARParts(page = 1) {
.where(and(like(psa.fineline, "%Trigger%"), like(psa.category, "Ar Parts")))
.offset(offset);
}
+
export async function getMags(page = 1) {
const limit = 40;
const offset = (page - 1) * limit;
@@ -150,6 +153,6 @@ export async function getMags(page = 1) {
return await db.select()
.from(psa)
.limit(limit)
- .where(and(like(psa.fineline, "%Magazine%"), like(psa.category, "Ar Parts")))
+ .where(like(psa.superfineline, "%AR Magazines%"))
.offset(offset);
}
\ No newline at end of file
diff --git a/src/db/schema/UserActivity.ts b/src/db/schema/UserActivity.ts
new file mode 100644
index 0000000..41bf2e6
--- /dev/null
+++ b/src/db/schema/UserActivity.ts
@@ -0,0 +1,18 @@
+import { bigint, bigserial, foreignKey, pgTable, text, timestamp } from "drizzle-orm/pg-core";
+import { users } from "./User";
+
+export const userActivityLog = pgTable("user_activity_log", {
+ id: bigserial({ mode: "bigint" }).primaryKey().notNull(),
+ // You can use { mode: "bigint" } if numbers are exceeding js number limitations
+ userId: bigint("user_id", { mode: "number" }).notNull(),
+ activity: text().notNull(),
+ timestamp: timestamp({ mode: 'string' }).default(sql`CURRENT_TIMESTAMP`),
+}, (table) => {
+ return {
+ userActivityLogUserIdFkey: foreignKey({
+ columns: [table.userId],
+ foreignColumns: [users.id],
+ name: "user_activity_log_user_id_fkey"
+ }).onDelete("cascade"),
+ }
+});