Server Refactor

README.md

@@ -109,6 +109,28 @@ server/                   # Backend code
 ├── __tests__/                     # Backend tests
 │   ├── database.test.js
 │   └── server.test.js
+├── database/              # Database layer
+│   ├── __tests__/                 # Database tests
+│   │   └── index.test.ts
+│   ├── survey/                    # Survey domain module
+│   │   ├── mongoose/              # Mongoose models and hooks
+│   │   │   ├── __tests__/
+│   │   │   ├── survey.hooks.ts
+│   │   │   └── survey.model.ts
+│   │   ├── zod/                   # Zod validation schemas
+│   │   │   ├── __tests__/
+│   │   │   ├── survey.base.ts
+│   │   │   └── survey.validator.ts
+│   │   ├── survey.controller.ts   # Route operations
+│   │   └── survey.utils.ts        # Utility functions
+│   ├── user/                      # User domain module (same structure as survey)
+│   │   └── ...
+│   ├── seed/                      # Seed domain module (same structure as survey)
+│   │   └── ...
+│   ├── utils/                     # Database utilities
+│   │   ├── constants.ts
+│   │   └── errors.ts
+│   └── index.ts                   # Database module exports
 ├── models/               # Mongoose schemas
 │   └── __tests__/                 # Models tests
 │       ├── Survey.test.js
@@ -127,8 +149,7 @@ server/                   # Backend code
 │   ├── __tests__/                 # Utils tests
 │   │   └── generateReferralCode.test.js
 │   └── generateReferralCode.js           # Utility to generate unique referral codes
-├── database.js                           # Mongoose DB connection init
-├── index.js                              # Main entry point for Express backend
+├── index.ts                              # Main entry point for Express backend
 ├── .gitignore                            # Specifies files to ignore in Git
 ├── package.json                          # Backend dependencies and scripts
 └── package-lock.json                     # Lockfile for backend dependencies

client/src/pages/Signup/Signup.tsx

@@ -12,12 +12,32 @@ export default function Signup() {
 		lastName: '',
 		email: '',
 		phone: '',
-		role: ''
+		role: '',
+		locationObjectId: ''
 	});
 	const [otp, setOtp] = useState('');
 	const [otpSent, setOtpSent] = useState(false);
 	const [errorMessage, setErrorMessage] = useState('');
 	const [countdown, setCountdown] = useState(0);
+	const [locations, setLocations] = useState<
+		Array<{ _id: string; hubName: string }>
+	>([]);
+
+	useEffect(() => {
+		const fetchLocations = async () => {
+			try {
+				const response = await fetch('/api/v2/locations');
+				if (response.ok) {
+					const data = await response.json();
+					console.log('Fetched locations:', data);
+					setLocations(data.data);
+				}
+			} catch (error) {
+				console.error('Failed to fetch locations:', error);
+			}
+		};
+		fetchLocations();
+	}, []);
 
 	useEffect(() => {
 		let timer: string | number | NodeJS.Timeout | undefined;
@@ -124,16 +144,29 @@ export default function Signup() {
 							onChange={handlePhoneChange}
 							required
 						/>
+						<select
+							name="locationObjectId"
+							value={userData.locationObjectId}
+							onChange={handleChange}
+							required
+						>
+							<option value="">--Select Location--</option>
+							{locations.map(location => (
+								<option key={location._id} value={location._id}>
+									{location.hubName}
+								</option>
+							))}
+						</select>
 						<select
 							name="role"
 							value={userData.role}
 							onChange={handleChange}
 							required
 						>
 							<option value="">--Select Role--</option>
-							<option value="Volunteer">Volunteer</option>
-							<option value="Manager">Manager</option>
-							<option value="Admin">Admin</option>
+							<option value="VOLUNTEER">VOLUNTEER</option>
+							<option value="MANAGER">MANAGER</option>
+							<option value="ADMIN">ADMIN</option>
 						</select>
 						<button onClick={sendOtp}>Send OTP</button>
 						<p className="switch-auth">

server/.env.example

@@ -1,4 +1,5 @@
-MONGODB_URI=
+NODE_ENV=development
+MONGO_URI=
 TWILIO_ACCOUNT_SID=""  
 TWILIO_AUTH_TOKEN=""
 # TWILIO_VERIFY_SID