Skip to content

Commit

Permalink
Merge pull request #91 from NITA-South-Paribar/Dev
Browse files Browse the repository at this point in the history 
sign up page and contact page changes
  • Loading branch information
@rana53s
rana53s authored May 26, 2024
2 parents 658657f + 2cc984b commit 376db07
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 108 deletions.
22 changes: 13 additions & 9 deletions src/App.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ import Headroom from "react-headroom";
import { Navbar } from "./components/Navbar/Navbar";
import { Footer } from "./components/Footer/Footer";



function App() {
return (
<>
<Headroom>
<Navbar />
</Headroom>
<main>
<Outlet />
</main>
<Footer />
<div className="min-h-[60px]">
<Headroom>
<Navbar />
</Headroom>
</div>
<div className="min-h-[640px]">
<main>
<Outlet />
</main>
</div>
<div>
<Footer />
</div>
</>
);
}
Expand Down
71 changes: 2 additions & 69 deletions src/components/Contact/Contact.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,73 +2,6 @@ import React from "react";

export const Contact = () => {
return (
<div className="container mx-auto px-4">
<div className="innerwrap">
<section className="text-center py-10">
<div className="mb-2 uppercase">Contact Us</div>
<div className="h-1 bg-gray-300 mx-auto w-36 my-2"></div>
<h1 className="text-3xl text-purple-600">Drop Us a Mail</h1>
</section>

<section className="flex flex-wrap justify-between mx-auto">
<div className="w-full md:w-1/2">
<div className="overflow-hidden" style={{ height: "550px" }}>
<iframe
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6120.792724789083!2d91.42053501709134!3d23.83736638671194!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x3753ed626f9bf605%3A0xa275e562390127f!2sNIT%20Agartala!5e0!3m2!1sen!2sin!4v1712903905127!5m2!1sen!2sin"
width="100%"
height="100%"
style={{ border: 0 }}
allowFullScreen=""
loading="lazy"
referrerPolicy="no-referrer-when-downgrade"
></iframe>
</div>
</div>
<div className="w-full md:w-1/2 mt-8 md:mt-0 p-4">
<div>
<p>45 BC, a Latin professor at Hampden-Sydney College in Virginia</p>
<p><span className="text-gray-500">Phone :</span> +91 976885083</p>
<p><span className="text-gray-500">Email :</span> [email protected]</p>
<p><span className="text-gray-500">Fax :</span> +91 9768850839</p>
</div>
<div className="mt-8">
<h3 className="text-purple-600 border-b border-gray-200 pb-4">Want to Know More?? Drop Us a Mail</h3>
<form>
<div className="flex flex-wrap mb-2">
<input
className="flex-1 m-1 p-2 border border-gray-300 rounded"
type="text"
placeholder="FirstName"
/>
<input
className="flex-1 m-1 p-2 border border-gray-300 rounded"
type="text"
placeholder="LastName"
/>
</div>
<div className="flex flex-wrap mb-2">
<input
className="flex-1 m-1 p-2 border border-gray-300 rounded"
type="email"
placeholder="Email"
/>
<input
className="flex-1 m-1 p-2 border border-gray-300 rounded"
type="text"
placeholder="Contact Number"
/>
</div>
<textarea
className="w-full m-1 p-2 border border-gray-300 rounded"
rows="4"
placeholder="Your message here..."
></textarea>
<button type="submit" className="block mx-auto bg-purple-600 text-white px-6 py-2 rounded mt-4">Send</button>
</form>
</div>
</div>
</section>
</div>
</div>
);
<div className="text-2xl text-center px-5 py-3">NSP Contact Page</div>
)
};
48 changes: 24 additions & 24 deletions src/components/SignUp/MemberSignUp.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,14 @@ export const MemberSignUp = () => {
const { errors } = formState;

const submitDetails = (data) => {
console.log("Submitted", data);
console.log("Name", data.username);
console.log("Email", data.email);
console.log("Password", data.password);
console.log("Confirm Password", data.confirmPassword);
console.log("Submitted Data: ", data);
alert(JSON.stringify(data));
reset()
reset();
};

return (
<div className="flex items-center justify-center p-12">
<div className="bg-white w-[640px] rounded-lg p-5 justify-center h-auto mt-10">
<div className="flex items-center justify-center mt-6">
<div className="bg-white w-[640px] rounded-lg p-5 justify-center h-auto">
<p className="text-[26px] text-black font-bold text-center">
Create your member account
</p>
Expand All @@ -37,7 +33,7 @@ export const MemberSignUp = () => {
htmlFor="name"
className="block mt-6 text-black text-lg font-extrabold"
>
Full Name
Full Name<span className="text-red-600">*</span>
</label>
<input
className="mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
Expand All @@ -56,7 +52,7 @@ export const MemberSignUp = () => {
htmlFor="email"
className="mt-4 block text-lg font-extrabold text-black"
>
G-mail
G-mail<span className="text-red-600">*</span>
</label>
<input
className="mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block w-full p-2.5 dark:bg-white"
Expand Down Expand Up @@ -92,7 +88,7 @@ export const MemberSignUp = () => {
htmlFor="passout_year"
className="block mt-6 text-black text-lg font-extrabold"
>
Admission Year
Admission Year<span className="text-red-600">*</span>
</label>
<select
name="year"
Expand All @@ -102,6 +98,9 @@ export const MemberSignUp = () => {
required: "Admission Year is required",
})}
>
<option key="select-year" value="">
Select Year
</option>
{filters[0].options.map((year, yearIdx) => (
<option key={yearIdx}>{year.value}</option>
))}
Expand All @@ -115,7 +114,7 @@ export const MemberSignUp = () => {
htmlFor="department"
className="block mt-6 text-black text-lg font-extrabold"
>
Department
Department<span className="text-red-600">*</span>
</label>
<select
name="department"
Expand All @@ -125,6 +124,9 @@ export const MemberSignUp = () => {
required: "Department is required",
})}
>
<option key="select-dept" value="">
Select Department
</option>
{filters[1].options.map((department, departmentIdx) => (
<option key={departmentIdx}>{department.value}</option>
))}
Expand All @@ -140,7 +142,7 @@ export const MemberSignUp = () => {
htmlFor="rollNo"
className="block mt-6 text-black text-lg font-extrabold"
>
NIT-A Enrollment No
NIT-A Enrollment No<span className="text-red-600">*</span>
</label>
<input
className="w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
Expand All @@ -163,9 +165,7 @@ export const MemberSignUp = () => {
className="w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
id="registrationNo"
type="text"
{...register("registrationNo", {
required: "Registration No is required",
})}
{...register("registrationNo")}
/>
<p className=" mt-2 text-red-500">
{errors.registrationNo?.message}
Expand All @@ -180,7 +180,7 @@ export const MemberSignUp = () => {
htmlFor="gender"
className="block mt-6 text-black text-lg font-extrabold"
>
Gender
Gender<span className="text-red-600">*</span>
</label>
<div className="flex justify-between gap-3 w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 ">
<div>
Expand All @@ -189,7 +189,7 @@ export const MemberSignUp = () => {
type="radio"
value="male"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-30 dark:bg-gray-700 dark:border-gray-600"
{...register("gender", {required: "Gender is required"})}
{...register("gender", { required: "Gender is required" })}
/>
<label
for="male-gender"
Expand All @@ -204,7 +204,7 @@ export const MemberSignUp = () => {
type="radio"
value="female"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-30 dark:bg-gray-700 dark:border-gray-600"
{...register("gender", {required: "Gender is required"})}
{...register("gender", { required: "Gender is required" })}
/>
<label
for="female-gender"
Expand All @@ -219,7 +219,7 @@ export const MemberSignUp = () => {
type="radio"
value="other"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-30 dark:bg-gray-700 dark:border-gray-600"
{...register("gender", {required: "Gender is required"})}
{...register("gender", { required: "Gender is required" })}
/>
<label
for="other-gender"
Expand All @@ -238,15 +238,15 @@ export const MemberSignUp = () => {
htmlFor="aadhaarFile"
className="block mt-6 text-black text-lg font-extrabold"
>
Aadhaar
Aadhaar<span className="text-red-600">*</span>
</label>
<input
className="w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
placeholder="Aadhaar No"
type="file"
id="aadhaar"
{...register("aadhaar", {
required: "Aadhaar is required"
required: "Aadhaar is required",
})}
/>
<p className="mt-2 text-red-500">{errors.aadhaar?.message}</p>
Expand All @@ -261,7 +261,7 @@ export const MemberSignUp = () => {
htmlFor="password"
className="block mt-6 text-black text-lg font-extrabold"
>
Password
Password<span className="text-red-600">*</span>
</label>
<input
className="w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
Expand All @@ -284,7 +284,7 @@ export const MemberSignUp = () => {
htmlFor="confirmPassword"
className="block mt-6 text-black text-lg font-extrabold"
>
Confirm Password
Confirm Password<span className="text-red-600">*</span>
</label>
<input
className="w-[240px] mt-1 bg-white border border-gray-300 text-gray-900 sm:text-sm rounded-lg focus:ring-primary-600 focus:border-primary-600 block p-2.5 dark:bg-white dark:border-gray-600 dark:placeholder-gray-400 dark:text-black dark:focus:ring-blue-500 dark:focus:border-blue-500 "
Expand Down
13 changes: 7 additions & 6 deletions src/constants/member.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,6 @@ export const filters = [
id:"year",
name:"year",
options:[
{value:"2008",label:"2008"},
{value:"2009",label:"2009"},
{value:"2010",label:"2010"},
{value:"2011",label:"2011"},
{value:"2012",label:"2012"},
{value:"2013",label:"2013"},
{value:"2014",label:"2014"},
{value:"2015",label:"2015"},
Expand All @@ -97,7 +92,13 @@ export const filters = [
{value:"2022",label:"2022"},
{value:"2023",label:"2023"},
{value:"2024",label:"2024"},
],
{value:"2025",label:"2025"},
{value:"2026",label:"2026"},
{value:"2027",label:"2027"},
{value:"2028",label:"2028"},
{value:"2029",label:"2029"},
{value:"2030",label:"2030"}
]
},
{
id:"branch",
Expand Down

0 comments on commit 376db07

Please sign in to comment.