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
19 changes: 10 additions & 9 deletions Backend/controllers/pharmacyController.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ exports.toggleClosingStatus = async (req, res) => {
// @desc post pharmacy Forgot password
// @route POST /api/pharmacies/forgot-password
exports.forgotPassword = async (req, res) => {
const pharmacy = await pharmacy.findOne({ email: req.body.email.trim().toLowerCase() });
const pharmacy = await pharmacy.findOne({
email: req.body.email.trim().toLowerCase(),
});
if (!pharmacy) {
return res.status(404).json({ message: "Pharmacy not found" });
}
Expand Down Expand Up @@ -204,8 +206,7 @@ exports.forgotPassword = async (req, res) => {
message: "Error sending email. Please try again later.",
});
}
}

};

// @desc patch pharmacy reset password
// @route PATCH /api/pharmacies/reset-password/:token
Expand All @@ -221,17 +222,17 @@ exports.resetPassword = async (req, res) => {
passwordResetToken: hashedToken,
passwordResetExpires: { $gt: Date.now() },
});

if (!pharmacy) {
return res.status(400).json({ message: "Invalid or expired token" });
}

pharmacy.password = req.body.password;
pharmacy.passwordResetToken = undefined;
pharmacy.passwordResetExpires = undefined;

await pharmacy.save();

res.status(200).json({ message: "Password reset successful" });
//login pharmacy
const loginToken = generateToken(pharmacy);
Expand All @@ -240,6 +241,6 @@ exports.resetPassword = async (req, res) => {
token: loginToken,
});
} catch (err) {
res.status(500).json({message: "Server error", error: err.message });
res.status(500).json({ message: "Server error", error: err.message });
}
}
};
3 changes: 3 additions & 0 deletions Frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Ignore the .env file
.env
6 changes: 4 additions & 2 deletions Frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ import OrderSummary from "./pages/OrderSummary";
// import ProfileSignup from "./pages/ProfileSignup";
import FindMedsLoading from "./components/FindMedsLoading";
import UpdatedCart from "./pages/UpdatedCart";
import PhamarcySignUp from "./components/forms/PhamarcySignUp";
import NewPharmarcySignUp from "./components/forms/NewPharmarcySignUp";
import MedicineTable from "./components/MedicineTable";
import UploadPrescription from "./pages/UploadPrescription";
import PharmacyOtp from "./components/PharmacyOtp";
import OtpConfirmed from "./components/OtpConfirmed";
import Pharmarcysignin from "./components/forms/Pharmarcysignin";

// Code splitted Components (Lazy Loading)...
// N.B- Please do not touch if you're new to how lazy loading works..
Expand Down Expand Up @@ -133,7 +134,8 @@ function App() {
{/* Pharmacy Routing */}
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/pharmacist-profile" element={<PharmacistProfile />} />
<Route path="/pharmacy-signup" element={<PhamarcySignUp />} />
<Route path="/pharmacy-signup" element={<NewPharmarcySignUp />} />
<Route path="/pharmacy-signin" element={<Pharmarcysignin />} />
<Route path="/medicine-table" element={<MedicineTable />} />
<Route path="/upload-prescription" element={<UploadPrescription />} />
<Route path="/pharmacy-otp" element={<PharmacyOtp />} />
Expand Down
170 changes: 170 additions & 0 deletions Frontend/src/components/forms/NewPharmarcySignUp.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
import React, { useState } from "react";
import styles from "../../styles/newpharmacysignup.module.css";
import caretleft from "../../assets/CaretLeft.png";
import cancelicon from "../../assets/X.png";

const InputField = ({ id, name, type, placeholder, value, onChange }) => (
<input
id={id}
name={name}
type={type}
placeholder={placeholder}
value={value}
onChange={onChange}
/>
);

const NewPharmarcySignUp = () => {
const [formData, setFormData] = useState({
name: "",
email: "",
password: "",
confirmPassword: "",
phone: "",
address: "",
});

const [error, setError] = useState("");
const [success, setSuccess] = useState(false);
const [loading, setLoading] = useState(false);

const handleChange = (e) => {
const { name, value } = e.target;
setFormData({ ...formData, [name]: value });
};

const handleSubmit = async (e) => {
e.preventDefault();
setError("");
setSuccess(false);

// Basic validation
if (
!formData.name ||
!formData.email ||
!formData.password ||
!formData.confirmPassword ||
!formData.phone ||
!formData.address
) {
setError("All fields are required.");
return;
}

if (formData.password !== formData.confirmPassword) {
setError("Passwords do not match.");
return;
}

setLoading(true);

try {
const response = await fetch(
`${import.meta.env.VITE_API_URL}/pharmacies/signup`,
{
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(formData),
}
);

if (!response.ok) {
throw new Error("Failed to sign up. Please try again.");
}

const data = await response.json();
setSuccess(true);
setFormData({
name: "",
email: "",
password: "",
confirmPassword: "",
phone: "",
address: "",
});
} catch (err) {
setError(err.message);
} finally {
setLoading(false);
}
};

return (
<div className={styles.container}>
<section className={styles.signupSection}>
<div className={styles.headerNav}>
<img src={caretleft} alt="go back" className={styles.backIcon} />
<h1 className={styles.headerText}>Create Account</h1>
<img src={cancelicon} alt="close" className={styles.closeIcon} />
</div>
<form onSubmit={handleSubmit}>
<InputField
id="name"
name="name"
type="text"
placeholder="Pharmacy Name"
value={formData.name}
onChange={handleChange}
/>
<InputField
id="email"
name="email"
type="email"
placeholder="Email address"
value={formData.email}
onChange={handleChange}
/>
<InputField
id="password"
name="password"
type="password"
placeholder="Password"
value={formData.password}
onChange={handleChange}
/>
<InputField
id="confirmPassword"
name="confirmPassword"
type="password"
placeholder="Confirm Password"
value={formData.confirmPassword}
onChange={handleChange}
/>
<InputField
id="phone"
name="phone"
type="tel"
placeholder="+234 800-123-4567"
value={formData.phone}
onChange={handleChange}
inputMode="numeric"
maxLength="13"
/>
<InputField
id="address"
name="address"
type="text"
placeholder="Address"
value={formData.address}
onChange={handleChange}
/>

{error && <p className={styles.error}>{error}</p>}
{success && <p className={styles.success}>Sign up successful!</p>}

<button type="submit" className={styles.signupbtn} disabled={loading}>
{loading ? "Signing Up..." : "Sign Up"}
</button>
</form>
<div className={styles.redirectLink}>
<p>Already have an account?</p>
<a href="/pharmacy-signin">Log in</a>
</div>
</section>
</div>
);
};

export default NewPharmarcySignUp;
39 changes: 0 additions & 39 deletions Frontend/src/components/forms/PhamarcySignUp.jsx

This file was deleted.

31 changes: 0 additions & 31 deletions Frontend/src/components/forms/PharmacyLogin.jsx

This file was deleted.

Loading