From 429d6d2b26618f53a68e6ee577f48d90a8e53b18 Mon Sep 17 00:00:00 2001 From: Don Starwsburg Date: Tue, 19 Nov 2024 21:15:15 -0500 Subject: [PATCH] changing plurals to single and proper-casing --- package-lock.json | 201 ++++++++++++++++-- package.json | 3 +- src/db/index.ts | 2 +- src/db/queries/index.ts | 16 +- src/db/schema/{accounts.ts => Account.ts} | 2 +- src/db/schema/{categories.ts => Category.ts} | 2 +- .../{lipseyCatalog.ts => LipseyCatalog.ts} | 2 +- src/db/schema/{products.ts => Product.ts} | 2 +- .../{product_feeds.ts => Product_feed.ts} | 2 +- src/db/schema/{retailers.ts => Reseller.ts} | 2 +- src/db/schema/relations.ts | 2 +- 11 files changed, 204 insertions(+), 32 deletions(-) rename src/db/schema/{accounts.ts => Account.ts} (91%) rename src/db/schema/{categories.ts => Category.ts} (88%) rename src/db/schema/{lipseyCatalog.ts => LipseyCatalog.ts} (97%) rename src/db/schema/{products.ts => Product.ts} (92%) rename src/db/schema/{product_feeds.ts => Product_feed.ts} (88%) rename src/db/schema/{retailers.ts => Reseller.ts} (89%) diff --git a/package-lock.json b/package-lock.json index 73bb39d..0948e85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,12 +30,13 @@ "@types/pg": "^8.11.10", "@types/react": "^18", "@types/react-dom": "^18", + "autoprefixer": "^10.4.20", "drizzle-kit": "^0.28.1", "eslint": "^8", "eslint-config-next": "15.0.3", "postcss": "^8", "prisma": "^5.22.0", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.4.15", "tsx": "^4.19.2", "typescript": "^5.6.3" } @@ -3154,6 +3155,43 @@ "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==", "dev": true }, + "node_modules/autoprefixer": { + "version": "10.4.20", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", + "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/autoprefixer" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "browserslist": "^4.23.3", + "caniuse-lite": "^1.0.30001646", + "fraction.js": "^4.3.7", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.1", + "postcss-value-parser": "^4.2.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", @@ -3241,6 +3279,38 @@ "node": ">=8" } }, + "node_modules/browserslist": { + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "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" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.1" + }, + "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", @@ -4220,6 +4290,12 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dev": true }, + "node_modules/electron-to-chromium": { + "version": "1.5.63", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.63.tgz", + "integrity": "sha512-ddeXKuY9BHo/mw145axlyWjlJ1UBt4WK3AlvkT7W2AbqfRQoacVoRUCF6wL3uIx/8wT9oLKXzI+rFqHHscByaA==", + "dev": true + }, "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", @@ -4462,6 +4538,15 @@ "esbuild": ">=0.12 <1" } }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": 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", @@ -5077,6 +5162,19 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/fraction.js": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", + "dev": true, + "engines": { + "node": "*" + }, + "funding": { + "type": "patreon", + "url": "https://github.com/sponsors/rawify" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -6289,6 +6387,12 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -6298,6 +6402,15 @@ "node": ">=0.10.0" } }, + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -7725,33 +7838,33 @@ } }, "node_modules/tailwindcss": { - "version": "3.4.14", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz", - "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==", + "version": "3.4.15", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz", + "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", - "chokidar": "^3.5.3", + "chokidar": "^3.6.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.3.0", + "fast-glob": "^3.3.2", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.21.0", + "jiti": "^1.21.6", "lilconfig": "^2.1.0", - "micromatch": "^4.0.5", + "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.23", + "picocolors": "^1.1.1", + "postcss": "^8.4.47", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", - "postcss-load-config": "^4.0.1", - "postcss-nested": "^6.0.1", - "postcss-selector-parser": "^6.0.11", - "resolve": "^1.22.2", - "sucrase": "^3.32.0" + "postcss-load-config": "^4.0.2", + "postcss-nested": "^6.2.0", + "postcss-selector-parser": "^6.1.2", + "resolve": "^1.22.8", + "sucrase": "^3.35.0" }, "bin": { "tailwind": "lib/cli.js", @@ -7761,6 +7874,34 @@ "node": ">=14.0.0" } }, + "node_modules/tailwindcss/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==", + "dev": true, + "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/tailwindcss/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==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -7999,6 +8140,36 @@ "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "devOptional": true }, + "node_modules/update-browserslist-db": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", + "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" + } + ], + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.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", diff --git a/package.json b/package.json index 9250a43..c34dde6 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,13 @@ "@types/pg": "^8.11.10", "@types/react": "^18", "@types/react-dom": "^18", + "autoprefixer": "^10.4.20", "drizzle-kit": "^0.28.1", "eslint": "^8", "eslint-config-next": "15.0.3", "postcss": "^8", "prisma": "^5.22.0", - "tailwindcss": "^3.4.1", + "tailwindcss": "^3.4.15", "tsx": "^4.19.2", "typescript": "^5.6.3" } diff --git a/src/db/index.ts b/src/db/index.ts index de44adb..819ebab 100644 --- a/src/db/index.ts +++ b/src/db/index.ts @@ -1,5 +1,5 @@ import 'dotenv/config'; -import { drizzle } from 'drizzle-orm/node-postgres'; +import { drizzle } from 'drizzle-orm'; import { Pool } from 'pg'; import { sql } from 'drizzle-orm'; diff --git a/src/db/queries/index.ts b/src/db/queries/index.ts index 24be4b1..4ca8b50 100644 --- a/src/db/queries/index.ts +++ b/src/db/queries/index.ts @@ -1,5 +1,5 @@ // db/queries.ts -import { accounts } from '../schema/accounts' +import { accounts } from '../schema/Account' import { db } from '../index'; // Fetch all accounts @@ -9,15 +9,15 @@ export async function getAllAccounts() { // Add a new accounts export async function addAcounts(name: string) { - return await db.insertInto(User).values({ name }).returning(); + return await db.insertInto(accounts).values({ name }).returning(); } -// Update a user -export async function updateUser(id: number, name: string) { - return await db.update(User).set({ name }).where(User.id.equals(id)); +// Update a accounts +export async function updateAcounts(id: number, name: string) { + return await db.update(accounts).set({ name }).where(accounts.id.equals(id)); } -// Delete a user -export async function deleteUser(id: number) { - return await db.deleteFrom(User).where(User.id.equals(id)); +// Delete a accounts +export async function deleteAccount(id: number) { + return await db.deleteFrom(accounts).where(accounts.id.equals(id)); } \ No newline at end of file diff --git a/src/db/schema/accounts.ts b/src/db/schema/Account.ts similarity index 91% rename from src/db/schema/accounts.ts rename to src/db/schema/Account.ts index 77141f2..ed11859 100644 --- a/src/db/schema/accounts.ts +++ b/src/db/schema/Account.ts @@ -2,7 +2,7 @@ import { pgTable, integer, varchar } from "drizzle-orm/pg-core"; import { sql } from "drizzle-orm"; import { timestamps } from "./columns.helpers"; -export const accounts = pgTable("bal_accounts", { +export const Account = pgTable("bal_accounts", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "accounts_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), first_name: varchar({ length: 40 }), last_name: varchar({ length: 40 }), diff --git a/src/db/schema/categories.ts b/src/db/schema/Category.ts similarity index 88% rename from src/db/schema/categories.ts rename to src/db/schema/Category.ts index 81d0184..280d26f 100644 --- a/src/db/schema/categories.ts +++ b/src/db/schema/Category.ts @@ -2,7 +2,7 @@ import { pgTable, integer, varchar } from "drizzle-orm/pg-core"; import { sql } from "drizzle-orm"; import { timestamps } from "./columns.helpers"; -export const categories = pgTable("categories", { +export const Category = pgTable("categories", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "categories_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), name: varchar({length: 100}).notNull(), parent_category_id: integer(), diff --git a/src/db/schema/lipseyCatalog.ts b/src/db/schema/LipseyCatalog.ts similarity index 97% rename from src/db/schema/lipseyCatalog.ts rename to src/db/schema/LipseyCatalog.ts index 916305c..ce87ab7 100644 --- a/src/db/schema/lipseyCatalog.ts +++ b/src/db/schema/LipseyCatalog.ts @@ -3,7 +3,7 @@ import { sql } from "drizzle-orm" import { timestamps } from "./columns.helpers"; -export const lipseycatalog = pgTable("lipseycatalog", { +export const LipseyCatalog = pgTable("lipseycatalog", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "lipseycatalog_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), itemno: varchar({ length: 20 }).notNull(), description1: text(), diff --git a/src/db/schema/products.ts b/src/db/schema/Product.ts similarity index 92% rename from src/db/schema/products.ts rename to src/db/schema/Product.ts index ea8537b..dd3c047 100644 --- a/src/db/schema/products.ts +++ b/src/db/schema/Product.ts @@ -2,7 +2,7 @@ import { pgTable, integer, varchar, text, decimal } from "drizzle-orm/pg-core"; import { sql } from "drizzle-orm"; import { timestamps } from "./columns.helpers"; -export const products = pgTable("products", { +export const Product = pgTable("products", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "products_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), name: varchar({length: 255 }).notNull(), description: text().notNull(), diff --git a/src/db/schema/product_feeds.ts b/src/db/schema/Product_feed.ts similarity index 88% rename from src/db/schema/product_feeds.ts rename to src/db/schema/Product_feed.ts index de10cba..b0c20f5 100644 --- a/src/db/schema/product_feeds.ts +++ b/src/db/schema/Product_feed.ts @@ -2,7 +2,7 @@ import { pgTable, integer, varchar, timestamp } from "drizzle-orm/pg-core"; import { sql } from "drizzle-orm"; import { timestamps } from "./columns.helpers"; -export const product_feeds = pgTable("product_feeds", { +export const Product_feed = pgTable("product_feeds", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "productfeeds_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), reseller_id: integer().notNull(), feed_url: varchar({ length:255 }).notNull(), diff --git a/src/db/schema/retailers.ts b/src/db/schema/Reseller.ts similarity index 89% rename from src/db/schema/retailers.ts rename to src/db/schema/Reseller.ts index cf7a770..16c6e81 100644 --- a/src/db/schema/retailers.ts +++ b/src/db/schema/Reseller.ts @@ -2,7 +2,7 @@ import { pgTable, integer, varchar } from "drizzle-orm/pg-core"; import { sql } from "drizzle-orm"; import { timestamps } from "./columns.helpers"; -export const resellers = pgTable("bal_resellers", { +export const Reseller = pgTable("bal_resellers", { id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "resellers_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }), name: varchar({ length: 100 }).notNull(), website_url: varchar({ length: 255 }), diff --git a/src/db/schema/relations.ts b/src/db/schema/relations.ts index d0ed933..665fba9 100644 --- a/src/db/schema/relations.ts +++ b/src/db/schema/relations.ts @@ -1,3 +1,3 @@ import { relations } from "drizzle-orm/relations"; -import { } from "./lipseyCatalog"; +import { } from "./LipseyCatalog";