+ );
+ }
From 4efbd63e26d16c86636e645d3231289791857ff3 Mon Sep 17 00:00:00 2001
From: hunardeep720 <123598156+hunardeep720@users.noreply.github.com>
Date: Mon, 27 May 2024 20:14:24 -0600
Subject: [PATCH 02/44] database
---
.expo/README.md | 15 ++++
.expo/settings.json | 8 +++
app/student/information/page.js | 40 ++++++++---
app/student/login.js | 101 ++++++++++++++-------------
app/student/register/page.js | 118 ++++++++++++++++++++++++++++++++
package-lock.json | 94 ++++++++++++-------------
package.json | 2 +-
services/addInformation.js | 33 +++++++++
8 files changed, 301 insertions(+), 110 deletions(-)
create mode 100644 .expo/README.md
create mode 100644 .expo/settings.json
create mode 100644 services/addInformation.js
diff --git a/.expo/README.md b/.expo/README.md
new file mode 100644
index 0000000..fd146b4
--- /dev/null
+++ b/.expo/README.md
@@ -0,0 +1,15 @@
+> Why do I have a folder named ".expo" in my project?
+
+The ".expo" folder is created when an Expo project is started using "expo start" command.
+
+> What do the files contain?
+
+- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
+- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator.
+- "settings.json": contains the server configuration that is used to serve the application manifest.
+
+> Should I commit the ".expo" folder?
+
+No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.
+
+Upon project creation, the ".expo" folder is already added to your ".gitignore" file.
diff --git a/.expo/settings.json b/.expo/settings.json
new file mode 100644
index 0000000..92bc513
--- /dev/null
+++ b/.expo/settings.json
@@ -0,0 +1,8 @@
+{
+ "hostType": "lan",
+ "lanType": "ip",
+ "dev": true,
+ "minify": false,
+ "urlRandomness": null,
+ "https": false
+}
diff --git a/app/student/information/page.js b/app/student/information/page.js
index fe0c903..c131369 100644
--- a/app/student/information/page.js
+++ b/app/student/information/page.js
@@ -1,8 +1,12 @@
'use client';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
import { useRouter } from 'next/navigation';
+import { auth } from '@/app/firebase/config';
+import { onAuthStateChanged } from 'firebase/auth';
+import { addUserInformation, addOtherUserInformation } from '@/services/addInformation';
const PersonalInfo = () => {
+ const [user, setUser] = useState(null);
const [fname, setfName] = useState('');
const [lname, setlName] = useState('');
const [address, setAddress] = useState('');
@@ -13,7 +17,22 @@ const PersonalInfo = () => {
const [error, setError] = useState('');
const router = useRouter();
+ useEffect(() => {
+ const unsubscribe = onAuthStateChanged(auth, (currentUser) => {
+ if (currentUser) {
+ setUser(currentUser);
+ console.log("User ID:", currentUser.uid); // Log the user ID
+ } else {
+ // Redirect to login if not authenticated
+ router.push("/student/homepage");
+ }
+ });
+ console.log("User:", auth.uid)
+ return () => unsubscribe();
+ }, [router]);
+
const handleSubmit = () => {
+ const userInformation = { name: fname, lastName: lname, address: address, unitNum: unitnum, postalCode: postalCode, phoneNumber: phoneNumber };
setError('');
setpostalcoderr('');
@@ -21,9 +40,9 @@ const PersonalInfo = () => {
setError('All fields are required.');
return;
}
-
- // Check if postal code is canadian
- if(!postalCode.match(/^[A-Za-z]\d[A-Za-z][ -]?\d[A-Za-z]\d$/)) {
+
+ // Check if postal code is Canadian
+ if (!postalCode.match(/^[A-Za-z]\d[A-Za-z][ -]?\d[A-Za-z]\d$/)) {
setpostalcoderr('Postal code not Valid!');
return;
}
@@ -35,15 +54,14 @@ const PersonalInfo = () => {
// Save the personal info to a database or state management solution
// For demonstration, we will just log the data
- console.log(' First Name:', fname);
- console.log(' Last Name:', lname);
+ console.log('First Name:', fname);
+ console.log('Last Name:', lname);
console.log('Address:', address);
console.log('Unit Number:', unitnum);
console.log('Postal Code:', postalCode);
console.log('Phone Number:', phoneNumber);
-
- // Redirect to another page if needed
- router.push("/student/homepage");
+ addUserInformation(user.uid, userInformation);
+ addOtherUserInformation(user.uid, userInformation);
};
return (
@@ -52,12 +70,12 @@ const PersonalInfo = () => {