-
);
-export default withStyles(styles)(Header);
+export default withStyles(styles)(Header);
\ No newline at end of file
diff --git a/src/components/main-site/Header2.js b/src/components/Header2.js
similarity index 97%
rename from src/components/main-site/Header2.js
rename to src/components/Header2.js
index b3a9ea3..c72bb5f 100644
--- a/src/components/main-site/Header2.js
+++ b/src/components/Header2.js
@@ -7,9 +7,9 @@ import "bootstrap/dist/css/bootstrap.min.css";
import { compose } from "recompose";
import { withStyles } from "@material-ui/styles";
-import * as ROUTES from "../../constants/routes";
+import * as ROUTES from "../constants/routes";
-import img from "../../assets/img/header.jpg";
+import img from "../assets/img/header.jpg";
const styles = {
mainNav: {
diff --git a/src/components/main-site/Header3.js b/src/components/Header3.js
similarity index 97%
rename from src/components/main-site/Header3.js
rename to src/components/Header3.js
index b9cdadf..ea8592f 100644
--- a/src/components/main-site/Header3.js
+++ b/src/components/Header3.js
@@ -8,9 +8,9 @@ import "bootstrap/dist/css/bootstrap.min.css";
import { compose } from "recompose";
import { withStyles } from "@material-ui/styles";
-import * as ROUTES from "../../constants/routes";
+import * as ROUTES from "../constants/routes";
-import img from "../../assets/img/header.jpg";
+import img from "../assets/img/header.jpg";
const styles = {
mainNav: {
@@ -155,7 +155,7 @@ class Header3Base extends Component {
Event Management
-
-
-
-
-
-
-
- +
( +
+
+);
+
+export default withStyles(styles)(HeaderPhoto);
diff --git a/src/components/main-site/LoginForm.js b/src/components/LoginForm.js
similarity index 90%
rename from src/components/main-site/LoginForm.js
rename to src/components/LoginForm.js
index d4f923a..bed3eba 100644
--- a/src/components/main-site/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -4,11 +4,11 @@ import Form from "react-bootstrap/Form";
import Container from "react-bootstrap/Container";
import { withStyles } from "@material-ui/styles";
-import logo from "../../assets/img/logo.png";
+import logo from "../assets/img/logo.png";
import "bootstrap/dist/css/bootstrap.min.css";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
import { compose } from "recompose";
const styles = {
@@ -41,7 +41,7 @@ const styles = {
class LoginFormBase extends Component {
componentDidMount = () => {
- console.log("login form mounted")
+ console.log("login form mounted");
if (this.props.firebase) {
const urlParams = new URLSearchParams(window.location.search);
const token = urlParams.get("token");
@@ -51,7 +51,7 @@ class LoginFormBase extends Component {
window.localStorage.removeItem("pathname");
this.props.firebase
.doSignInWithToken(token)
- .then(() => (this.props.history.push(pathname ? pathname : "/panel")))
+ .then(() => this.props.history.push(pathname ? pathname : "/panel"))
.catch(console.error);
} else {
window.location.href = "https://upe-authenticator.herokuapp.com/";
diff --git a/src/components/main-site/MemberCard.js b/src/components/MemberCard.js
similarity index 95%
rename from src/components/main-site/MemberCard.js
rename to src/components/MemberCard.js
index fb953eb..f9f260a 100644
--- a/src/components/main-site/MemberCard.js
+++ b/src/components/MemberCard.js
@@ -8,7 +8,7 @@ import {
faLinkedin,
} from "@fortawesome/free-brands-svg-icons";
import { withStyles } from "@material-ui/styles";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
import { compose } from "recompose";
import "bootstrap/dist/css/bootstrap.min.css";
@@ -20,7 +20,7 @@ const styles = {
borderRadius: "150px",
},
cardImgTopAlum: {
- opacity: '0.5',
+ opacity: "0.5",
width: "75%",
margin: "10% auto",
borderRadius: "150px",
@@ -39,12 +39,12 @@ const styles = {
},
cardTitle: {
fontSize: "30px",
- fontFamily: "Gruppo",
+ fontFamily: "Montserrat",
fontWeight: 1000,
},
cardSubtitle: {
fontSize: "25px",
- fontFamily: "Gruppo",
+ fontFamily: "Montserrat",
fontWeight: 1000,
color: "#f21131",
},
@@ -102,8 +102,8 @@ class MemberCardBase extends Component {
const { classes } = this.props;
var item = this.props.data;
-
- var alum = (item.roles && !!item.roles.alum);
+
+ var alum = item.roles && !!item.roles.alum;
var defaultIMG =
"https://firebasestorage.googleapis.com/v0/b/upe-website-fa07a.appspot.com/o/default.png?alt=media&token=6cced97e-fb1e-4604-8b5b-81318a52fcc2";
@@ -158,9 +158,7 @@ class MemberCardBase extends Component {
+
+
+
+
+
+
+ {item.upe.position}
-- Alumni -
+Alumni
diff --git a/src/components/main-site/MemberList.js b/src/components/MemberList.js similarity index 87% rename from src/components/main-site/MemberList.js rename to src/components/MemberList.js index ee4bd92..872e6ec 100644 --- a/src/components/main-site/MemberList.js +++ b/src/components/MemberList.js @@ -7,7 +7,7 @@ import MemberCard from "./MemberCard.js"; import "bootstrap/dist/css/bootstrap.min.css"; -import { withFirebase } from "../../api/Firebase"; +import { withFirebase } from "../api/Firebase"; import { compose } from "recompose"; const styles = { @@ -33,7 +33,9 @@ class MemberListBase extends Component { getClasses() { this.props.firebase.getConfig().then((doc) => { - const memberClasses = Object.entries(doc.data().classes).sort((a,b) => b[1] > a[1] ? 1 : -1).map(c => c[0]); + const memberClasses = Object.entries(doc.data().classes) + .sort((a, b) => (b[1] > a[1] ? 1 : -1)) + .map((c) => c[0]); this.setState({ memberClasses }, this.getMembers); }); } @@ -49,10 +51,10 @@ class MemberListBase extends Component { console.error("Error getting documents: ", error); }); } - + getMembers() { - const { classes } = this.props; - + const { classes } = this.props; + const members = this.state.memberClasses.map(async (className) => { const classMembers = await this.props.firebase .getClass(className) @@ -77,10 +79,10 @@ class MemberListBase extends Component { ); }); - - Promise.all(members).then(values => { - this.setState({members: values}); - }); + + Promise.all(members).then((values) => { + this.setState({ members: values }); + }); } render() { @@ -89,7 +91,7 @@ class MemberListBase extends Component { const eboard = this.state.eboard.map((item, index) => (
@@ -106,8 +110,11 @@ class MemberListBase extends Component {
-
-
-
+
-
+
-
- {members}
-
+ {members}
);
diff --git a/src/components/main-site/MemberMngCard.js b/src/components/MemberMngCard.js
similarity index 72%
rename from src/components/main-site/MemberMngCard.js
rename to src/components/MemberMngCard.js
index eeda133..d4cb7ec 100644
--- a/src/components/main-site/MemberMngCard.js
+++ b/src/components/MemberMngCard.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
import Col from "react-bootstrap/Col";
import Button from "react-bootstrap/Button";
import { withStyles } from "@material-ui/styles";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
import { compose } from "recompose";
import DataEdit from "./DataEdit.js";
@@ -81,22 +81,22 @@ class MemberMngCardBase extends Component {
this.state = {
uid: "",
editData: false,
- editBP: false,
+ editBP: false,
demote: false,
deleteData: false,
- toggleAdmin: false,
- admin: (this.props.data.roles && !!this.props.data.roles.admin)
+ toggleAdmin: false,
+ admin: this.props.data.roles && !!this.props.data.roles.admin,
};
this.handleToggleData = this.handleToggleData.bind(this);
- this.handleToggleBP = this.handleToggleBP.bind(this);
+ this.handleToggleBP = this.handleToggleBP.bind(this);
this.handleToggleDelete = this.handleToggleDelete.bind(this);
this.deleteData = this.deleteData.bind(this);
this.handleToggleDemote = this.handleToggleDemote.bind(this);
this.demote = this.demote.bind(this);
- this.handleToggleAdmin = this.handleToggleAdmin.bind(this);
+ this.handleToggleAdmin = this.handleToggleAdmin.bind(this);
this.adminSwitch = this.adminSwitch.bind(this);
- this.updateSubFun = this.updateSubFun.bind(this);
+ this.updateSubFun = this.updateSubFun.bind(this);
}
componentDidMount() {
@@ -110,7 +110,7 @@ class MemberMngCardBase extends Component {
editData: !this.state.editData,
});
};
-
+
handleToggleBP = () => {
this.setState({
editBP: !this.state.editBP,
@@ -122,11 +122,18 @@ class MemberMngCardBase extends Component {
deleteData: !this.state.deleteData,
});
};
-
+
updateSubFun = () => {
- this.props.updateFunc();
-
- this.setState({editBP: false, editData: false, deleteData: false, demote: false, toggleAdmin: false, admin: (!this.state.admin)});
+ this.props.updateFunc();
+
+ this.setState({
+ editBP: false,
+ editData: false,
+ deleteData: false,
+ demote: false,
+ toggleAdmin: false,
+ admin: !this.state.admin,
+ });
};
deleteData = () => {
@@ -154,7 +161,7 @@ class MemberMngCardBase extends Component {
const data = {
roles: {
upemember: false,
- nonmember: true,
+ nonmember: true,
},
};
@@ -167,7 +174,7 @@ class MemberMngCardBase extends Component {
this.setState({ error });
});
};
-
+
handleToggleAdmin = () => {
this.setState({
toggleAdmin: !this.state.toggleAdmin,
@@ -177,7 +184,7 @@ class MemberMngCardBase extends Component {
adminSwitch = () => {
const data = {
roles: {
- admin: (!this.state.admin),
+ admin: !this.state.admin,
},
};
@@ -194,10 +201,9 @@ class MemberMngCardBase extends Component {
render() {
const { classes } = this.props;
- var adminButton = "Make Admin";
- if (this.state.admin)
- adminButton = "Remove Adminship";
-
+ var adminButton = "Make Admin";
+ if (this.state.admin) adminButton = "Remove Adminship";
+
var item = this.props.data;
return (
@@ -206,7 +212,9 @@ class MemberMngCardBase extends Component {
{item.name}
{item.email}
-BP: {item.upe.bp} | RP: {item.upe.rp}
++ BP: {item.upe.bp} | RP: {item.upe.rp} +
@@ -218,42 +226,45 @@ class MemberMngCardBase extends Component { Edit Data
-
@@ -87,14 +91,15 @@ class UserManagementBase extends Component {
-
- {members}
-
+ {members}
);
}
}
-const UserManagement = compose(withFirebase, withStyles(styles))(UserManagementBase);
+const UserManagement = compose(
+ withFirebase,
+ withStyles(styles)
+)(UserManagementBase);
export default UserManagement;
diff --git a/src/components/main-site/UserMngCard.js b/src/components/UserMngCard.js
similarity index 92%
rename from src/components/main-site/UserMngCard.js
rename to src/components/UserMngCard.js
index 848a88f..c61c441 100644
--- a/src/components/main-site/UserMngCard.js
+++ b/src/components/UserMngCard.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
import Col from "react-bootstrap/Col";
import Button from "react-bootstrap/Button";
import { withStyles } from "@material-ui/styles";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
import { compose } from "recompose";
import PromoteUser from "./PromoteUser.js";
@@ -86,7 +86,7 @@ class UserMngCardBase extends Component {
this.handleToggleDelete = this.handleToggleDelete.bind(this);
this.deleteData = this.deleteData.bind(this);
this.handleTogglePromote = this.handleTogglePromote.bind(this);
- this.updateSubFun = this.updateSubFun.bind(this);
+ this.updateSubFun = this.updateSubFun.bind(this);
}
componentDidMount() {
@@ -106,10 +106,10 @@ class UserMngCardBase extends Component {
deleteData: !this.state.deleteData,
});
};
-
+
updateSubFun = () => {
- this.props.updateFunc();
- this.setState({deleteData: false, promote: false});
+ this.props.updateFunc();
+ this.setState({ deleteData: false, promote: false });
};
deleteData = () => {
@@ -166,14 +166,17 @@ class UserMngCardBase extends Component {
-
{" "} - Class: {this.props.value.upe.class}{" "} + Class:{" "} + {this.props.value.upe.class}{" "}
{" "}
@@ -176,7 +189,8 @@ class UserPanelBase extends Component {
{" "}
- Email: {this.props.value.email}{" "}
+ Email:{" "}
+ {this.props.value.email}{" "}
{" "}
@@ -204,11 +218,13 @@ class UserPanelBase extends Component {
{" "}
- Brownie Points: {this.props.value.upe.bp}{" "}
+ Brownie Points:{" "}
+ {this.props.value.upe.bp}{" "}
{" "}
- Recruitment Points: {this.props.value.upe.rp}{" "}
+ Recruitment Points:{" "}
+ {this.props.value.upe.rp}{" "}
diff --git a/src/pages/main-site/About.js b/src/pages/About.js
similarity index 94%
rename from src/pages/main-site/About.js
rename to src/pages/About.js
index 33246f7..a7697b9 100644
--- a/src/pages/main-site/About.js
+++ b/src/pages/About.js
@@ -1,10 +1,10 @@
import React from "react";
import { withRouter } from "react-router-dom";
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
+import Header from "../components/Header";
+import Footer from "../components/Footer";
-import * as ROUTES from "../../constants/routes";
+import * as ROUTES from "../constants/routes";
import { Link } from "react-router-dom";
import Container from "react-bootstrap/Container";
@@ -16,8 +16,7 @@ const About = () => {
return (
+
UPE BU Members are both undergraduate & graduate students from
Boston University who are either actively studying information
- techniologies and computing disciplines or have shown exceeding
+ technologies and computing disciplines or have shown exceeding
interest and/or talent in them.
diff --git a/src/pages/main-site/Contact.js b/src/pages/Contact.js
similarity index 71%
rename from src/pages/main-site/Contact.js
rename to src/pages/Contact.js
index 0d7afd1..b85bba8 100644
--- a/src/pages/main-site/Contact.js
+++ b/src/pages/Contact.js
@@ -1,11 +1,11 @@
import React from "react";
import { withRouter } from "react-router-dom";
-import "../../styles/main-site/main.css";
+import "../styles/main.css";
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import ContactForm from "../../components/main-site/ContactForm";
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+import ContactForm from "../components/ContactForm";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
@@ -15,8 +15,7 @@ const About = () => {
return (
+
+
+
+
+
+ );
+};
+
+export default withRouter(Members);
diff --git a/src/pages/Landing.js b/src/pages/Landing.js
new file mode 100644
index 0000000..8071a2b
--- /dev/null
+++ b/src/pages/Landing.js
@@ -0,0 +1,224 @@
+import React, { Component } from "react";
+import { Link } from "react-router-dom";
+import { withRouter } from "react-router-dom";
+
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+
+import * as ROUTES from "../constants/routes";
+import { withFirebase } from "../api/Firebase";
+import "../styles/main.css";
+import { compose } from "recompose";
+import { withStyles } from "@material-ui/styles";
+
+import Container from "react-bootstrap/Container";
+import Row from "react-bootstrap/Row";
+import Col from "react-bootstrap/Col";
+import Button from "react-bootstrap/Button";
+import HeaderPhoto from "../components/HeaderPhoto";
+
+const styles = {
+ bobble: {
+ backgroundColor: "#e8e88c",
+ fontWeight: "600",
+ fontSize: "20px",
+ borderRadius: "10px",
+ textAlign: "center",
+ paddingBottom: "1px",
+ paddingTop: "15px",
+ },
+ container: {
+ maxWidth: "1000px",
+ },
+ col1: {
+ position: "relative",
+ left: "-100px",
+ },
+ col2: {
+ position: "relative",
+ left: "+40px",
+ },
+};
+
+class MainLandingBase extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ displayApplyPage: false,
+ displayInterestForm: false,
+ ytEmbed: "https://www.youtube.com/embed/NTuI2b9hZGM",
+ };
+ }
+
+ getData = () => {
+ this.props.firebase
+ .generalSettings()
+ .get()
+ .then((querySnapshot) => {
+ const data = querySnapshot.data();
+
+ this.setState({
+ displayApplyPage: data.displayApplyPage,
+ displayInterestForm: data.displayInterestForm,
+ ytEmbed: data.ytEmbed,
+ });
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ };
+
+ componentDidMount() {
+ this.getData();
+ }
+
+ render() {
+ const { classes } = this.props;
+ const { displayApplyPage, displayInterestForm, ytEmbed } = this.state;
+
+ const BobbleForm = () => {
+ return (
+
+
+ Interested in joining UPE? Click
+ here.
+
+
+ );
+ };
+
+ const BobbleApply = () => {
+ return (
+
+
+ We are now accepting applications! Click
+ here to apply.
+
+
+ );
+ };
+
+ const DisplayBobble = () => {
+ if (displayApplyPage) {
+ return (
+
+
+ );
+ } else if (displayInterestForm) {
+ return (
+
+
+ );
+ } else {
+ return <> ;
+ }
+ };
+
+ return (
+
+
+
+ About Us
+
+
+
+ Our Projects
+
+
+
+
+
+
+
+
+ Upsilon Pi Epsilon (UPE) at BU is an honor society dedicated
+ to promoting excellence in technical and computing
+ disciplines. UPE's chapter at BU has as it's main focus the
+ improvement of it's member's technical skills, as to
+ complement the school's great theoretical teaching.
+
+
+
+
+
+
+
+
+
+ Both UPE as an organization, and each of our dedicated members
+ are constantly working on amazing projects both related to the
+ org. or otherwise!
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Check out the latest episode of our podcast!
+
+
+
+
+
+ );
+ }
+}
+
+const MainLanding = compose(
+ withFirebase,
+ withStyles(styles),
+ withRouter
+)(MainLandingBase);
+
+export default MainLanding;
diff --git a/src/pages/main-site/Login.js b/src/pages/Login.js
similarity index 53%
rename from src/pages/main-site/Login.js
rename to src/pages/Login.js
index 0a40405..87283a7 100644
--- a/src/pages/main-site/Login.js
+++ b/src/pages/Login.js
@@ -1,9 +1,9 @@
import React from "react";
-import "../../styles/main-site/main.css";
-import LoginForm from "../../components/main-site/LoginForm";
-import { AuthUserContext } from "../../api/Session";
-import * as ROUTES from "../../constants/routes";
+import "../styles/main.css";
+import LoginForm from "../components/LoginForm";
+import { AuthUserContext } from "../api/Session";
+import * as ROUTES from "../constants/routes";
class Login extends React.Component {
static contextType = AuthUserContext;
@@ -16,7 +16,7 @@ class Login extends React.Component {
if (this.context) {
return null;
} else {
- return ;
+ return
+
+
+
+
+ );
+};
+
+export default withRouter(Members);
diff --git a/src/pages/main-site/Panel.js b/src/pages/Panel.js
similarity index 54%
rename from src/pages/main-site/Panel.js
rename to src/pages/Panel.js
index e57d6b0..c0eed44 100644
--- a/src/pages/main-site/Panel.js
+++ b/src/pages/Panel.js
@@ -1,13 +1,13 @@
import React, { useContext } from "react";
-import Footer from "../../components/main-site/Footer";
-import Header2 from "../../components/main-site/Header2";
-import Header3 from "../../components/main-site/Header3";
+import Footer from "../components/Footer";
+import Header2 from "../components/Header2";
+import Header3 from "../components/Header3";
-import "../../styles/main-site/main.css";
-import { withAuthorization, AuthUserContext } from "../../api/Session";
+import "../styles/main.css";
+import { withAuthorization, AuthUserContext } from "../api/Session";
-import UserPanel from "../../components/main-site/UserPanel";
+import UserPanel from "../components/UserPanel";
const Panel = () => {
const authUser = useContext(AuthUserContext);
@@ -19,7 +19,7 @@ const Panel = () => {
);
-}
+};
// TODO: move conditions into component library
const condition = (authUser) => !!authUser?.roles?.upemember;
diff --git a/src/pages/main-site/Events.js b/src/pages/main-site/Events.js
deleted file mode 100644
index f06da9f..0000000
--- a/src/pages/main-site/Events.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
-
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import EventsCalendar from "../../components/main-site/EventsCalendar";
-
-import "../../styles/main-site/main.css";
-
-const Members = () => {
- return (
-
-
- Interested in joining UPE? Click here.
-
- );
- };
-
- const BobbleApply = () => {
- return (
-
- We are now accepting applications! Click here to apply.
-
- );
- };
-
- const DisplayBobble = () => {
- if (displayApplyPage) {
- return (
-
-
- );
- } else if (displayInterestForm) {
- return (
-
-
- );
- } else {
- return (<> );
- }
- };
-
- return (
-
-
-
-
- About Us
-
-
-
-
-
-
- Upsilon Pi Epsilon (UPE) at BU is an honor society dedicated to
- promoting excellence in technical and computing disciplines.
- UPE's chapter at BU has as it's main focus the improvement of
- it's member's technical skills, as to complement the school's
- great theoretical teaching.
-
-
-
-
-
-
-
-
-
-
-
-
-
- Our Projects
-
-
-
-
-
- 
-
-
-
- Both UPE as an organization, and each of our dedicated members
- are constantly working on amazing projects both related to the
- org. or otherwise!
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-};
-
-const MainLanding = compose(
- withFirebase,
- withStyles(styles),
- withRouter
-)(MainLandingBase);
-
-export default MainLanding;
diff --git a/src/pages/main-site/Members.js b/src/pages/main-site/Members.js
deleted file mode 100644
index 052b968..0000000
--- a/src/pages/main-site/Members.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
-
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import MemberList from "../../components/main-site/MemberList";
-
-import "../../styles/main-site/main.css";
-
-const Members = () => {
- return (
-
-
{" "} - Brownie Points: {this.props.value.upe.bp}{" "} + Brownie Points:{" "} + {this.props.value.upe.bp}{" "}
{" "} - Recruitment Points: {this.props.value.upe.rp}{" "} + Recruitment Points:{" "} + {this.props.value.upe.rp}{" "}
@@ -34,7 +33,7 @@ const About = () => {
diff --git a/src/pages/main-site/Contact.js b/src/pages/Contact.js
similarity index 71%
rename from src/pages/main-site/Contact.js
rename to src/pages/Contact.js
index 0d7afd1..b85bba8 100644
--- a/src/pages/main-site/Contact.js
+++ b/src/pages/Contact.js
@@ -1,11 +1,11 @@
import React from "react";
import { withRouter } from "react-router-dom";
-import "../../styles/main-site/main.css";
+import "../styles/main.css";
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import ContactForm from "../../components/main-site/ContactForm";
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+import ContactForm from "../components/ContactForm";
import Container from "react-bootstrap/Container";
import Row from "react-bootstrap/Row";
@@ -15,8 +15,7 @@ const About = () => {
return (
UPE BU Members are both undergraduate & graduate students from Boston University who are either actively studying information - techniologies and computing disciplines or have shown exceeding + technologies and computing disciplines or have shown exceeding interest and/or talent in them.
diff --git a/src/pages/main-site/EboardE.js b/src/pages/EboardE.js
similarity index 55%
rename from src/pages/main-site/EboardE.js
rename to src/pages/EboardE.js
index 187284d..c19a8d4 100644
--- a/src/pages/main-site/EboardE.js
+++ b/src/pages/EboardE.js
@@ -1,18 +1,18 @@
import React, { Component } from "react";
-import Header2 from "../../components/main-site/Header2";
-import Header3 from "../../components/main-site/Header3";
-import Footer from "../../components/main-site/Footer";
+import Header2 from "../components/Header2";
+import Header3 from "../components/Header3";
+import Footer from "../components/Footer";
-import "../../styles/main-site/main.css";
-import { withAuthorization, AuthUserContext } from "../../api/Session";
+import "../styles/main.css";
+import { withAuthorization, AuthUserContext } from "../api/Session";
import { compose } from "recompose";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
-import NotEboard from "../../components/main-site/NotEboard";
-import Spacer from "../../components/main-site/Spacer";
-import EventsManagement from "../../components/main-site/EventsManagement";
+import NotEboard from "../components/NotEboard";
+import Spacer from "../components/Spacer";
+import EventsManagement from "../components/EventsManagement";
class EboardMBase extends Component {
static contextType = AuthUserContext;
diff --git a/src/pages/main-site/EboardM.js b/src/pages/EboardM.js
similarity index 55%
rename from src/pages/main-site/EboardM.js
rename to src/pages/EboardM.js
index 0473369..0a71aad 100644
--- a/src/pages/main-site/EboardM.js
+++ b/src/pages/EboardM.js
@@ -1,18 +1,18 @@
import React, { Component } from "react";
-import Header2 from "../../components/main-site/Header2";
-import Header3 from "../../components/main-site/Header3";
-import Footer from "../../components/main-site/Footer";
+import Header2 from "../components/Header2";
+import Header3 from "../components/Header3";
+import Footer from "../components/Footer";
-import "../../styles/main-site/main.css";
-import { withAuthorization, AuthUserContext } from "../../api/Session";
+import "../styles/main.css";
+import { withAuthorization, AuthUserContext } from "../api/Session";
import { compose } from "recompose";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
-import NotEboard from "../../components/main-site/NotEboard";
-import Spacer from "../../components/main-site/Spacer";
-import MemberManagement from "../../components/main-site/MemberManagement";
+import NotEboard from "../components/NotEboard";
+import Spacer from "../components/Spacer";
+import MemberManagement from "../components/MemberManagement";
class EboardMBase extends Component {
static contextType = AuthUserContext;
diff --git a/src/pages/main-site/EboardU.js b/src/pages/EboardU.js
similarity index 55%
rename from src/pages/main-site/EboardU.js
rename to src/pages/EboardU.js
index b0dc378..ae8a526 100644
--- a/src/pages/main-site/EboardU.js
+++ b/src/pages/EboardU.js
@@ -1,18 +1,18 @@
import React, { Component } from "react";
-import Header2 from "../../components/main-site/Header2";
-import Header3 from "../../components/main-site/Header3";
-import Footer from "../../components/main-site/Footer";
+import Header2 from "../components/Header2";
+import Header3 from "../components/Header3";
+import Footer from "../components/Footer";
-import "../../styles/main-site/main.css";
-import { withAuthorization, AuthUserContext } from "../../api/Session";
+import "../styles/main.css";
+import { withAuthorization, AuthUserContext } from "../api/Session";
import { compose } from "recompose";
-import { withFirebase } from "../../api/Firebase";
+import { withFirebase } from "../api/Firebase";
-import NotEboard from "../../components/main-site/NotEboard";
-import Spacer from "../../components/main-site/Spacer";
-import UserManagement from "../../components/main-site/UserManagement";
+import NotEboard from "../components/NotEboard";
+import Spacer from "../components/Spacer";
+import UserManagement from "../components/UserManagement";
class EboardUBase extends Component {
static contextType = AuthUserContext;
diff --git a/src/pages/Events.js b/src/pages/Events.js
new file mode 100644
index 0000000..3bef8be
--- /dev/null
+++ b/src/pages/Events.js
@@ -0,0 +1,25 @@
+import React from "react";
+import { withRouter } from "react-router-dom";
+
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+import EventsCalendar from "../components/EventsCalendar";
+
+import Container from "react-bootstrap/Container";
+
+import "../styles/main.css";
+
+const Members = () => {
+ return (
+
+
+ );
+ };
+
+ const BobbleApply = () => {
+ return (
+
+
+ );
+ };
+
+ const DisplayBobble = () => {
+ if (displayApplyPage) {
+ return (
+
+
+ );
+ } else if (displayInterestForm) {
+ return (
+
+
+ );
+ } else {
+ return <> ;
+ }
+ };
+
+ return (
+ ;
+ return
-
- );
- };
-
- const BobbleApply = () => {
- return (
-
-
- );
- };
-
- const DisplayBobble = () => {
- if (displayApplyPage) {
- return (
-
-
- );
- } else if (displayInterestForm) {
- return (
-
-
- );
- } else {
- return (<> );
- }
- };
-
- return (
-
+
+
+
+
+
+ );
+};
+
+export default withRouter(Members);
diff --git a/src/pages/Landing.js b/src/pages/Landing.js
new file mode 100644
index 0000000..8071a2b
--- /dev/null
+++ b/src/pages/Landing.js
@@ -0,0 +1,224 @@
+import React, { Component } from "react";
+import { Link } from "react-router-dom";
+import { withRouter } from "react-router-dom";
+
+import Header from "../components/Header";
+import Footer from "../components/Footer";
+
+import * as ROUTES from "../constants/routes";
+import { withFirebase } from "../api/Firebase";
+import "../styles/main.css";
+import { compose } from "recompose";
+import { withStyles } from "@material-ui/styles";
+
+import Container from "react-bootstrap/Container";
+import Row from "react-bootstrap/Row";
+import Col from "react-bootstrap/Col";
+import Button from "react-bootstrap/Button";
+import HeaderPhoto from "../components/HeaderPhoto";
+
+const styles = {
+ bobble: {
+ backgroundColor: "#e8e88c",
+ fontWeight: "600",
+ fontSize: "20px",
+ borderRadius: "10px",
+ textAlign: "center",
+ paddingBottom: "1px",
+ paddingTop: "15px",
+ },
+ container: {
+ maxWidth: "1000px",
+ },
+ col1: {
+ position: "relative",
+ left: "-100px",
+ },
+ col2: {
+ position: "relative",
+ left: "+40px",
+ },
+};
+
+class MainLandingBase extends Component {
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ displayApplyPage: false,
+ displayInterestForm: false,
+ ytEmbed: "https://www.youtube.com/embed/NTuI2b9hZGM",
+ };
+ }
+
+ getData = () => {
+ this.props.firebase
+ .generalSettings()
+ .get()
+ .then((querySnapshot) => {
+ const data = querySnapshot.data();
+
+ this.setState({
+ displayApplyPage: data.displayApplyPage,
+ displayInterestForm: data.displayInterestForm,
+ ytEmbed: data.ytEmbed,
+ });
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ };
+
+ componentDidMount() {
+ this.getData();
+ }
+
+ render() {
+ const { classes } = this.props;
+ const { displayApplyPage, displayInterestForm, ytEmbed } = this.state;
+
+ const BobbleForm = () => {
+ return (
+ + Interested in joining UPE? Click + here. +
++ We are now accepting applications! Click + here to apply. +
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+const MainLanding = compose(
+ withFirebase,
+ withStyles(styles),
+ withRouter
+)(MainLandingBase);
+
+export default MainLanding;
diff --git a/src/pages/main-site/Login.js b/src/pages/Login.js
similarity index 53%
rename from src/pages/main-site/Login.js
rename to src/pages/Login.js
index 0a40405..87283a7 100644
--- a/src/pages/main-site/Login.js
+++ b/src/pages/Login.js
@@ -1,9 +1,9 @@
import React from "react";
-import "../../styles/main-site/main.css";
-import LoginForm from "../../components/main-site/LoginForm";
-import { AuthUserContext } from "../../api/Session";
-import * as ROUTES from "../../constants/routes";
+import "../styles/main.css";
+import LoginForm from "../components/LoginForm";
+import { AuthUserContext } from "../api/Session";
+import * as ROUTES from "../constants/routes";
class Login extends React.Component {
static contextType = AuthUserContext;
@@ -16,7 +16,7 @@ class Login extends React.Component {
if (this.context) {
return null;
} else {
- return
+
+
+
+ About Us
+
+
+
+ Our Projects
+
+
+
+ + Upsilon Pi Epsilon (UPE) at BU is an honor society dedicated + to promoting excellence in technical and computing + disciplines. UPE's chapter at BU has as it's main focus the + improvement of it's member's technical skills, as to + complement the school's great theoretical teaching. +
+
+
+
+
+
+
+
+
+ + Both UPE as an organization, and each of our dedicated members + are constantly working on amazing projects both related to the + org. or otherwise! +
+
+
+
+
+
+
+
+
+
+
+
+ Check out the latest episode of our podcast!
+
+
+
+
+
+
+ );
+};
+
+export default withRouter(Members);
diff --git a/src/pages/main-site/Panel.js b/src/pages/Panel.js
similarity index 54%
rename from src/pages/main-site/Panel.js
rename to src/pages/Panel.js
index e57d6b0..c0eed44 100644
--- a/src/pages/main-site/Panel.js
+++ b/src/pages/Panel.js
@@ -1,13 +1,13 @@
import React, { useContext } from "react";
-import Footer from "../../components/main-site/Footer";
-import Header2 from "../../components/main-site/Header2";
-import Header3 from "../../components/main-site/Header3";
+import Footer from "../components/Footer";
+import Header2 from "../components/Header2";
+import Header3 from "../components/Header3";
-import "../../styles/main-site/main.css";
-import { withAuthorization, AuthUserContext } from "../../api/Session";
+import "../styles/main.css";
+import { withAuthorization, AuthUserContext } from "../api/Session";
-import UserPanel from "../../components/main-site/UserPanel";
+import UserPanel from "../components/UserPanel";
const Panel = () => {
const authUser = useContext(AuthUserContext);
@@ -19,7 +19,7 @@ const Panel = () => {
);
-}
+};
// TODO: move conditions into component library
const condition = (authUser) => !!authUser?.roles?.upemember;
diff --git a/src/pages/main-site/Events.js b/src/pages/main-site/Events.js
deleted file mode 100644
index f06da9f..0000000
--- a/src/pages/main-site/Events.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
-
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import EventsCalendar from "../../components/main-site/EventsCalendar";
-
-import "../../styles/main-site/main.css";
-
-const Members = () => {
- return (
-
-
- );
-};
-
-export default withRouter(Members);
diff --git a/src/pages/main-site/Landing.js b/src/pages/main-site/Landing.js
deleted file mode 100644
index b920085..0000000
--- a/src/pages/main-site/Landing.js
+++ /dev/null
@@ -1,194 +0,0 @@
-import React, { Component }from "react";
-import { Link } from "react-router-dom";
-import { withRouter } from "react-router-dom";
-
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import projectsIMG from "../../assets/img/projects.jpg";
-
-import * as ROUTES from "../../constants/routes";
-import { withFirebase } from "../../api/Firebase";
-import "../../styles/main-site/main.css";
-import { compose } from "recompose";
-import { withStyles } from "@material-ui/styles";
-
-import Container from "react-bootstrap/Container";
-import Row from "react-bootstrap/Row";
-import Col from "react-bootstrap/Col";
-import Button from "react-bootstrap/Button";
-
-const styles = {
- bobble: {
- backgroundColor: "#e8e88c",
- fontWeight: "600",
- fontSize: "20px",
- borderRadius: "10px",
- textAlign: "center",
- paddingBottom: "1px",
- paddingTop: "15px",
- },
-};
-
-class MainLandingBase extends Component {
- constructor(props){
- super(props);
-
- this.state = {
- displayApplyPage: false,
- displayInterestForm: false,
- }
- }
-
- getData = () => {
- this.props.firebase.generalSettings().get().then((querySnapshot) => {
- const data = querySnapshot.data();
-
- this.setState({displayApplyPage: data.displayApplyPage, displayInterestForm: data.displayInterestForm});
- }).catch((err) => {
- console.log(err);
- });
- }
-
- componentDidMount() {
- this.getData();
- }
-
- render() {
- const { classes } = this.props;
- const { displayApplyPage, displayInterestForm } = this.state;
-
- const BobbleForm = () => {
- return (
- Interested in joining UPE? Click here.
-We are now accepting applications! Click here to apply.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-};
-
-const MainLanding = compose(
- withFirebase,
- withStyles(styles),
- withRouter
-)(MainLandingBase);
-
-export default MainLanding;
diff --git a/src/pages/main-site/Members.js b/src/pages/main-site/Members.js
deleted file mode 100644
index 052b968..0000000
--- a/src/pages/main-site/Members.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from "react";
-import { withRouter } from "react-router-dom";
-
-import Header from "../../components/main-site/Header";
-import Footer from "../../components/main-site/Footer";
-import MemberList from "../../components/main-site/MemberList";
-
-import "../../styles/main-site/main.css";
-
-const Members = () => {
- return (
-
-
-
- About Us
-
-
-
- - Upsilon Pi Epsilon (UPE) at BU is an honor society dedicated to - promoting excellence in technical and computing disciplines. - UPE's chapter at BU has as it's main focus the improvement of - it's member's technical skills, as to complement the school's - great theoretical teaching. -
-
-
-
-
-
-
-
-
- Our Projects
-
-
-
- - Both UPE as an organization, and each of our dedicated members - are constantly working on amazing projects both related to the - org. or otherwise! -
-
-
-
-
-
-
-
- );
-};
-
-export default withRouter(Members);
diff --git a/src/styles/main-site/calendar.css b/src/styles/calendar.css
similarity index 100%
rename from src/styles/main-site/calendar.css
rename to src/styles/calendar.css
diff --git a/src/styles/main-site/login.css b/src/styles/login.css
similarity index 100%
rename from src/styles/main-site/login.css
rename to src/styles/login.css
diff --git a/src/styles/main-site/main.css b/src/styles/main-site/main.css
deleted file mode 100644
index 418c386..0000000
--- a/src/styles/main-site/main.css
+++ /dev/null
@@ -1,93 +0,0 @@
-@import url("https://fonts.googleapis.com/css?family=Gruppo");
-
-.logo {
- padding-top: 100px;
- padding-bottom: 50px;
-}
-
-.title h1 {
- font-family: 'Gruppo';
- font-weight: 1000;
- font-size: 50px;
-}
-
-.title {
- padding-bottom: 30px;
-}
-
-.title-centered {
- font-family: 'Gruppo';
- font-weight: 8000;
- font-size: 35px;
- text-align: center;
- padding-bottom: 30px;
- color: #f21131;
-}
-
-.bodyText h2 {
- font-family: 'Gruppo';
- font-weight: 1000;
- font-size: 35px;
- padding-top: 15px;
-}
-
-.bodyText li {
- font-family: 'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;
- font-size: 15px;
- padding-bottom:5px;
-}
-
-.bodyText p {
- font-family:'Open Sans','Helvetica Neue',Helvetica,Arial,sans-serif;
- font-size: 18px;
-}
-
-.bodyText {
- padding-bottom: 20px;
-}
-
-.bodyText Link {
- font-family: 'Gruppo';
- font-weight: 800;
- font-size: 20px;
- color: #f21131;
- text-transform: uppercase;
-}
-.bodyText Link:hover {
- color: #C30000;
- text-transform: uppercase;
- text-decoration: none;
-}
-
-.white-text {
- color: #fff;
-}
-.white-text:hover {
- color: #fff;
- text-decoration: none;
-}
-
-.buttonBlock .btn {
- background-color: #f21131;
- color: #fff;
- border-color: #f21131;
- font-family: 'Gruppo';
- font-weight: 800;
- font-size: 20px;
- text-transform: uppercase;
-}
-
-.buttonBlock .btn:hover {
- background-color: #C30000;
- border-color: #C30000;
- color: #fff;
- font-family: 'Gruppo';
- font-weight: 800;
- font-size: 20px;
- text-transform: uppercase;
-}
-
-.buttonBlock {
- padding-bottom: 40px;
-}
-
diff --git a/src/styles/main.css b/src/styles/main.css
new file mode 100644
index 0000000..ec15d85
--- /dev/null
+++ b/src/styles/main.css
@@ -0,0 +1,101 @@
+@import url("https://fonts.googleapis.com/css?family=Gruppo");
+@import url("https://fonts.googleapis.com/css2?family=Open+Sans:wght@300&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@300&family=Open+Sans:wght@300&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Recursive:wght@600&display=swap");
+
+.logo {
+ padding-top: 100px;
+ padding-bottom: 50px;
+}
+
+.title h1 {
+ font-family: "Montserrat";
+ font-weight: 1000;
+ font-size: 40px;
+}
+
+.title {
+ padding-bottom: 30px;
+}
+
+.title-centered {
+ font-family: "Gruppo";
+ font-weight: 8000;
+ font-size: 35px;
+ text-align: center;
+ padding-bottom: 30px;
+ color: #f21131;
+}
+.bodyText h1 {
+ font-family: "Montserrat";
+ font-weight: 1000;
+ text-align: center;
+ margin-left: 105px;
+ margin-bottom: 50px;
+}
+.bodyText h2 {
+ font-family: "Montserrat";
+ font-weight: 1000;
+ font-size: 35px;
+ padding-top: 15px;
+}
+
+.bodyText li {
+ font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 15px;
+ padding-bottom: 5px;
+}
+
+.bodyText p {
+ font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 18px;
+}
+
+.bodyText {
+ padding-bottom: 20px;
+}
+
+.bodyText Link {
+ font-family: "Gruppo";
+ font-weight: 800;
+ font-size: 20px;
+ color: #f21131;
+ text-transform: uppercase;
+}
+.bodyText Link:hover {
+ color: #c30000;
+ text-transform: uppercase;
+ text-decoration: none;
+}
+
+.white-text {
+ color: #fff;
+}
+.white-text:hover {
+ color: #fff;
+ text-decoration: none;
+}
+
+.buttonBlock .btn {
+ background-color: #f21131;
+ color: #fff;
+ border-color: #f21131;
+ font-family: "Montserrat";
+ font-weight: 800;
+ font-size: 15px;
+ text-transform: uppercase;
+}
+
+.buttonBlock .btn:hover {
+ background-color: #c30000;
+ border-color: #c30000;
+ color: #fff;
+ font-family: "Montserrat";
+ font-weight: 800;
+ font-size: 15px;
+ text-transform: uppercase;
+}
+
+.buttonBlock {
+ padding-bottom: 40px;
+}
diff --git a/storage.rules b/storage.rules
deleted file mode 100644
index d494542..0000000
--- a/storage.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-service firebase.storage {
- match /b/{bucket}/o {
- match /{allPaths=**} {
- allow read, write: if request.auth!=null;
- }
- }
-}
diff --git a/yarn.lock b/yarn.lock
index 72f4fac..aeb1edb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7111,9 +7111,9 @@ home-dir@^1.0.0:
integrity sha1-KRfrRL3JByztqUJXlUOEfjAX/k4=
hosted-git-info@^2.1.4:
- version "2.8.8"
- resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
- integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+ version "2.8.9"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+ integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
hpack.js@^2.1.6:
version "2.1.6"
@@ -7291,6 +7291,11 @@ https-proxy-agent@^5.0.0:
agent-base "6"
debug "4"
+husky@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
+ integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
+
hyphenate-style-name@^1.0.3:
version "1.0.4"
resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
@@ -11405,10 +11410,10 @@ prepend-http@^2.0.0:
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-prettier@^2.0.5:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
- integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+prettier@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18"
+ integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==
pretty-bytes@^5.1.0:
version "5.4.1"
@@ -13859,9 +13864,9 @@ typedarray@^0.0.6:
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
ua-parser-js@^0.7.18:
- version "0.7.22"
- resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
- integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+ version "0.7.28"
+ resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+ integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
uncontrollable@^7.0.0:
version "7.1.1"
@@ -14043,9 +14048,9 @@ url-parse-lax@^3.0.0:
prepend-http "^2.0.0"
url-parse@^1.4.3:
- version "1.4.7"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
- integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
+ integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
dependencies:
querystringify "^2.1.1"
requires-port "^1.0.0"