From a3865cac05c7c881af3d3e5db348d54525bf3d6f Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Sun, 15 Jan 2023 14:09:45 -0500 Subject: [PATCH 1/7] Update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7937bc8..52e0314 100644 --- a/README.md +++ b/README.md @@ -133,3 +133,5 @@ _Email_: [wang.erin@northeastern.edu](mailto:wang.erin@northeastern.edu)

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! + +This is a test From 43e1264e01b43f469ee2f1d991ae7f29d0c1192b Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Sun, 15 Jan 2023 21:41:04 -0500 Subject: [PATCH 2/7] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52e0314..c538ad3 100644 --- a/README.md +++ b/README.md @@ -134,4 +134,4 @@ _Email_: [wang.erin@northeastern.edu](mailto:wang.erin@northeastern.edu) 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! -This is a test +This is a test \ No newline at end of file From d8bf986b565fcd05b17575cea8a1bf65c34d4b15 Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Sun, 15 Jan 2023 22:06:16 -0500 Subject: [PATCH 3/7] Removed medium --- src/components/footer/footer-styles.js | 1 - src/components/footer/footer.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/footer/footer-styles.js b/src/components/footer/footer-styles.js index 892d3bb..bd95afc 100644 --- a/src/components/footer/footer-styles.js +++ b/src/components/footer/footer-styles.js @@ -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%; diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js index e02c281..4316802 100644 --- a/src/components/footer/footer.js +++ b/src/components/footer/footer.js @@ -36,9 +36,8 @@ const Footer = ({ contentfulFooter, contactInfo }) => ( CONNECT - + - From 55c41601c7b64256cbcc9b675be2c04eba8a5f56 Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Sun, 15 Jan 2023 22:15:41 -0500 Subject: [PATCH 4/7] Removed medium from contact page --- src/components/contact/contact.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/contact/contact.js b/src/components/contact/contact.js index b9e93c7..a61dc74 100644 --- a/src/components/contact/contact.js +++ b/src/components/contact/contact.js @@ -214,9 +214,6 @@ const Contact = (props) => ( - - - From a8110f00d76f81f6f34b4b2a10bda14cd4643bb9 Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Wed, 18 Jan 2023 21:36:59 -0500 Subject: [PATCH 5/7] Added support for One Pagers --- README.md | 2 +- schema.gql | 1 + src/components/base/base-components.js | 12 ++++++++++++ src/components/portfolio/featured-ventures-block.js | 9 ++++++++- src/images/paper-icon.js | 11 +++++++++++ src/images/paper-icon.svg | 5 +++++ src/pages/portfolio.js | 1 + 7 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 src/images/paper-icon.js create mode 100644 src/images/paper-icon.svg diff --git a/README.md b/README.md index c538ad3..d73d228 100644 --- a/README.md +++ b/README.md @@ -134,4 +134,4 @@ _Email_: [wang.erin@northeastern.edu](mailto:wang.erin@northeastern.edu) 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! -This is a test \ No newline at end of file +Make sure to run export NODE_OPTIONS=--openssl-legacy-provider on Mac if you get the error: Error: error:0308010C:digital envelope routines::unsupported \ No newline at end of file diff --git a/schema.gql b/schema.gql index a1bf203..e60ca92 100644 --- a/schema.gql +++ b/schema.gql @@ -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") diff --git a/src/components/base/base-components.js b/src/components/base/base-components.js index f431eec..048308f 100644 --- a/src/components/base/base-components.js +++ b/src/components/base/base-components.js @@ -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}; @@ -62,6 +63,17 @@ export const SecondaryButton = (props) => { ); }; +export const OnePagerButton = (props) => { + const { text, children, ...rest } = props; + return ( + + {text}{' '} + {children} + + + ); +}; + export const BaseMarginContainer = styled.div` position: relative; max-width: ${size.desktop}px; diff --git a/src/components/portfolio/featured-ventures-block.js b/src/components/portfolio/featured-ventures-block.js index 521db27..145c6b3 100644 --- a/src/components/portfolio/featured-ventures-block.js +++ b/src/components/portfolio/featured-ventures-block.js @@ -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" @@ -152,6 +152,8 @@ const Venture = ({ venture }) => { } }, [width]); + console.log(venture) + return setOpen(!open)} > @@ -167,6 +169,11 @@ const Venture = ({ venture }) => { Visit Website + {venture.onePager && + + Learn More + + } diff --git a/src/images/paper-icon.js b/src/images/paper-icon.js new file mode 100644 index 0000000..7b27cfd --- /dev/null +++ b/src/images/paper-icon.js @@ -0,0 +1,11 @@ +import React from 'react'; +import { teal } + from "../components/base/colors" + +const PaperIconSVG = (props) => ( + + + +); + +export default PaperIconSVG \ No newline at end of file diff --git a/src/images/paper-icon.svg b/src/images/paper-icon.svg new file mode 100644 index 0000000..2317e06 --- /dev/null +++ b/src/images/paper-icon.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/pages/portfolio.js b/src/pages/portfolio.js index 7645019..a3f9a15 100644 --- a/src/pages/portfolio.js +++ b/src/pages/portfolio.js @@ -49,6 +49,7 @@ export const pageQuery = graphql` src } } + onePager } pastVenturesSubheader pastVentures { From ff7eafe38207cc5faa0e7724e2a257d0778d9706 Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Wed, 18 Jan 2023 22:02:22 -0500 Subject: [PATCH 6/7] Fixed margin error --- src/components/portfolio/featured-ventures-block.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/portfolio/featured-ventures-block.js b/src/components/portfolio/featured-ventures-block.js index 145c6b3..e173a8e 100644 --- a/src/components/portfolio/featured-ventures-block.js +++ b/src/components/portfolio/featured-ventures-block.js @@ -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; @@ -166,7 +166,7 @@ const Venture = ({ venture }) => { {venture.description.description} - + Visit Website {venture.onePager && From 38afedc561edcaa9f9ab92e5078cf9a79ad4d915 Mon Sep 17 00:00:00 2001 From: alderwhiteford Date: Fri, 27 Jan 2023 13:49:36 -0500 Subject: [PATCH 7/7] Remove Explore Page and Adjust Drop-down spacing --- src/components/navigation/hamburger.js | 1 - src/components/navigation/navigation.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/navigation/hamburger.js b/src/components/navigation/hamburger.js index 2ff6f58..6c2f72c 100644 --- a/src/components/navigation/hamburger.js +++ b/src/components/navigation/hamburger.js @@ -112,7 +112,6 @@ const Hamburger = () => { - Explore Contact diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js index 52c3de6..58f2463 100644 --- a/src/components/navigation/navigation.js +++ b/src/components/navigation/navigation.js @@ -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')}; @@ -66,6 +66,7 @@ export const NavLinkGroup = styled.div` @media ${device.mobile} { width: 100%; + justify-content: left; } @media (max-width: 360px) { @@ -160,7 +161,6 @@ const Navigation = () => { - Explore Portfolio