merge

package.json

@@ -23,6 +23,7 @@
     "mongoose": "^7.4.5",
     "next": "13.4.19",
     "next-auth": "^4.24.7",
+    "nodemailer": "^6.9.15",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-google-button": "^0.7.2",
@@ -34,6 +35,7 @@
     "@testing-library/react": "^14.0.0",
     "@types/jest": "^29.5.4",
     "@types/node": "20.5.6",
+    "@types/nodemailer": "^6.4.16",
     "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",
     "@typescript-eslint/eslint-plugin": "^6.4.1",

src/app/api/donors/[donorId]/route.ts

@@ -1,4 +1,4 @@
-import { DonorResponse } from '@/types/persons';
+import { DonorResponse } from '@/types/donors';
 import { NextResponse, NextRequest } from 'next/server';
 import { getDonorById, updateDonor } from '../../../../server/actions/donors';
 
@@ -19,7 +19,7 @@ export async function GET(
     return NextResponse.json(result, { status: 200 });
   } catch (error) {
     // if the donor is not found, return a 500 error
-    return NextResponse.json({ error: 'Donor not found' }, { status: 500 });
+    return NextResponse.json({ error: 'Donor not found' }, { status: 404 });
   }
 }
 
@@ -52,7 +52,7 @@ export async function PUT(
     return NextResponse.json(updatedDonor, { status: 200 });
   } catch (error) {
     // Handle any errors during parsing or updating
-    const message = error instanceof Error ? error.message : 'Unknowm errpr';
+    const message = error instanceof Error ? error.message : 'Unknown error';
     return NextResponse.json(
       { error: 'Failed to update donor information', details: message },
       { status: 500 }

src/app/api/donors/route.ts

@@ -1,20 +1,17 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { getAllDonors, createDonors } from '@/server/actions/donors';
-import { DonorResponse, zCreateDonorRequest } from '@/types/persons';
+import { DonorResponse, zCreateDonorRequest } from '@/types/donors';
 
-export async function GET(request: NextRequest) {
-  if (request.method == 'GET') {
-    try {
-      const response: DonorResponse[] = await getAllDonors(); // Call getDonors function
-      return NextResponse.json(response, { status: 200 }); // Return result with status 200 on success
-    } catch (error) {
-      console.error(error); // Log the error for debugging
-      return NextResponse.json('Unknown error', { status: 500 }); // Return status 500 for unknown errors
-    }
+export async function GET() {
+  try {
+    const response: DonorResponse[] = await getAllDonors(); // Call getDonors function
+    return NextResponse.json(response, { status: 200 }); // Return result with status 200 on success
+  } catch (error) {
+    console.error(error); // Log the error for debugging
+    return NextResponse.json('Unknown error', { status: 500 }); // Return status 500 for unknown errors
   }
 }
 
-
 export async function POST(request: NextRequest) {
   try {
     const requestBody = await request.json();
@@ -36,6 +33,5 @@ export async function POST(request: NextRequest) {
     // create a response for any unknown errors
     console.log(error);
     return NextResponse.json({ message: 'Unknown Error' }, { status: 500 });
-
   }
 }

src/app/api/items/route.ts

@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { createItem, getAllItems } from '@/server/actions/items';
 import { zCreateItemRequest } from '@/types/items';
-// import { CreateItem } from '@/server/actions/items';
 
 export async function POST(request: NextRequest) {
   try {

src/app/donors/[donorId]/page.tsx

@@ -1,5 +1,5 @@
 import { getDonorById } from '@/server/actions/donors';
-import { DonorResponse } from '@/types/persons';
+import { DonorResponse } from '@/types/donors';
 import DonorIdView from '@/views/donorIdView';
 
 export default async function DonorEditPage({

src/app/donors/page.tsx

@@ -1,7 +1,7 @@
 import { getAllDonations } from '@/server/actions/donations';
 import { getAllDonors } from '@/server/actions/donors';
 import { DonationResponse } from '@/types/donation';
-import { DonorResponse } from '@/types/persons';
+import { DonorResponse } from '@/types/donors';
 import DonorView from '@/views/donorView';
 
 export default async function DonorPage() {

src/components/donation-form/AutofillDonorEmail.tsx

@@ -1,5 +1,5 @@
 import { DonorFormData } from '@/types/forms/donor';
-import { DonorResponse } from '@/types/persons';
+import { DonorResponse } from '@/types/donors';
 import { Autocomplete, TextField } from '@mui/material';
 import { useState } from 'react';
 

src/components/donationItemForm/index.tsx

@@ -79,7 +79,7 @@ export default function DonationItemForm({
 
   return (
     <>
-      <Grid item xs={7}>
+      <Grid item xs={12} sm={8}>
         <AutofillItem
           ItemOptions={itemOptions}
           onItemSelect={handleItemSelect}
@@ -90,18 +90,7 @@ export default function DonationItemForm({
           // helperText={validationErrors?.donatedItemName}
         />
       </Grid>
-      <Grid item xs={4}>
-        <AutofillCategory
-          ItemOptions={itemOptions}
-          onCategorySelect={handleCategorySelect}
-          name={donationItemData.name}
-          value={donationItemData.category}
-          disabled={disabled}
-          // error={!!validationErrors?.category}
-          // helperText={validationErrors?.category}
-        />
-      </Grid>
-      <Grid item xs={3} sm={4}>
+      <Grid item xs={12} sm={4}>
         <TextField
           fullWidth
           id="outlined-required"
@@ -119,7 +108,7 @@ export default function DonationItemForm({
           // helperText={validationErrors?.quantity}
         />
       </Grid>
-      <Grid item xs={9} sm={8}>
+      <Grid item xs={12} sm={8}>
         <TextField
           fullWidth
           id="outlined-required"
@@ -137,15 +126,26 @@ export default function DonationItemForm({
           // helperText={validationErrors?.quantity}
         />
       </Grid>
+      <Grid item xs={12} sm={4}>
+        <AutofillCategory
+          ItemOptions={itemOptions}
+          onCategorySelect={handleCategorySelect}
+          name={donationItemData.name}
+          value={donationItemData.category}
+          disabled={disabled}
+          // error={!!validationErrors?.category}
+          // helperText={validationErrors?.category}
+        />
+      </Grid>
       <Grid item xs={12} sm={4}>
         <FormControl fullWidth disabled={disabled}>
-          <InputLabel>New or Used</InputLabel>
+          <InputLabel>New or Used?</InputLabel>
           <Select
             value={donationItemData.newOrUsed ?? ''}
             onChange={(e) => {
               onChange({ ...donationItemData, newOrUsed: e.target.value });
             }}
-            label="New or Used"
+            label="New or Used?"
             id="new-or-used"
             // error={!!validationErrors?.newOrUsed}
           >
@@ -161,7 +161,7 @@ export default function DonationItemForm({
           disabled={donationItemData.newOrUsed !== 'Used' || disabled} // Disable if new
         >
           <InputLabel id="high-or-low-value-label">
-            High or Low Value
+            High or Low Value?
           </InputLabel>
           <Select
             labelId="high-or-low-value-label"
@@ -172,7 +172,7 @@ export default function DonationItemForm({
                 highOrLow: e.target.value,
               });
             }}
-            label="High or Low Value"
+            label="High or Low Value?"
             id="high-or-low-value"
             // error={!!validationErrors?.highOrLow}
           >
@@ -185,7 +185,7 @@ export default function DonationItemForm({
                setHighOrLow(e.target.value);
             }}*/}
       </Grid>
-      <Grid item xs={12} sm={4}>
+      <Grid item xs={12} sm={3} md={3.5}>
         <TextField
           id="price"
           label="Price"
@@ -207,6 +207,7 @@ export default function DonationItemForm({
             startAdornment: <InputAdornment position="start">$</InputAdornment>,
           }}
           disabled={donationItemData.newOrUsed !== 'New' || disabled} // Disable if used
+          fullWidth
           // error={!!validationErrors?.price}
           // helperText={validationErrors?.price}
         />

src/components/donorForm/index.tsx

@@ -51,7 +51,7 @@ export default function DonorForm(props: donorProps) {
           }}
         />
       </Grid>
-      <Grid item xs={12} sm={5}>
+      <Grid item xs={12} sm={4}>
         <TextField
           fullWidth
           id="outlined-required"
@@ -75,7 +75,7 @@ export default function DonorForm(props: donorProps) {
           }}
         />
       </Grid>
-      <Grid item xs={12} sm={3}>
+      <Grid item xs={12} sm={4}>
         <TextField
           fullWidth
           id="outlined-required"
@@ -87,7 +87,7 @@ export default function DonorForm(props: donorProps) {
           onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
             props.onChange({
               ...props.donorData,
-              zip: Number(e.target.value),
+              zip: e.target.value,
             });
           }}
         />