Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-- RedefineTables
PRAGMA defer_foreign_keys=ON;
PRAGMA foreign_keys=OFF;
CREATE TABLE "new_users" (
"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
"email" TEXT NOT NULL,
"first_name" TEXT NOT NULL DEFAULT '',
"last_name" TEXT NOT NULL DEFAULT '',
"pass_hash" TEXT NOT NULL,
"created_at" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP
);
INSERT INTO "new_users" ("created_at", "email", "id", "pass_hash") SELECT "created_at", "email", "id", "pass_hash" FROM "users";
DROP TABLE "users";
ALTER TABLE "new_users" RENAME TO "users";
CREATE UNIQUE INDEX "users_email_key" ON "users"("email");
PRAGMA foreign_keys=ON;
PRAGMA defer_foreign_keys=OFF;
2 changes: 2 additions & 0 deletions backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ datasource db {
model User {
id Int @id @default(autoincrement())
email String @unique
firstName String @default("") @map("first_name")
lastName String @default("") @map("last_name")
passHash String @map("pass_hash")
createdAt DateTime @default(now()) @map("created_at")

Expand Down
8 changes: 7 additions & 1 deletion backend/src/routes/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const router = Router();
*/
router.post("/signup", validateRequest(signupSchema), async (req, res) => {
try {
const { email, password } = req.validatedData;
const { email, firstName, lastName, password } = req.validatedData;

// Check if user already exists
const existingUser = await prisma.user.findUnique({
Expand All @@ -43,11 +43,15 @@ router.post("/signup", validateRequest(signupSchema), async (req, res) => {
const user = await prisma.user.create({
data: {
email,
firstName,
lastName,
passHash,
},
select: {
id: true,
email: true,
firstName: true,
lastName: true,
createdAt: true,
},
});
Expand Down Expand Up @@ -120,6 +124,8 @@ router.post("/login", validateRequest(loginSchema), async (req, res) => {
user: {
id: user.id,
email: user.email,
firstName: user.firstName,
lastName: user.lastName,
createdAt: user.createdAt,
},
tokens: {
Expand Down
36 changes: 24 additions & 12 deletions backend/src/utils/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ import { z } from "zod";
// Auth validation schemas
export const signupSchema = z.object({
email: z.string().email("Invalid email format"),
firstName: z
.string()
.min(1, "First name is required")
.max(50, "First name must be less than 50 characters"),
lastName: z
.string()
.min(1, "Last name is required")
.max(50, "Last name must be less than 50 characters"),
password: z
.string()
.min(8, "Password must be at least 8 characters")
Expand All @@ -29,22 +37,26 @@ export const eb1aAssessmentSchema = z.object({
z.string(),
z.array(z.string()),
z.object({
user: z.object({
educationLevel: z.string().optional()
}).optional(),
startupAchievements: z.object({
funding: z.string().optional(),
traction: z.string().optional(),
awards: z.array(z.string()).optional(),
patents: z.array(z.string()).optional()
}).optional(),
user: z
.object({
educationLevel: z.string().optional(),
})
.optional(),
startupAchievements: z
.object({
funding: z.string().optional(),
traction: z.string().optional(),
awards: z.array(z.string()).optional(),
patents: z.array(z.string()).optional(),
})
.optional(),
media: z.array(z.string()).optional(),
speakingExperience: z.array(z.string()).optional(),
publications: z.array(z.string()).optional(),
references: z.array(z.string()).optional(),
usContacts: z.array(z.string()).optional()
})
])
usContacts: z.array(z.string()).optional(),
}),
]),
});

/**
Expand Down
49 changes: 48 additions & 1 deletion frontend/src/components/auth/SignupForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ interface SignupFormProps {

const SignupForm: React.FC<SignupFormProps> = ({ onSwitchToLogin }) => {
const [formData, setFormData] = useState({
firstName: "",
lastName: "",
email: "",
password: "",
confirmPassword: "",
Expand Down Expand Up @@ -34,7 +36,12 @@ const SignupForm: React.FC<SignupFormProps> = ({ onSwitchToLogin }) => {
return;
}

const result = await signup(formData.email, formData.password);
const result = await signup(
formData.email,
formData.firstName,
formData.lastName,
formData.password
);

if (result.success) {
console.log("Signup successful:", result.user);
Expand All @@ -43,6 +50,8 @@ const SignupForm: React.FC<SignupFormProps> = ({ onSwitchToLogin }) => {

const isFormValid = () => {
return (
formData.firstName.trim() &&
formData.lastName.trim() &&
formData.email &&
formData.password &&
formData.confirmPassword &&
Expand All @@ -67,6 +76,44 @@ const SignupForm: React.FC<SignupFormProps> = ({ onSwitchToLogin }) => {
)}

<form onSubmit={handleSubmit} className="space-y-6">
<div>
<label
htmlFor="firstName"
className="block text-sm font-medium text-gray-700 mb-2"
>
First Name
</label>
<input
type="text"
id="firstName"
name="firstName"
value={formData.firstName}
onChange={handleChange}
required
className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
placeholder="Enter your first name"
/>
</div>

<div>
<label
htmlFor="lastName"
className="block text-sm font-medium text-gray-700 mb-2"
>
Last Name
</label>
<input
type="text"
id="lastName"
name="lastName"
value={formData.lastName}
onChange={handleChange}
required
className="w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
placeholder="Enter your last name"
/>
</div>

<div>
<label
htmlFor="email"
Expand Down
Loading