Skip to content
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

Remove explore #39

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,5 @@ _Email_: [[email protected]](mailto:[email protected])
</p>

Scout is Northeastern University's student-led design studio. The Studio has about 45 members selected via interview and application processes to select the university's best talent. Each semester the studio produces design and development assets for four ventures. Check out our [portfolio](https://web.northeastern.edu/scout/portfolio) for some past projects!

Make sure to run export NODE_OPTIONS=--openssl-legacy-provider on Mac if you get the error: Error: error:0308010C:digital envelope routines::unsupported
1 change: 1 addition & 0 deletions schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@ type ContentfulVenture implements Node @derivedTypes @dontInfer {
year: Date @dateformat
website: String
logo: ContentfulAsset @link(by: "id", from: "logo___NODE")
onePager: String
portfolio_page: [ContentfulPortfolioPage] @link(by: "id", from: "portfolio page___NODE") @proxy(from: "portfolio page___NODE")
involved_venture_page: [ContentfulInvolvedVenturePage] @link(by: "id", from: "involved venture page___NODE") @proxy(from: "involved venture page___NODE")
involved_student_page: [ContentfulInvolvedStudentPage] @link(by: "id", from: "involved student page___NODE") @proxy(from: "involved student page___NODE")
Expand Down
12 changes: 12 additions & 0 deletions src/components/base/base-components.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import ArrowIconSVG from '../../images/arrowIcon'
import React from 'react';
import { DESKTOP_MARGIN, LAPTOP_MARGIN, TABLET_MARGIN, MOBILE_MARGIN } from "./constants"
import { device, size } from "./device"
import PaperIconSVG from "../../images/paper-icon";

export const Button = styled.button`
border: 2.5px solid ${teal};
Expand Down Expand Up @@ -62,6 +63,17 @@ export const SecondaryButton = (props) => {
);
};

export const OnePagerButton = (props) => {
const { text, children, ...rest } = props;
return (
<ArrowButton>
{text}{' '}
{children}
<PaperIconSVG />
</ArrowButton>
);
};

export const BaseMarginContainer = styled.div`
position: relative;
max-width: ${size.desktop}px;
Expand Down
3 changes: 0 additions & 3 deletions src/components/contact/contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@ const Contact = (props) => (
<a target="_blank" href={props.contactInfoLinks.instagramLink}>
<SocialIcon src={Instagram} />
</a>
<a target="_blank" href={props.contactInfoLinks.mediumLink}>
<SocialIcon src={Medium} />
</a>
</SocialContainer>
</ContactGroup>
<FAQButton>
Expand Down
1 change: 0 additions & 1 deletion src/components/footer/footer-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ export const FooterContactContainerEmail = styled(FooterContactContainer)`

export const FooterSocialBlock = styled.div`
display: flex;
justify-content: space-between;
align-items: baseline;
padding: 30px 0 30px 0;
width: 70%;
Expand Down
3 changes: 1 addition & 2 deletions src/components/footer/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ const Footer = ({ contentfulFooter, contactInfo }) => (
<FooterContactContainer>
<ConnectContactText>CONNECT</ConnectContactText>
<FooterSocialBlock>
<a target="_blank" href={contactInfo.instagramLink}><InstagramIcon /></a>
<a target="_blank" href={contactInfo.instagramLink} style={{paddingRight: 50}}><InstagramIcon /></a>
<a target="_blank" href={contactInfo.linkedInLink}><LinkedInIcon /></a>
<a target="_blank" href={contactInfo.mediumLink}><MediumIcon /></a>
</FooterSocialBlock>
</FooterContactContainer>
<FooterContactContainerEmail>
Expand Down
1 change: 0 additions & 1 deletion src/components/navigation/hamburger.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ const Hamburger = () => {
<MenuContentColumn>
<HamburgerDropdown menuName="Involved"
listContents={GET_INVOLVED_LINKS}/>
<HamburgerLink to="/explore">Explore</HamburgerLink>
<HamburgerLink to="/contact">Contact</HamburgerLink>
</MenuContentColumn>
<MenuContentColumn>
Expand Down
4 changes: 2 additions & 2 deletions src/components/navigation/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const NavLinkGroup = styled.div`
top: 0;
right: 0;
width: 55vw;
justify-content: center;
justify-content: left;
transition: all 0.2s;
max-height: ${ props => (props.isOpen ? '500px': '0px')};
padding: ${ props => (props.isOpen ? '60px 40px': '0px 40px')};
Expand All @@ -66,6 +66,7 @@ export const NavLinkGroup = styled.div`

@media ${device.mobile} {
width: 100%;
justify-content: left;
}

@media (max-width: 360px) {
Expand Down Expand Up @@ -160,7 +161,6 @@ const Navigation = () => {
<NavLinkGroup isOpen={open}>
<NavDropdown menuName="Involved"
listContents={GET_INVOLVED_LINKS}/>
<NavLink to="/explore">Explore</NavLink>
<NavDropdown menuName="People"
listContents={OUR_TEAM_LINKS}/>
<NavLink to="/portfolio">Portfolio</NavLink>
Expand Down
13 changes: 10 additions & 3 deletions src/components/portfolio/featured-ventures-block.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"
import styled from "styled-components"
import { SecondaryButton } from "../base/base-components"
import { OnePagerButton, SecondaryButton } from "../base/base-components"
import { teal, lightGray, yellow } from "../base/colors"
import { device, size } from "../base/device"
import { HANbody, HANh2, HANsubh2 } from "../base/fonts"
Expand Down Expand Up @@ -102,7 +102,7 @@ const DropdownIcon = styled.div`
}
`

const DescriptionContainer = styled.div`
const DescriptionContainer = styled.div`
@media ${device.mobile} {
overflow: hidden;
transition: all 0.2s;
Expand Down Expand Up @@ -152,6 +152,8 @@ const Venture = ({ venture }) => {
}
}, [width]);

console.log(venture)

return <VentureBlockContainer>
<FeaturedVentureImage src={venture.logo.fluid.src} />
<VentureContainer onClick={e => setOpen(!open)} >
Expand All @@ -164,9 +166,14 @@ const Venture = ({ venture }) => {
</VentureContainer>
<DescriptionContainer isOpen={open}>
<VentureDescription>{venture.description.description}</VentureDescription>
<a target="_blank" href={venture.website}>
<a target="_blank" href={venture.website} style={{marginRight: 200}}>
<SecondaryButton>Visit Website</SecondaryButton>
</a>
{venture.onePager &&
<a target="_blank" href={venture.onePager}>
<OnePagerButton>Learn More</OnePagerButton>
</a>
}
</DescriptionContainer>
<TealBar />
</VentureBlockContainer>
Expand Down
11 changes: 11 additions & 0 deletions src/images/paper-icon.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/images/paper-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/pages/portfolio.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const pageQuery = graphql`
src
}
}
onePager
}
pastVenturesSubheader
pastVentures {
Expand Down