-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into temp-dropdown
- Loading branch information
Showing
16 changed files
with
224 additions
and
42 deletions.
There are no files selected for viewing
This file contains 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 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 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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
File renamed without changes.
File renamed without changes.
This file contains 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,23 @@ | ||
|
|
||
| import React from "react"; | ||
| import styles from "./NavBar.module.css"; | ||
|
|
||
| import { NavLink } from "react-router-dom"; | ||
|
|
||
| function PageLinks() { | ||
| return ( | ||
| <div style={{ display: "flex", flexDirection: "row", marginRight: "20px" }}> | ||
| <NavLink to="/graduation" className={({ isActive }) => isActive ? styles.activeLink : styles.dormantLink }> | ||
| Graduation | ||
| </NavLink> | ||
| <NavLink to="/courses" className={({ isActive }) => isActive ? styles.activeLink : styles.dormantLink }> | ||
| Courses | ||
| </NavLink> | ||
| <NavLink to="/majors" className={({ isActive }) => isActive ? styles.activeLink : styles.dormantLink }> | ||
| Majors | ||
| </NavLink> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default PageLinks; |
This file contains 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 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 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 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,59 @@ | ||
| .centerDiv { | ||
| min-height: 100vh; | ||
| text-align: center; | ||
| max-width: 1000px; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| justify-content: center; | ||
| align-items: center; | ||
| padding: 1rem; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| } | ||
|
|
||
| .featureListStyle { | ||
| list-style: none; | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: .5rem; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .featureItemStyle { | ||
| font-weight: 500; | ||
| transition: transform .3s; | ||
| cursor: default; | ||
| text-align: left; | ||
| } | ||
|
|
||
| .featureItemStyle:hover { | ||
| transform: translateX(7px); | ||
| } | ||
|
|
||
| .loginButtons { | ||
| display: flex; | ||
| margin-left: auto; | ||
| margin-right: auto; | ||
| margin-top: 3px; | ||
| justify-content: start; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .btn { | ||
| padding: 8px 24px; | ||
| border-radius: 10px; | ||
| font-weight: 500; | ||
| color: black; | ||
| background-color: lightblue; | ||
| transition: | ||
| transform 0.3s, | ||
| filter 0.3s; | ||
| margin-top: 8px; | ||
| } | ||
|
|
||
| .btn:hover { | ||
| text-decoration: none; | ||
| transform: translateY(-5px); | ||
| filter: brightness(90%); | ||
| } |
This file contains 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,62 @@ | ||
| import React, { useState } from "react"; | ||
| import { Link } from "react-router-dom"; | ||
| import styles from "./Login.module.css"; | ||
|
|
||
| import navStyles from "../../navbar/NavBar.module.css"; | ||
| import logo from "../../commons/images/ma_logo.png"; | ||
| import loginPageImage from "../../commons/images/reallycoolguy.jpg"; | ||
|
|
||
| function NavBar() { | ||
| return ( | ||
| <div className={navStyles.NavBar}> | ||
| <div style={{ marginLeft: "20px" }}> | ||
| <img | ||
| src={logo} | ||
| alt="" | ||
| style={{ width: "150px", height: "auto", marginRight: "10px" }} | ||
| /> | ||
| </div> | ||
| {/* <PageLinks /> | ||
| <MeDropdown /> */} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| function Login() { | ||
| return ( | ||
| <div> | ||
| <NavBar /> | ||
| <div className={styles.centerDiv}> | ||
| <div style={{width: "450px"}}> | ||
| <h1>The best place to explore and plan your major at Yale</h1> | ||
| <ul className={styles.featureListStyle}> | ||
| <li className={styles.featureItemStyle}>Explore all 80+ majors at Yale</li> | ||
| <li className={styles.featureItemStyle}>Check all your distributional requirements are satisfied</li> | ||
| <li className={styles.featureItemStyle}>Plan out all your courses in the traditional four-year plan</li> | ||
| <li className={styles.featureItemStyle}>Look at this really cool guy to the right</li> | ||
| </ul> | ||
| <div className={styles.loginButtons}> | ||
| {/* <a | ||
| href={`${API_ENDPOINT}/api/auth/cas?redirect=${window.location.origin}/catalog`} | ||
| className={clsx(styles.btn, styles.login, 'me-2')} | ||
| > | ||
| Login with CAS | ||
| </a> */} | ||
| <Link to="/graduation" className={styles.btn} style={{marginRight: "8px"}}> | ||
| Login with CAS | ||
| </Link> | ||
| <Link to="/courses" className={styles.btn} style={{marginRight: "8px"}}> | ||
| About Us | ||
| </Link> | ||
| <Link to="/majors" className={styles.btn}> | ||
| Guest | ||
| </Link> | ||
| </div> | ||
| </div> | ||
| <img alt="Landing page" src={loginPageImage} width="450"/> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default Login; |
This file contains 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,2 @@ | ||
| import Login from "./Login"; | ||
| export default Login; |
Oops, something went wrong.