Skip to content

Commit

Permalink
#12 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@nihalshaikh196
nihalshaikh196 committed Aug 4, 2021
1 parent 1db4ab1 commit 548154e
Show file tree
Hide file tree
Showing 9 changed files with 173 additions and 177 deletions.
2 changes: 1 addition & 1 deletion client/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>LOR-CHARUSAT</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/DynamicForm/FacultyForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default class FacultyForm extends React.Component {
facultyEmailId: "",
lor: "",
};

items.push(item);

this.setState({ items: items });
Expand Down
53 changes: 28 additions & 25 deletions client/src/views/Auth/Login/ForgotPassword.js
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React,{useState} from "react";
import React, { useState } from "react";
import { Link } from "react-router-dom";

export default function Login() {
const [Email, setEmail] = useState("*******@gmail.com")
const [Email, setEmail] = useState("*******@gmail.com");
return (
<>
<div className="container mx-auto px-4 h-full">
<div className="flex content-center items-center justify-center h-full">
<div className="w-full lg:w-4/12 px-4">
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-gray-300 border-0">
<div className="rounded-t mb-0 px-6 py-6">
<div className="text-center mb-3">
<div className="text-center mb-3">
<h6 className="text-gray-600 text-lg font-bold">
We need to verify your Identity
</h6>
Expand All @@ -19,45 +19,48 @@ export default function Login() {
<hr className="mt-6 border-b-1 border-gray-400" />
</div>
<div className="flex-auto px-4 lg:px-10 py-10 pt-0">

<form>
<div className="relative w-full mb-3">
<label
className="block uppercase text-gray-700 text-xs font-bold mb-2"
htmlFor="grid-password"
>
How would you like to get your security code?
Enter email id connected to your account.
</label>
<input
type="radio"
className="px-3 py-3 placeholder-gray-400 text-gray-700 text-sm shadow focus:outline-none focus:shadow-outline w-5 ease-linear transition-all duration-150"
/>
Email to {Email}
<div className="relative w-full mb-3">
<label
className="block uppercase text-gray-700 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Email
</label>
<input
type="email"
className="px-3 py-3 placeholder-gray-400 text-gray-700 bg-white rounded text-sm shadow focus:outline-none focus:shadow-outline w-full ease-linear transition-all duration-150"
placeholder="Email id"
/>
</div>
</div>

<div className="text-right mt-6">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
<Link to="/">
<Link to="/">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
Cancel
</button>
</Link>
</button>

<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>

<Link to="/auth/getCode">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
Get Code
</button>
</Link>

</button>

</div>

</form>
</div>
</div>
Expand Down
28 changes: 10 additions & 18 deletions client/src/views/Auth/Login/ResetPassword.js
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React,{useState} from "react";
import React, { useState } from "react";
import { Link } from "react-router-dom";

export default function ResetPassword() {

return (
<>
<div className="container mx-auto px-4 h-full">
<div className="flex content-center items-center justify-center h-full">
<div className="w-full lg:w-4/12 px-4">
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-gray-300 border-0">
<div className="rounded-t mb-0 px-6 py-6">
<div className="text-center mb-3">
<div className="text-center mb-3">
<h6 className="text-gray-600 text-lg font-bold">
Reset Password
</h6>
Expand All @@ -19,10 +18,7 @@ export default function ResetPassword() {
<hr className="mt-6 border-b-1 border-gray-400" />
</div>
<div className="flex-auto px-4 lg:px-10 py-10 pt-0">

<form>


<div className="relative w-full mb-3">
<label
className="block uppercase text-gray-700 text-xs font-bold mb-2"
Expand All @@ -31,7 +27,7 @@ export default function ResetPassword() {
Enter New Password
</label>
<input
type="number"
type="text"
className="px-3 py-3 placeholder-gray-400 text-gray-700 bg-white rounded text-sm shadow focus:outline-none focus:shadow-outline w-full ease-linear transition-all duration-150"
placeholder="Enter New Password"
/>
Expand All @@ -45,26 +41,22 @@ export default function ResetPassword() {
Confirm Password
</label>
<input
type="number"
type="text"
className="px-3 py-3 placeholder-gray-400 text-gray-700 bg-white rounded text-sm shadow focus:outline-none focus:shadow-outline w-full ease-linear transition-all duration-150"
placeholder="Confirm Password"
/>
</div>


<div className="text-right mt-6">

<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
<Link to="/">
<Link to="/">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
Done
</button>
</Link>
</button>

</div>

</form>
</div>
</div>
Expand Down
56 changes: 27 additions & 29 deletions client/src/views/Auth/Login/getCode.js
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React,{useState} from "react";
import React, { useState } from "react";
import { Link } from "react-router-dom";

export default function GetCode() {
const [Email, setEmail] = useState("*******@gmail.com")
const [Email, setEmail] = useState("*******@gmail.com");
return (
<>
<div className="container mx-auto px-4 h-full">
<div className="flex content-center items-center justify-center h-full">
<div className="w-full lg:w-4/12 px-4">
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-gray-300 border-0">
<div className="rounded-t mb-0 px-6 py-6">
<div className="text-center mb-3">
<div className="text-center mb-3">
<h6 className="text-gray-600 text-lg font-bold">
Verify your identity
</h6>
Expand All @@ -19,19 +19,16 @@ export default function GetCode() {
<hr className="mt-6 border-b-1 border-gray-400" />
</div>
<div className="flex-auto px-4 lg:px-10 py-10 pt-0">

<form>


<div className="relative w-full mb-3">
<div className="relative w-full mb-3">
<label
className="block text-gray-700 text-sm font-bold mb-2"
htmlFor="grid-password"
>
We have sent a code to {Email}
</label>
</div>
<div className="relative w-full mb-3">
<label
className="block text-gray-700 text-sm font-bold mb-2"
htmlFor="grid-password"
>
We have sent a code to {Email}
</label>
</div>
<label
className="block uppercase text-gray-700 text-xs font-bold mb-2"
htmlFor="grid-password"
Expand All @@ -49,31 +46,32 @@ export default function GetCode() {
className="block text-gray-700 text-sm font-bold mb-2"
htmlFor="grid-password"
>
Didn't receive it? Please wait for few minutes or <a href="#none" className="text-blue-400">Resend Code?</a>
Didn't receive it? Please wait for few minutes or{" "}
<a href="#none" className="text-blue-400">
Resend Code?
</a>
</label>
</div>

<div className="text-right mt-6">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
<Link to="/auth/forgotPassword">
<Link to="/auth/forgotPassword">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
Back
</button>
</Link>
</button>

<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
<Link to="/auth/ResetPassword">
<Link to="/auth/ResetPassword">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
Next
</button>
</Link>
</button>

</div>

</form>
</div>
</div>
Expand Down
73 changes: 35 additions & 38 deletions client/src/views/Auth/Register/Captcha.js
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
import React,{useState} from "react";
import React, { useState } from "react";
import { Link } from "react-router-dom";
import ReCAPTCHA from "react-google-recaptcha";

function onChange(value) {
console.log("Captcha value:", value)
console.log("Captcha value:", value);
}

export default function Captcha() {

return (
<>
<div className="container mx-auto px-4 h-full">
<div className="flex content-center items-center justify-center h-full">
<div className="w-full lg:w-4/12 px-4">
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-gray-300 border-0">
<div className="rounded-t mb-0 px-6 py-6">
<div className="text-center mb-3">
<div className="text-center mb-3">
<h6 className="text-gray-600 text-lg font-bold">
One more step
</h6>
Expand All @@ -24,10 +23,7 @@ export default function Captcha() {
<hr className="mt-6 border-b-1 border-gray-400" />
</div>
<div className="flex-auto px-4 lg:px-10 py-10 pt-0">

<form>


{/* <div className="relative w-full mb-3">
<div className="relative w-full mb-3">
<label
Expand All @@ -49,50 +45,51 @@ export default function Captcha() {
placeholder="Enter Code"
/>
</div> */}

<ReCAPTCHA sitekey="6Le0vz4aAAAAAMU7pRDBx9L-l3QGqqf-9M1zfHwu" onChange={onChange} />

<ReCAPTCHA
sitekey="6Le0vz4aAAAAAMU7pRDBx9L-l3QGqqf-9M1zfHwu"
onChange={onChange}
/>

<div>
<label className="inline-flex items-center cursor-pointer">
<input
<label className="inline-flex items-center cursor-pointer">
<input
id="customCheckLogin"
type="checkbox"
className="form-checkbox text-gray-800 ml-1 w-5 h-5 ease-linear transition-all duration-150"
/>
<span className="ml-2 text-sm font-semibold text-gray-700">
/>
<span className="ml-2 text-sm font-semibold text-gray-700">
I agree with the{" "}
<a
href="#pablo"
className="text-blue-500"
onClick={(e) => e.preventDefault()}
>
Privacy Policy
</a>
</span>
</label>
</div>
<a
href="#pablo"
className="text-blue-500"
onClick={(e) => e.preventDefault()}
>
Privacy Policy
</a>
</span>
</label>
</div>

<div className="text-right mt-6">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
<Link to="/auth/AccountDetails">
<Link to="/auth/AccountDetails">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 w-auto transition-all duration-150"
type="button"
>
Back
</button>
</Link>
</button>

<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
<Link to="/auth/VerifyEmail">
<Link to="/auth/VerifyEmail">
<button
className="bg-gray-900 text-white active:bg-gray-700 text-sm font-bold uppercase px-6 py-3 rounded shadow hover:shadow-lg outline-none focus:outline-none mr-1 mb-1 ml-2 w-auto ease-linear transition-all duration-150"
type="button"
>
Next
</button>
</Link>
</button>

</div>

</form>
</div>
</div>
Expand Down
Loading

0 comments on commit 548154e

Please sign in to comment.