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

package-lock.json

@@ -25,7 +25,7 @@
         "clsx": "^2.1.1",
         "dotenv": "^16.4.7",
         "fontsource-roboto": "^4.0.0",
-        "framer-motion": "^11.11.17",
+        "framer-motion": "^11.18.0",
         "lucide-react": "^0.460.0",
         "next": "15.1.0",
         "next-themes": "^0.4.3",
@@ -55,8 +55,8 @@
         "eslint-config-next": "15.0.3",
         "fs": "^0.0.1-security",
         "next-auth": "^5.0.0-beta.25",
-        "postcss": "^8",
+        "postcss": "^8.5.1",
-        "tailwindcss": "^3.4.15",
+        "tailwindcss": "^3.4.17",
         "tsx": "^4.19.2",
         "typescript": "^5.6.3"
       }
@@ -3596,6 +3596,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.23.3",
         "caniuse-lite": "^1.0.30001646",
@@ -5668,16 +5669,19 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "11.11.17",
+      "version": "11.18.0",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.11.17.tgz",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.0.tgz",
-      "integrity": "sha512-O8QzvoKiuzI5HSAHbcYuL6xU+ZLXbrH7C8Akaato4JzQbX2ULNeniqC2Vo5eiCtFktX9XsJ+7nUhxcl2E2IjpA==",
+      "integrity": "sha512-Vmjl5Al7XqKHzDFnVqzi1H9hzn5w4eN/bdqXTymVpU2UuMQuz9w6UPdsL9dFBeH7loBlnu4qcEXME+nvbkcIOw==",
+      "license": "MIT",
       "dependencies": {
+        "motion-dom": "^11.16.4",
+        "motion-utils": "^11.16.0",
         "tslib": "^2.4.0"
       },
       "peerDependencies": {
         "@emotion/is-prop-valid": "*",
-        "react": "^18.0.0",
+        "react": "^18.0.0 || ^19.0.0",
-        "react-dom": "^18.0.0"
+        "react-dom": "^18.0.0 || ^19.0.0"
       },
       "peerDependenciesMeta": {
         "@emotion/is-prop-valid": {
@@ -6688,11 +6692,15 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.1.0",
+      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
@@ -6795,6 +6803,21 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/motion-dom": {
+      "version": "11.16.4",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.16.4.tgz",
+      "integrity": "sha512-2wuCie206pCiP2K23uvwJeci4pMFfyQKpWI0Vy6HrCTDzDCer4TsYtT7IVnuGbDeoIV37UuZiUr6SZMHEc1Vww==",
+      "license": "MIT",
+      "dependencies": {
+        "motion-utils": "^11.16.0"
+      }
+    },
+    "node_modules/motion-utils": {
+      "version": "11.16.0",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.16.0.tgz",
+      "integrity": "sha512-ngdWPjg31rD4WGXFi0eZ00DQQqKKu04QExyv/ymlC+3k+WIgYVFbt6gS5JsFPbJODTF/r8XiE/X+SsoT9c0ocw==",
+      "license": "MIT"
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -6811,15 +6834,16 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
+      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -7394,9 +7418,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.49",
+      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -7411,8 +7435,9 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -7488,17 +7513,6 @@
         }
       }
     },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
-      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
-      }
-    },
     "node_modules/postcss-nested": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -8455,9 +8469,10 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.15",
+      "version": "3.4.17",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
-      "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==",
+      "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -8468,7 +8483,7 @@
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
         "jiti": "^1.21.6",
-        "lilconfig": "^2.1.0",
+        "lilconfig": "^3.1.3",
         "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",

package.json

@@ -26,7 +26,7 @@
     "clsx": "^2.1.1",
     "dotenv": "^16.4.7",
     "fontsource-roboto": "^4.0.0",
-    "framer-motion": "^11.11.17",
+    "framer-motion": "^11.18.0",
     "lucide-react": "^0.460.0",
     "next": "15.1.0",
     "next-themes": "^0.4.3",
@@ -56,8 +56,8 @@
     "eslint-config-next": "15.0.3",
     "fs": "^0.0.1-security",
     "next-auth": "^5.0.0-beta.25",
-    "postcss": "^8",
+    "postcss": "^8.5.1",
-    "tailwindcss": "^3.4.15",
+    "tailwindcss": "^3.4.17",
     "tsx": "^4.19.2",
     "typescript": "^5.6.3"
   }

src/app/Accounts/page.tsx

@@ -1,11 +1,19 @@
-import { Account } from "@db/schema/Account";
+import { accounts } from "@schemas/schema";
 import { getData } from "@actions/accountActions";
+import Account from "@components/Account"; // Adjust the import path as necessary
+import React from 'react';
+
+
+export interface AccountProps {
+  account: any; // Adjust the type according to your data structure
+}
+
 
 export default async function AccountsPage() {
   const data = await getData();
   return (
     <div className="bg-gray-100 min-h-screen flex flex-col">
- {/*   <Account account={data} /> */} 
+    <Account account={data} /> 
     </div>
   );
 }

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

@@ -1,4 +1,5 @@
 import { getMuzzleDevices } from "@queries/PSA";
+import PageHero from "@components/PageHero";
 import styles from '../styles.module.css';
 
 import SortTable from "@components/SortTable";

src/app/Products/stocks/page.tsx

@@ -1,9 +1,7 @@
 import { getStocks } from "@queries/PSA";
-import { psa } from '@schemas/schema';
 import partTypes from 'src/data/parts_cats.json';
 import styles from '../styles.module.css';
 import PageHero from "@components/PageHero";
-import ProductTable from "@components/ProductTable";
 import SortTable from "@components/SortTable";
 
 export default async function StocksPage() {

src/app/UserRegister/page.tsx

@@ -0,0 +1,4 @@
+import RegistrationForm from "@components/RegistrationForm";
+export default function RegisterPage() {
+  return <RegistrationForm />;
+}

src/app/api/auth/signin/route.tsx

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server';
-import { db } from '../../../../db';
+import { db } from '@db/index';
-import { users } from '../../../../drizzle/schema';
+import { users } from '@schemas/schema';
 import bcrypt from 'bcryptjs';
 import { eq } from 'drizzle-orm';
 

src/app/register/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 import React, { useState } from 'react';
 import { useRouter } from 'next/navigation';
-import PageHero from '../../components/PageHero';
+import PageHero from '@components/PageHero';
 import Link from 'next/link';
 
 export default function RegisterPage() {

src/components/Account/index.tsx

@@ -0,0 +1,14 @@
+import { AccountProps } from "@src/app/Accounts/page";
+import React from "react";
+
+
+export const Account: React.FC<AccountProps> = ({ account }) => {
+  return (
+    <div className="account-card">
+      <h2>{account.name}</h2>
+      <p>{account.email}</p>
+      {/* Add more fields as necessary */}
+    </div>
+  );
+};
+export default Account;

src/components/Brand/brand.tsx

@@ -1,6 +1,10 @@
 "use client";
 import { ChangeEvent, FC, useState } from "react";
-import { brandType } from "src/types/brandType";
+
+type brandType = {
+  id: number;
+  name: string;    
+};
 interface Props {
   brand: brandType;
   changeBrandName: (id: number, name: string) => void;

src/components/RegistrationForm/index.tsx

@@ -0,0 +1,122 @@
+'use client'
+
+import { useState } from 'react'
+import { useRouter } from 'next/navigation'
+
+export default function RegistrationForm() {
+  const router = useRouter()
+  const [error, setError] = useState('')
+  const [formData, setFormData] = useState({
+    name: '',
+    email: '',
+    password: '',
+    confirmPassword: ''
+  })
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+    setError('')
+
+    if (formData.password !== formData.confirmPassword) {
+      setError('Passwords do not match')
+      return
+    }
+
+    try {
+      // Add your registration API call here
+      console.log('Form submitted:', formData)
+      router.push('/login') // Redirect to login after successful registration
+    } catch (err) {
+      setError('Failed to register user')
+    }
+  }
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50 py-12 px-4 sm:px-6 lg:px-8">
+      <div className="max-w-md w-full space-y-8">
+        <div>
+          <h2 className="mt-6 text-center text-3xl font-extrabold text-gray-900">
+            Create your account
+          </h2>
+        </div>
+        <form className="mt-8 space-y-6" onSubmit={handleSubmit}>
+          <div className="rounded-md shadow-sm space-y-4">
+            <div>
+              <label htmlFor="name" className="sr-only">
+                Full Name
+              </label>
+              <input
+                id="name"
+                name="name"
+                type="text"
+                required
+                className="appearance-none rounded-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                placeholder="Full Name"
+                value={formData.name}
+                onChange={(e) => setFormData({...formData, name: e.target.value})}
+              />
+            </div>
+            <div>
+              <label htmlFor="email" className="sr-only">
+                Email address
+              </label>
+              <input
+                id="email"
+                name="email"
+                type="email"
+                required
+                className="appearance-none rounded-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                placeholder="Email address"
+                value={formData.email}
+                onChange={(e) => setFormData({...formData, email: e.target.value})}
+              />
+            </div>
+            <div>
+              <label htmlFor="password" className="sr-only">
+                Password
+              </label>
+              <input
+                id="password"
+                name="password"
+                type="password"
+                required
+                className="appearance-none rounded-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                placeholder="Password"
+                value={formData.password}
+                onChange={(e) => setFormData({...formData, password: e.target.value})}
+              />
+            </div>
+            <div>
+              <label htmlFor="confirmPassword" className="sr-only">
+                Confirm Password
+              </label>
+              <input
+                id="confirmPassword"
+                name="confirmPassword"
+                type="password"
+                required
+                className="appearance-none rounded-md relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
+                placeholder="Confirm Password"
+                value={formData.confirmPassword}
+                onChange={(e) => setFormData({...formData, confirmPassword: e.target.value})}
+              />
+            </div>
+          </div>
+
+          {error && (
+            <div className="text-red-500 text-sm text-center">{error}</div>
+          )}
+
+          <div>
+            <button
+              type="submit"
+              className="group relative w-full flex justify-center py-2 px-4 border border-transparent text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+            >
+              Register
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  )
+} 

src/components/UserRegistration/index.tsx

@@ -1,99 +0,0 @@
-// components/UserRegistration.js
-import { useState } from 'react';
-import { useToast } from '@chakra-ui/toast';
-import { FormControl, FormLabel, } from '@chakra-ui/form-control';
-import { Input, Button, Stack, Heading } from '@chakra-ui/react';
-import { drizzle } from 'drizzle-orm/node-postgres';
-import { users } from '@schemas/schema';
-
-
-export default function UserRegistration() {
-  const [formData, setFormData] = useState({
-    username: '',
-    email: '',
-    password: '',
-  });
-
-  const toast = useToast();
-
-  const handleChange = (e) => {
-    const { name, value } = e.target;
-    setFormData({ ...formData, [name]: value });
-  };
-
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-  
-    // Example of database interaction using drizzle-orm:
-    const db = drizzle(/* your database connection logic */);
-
-    try {
-      // Replace 'users' with your actual table name
-      await db.insert(users).values(formData);
-      toast({
-        title: 'Account created.',
-        description: "We've created your account successfully!",
-        status: 'success',
-        duration: 5000,
-        isClosable: true,
-      });
-
-      // Reset the form
-      setFormData({ username: '', email: '', password: '' });
-    } catch (error) {
-      toast({
-        title: 'An error occurred.',
-        description: error.message,
-        status: 'error',
-        duration: 5000,
-        isClosable: true,
-      });
-    }
-  };
-
-  return (
-    <Stack spacing={4} w="400px" mx="auto" mt={10}>
-      <Heading as="h2" size="lg">User Registration</Heading>
-      <form onSubmit={handleSubmit}>
-        <FormControl isRequired>
-          <FormLabel>Username</FormLabel>
-          <Input 
-            name="username" 
-            value={formData.username} 
-            onChange={handleChange} 
-            placeholder="Enter your username" 
-          />
-        </FormControl>
-        
-        <FormControl isRequired>
-          <FormLabel>Email</FormLabel>
-          <Input 
-            type="email" 
-            name="email" 
-            value={formData.email} 
-            onChange={handleChange} 
-            placeholder="Enter your email" 
-          />
-        </FormControl>
-        
-        <FormControl isRequired>
-          <FormLabel>Password</FormLabel>
-          <Input 
-            type="password" 
-            name="password" 
-            value={formData.password} 
-            onChange={handleChange} 
-            placeholder="Enter your password" 
-          />
-        </FormControl>
-        
-        <Button 
-          mt={4} 
-          colorScheme="teal" 
-          type="submit">
-          Create Account
-        </Button>
-      </form>
-    </Stack>
-  );
-}

src/drizzle/schema/schema.ts

@@ -23,6 +23,7 @@ export const users = pgTable("users", {
 	name: text("name"),
 	email: text("email").unique(),
 	emailVerified: timestamp("emailVerified", { mode: "date" }),
+	passwordHash: varchar("password_hash", { length: 255 }).notNull(),
 	image: text("image"),
   })
 
@@ -30,6 +31,7 @@ export const userskeep = pgTable("users-keep", {
 	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 }),
@@ -50,6 +52,33 @@ export const userskeep = pgTable("users-keep", {
 		usersBuildPrivacySettingCheck: check("users_build_privacy_setting_check", sql`build_privacy_setting = ANY (ARRAY['private'::text, 'public'::text])`),
 	}
 });
+export const usersMerged = pgTable("users-merged", {
+	id: text("id")
+	.primaryKey()
+	.$defaultFn(() => crypto.randomUUID()),
+	username: varchar({ length: 50 }).notNull(),
+	email: varchar({ length: 255 }).notNull(),
+	emailVerifiedOn: timestamp("emailVerified", { mode: "date" }),
+	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-merged_username_key").on(table.username),
+		usersEmailKey: unique("users-merged_email_key").on(table.email),
+		usersBuildPrivacySettingCheck: check("users-merged_build_privacy_setting_check", sql`build_privacy_setting = ANY (ARRAY['private'::text, 'public'::text])`),
+	}
+});
 
 export const categories = pgTable("categories", {
 	id: integer().primaryKey().generatedAlwaysAsIdentity({ name: "categories_id_seq", startWith: 1, increment: 1, minValue: 1, maxValue: 2147483647, cache: 1 }),

src/lib/types/brandType.ts

@@ -1,4 +1,6 @@
 export type brandType = {
     id: number;
     name: string;    
-  };
+  };
+
+  export default brandType;

tsconfig.json

@@ -39,7 +39,7 @@
         "./src/db/*"
       ],
       "@types/*": [
-        "./src/types/*"
+        "./src/lib/types/*"
       ],
       "@components/*": [
         "./src/components/*",