Skip to content

Commit

Permalink
Hunar (#49)
Browse files Browse the repository at this point in the history
* Add folder for student register

issue: There was a router problem for student register
resolve: always make page.js for route just separate them by making different folders.

* database

* - Created useContext for user (uid)
- Added service folder with functions to read and write data from the database
- Added authentication for student/homepage and student/information
- Updated student/login page to fix email and password authentication issues

* starting login page

* login page design

* signup page complete

* adding colors

* file change

* forget password

* add modal

* add conditions

* login page

* add posst function for menu and restaurant details

* meging with main

* adding restaurant information page

* fetching and adding data for restaurants

* merging from origin

* merge from orign

* adding emails status in database

* add and create function for adding new email with active status
add and create function for getting email names where active status is true
make changes in register page to check that email is in database for register

* chengin import sttement

* adding terms condition

* adding logos facility

* merge from master

* update database
sait-staff

* adding search option

* commit

* connecting sait-staff with database

* merging form master

* changes on sait

* mege from master to origin

* changing restaurant info table

* adding data to database

* updating cards

* adding logc for increase and decrease arrow

* adding databse changes

* updating datasbe function to getting student information

* adding authentication for restaurants

* changing Searching bar

* adding search bar in sait-staff

* updating restaurant login page

* adding update,delete and change password features

* adding fuctionality of deleting user's information from database including user data and restaurant menu, delete data from storage and from authentication

* update edit functionallity in sait-staff and add delete functionality in restaurant

* add add functionality for admins

---------

Co-authored-by: Abdel Mouzahir <[email protected]>
  • Loading branch information
hunardeep720 and Abdelmouzahir authored Jul 2, 2024
1 parent ec69477 commit 88f8882
Show file tree
Hide file tree
Showing 3 changed files with 234 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/auth/sign-in/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { auth } from "@/app/firebase/config";
import { useRouter } from "next/navigation";
import Link from "next/link";
import { sendPasswordResetEmail } from "firebase/auth";
import Modal from "@/components/Modal";
import Modal from "@/Components/Modal";
import { BiSolidCommentError } from "react-icons/bi";

const sign_in = () => {
Expand Down
229 changes: 229 additions & 0 deletions app/sait-staff/overviewDash/Add.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
"use client";
import React, { useState } from "react";
import { formatPhoneNumber } from "@/Constant/formated";
import Swal from "sweetalert2";

import { collection, addDoc } from "firebase/firestore";
import { db, auth } from "@/app/firebase/config";
import { createUserWithEmailAndPassword } from "firebase/auth";
import { existingRestaurantData } from "@/services/PostRequest/postRequest";

const Add = ({ admin, setAdmins, setIsAdding }) => {
const [role, setRole] = useState("");
const [name, setName] = useState("");
const [email, setEmail] = useState("");
const [phoneNumber, setPhoneNumber] = useState("");
const [address, setAddress] = useState("");

const currentDate = new Date();

const day = currentDate.getDate();
const month = currentDate.getMonth(); // Remember, month is zero-indexed
const year = currentDate.getFullYear();

const newDate = [day, month, year];
let firstWord = name.split(" ");

//generic password will be first name of student or restaurant + last three digits of mobile number + "!"
// like student name :- Moiz Khan mobilenumber :- 1234567890, so the password will be Moiz890!
// by this the password will bw different for every one and they can change it on forget password
const genericPassword = firstWord[0] + phoneNumber.slice(-3).concat("!");

const handleRoleChange = (event) => {
setRole(event.target.value);
};

const handleAdd = async (e) => {
e.preventDefault();

if (!name || !email || !phoneNumber || !address || role.length <= 0) {
return Swal.fire({
icon: "error",
title: "Error!",
text: "All fields are required.",
showConfirmButton: true,
});
}

try {
console.log("geneic password: ", genericPassword);
// Create user in Firebase Authentication
const userCredential = await createUserWithEmailAndPassword(
auth,
email,
genericPassword
);
const user = userCredential.user;

// Add restaurant to Firestore
const newAdmin = {
name,
email,
role,
phoneNumber,
address,
uid: user.uid,
acountCreated: newDate, // link with user ID
active: true,
};

await addDoc(collection(db, "saitStaff"), {
...newAdmin,
});

// Update local state
admin.push(newAdmin);
setAdmins(admin);
setIsAdding(false);

Swal.fire({
icon: "success",
title: "Added!",
text: `${name}'s data has been added.`,
showConfirmButton: false,
timer: 1500,
});
} catch (error) {
console.error(error);
if (
error == "FirebaseError: Firebase: Error (auth/email-already-in-use)."
) {
const newAdmin = {
name,
email,
role,
phoneNumber,
};
//function to change active state from false to true
await existingRestaurantData(email);
Swal.fire({
icon: "success",
title: "Added!",
text: `We located your previous account, and you can resume using it.`,
showConfirmButton: false,
timer: 1500,
});
// Update local state
admin.push(newAdmin);
setIsAdding(false);
return;
}
Swal.fire({
icon: "error",
title: "Error!",
text: error.message,
showConfirmButton: true,
});
}
};

return (
<div className="container mx-auto mt-8 p-6 bg-gray-100 rounded-lg shadow-lg max-w-lg">
<form onSubmit={handleAdd} className="space-y-6">
<h1 className="text-2xl font-bold mb-4 text-center text-gray-700">
Add Admin
</h1>
<div>
<label
htmlFor="name"
className="block text-sm font-medium text-gray-700"
>
Admin Name
</label>
<input
id="name"
type="text"
name="name"
value={name}
onChange={(e) => setName(e.target.value)}
className="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
/>
</div>
<div>
<label
htmlFor="email"
className="block text-sm font-medium text-gray-700"
>
Email
</label>
<input
id="email"
type="email"
name="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
className="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
/>
</div>
<div>
<label
htmlFor="Role"
className="block text-sm font-medium text-gray-700"
>
Role
</label>
<select
className="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm bg-white"
onChange={handleRoleChange}
value={role}
>
<option value="">Select a role</option>
<option value="admin">Admin</option>
<option value="editor">Editor</option>
<option value="viewer">Viewer</option>
</select>
</div>
<div>
<label
htmlFor="phone"
className="block text-sm font-medium text-gray-700"
>
Phone Number
</label>
<input
id="phone"
type="text"
maxLength={14}
name="phone"
value={phoneNumber}
onChange={(e) => setPhoneNumber(formatPhoneNumber(e.target.value))}
className="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
/>
</div>
<div>
<label
htmlFor="address"
className="block text-sm font-medium text-gray-700"
>
Address
</label>
<input
id="address"
type="text"
name="address"
value={address}
onChange={(e) => setAddress(e.target.value)}
className="mt-1 block w-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500 sm:text-sm"
/>
</div>
<div className="flex justify-end space-x-3">
<button
type="submit"
className="bg-blue-600 text-white px-4 py-2 rounded shadow hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
>
Add
</button>
<button
type="button"
className="bg-gray-600 text-white px-4 py-2 rounded shadow hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500"
onClick={() => setIsAdding(false)}
>
Cancel
</button>
</div>
</form>
</div>
);
};

export default Add;
6 changes: 4 additions & 2 deletions app/sait-staff/overviewDash/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import Head from 'next/head';
import Overview from './overview';
import Table from './table';
import { useState } from 'react';
import Add from './Add';

export default function Dash() {
const [isAdding, setIsAdding] = useState(false);


// Random data
const [admin, setAdmin] = useState([
{
Expand Down Expand Up @@ -49,12 +51,12 @@ export default function Dash() {
<Overview />
</div>
<div className="flex flex-col items-center w-full mt-8">
<Table
{isAdding? <><Add admin={admin} setAdmins={setAdmin} setIsAdding={setIsAdding}/></>:<><Table
admin={admin}
handleEdit={handleEdit}
handleDelete={handleDelete}
setIsAdding={setIsAdding}
/>
/></>}
</div>
</main>
</div>
Expand Down

0 comments on commit 88f8882

Please sign in to comment.