diff --git a/src/components/footer/index.js b/src/components/footer/index.js index 65bf1de..331edb0 100644 --- a/src/components/footer/index.js +++ b/src/components/footer/index.js @@ -16,9 +16,8 @@ class Footer extends React.Component { return (
-
- {this.props.isLoggedIn &&

this.navigate("home")}>BQUEST

} - {!this.props.isLoggedIn &&

this.navigate("")}>BQUEST

} +

this.navigate(this.props.isLoggedIn ? "home" : "")} className="inner-logo" dangerouslySetInnerHTML={{__html: BquestLogo}}>

+

this.navigate(this.props.isLoggedIn ? "home" : "")}>BQUEST

/

diff --git a/src/components/navbar/index.js b/src/components/navbar/index.js index d4ef08e..eaf13a5 100644 --- a/src/components/navbar/index.js +++ b/src/components/navbar/index.js @@ -2,8 +2,7 @@ import React from 'react'; import classNames from 'classnames'; import { connect } from 'react-redux'; import { push } from 'react-router-redux'; - -import BquestLogo from '../../../images/loginPage/white-bquest-logo.svg.inline'; +import Logo from '../util/Logo'; class NavBar extends React.Component { @@ -18,9 +17,7 @@ class NavBar extends React.Component { return(
-
-
-
+

this.navigate("home")} className={classNames({selected: location.startsWith("home")})}>Home

diff --git a/src/components/pages/forget-password/email-pending.js b/src/components/pages/forget-password/email-pending.js index 87f9903..6bb1225 100644 --- a/src/components/pages/forget-password/email-pending.js +++ b/src/components/pages/forget-password/email-pending.js @@ -1,16 +1,12 @@ import React from 'react'; -import newBquest from '../../../../images/loginPage/white-bquest.svg.inline' -import newBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline' +import Logo from '../../util/Logo'; import Footer from '../../../components/footer'; class ForgetPasswordPending extends React.Component { render() { return (
-
-
-
-
+

Email Sent! Check your email :)

diff --git a/src/components/pages/forget-password/index.js b/src/components/pages/forget-password/index.js index ee44c34..8091414 100644 --- a/src/components/pages/forget-password/index.js +++ b/src/components/pages/forget-password/index.js @@ -1,17 +1,13 @@ import React from 'react'; -import newBquest from '../../../../images/loginPage/white-bquest.svg.inline' -import newBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline' import Footer from '../../../components/footer'; +import Logo from '../../util/Logo'; import Form from '../../util/ForgetPasswordForm'; class ForgetPassword extends React.Component { render() { return (
-
-
-
-
+

Password Reset

We'll send a password reset link to your email.

diff --git a/src/components/pages/home/topBar/index.js b/src/components/pages/home/topBar/index.js index 3b2e3d9..c6fdece 100644 --- a/src/components/pages/home/topBar/index.js +++ b/src/components/pages/home/topBar/index.js @@ -1,21 +1,14 @@ import React from 'react'; import { Link } from 'react-router-dom'; - -import newBquestLogo from '../../../../../images/loginPage/teal-bquest-logo.svg.inline'; -import newBquest from '../../../../../images/loginPage/teal-bquest.svg.inline'; +import Logo from '../../../util/Logo'; export default (props) => { return (
-
-
-
-
+
Login Sign Up - {/*
location.href="/login"}>Login
*/} - {/*
location.href="/register"}>Sign Up
*/}
); diff --git a/src/components/pages/login/index.js b/src/components/pages/login/index.js index 003d4f6..ebca9e5 100644 --- a/src/components/pages/login/index.js +++ b/src/components/pages/login/index.js @@ -1,7 +1,6 @@ import React from 'react'; import Form from 'components/util/LoginRegisterForm'; -import newBquest from '../../../../images/loginPage/white-bquest.svg.inline' -import newBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline' +import Logo from '../../util/Logo'; import Footer from '../../../components/footer'; class Login extends React.Component { @@ -9,10 +8,7 @@ class Login extends React.Component { render() { return(
-
-
-
-
+

Login

diff --git a/src/components/pages/onboarding/index.js b/src/components/pages/onboarding/index.js index 9f321d7..27ede27 100644 --- a/src/components/pages/onboarding/index.js +++ b/src/components/pages/onboarding/index.js @@ -49,7 +49,7 @@ class Onboarding extends React.Component {

Feel free to skip this and explore on your own if you wish by
- clicking on the green button at the bottom left corner. + clicking on the green button below.
@@ -189,9 +189,9 @@ class Onboarding extends React.Component {
-
-
- +
+ +
); diff --git a/src/components/pages/onboarding/style.scss b/src/components/pages/onboarding/style.scss index a6410d1..5ef9aa5 100644 --- a/src/components/pages/onboarding/style.scss +++ b/src/components/pages/onboarding/style.scss @@ -51,7 +51,7 @@ img { } .onboarding-button { - width: 80%; display: flex; - justify-content: flex-end; + justify-content: center; + margin-top: 10px; } diff --git a/src/components/pages/profile/ambassadorProfile.js b/src/components/pages/profile/ambassadorProfile.js index 36123cb..dd461c2 100644 --- a/src/components/pages/profile/ambassadorProfile.js +++ b/src/components/pages/profile/ambassadorProfile.js @@ -97,13 +97,16 @@ class AmbassadorProfile extends React.Component { this.state = { classesOpen: false, bio: props.mentor.bio, + grad: props.mentor.grad, + quarter: props.mentor.quarter, // major: props.mentor.major || {name: ''}, // minor: props.mentor.minor || {name: ''}, major: props.mentor.major || [], minor: props.mentor.minor || [], majorDisplayLength: props.mentor.major ? props.mentor.major.length : 0, minorDisplayLength: props.mentor.minor ? props.mentor.minor.length : 0, - courses: props.mentor.courses ? props.mentor.courses.map(obj => obj.name) : [] + courses: props.mentor.courses ? props.mentor.courses.map(obj => obj.name) : [], + work: props.mentor.work || [] } } @@ -111,14 +114,17 @@ class AmbassadorProfile extends React.Component { let { major: currMajor, minor: currMinor, + work: currWork, } = this.state; let { major: nextMajor, minor: nextMinor, + work: nextWork, } = nextProps.mentor; nextMajor = nextMajor || []; // avoid undefined nextMinor = nextMinor || []; // avoid undefined + nextWork = nextWork || []; // The following lines are considered a hack // (as it is based on the assumption: when currMajor.length > nextMajor.length, the user must be editing other fields while not selecting the yet to select major) @@ -137,6 +143,7 @@ class AmbassadorProfile extends React.Component { bio: nextProps.mentor.bio, // major: nextProps.mentor.major, // minor: nextProps.mentor.minor || {name: ''}, + quarter: nextProps.mentor.quarter, major: relativeSortAndMerge(currMajor, nextMajor, e => e.name, n => { return { name: n }; }), minor: relativeSortAndMerge(currMinor, nextMinor, e => e.name, n => { return { name: n }; }), courses: nextProps.mentor.courses.map(obj => obj.name) @@ -251,6 +258,82 @@ class AmbassadorProfile extends React.Component { ); } + renderGrad = () => { + return ( + + this.setState({quarter: e.target.value})}> + + + + + this.setState({grad: e.target.value})} value={this.state.grad}/> + + + ); + } + + renderSingleWork = (position, company, start, end, index) => { + return ( + // Implement value storage and update for each field once backend finishes up + // Yes, I know the inline CSS is terrible. It will be cleaned in another commit I promise :) +
+ + + + + + + + + + + + + +
+ ); + } + + renderWork = () => { + + const { + work: currWork, + } = this.state; + + let displayList = currWork.map((e, i) => this.renderSingleWork(e.position || '', e.company || '', e.start || '', e.end || '', i)); + + return ( +
+ {displayList} + +
+ ); + } + + _deleteWork = (index) => { + const { + work: currWork, + } = this.state; + + currWork.splice(index,1); + this.setState({ work: currWork }); + // Make sure to implement update profile for backend + } + _updateMajor = (majorName, index) => { const { major: currMajor, @@ -443,6 +526,10 @@ class AmbassadorProfile extends React.Component { {this.renderMinor()} + + + {this.renderGrad()} + {this.renderBio()} @@ -451,6 +538,10 @@ class AmbassadorProfile extends React.Component { {this.renderClasses()} + + + {this.renderWork()} +
this.props.updateMentorStatus(false)}>I am no longer available
diff --git a/src/components/pages/register/index.js b/src/components/pages/register/index.js index ae67853..2f92607 100644 --- a/src/components/pages/register/index.js +++ b/src/components/pages/register/index.js @@ -1,8 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import Form from 'components/util/LoginRegisterForm'; -import newBquest from '../../../../images/loginPage/white-bquest.svg.inline' -import newBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline' +import Logo from '../../util/Logo'; import Footer from '../../footer'; import Loader from '../../loading'; @@ -17,10 +16,7 @@ class Register extends React.Component { render() { return (
-
-
-
-
+

Connect with students on all your major-related questions.

diff --git a/src/components/pages/reset-password/index.js b/src/components/pages/reset-password/index.js index 8528ee4..4581c1d 100644 --- a/src/components/pages/reset-password/index.js +++ b/src/components/pages/reset-password/index.js @@ -1,17 +1,13 @@ import React from 'react'; -import newBquest from '../../../../images/loginPage/white-bquest.svg.inline' -import newBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline' import Footer from '../../../components/footer'; import Form from '../../util/ResetPasswordForm'; +import Logo from '../../util/Logo'; class ResetPassword extends React.Component { render() { return (
-
-
-
-
+

Password Reset

diff --git a/src/components/util/Logo/index.js b/src/components/util/Logo/index.js new file mode 100644 index 0000000..90d2285 --- /dev/null +++ b/src/components/util/Logo/index.js @@ -0,0 +1,33 @@ +import React from 'react'; +import whiteBquest from '../../../../images/loginPage/white-bquest.svg.inline'; +import whiteBquestLogo from '../../../../images/loginPage/white-bquest-logo.svg.inline'; +import tealBquestLogo from '../../../../images/loginPage/teal-bquest-logo.svg.inline'; +import tealBquest from '../../../../images/loginPage/teal-bquest.svg.inline'; + +class Logo extends React.Component { + render() { + return ( +
+ {(this.props.color === "teal") && +
location.href=(this.props.LoggedIn ? "/home" : "/")} style={{cursor:'pointer'}}> +
+
+
+ } + {(this.props.color === "white") && +
location.href=(this.props.LoggedIn ? "/home" : "/")} style={{cursor:'pointer'}}> +
+
+
+ } + {(this.props.color === "small-white") && +
location.href=(this.props.LoggedIn ? "/home" : "/")} style={{cursor:'pointer'}}> +
+
+ } +
+ ); + } +} + +export default Logo; \ No newline at end of file