-
Notifications
You must be signed in to change notification settings - Fork 31
Briany/create aro login pages #622
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
ca20d1f
update routes to login pages
6774eca
add login tsx component
88d42c9
add Signup tsx component
df346f4
add verify tsx component for OTP verification
6ecae2f
add geist font for use in login pages
6768c65
set geist as default font
886c419
add email variable
e96dbbe
update descriptions and tailwind classes
d7154d3
removed login.css
d4c84ac
update vite and react versions
baa352a
Merge branch 'main' into briany/create-aro-login-pages
Brain256 a2d7cb3
move email variable into function
af585cf
update packages
5593fbd
Merge branch 'briany/create-aro-login-pages' of https://github.com/UW…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| @import url('https://fonts.googleapis.com/css2?family=Geist:wght@400;500;700&display=swap'); | ||
|
|
||
| .geist-text { | ||
| font-family: 'Geist', sans-serif; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import "./login.css" | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * @brief Login component displaying the login page | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| * @return tsx element of Login component | ||
| */ | ||
| function Login() { | ||
| return ( | ||
| <div className="geist-text flex flex-col items-center justify-center min-h-screen px-4"> | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| <div className="w-full max-w-xl bg-white rounded-lg p-6 pt-6"> | ||
| <div className="flex flex-col gap-y-1 mb-8"> | ||
| <h1 className="text-black text-lg font-medium text-left"> | ||
| Login to your ARO Account | ||
| </h1> | ||
| <h2 className="text-gray-500 text-left"> | ||
| Enter your email below to login to your account | ||
| </h2> | ||
| </div> | ||
joannalauu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <form className="space-y-6"> | ||
| <div> | ||
| <label htmlFor="email" className="text-black block mb-1"> | ||
| </label> | ||
| <input | ||
| type="text" | ||
| id="email" | ||
| className="w-full text-gray-600 px-4 py-2 rounded-lg border border-gray-600" | ||
| placeholder="Enter Email" | ||
| /> | ||
| </div> | ||
| <div> | ||
| <div className="flex justify-between"> | ||
| <label htmlFor="password" className="text-black block mb-1"> | ||
| Password | ||
| </label> | ||
| <a className="hover:underline cursor-pointer">Forgot Your Pasword? </a> | ||
| </div> | ||
| <input | ||
| type="password" | ||
| id="password" | ||
| className="w-full text-gray-600 px-4 py-2 rounded-lg border border-gray-600" | ||
| placeholder="Enter Password" | ||
| /> | ||
| </div> | ||
| <button | ||
| type="submit" | ||
| className="w-full bg-black text-white py-2 rounded-lg hover:bg-gray-700 transition-colors cursor-pointer" | ||
| > | ||
| Login | ||
| </button> | ||
| </form> | ||
| <button | ||
| type="button" | ||
| className="w-full shadow bg-white text-black py-2 rounded-lg hover:bg-gray-200 transition-colors border border-gray-700/20 mt-2 cursor-pointer" | ||
| > | ||
| Login with Google | ||
| </button> | ||
|
|
||
| <footer className="flex gap-x-2 items-center justify-center mt-5 mb-5"> | ||
| <p>Don't have an Account?</p> | ||
| <a href="/sign-up" className="underline">Sign Up</a> | ||
| </footer> | ||
|
|
||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Login; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import "./login.css" | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| /** | ||
| * @brief Signup component displaying sign up page | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| * @return tsx element of Signup component | ||
| */ | ||
| function Signup() { | ||
| return ( | ||
| <div className="geist-text flex flex-col items-center justify-center min-h-screen px-4 "> | ||
| <div className="w-full max-w-xl bg-white rounded-lg p-6 pt-6"> | ||
| <div className="flex flex-col gap-y-1 mb-7"> | ||
| <h1 className="text-black text-lg font-medium text-center"> | ||
| Sign Up a New Aro Account | ||
| </h1> | ||
| <h2 className="text-gray-500 text-center"> | ||
| Enter your email below to login to your account | ||
| </h2> | ||
| </div> | ||
| <form className="space-y-6"> | ||
| <div> | ||
| <label htmlFor="email" className="text-black block mb-1"> | ||
| </label> | ||
| <input | ||
| type="text" | ||
| id="email" | ||
| className="w-full text-gray-600 px-4 py-2 rounded-lg border border-gray-600" | ||
| placeholder="Enter Email" | ||
| /> | ||
| </div> | ||
| <div> | ||
| <label htmlFor="password" className="text-black block mb-1"> | ||
| Password | ||
| </label> | ||
| <input | ||
| type="password" | ||
| id="password" | ||
| className="w-full text-gray-600 px-4 py-2 rounded-lg border border-gray-600" | ||
| placeholder="Enter Password" | ||
| /> | ||
| </div> | ||
| <button | ||
| type="submit" | ||
| className="w-full bg-black text-white py-2 rounded-lg hover:bg-gray-700 transition-colors cursor-pointer" | ||
| > | ||
| Sign Up | ||
| </button> | ||
| </form> | ||
| <button | ||
| type="button" | ||
| className="w-full shadow bg-white text-black py-2 rounded-lg hover:bg-gray-200 transition-colors border border-gray-700/20 mt-2 mb-15 cursor-pointer" | ||
| > | ||
| Continue with Google | ||
| </button> | ||
|
|
||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Signup; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import "./login.css" | ||
| /** | ||
| * @brief Verify Component showing OTP verificataion form | ||
| * @return tsx element of Verify component | ||
| */ | ||
| function Verify() { | ||
| return ( | ||
| <div className="geist-text flex flex-col items-center justify-center min-h-screen px-4 "> | ||
| <div className="w-full max-w-xl bg-white rounded-lg p-6 pt-6"> | ||
| <div className="flex flex-col gap-y-1 mb-8"> | ||
| <h1 className="text-black text-lg font-medium text-center"> | ||
| Verify Your Account | ||
| </h1> | ||
| <h2 className="text-gray-500 text-center"> | ||
| Please Enter the verification code that we sent to johndoe@gmail.com in order to verify your account | ||
joannalauu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| </h2> | ||
| </div> | ||
| <form className="space-y-6"> | ||
| <div> | ||
| <label htmlFor="otp-code" className="text-black block mb-1"> | ||
| OTP Verification Code | ||
| </label> | ||
| <input | ||
| type="text" | ||
| id="opt-code" | ||
| className="w-full text-gray-600 px-4 py-2 rounded-lg border border-gray-600" | ||
| placeholder="Enter Verification Code" | ||
| /> | ||
| </div> | ||
| <button | ||
| type="submit" | ||
| className="w-full bg-black text-white py-2 rounded-lg hover:bg-gray-700 transition-colors cursor-pointer" | ||
| > | ||
| Confirm Code | ||
| </button> | ||
| </form> | ||
| <button | ||
| type="button" | ||
| className="w-full shadow bg-white text-black py-2 rounded-lg hover:bg-gray-200 transition-colors border border-gray-700/20 mt-2 mb-15 cursor-pointer" | ||
| > | ||
| Resend Code | ||
| </button> | ||
|
|
||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Verify; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.