diff --git a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index copy.js b/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index copy.js
deleted file mode 100644
index 674c18d..0000000
--- a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index copy.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types' //ES6
-import styles from './styles.module.css'
-import List from '@mui/material/List'
-import ListItem from '@mui/material/ListItem';
-import ListItemText from '@mui/material/ListItemText';
-import TypoGraphy from '@mui/material/Typography'
-import Link from 'next/link'
-import { makeStyles } from '@mui/material/styles';
-
-const useStyles = makeStyles((theme) => ({
- root: {
- width: '75%',
- maxWidth: 260,
- /* backgroundColor: theme.palette.background.paper, */
- float : 'right',
- marginRight:'2%',
- fontSize : '.80em'
-
-
- },
- }));
-
-export default function FooterLinks() {
-
- const classes = useStyles();
- return (
- (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
)
- );
- }
-
diff --git a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index.js b/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index.js
deleted file mode 100644
index c681323..0000000
--- a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/index.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types' //ES6
-import styles from './styles.module.css'
-import List from '@mui/material/List'
-import ListItem from '@mui/material/ListItem';
-import ListItemText from '@mui/material/ListItemText';
-import TypoGraphy from '@mui/material/Typography'
-import Link from 'next/link'
-import { withStyles } from '@mui/material/styles';
-import styled from '@emotion/styled'
-import FooterLink from '@/src/Fragments/FooterLink';
-
-
-class FooterLinks extends React.Component {
- constructor(props) {
- super(props)
- this.state = {
- }
- }
-
- render() {
- const { classes } = this.props;
- return (
-
-
-
-
-
-
-
-
- )
- }
-}
-
-const FooterLinksStyled = styled.div`
- .footer-links nav {
- display: flex;
- flex-direction: row;
- justify-content: space-around;
- width: 100%;
- }
-`
-// export default withStyles(useStyles)(FooterLinks);
-
-export default FooterLinks;
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/package.json b/src/Example Code/GunBuilder/GB_Footer/FooterLinks/package.json
deleted file mode 100644
index 3448443..0000000
--- a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "footerlinks",
- "version": "0.0.0",
- "private": true,
- "main": "./index",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/styles.module.css b/src/Example Code/GunBuilder/GB_Footer/FooterLinks/styles.module.css
deleted file mode 100644
index 5d56616..0000000
--- a/src/Example Code/GunBuilder/GB_Footer/FooterLinks/styles.module.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.navLinks {
- color:#000;
-}
-.navLinks:hover {
- font-weight: bold;
- text-decoration : none;
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Footer/index.tsx b/src/Example Code/GunBuilder/GB_Footer/index.tsx
deleted file mode 100644
index 3a684ba..0000000
--- a/src/Example Code/GunBuilder/GB_Footer/index.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import styles from './styles.module.scss';
-import Copyright from "@/src/components/GB_Info/Copyright";
-import FooterLinks from "./FooterLinks";
-import Link from "next/link";
-import { infoLinks } from "@/src/lib/linkList/infoLinks";
-import { sectionLinks } from "@/src/lib/linkList/sectionLinks";
-import Armory from '@/src/Fragments/Armory';
-import GroundZero from "@/src/Fragments/GroundZero";
-import Information from "@/src/Fragments/Information";
-export const Footer = () => {
-
- return (
- //
- //
- (<>
-
-
-
-
- Logo
-
-
Find Parts.
-
Build Guns.
-
Freedom On.
-
-
-
-
-
{this.props.heading}
-
{this.props.subheading}
-
- {this.props.linktext}
-
-
-
-
-
-
About
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
- )
-
-}
-
-ContactUs.propTypes = {
-
-};
diff --git a/src/Example Code/GunBuilder/GB_Info/ContactUs/package.json b/src/Example Code/GunBuilder/GB_Info/ContactUs/package.json
deleted file mode 100644
index 06d382c..0000000
--- a/src/Example Code/GunBuilder/GB_Info/ContactUs/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "contactus",
- "version": "0.0.0",
- "private": true,
- "main": "./index",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Info/ContactUs/styles.module.css b/src/Example Code/GunBuilder/GB_Info/ContactUs/styles.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Example Code/GunBuilder/GB_Info/Disclosure/styles.module.css b/src/Example Code/GunBuilder/GB_Info/Disclosure/styles.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Example Code/GunBuilder/GB_Info/Faq/index.tsx b/src/Example Code/GunBuilder/GB_Info/Faq/index.tsx
deleted file mode 100644
index babfa2e..0000000
--- a/src/Example Code/GunBuilder/GB_Info/Faq/index.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React, { Component } from 'react';
-import styles from './styles.module.css'
-import { useQuery, useMutation, gql } from "@apollo/client";
-
-export default function Faq(props) {
-
- const GET_SITE_CONTENT_FAQ = gql`
- query Get_Site_Content_Faq {
- site_contents(where: {content_id: {_eq: "FAQ"}}, order_by: {content: asc}) {
- id
- content_id
- content
- }
- }
- `;
-
- const { loading, error, data } = useQuery(GET_SITE_CONTENT_FAQ);
- if(loading) return "Loading ...";
- if(error) return `Error! ${error.message}` ;
-
- return (
-
-
- {props.children}
-
Frequently Asked Questions
-
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
-
-
-
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
- )
-}
-
-PIP.propTypes = {
-
-};
diff --git a/src/Example Code/GunBuilder/GB_Info/PIP/package.json b/src/Example Code/GunBuilder/GB_Info/PIP/package.json
deleted file mode 100644
index 7788c82..0000000
--- a/src/Example Code/GunBuilder/GB_Info/PIP/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "pip",
- "version": "0.0.0",
- "private": true,
- "main": "./index",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Info/PIP/styles.module.css b/src/Example Code/GunBuilder/GB_Info/PIP/styles.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/index.tsx b/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/index.tsx
deleted file mode 100644
index 2f5a086..0000000
--- a/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/index.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React, { Component } from 'react'
-import TypoGraphy from '@mui/material/Typography';
-import Head from 'next/head';
-import PropTypes from 'prop-types' //ES6
-import styles from './styles.module.css';
-import constants from '@/src/lib/constants'
-import { useQuery, useMutation, gql } from "@apollo/client";
-
-export default function PrivacyPolicy(props) {
- const GET_SITE_CONTENT = gql`
- query Get_Site_Content {
- site_contents(where: {content_id: {_eq: "PP"}}, order_by: {content: asc}) {
- id
- content_id
- content
- }
- }
- `;
-
- const { loading, error, data } = useQuery(GET_SITE_CONTENT);
- if (loading) return "Loading ...";
- if (error) return `Error! ${error.message}`;
-
- return (
-
-
-
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
- )
- }
-
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/package.json b/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/package.json
deleted file mode 100644
index 6de89ba..0000000
--- a/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "privacypolicy",
- "version": "0.0.0",
- "private": true,
- "main": "./index",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/styles.module.css b/src/Example Code/GunBuilder/GB_Info/PrivacyPolicy/styles.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Example Code/GunBuilder/GB_Info/TermsOfService/index.tsx b/src/Example Code/GunBuilder/GB_Info/TermsOfService/index.tsx
deleted file mode 100644
index 93d137f..0000000
--- a/src/Example Code/GunBuilder/GB_Info/TermsOfService/index.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import React, { Component } from 'react'
-import Head from 'next/head';
-import TypoGraphy from '@mui/material/Typography';
-import PropTypes from 'prop-types' //ES6
-import constants from '@/src/lib/constants'
-import { useQuery, useMutation, gql } from "@apollo/client";
-
-export default function TermsOfService(props) {
- const GET_SITE_CONTENT = gql`
- query Get_Site_Content {
- site_contents(where: {content_id: {_eq: "TOS"}}, order_by: {content: asc}) {
- id
- content_id
- content
- }
- }
- `;
-
- const { loading, error, data } = useQuery(GET_SITE_CONTENT);
- if (loading) return "Loading ...";
- if (error) return `Error! ${error.message}`;
- return (
-
-
-
-
- {data.site_contents.map((site_content: { content: any; }) => (
-
-
-
- )
-}
-
-TermsOfService.propTypes = {
-
-};
diff --git a/src/Example Code/GunBuilder/GB_Info/TermsOfService/package.json b/src/Example Code/GunBuilder/GB_Info/TermsOfService/package.json
deleted file mode 100644
index 8860bc2..0000000
--- a/src/Example Code/GunBuilder/GB_Info/TermsOfService/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "termsofservice",
- "version": "0.0.0",
- "private": true,
- "main": "./index.tsx",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_Info/TermsOfService/styles.module.css b/src/Example Code/GunBuilder/GB_Info/TermsOfService/styles.module.css
deleted file mode 100644
index e69de29..0000000
diff --git a/src/Example Code/GunBuilder/GB_SignIn/index.tsx b/src/Example Code/GunBuilder/GB_SignIn/index.tsx
deleted file mode 100644
index ea40f94..0000000
--- a/src/Example Code/GunBuilder/GB_SignIn/index.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import React from 'react';
-import Avatar from '@mui/material/Avatar';
-import Button from '@mui/material/Button';
-import CssBaseline from '@mui/material/CssBaseline';
-import TextField from '@mui/material/TextField';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Checkbox from '@mui/material/Checkbox';
-import Link from '@mui/material/Link';
-import Paper from '@mui/material/Paper';
-import Box from '@mui/material/Box';
-import Grid from '@mui/material/Grid';
-import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
-import Typography from '@mui/material/Typography';
-import { makeStyles } from '@mui/material/styles';
-import styles from "./styles.module.css";
-
-function Copyright() {
- return (
-
- {'Copyright © '}
-
- );
-}
-
-const useStyles = makeStyles((theme) => ({
- root: {
- height: '100vh',
- },
- image: {
- backgroundImage: 'url(https://source.unsplash.com/random)',
- backgroundRepeat: 'no-repeat',
- backgroundColor:
- theme.palette.type === 'light' ? theme.palette.grey[50] : theme.palette.grey[900],
- backgroundSize: 'cover',
- backgroundPosition: 'center',
- },
- paper: {
- margin: theme.spacing(8, 4),
- display: 'flex',
- flexDirection: 'column',
- alignItems: 'center',
- },
- avatar: {
- margin: theme.spacing(1),
- backgroundColor: theme.palette.secondary.main,
- },
- form: {
- width: '100%', // Fix IE 11 issue.
- marginTop: theme.spacing(1),
- },
- submit: {
- margin: theme.spacing(3, 0, 2),
- },
-}));
-
-export default function SignInSide() {
- const classes = useStyles();
-
- return (
-
-
-
-
-
- );
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_SignIn/package.json b/src/Example Code/GunBuilder/GB_SignIn/package.json
deleted file mode 100644
index a84a5b4..0000000
--- a/src/Example Code/GunBuilder/GB_SignIn/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "signin",
- "version": "0.0.0",
- "private": true,
- "main": "./index",
- "author": {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- "contributors": [
- {
- "name": "Don Strawsburg",
- "email": "don@goforward.group",
- "url": "https://goforward.group/"
- },
- {
- "name": "Sean Strawsburg",
- "email": "sean@goforward.group",
- "url": "https://goforward.group/"
- }
- ]
-}
\ No newline at end of file
diff --git a/src/Example Code/GunBuilder/GB_SignIn/styles.module.css b/src/Example Code/GunBuilder/GB_SignIn/styles.module.css
deleted file mode 100644
index 8b13789..0000000
--- a/src/Example Code/GunBuilder/GB_SignIn/styles.module.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/Example Code/Weather/index.js b/src/Example Code/Weather/index.js
deleted file mode 100644
index ba5a3cf..0000000
--- a/src/Example Code/Weather/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from "react";
-import styles from "./styles.module.css";
-class Weather extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- show: true,
-
- };
- this.props = {
- name : '',
- temperature : '',
- temperatureUnit : '',
- detailedForecast : '',
- }
- }
-
- render() {
- return (
-
-
×
-
-
-
{this.props.name}
-
{this.props.temperature}
-
{this.props.temperatureUnit}
-
{this.props.detailedForecast}
-
- {
- this.state.periods.map((period, index) => {
- return
- );
- }
- getData() {
- fetch("https://api.weather.gov/gridpoints/MLB/25,69/forecast")
- .then(response => response.json())
- .then(data => this.setState({ periods : data.properties.periods}))
- .then(data => console.log(data));
- this.setState({
- detailedForcast : 'Test Detailed forcast',
- name : 'Test data',
- temperature : '90',
- temperatureUnit : 'Celcius'});
-
- }
-
- componentDidMount() {
- this.getData();
- }
-
-}
-export default WeatherList;
\ No newline at end of file
diff --git a/src/Example Code/fetchData.tsx b/src/Example Code/fetchData.tsx
deleted file mode 100644
index 10671f4..0000000
--- a/src/Example Code/fetchData.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-export default async function Page() {
- let data = await fetch('https://api.vercel.app/blog')
- let posts = await data.json()
- return (
-
- {posts.map((post) => (
- {post.title}
- ))}
-
- )
- }
\ No newline at end of file
diff --git a/src/app/MyAccount/page.tsx b/src/app/MyAccount/page.tsx
index 5e13748..e0a7470 100644
--- a/src/app/MyAccount/page.tsx
+++ b/src/app/MyAccount/page.tsx
@@ -1,4 +1,4 @@
-import { Account } from "@db/schema/Account";
+import { User } from "@db/schema/User";
import { getData } from "@actions/accountActions";
export default async function MyAccountsPage() {
diff --git a/src/Example Code/GunBuilder/GB_Info/Copyright/index.tsx b/src/components/Copyright/index.tsx
similarity index 85%
rename from src/Example Code/GunBuilder/GB_Info/Copyright/index.tsx
rename to src/components/Copyright/index.tsx
index 2a143e7..36191e5 100644
--- a/src/Example Code/GunBuilder/GB_Info/Copyright/index.tsx
+++ b/src/components/Copyright/index.tsx
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import { COMPANY_NAME, COMPANY_URL } from '@/src/lib/constants';
+import constants from '@lib/constants';
import Typography from '@mui/material/Typography';
import MuiLink from '@mui/material/Link';
import styles from './styles.module.css'
@@ -12,8 +12,8 @@ export default class Copyright extends Component {
return (
(
© {new Date().getFullYear()} {' '}
- All Rights Reserved.
diff --git a/src/Example Code/GunBuilder/GB_Info/Copyright/package.json b/src/components/Copyright/package.json
similarity index 100%
rename from src/Example Code/GunBuilder/GB_Info/Copyright/package.json
rename to src/components/Copyright/package.json
diff --git a/src/Example Code/GunBuilder/GB_Info/Copyright/styles.module.css b/src/components/Copyright/styles.module.css
similarity index 100%
rename from src/Example Code/GunBuilder/GB_Info/Copyright/styles.module.css
rename to src/components/Copyright/styles.module.css
diff --git a/src/Example Code/GunBuilder/GB_Info/Disclosure/index.tsx b/src/components/Disclosure/index.tsx
similarity index 72%
rename from src/Example Code/GunBuilder/GB_Info/Disclosure/index.tsx
rename to src/components/Disclosure/index.tsx
index 78e2aa8..de764be 100644
--- a/src/Example Code/GunBuilder/GB_Info/Disclosure/index.tsx
+++ b/src/components/Disclosure/index.tsx
@@ -2,25 +2,12 @@ import React, { Component } from 'react'
import TypoGraphy from '@mui/material/Typography';
import PropTypes from 'prop-types' //ES6
import styles from './styles.module.css';
-import constants from '@/src/lib/constants'
-import {SITE_CONT_TYPE} from '@/src/lib/constants'
-import { useQuery, useMutation, gql } from "@apollo/client";
+import constants from '@lib/constants'
+import {SITE_CONT_TYPE} from '@lib/constants'
export default function Disclosure(props) {
- const GET_SITE_CONTENT = gql`
- query Get_Site_Content {
- site_contents(where: {content_id: {_eq: ${SITE_CONT_TYPE.DISCLOSURE}}}, order_by: {content: asc}) {
- id
- content_id
- content
- }
- }
- `;
-
- const { loading, error, data } = useQuery(GET_SITE_CONTENT);
- if (loading) return "Loading ...";
- if (error) return `Error! ${error.message}`;
+
return (
@@ -31,9 +18,7 @@ export default function Disclosure(props) {
{constants.SITE_NAME} does not accept donations. Instead, income received from affiliate relationships funds site maintenance and feature development. If you desire to donate to PCPartPicker, I kindly ask that you consider donating to a charitable organization instead. I am particularly fond of the NRA, a non-profit organization that provides safety training to gun owners.
- {data.site_contents.map((site_content: { content: any; }) => (
-
Thanks,
diff --git a/src/Example Code/GunBuilder/GB_Info/Disclosure/package.json b/src/components/Disclosure/package.json
similarity index 100%
rename from src/Example Code/GunBuilder/GB_Info/Disclosure/package.json
rename to src/components/Disclosure/package.json
diff --git a/src/Example Code/GunBuilder/GB_Hero/styles.module.css b/src/components/Disclosure/styles.module.css
similarity index 100%
rename from src/Example Code/GunBuilder/GB_Hero/styles.module.css
rename to src/components/Disclosure/styles.module.css
diff --git a/src/db/schema/Account.ts b/src/db/schema/Account.ts
deleted file mode 100644
index 8d4058e..0000000
--- a/src/db/schema/Account.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { pgTable, integer, varchar, uuid } from "drizzle-orm/pg-core";
-import { sql } from "drizzle-orm";
-import { timestamps } from "./helpers/columns.helpers";
-
-export const Account = pgTable("bal_accounts", {
- id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "accounts_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }),
- uuid: uuid().defaultRandom().unique(),
- first_name: varchar({ length: 40 }),
- last_name: varchar({ length: 40 }),
- email: varchar({length: 100}),
- username: varchar({length:50}).notNull().unique(),
- password_hash: varchar({length:255}).notNull().unique(),
-
- ...timestamps
-})
\ No newline at end of file
diff --git a/src/db/schema/User.ts b/src/db/schema/User.ts
index 68093eb..825eafb 100644
--- a/src/db/schema/User.ts
+++ b/src/db/schema/User.ts
@@ -1,8 +1,7 @@
-import { pgTable, integer, varchar, text, decimal, uuid, real, bigserial, date, timestamp, boolean, unique, check } from "drizzle-orm/pg-core";
import { sql } from "drizzle-orm";
-import { timestamps } from "./helpers/columns.helpers";
+import { bigserial, boolean, check, date, pgTable, text, timestamp, unique, uuid, varchar } from "drizzle-orm/pg-core";
-export const users = pgTable("users", {
+export const User = pgTable("users", {
id: bigserial({ mode: "bigint" }).primaryKey().notNull(),
username: varchar({ length: 50 }).notNull(),
email: varchar({ length: 255 }).notNull(),
@@ -18,6 +17,7 @@ export const users = pgTable("users", {
lastLogin: timestamp("last_login", { mode: 'string' }),
emailVerified: boolean("email_verified").default(false),
buildPrivacySetting: text("build_privacy_setting").default('public'),
+ uuid: uuid().defaultRandom(),
}, (table) => {
return {
usersUsernameKey: unique("users_username_key").on(table.username),
diff --git a/src/drizzle/schema.ts b/src/drizzle/schema.ts
index fc41d1a..70a39e9 100644
--- a/src/drizzle/schema.ts
+++ b/src/drizzle/schema.ts
@@ -1,4 +1,4 @@
-import { pgTable, integer, varchar, text, numeric, timestamp, uuid, unique, check, bigserial, date, boolean, foreignKey, bigint, index, real, doublePrecision, pgView } from "drizzle-orm/pg-core"
+import { pgTable, integer, varchar, text, numeric, timestamp, uuid, unique, foreignKey, bigserial, bigint, boolean, index, real, check, date, doublePrecision, pgView } from "drizzle-orm/pg-core"
import { sql } from "drizzle-orm"
@@ -41,30 +41,6 @@ export const productFeeds = pgTable("product_feeds", {
}
});
-export const users = pgTable("users", {
- id: bigserial({ mode: "bigint" }).primaryKey().notNull(),
- username: varchar({ length: 50 }).notNull(),
- email: varchar({ length: 255 }).notNull(),
- passwordHash: varchar("password_hash", { length: 255 }).notNull(),
- firstName: varchar("first_name", { length: 50 }),
- lastName: varchar("last_name", { length: 50 }),
- profilePicture: varchar("profile_picture", { length: 255 }),
- dateOfBirth: date("date_of_birth"),
- phoneNumber: varchar("phone_number", { length: 20 }),
- createdAt: timestamp("created_at", { mode: 'string' }).default(sql`CURRENT_TIMESTAMP`),
- updatedAt: timestamp("updated_at", { mode: 'string' }).default(sql`CURRENT_TIMESTAMP`),
- isAdmin: boolean("is_admin").default(false),
- lastLogin: timestamp("last_login", { mode: 'string' }),
- emailVerified: boolean("email_verified").default(false),
- buildPrivacySetting: text("build_privacy_setting").default('public'),
-}, (table) => {
- return {
- usersUsernameKey: unique("users_username_key").on(table.username),
- usersEmailKey: unique("users_email_key").on(table.email),
- usersBuildPrivacySettingCheck: check("users_build_privacy_setting_check", sql`build_privacy_setting = ANY (ARRAY['private'::text, 'public'::text])`),
- }
-});
-
export const userBuilds = pgTable("user_builds", {
id: bigserial({ mode: "bigint" }).primaryKey().notNull(),
// You can use { mode: "bigint" } if numbers are exceeding js number limitations
@@ -309,6 +285,31 @@ export const psa = pgTable("psa", {
uuid: uuid().defaultRandom(),
});
+export const users = pgTable("users", {
+ id: bigserial({ mode: "bigint" }).primaryKey().notNull(),
+ username: varchar({ length: 50 }).notNull(),
+ email: varchar({ length: 255 }).notNull(),
+ passwordHash: varchar("password_hash", { length: 255 }).notNull(),
+ firstName: varchar("first_name", { length: 50 }),
+ lastName: varchar("last_name", { length: 50 }),
+ profilePicture: varchar("profile_picture", { length: 255 }),
+ dateOfBirth: date("date_of_birth"),
+ phoneNumber: varchar("phone_number", { length: 20 }),
+ createdAt: timestamp("created_at", { mode: 'string' }).default(sql`CURRENT_TIMESTAMP`),
+ updatedAt: timestamp("updated_at", { mode: 'string' }).default(sql`CURRENT_TIMESTAMP`),
+ isAdmin: boolean("is_admin").default(false),
+ lastLogin: timestamp("last_login", { mode: 'string' }),
+ emailVerified: boolean("email_verified").default(false),
+ buildPrivacySetting: text("build_privacy_setting").default('public'),
+ uuid: uuid().defaultRandom(),
+}, (table) => {
+ return {
+ usersUsernameKey: unique("users_username_key").on(table.username),
+ usersEmailKey: unique("users_email_key").on(table.email),
+ usersBuildPrivacySettingCheck: check("users_build_privacy_setting_check", sql`build_privacy_setting = ANY (ARRAY['private'::text, 'public'::text])`),
+ }
+});
+
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(),
diff --git a/src/types/accountType.ts b/src/types/accountType.ts
deleted file mode 100644
index c0d7c7d..0000000
--- a/src/types/accountType.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export type brandType = {
- id: number;
- first_name: string;
- last_name: string;
- username : string;
- email: string;
- password_hash: string;
- updated_at: Date;
- created_at: Date;
- deleted_at: Date;
-
- };
\ No newline at end of file