From 25ed6e8883117142a5dca5e6782a2d46d577ed91 Mon Sep 17 00:00:00 2001 From: samgildea Date: Tue, 16 Mar 2021 13:27:52 -0400 Subject: [PATCH 01/41] #18 adding lofi about page mission section --- src/components/layout.js | 49 ++------------------- src/pages/about.js | 93 +++++++++++++++++++++++++++++++++++++--- src/style/global.scss | 4 ++ src/style/variables.js | 2 +- 4 files changed, 94 insertions(+), 54 deletions(-) create mode 100644 src/style/global.scss diff --git a/src/components/layout.js b/src/components/layout.js index 4d54b27..74ff061 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -1,62 +1,19 @@ import React from "react" import styled from "styled-components" import "../style/typography.scss" - +import "../style/global.scss" import dimensions from "../style/dimensions" import { layoutPaddingDesktop, layoutPaddingMobile } from "../style/variables" const LayoutContainer = styled.div` - body * { - box-sizing: border-box; - margin: 0; - } - - html, - body, - #root { - margin: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - min-height: 100%; - } - body { - width: 100%; - margin: 0 auto; - font-size: 16px; - line-height: 1.5; - -webkit-font-smoothing: antialiased; - - @media (max-width: ${dimensions.maxwidthMobile}px) { - font-size: 14px; - } - - * { - box-sizing: border-box; - } - } - - /* - A workaround for forcing accessibility wrappers - to have a 100% height. - Reach Router issue here: https: //github.com/reach/router/issues/63 - */ - #___gatsby, - div[role="group"][tabindex] { - height: 100%; - min-height: 100% !important; - } - - padding: 0 ${layoutPaddingDesktop} ${layoutPaddingDesktop}; - - margin: 0 auto; ` const LayoutBody = styled.div` - @media (max-width: ${dimensions.maxwidthTablet}px) { + @media (min-width: ${dimensions.maxwidthTablet}px) { padding: 0 ${layoutPaddingDesktop} ${layoutPaddingDesktop}; } - @media (max-width: ${dimensions.maxwidthMobile}px) { + @media (max-width: ${dimensions.maxwidthTablet}px) { padding: 0 ${layoutPaddingMobile} ${layoutPaddingMobile}; } ` diff --git a/src/pages/about.js b/src/pages/about.js index f500a48..ca4e8e7 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -1,15 +1,94 @@ import { graphql } from "gatsby" - +import Layout from "../components/layout" import React from "react" +import styled from "styled-components" +import dimensions from "../style/dimensions" + +const IconPlaceholder = styled.div` + height: 50px; + width: 50px; + background-color: #9d9d9d; +` + +const AboutHeaderText = styled.div` + font-size: 48px; + font-weight: bold; + padding-left: 20px; +` + +const AboutHeader = styled.div` + display: flex; + align-items: center; + padding-top: 96px; +` + +const MissionSection = styled.div` + padding-top: 21px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + padding-top: 96px; + } +` + +const MissionImage = styled.div` + background-color: #9d9d9d; + height: 405px; + width: 45vw; + left: 0; + margin-left: -80px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100vw; + margin-left: -16px; + } +` + +const MissionText = styled.div` + position: relative; + padding-top: 28px; + @media (min-width: ${dimensions.maxwidthTablet}px) { + width: 35vw; + position: relative; + padding-left: 75px; + padding-top: 0px; + } +` + +const MissionTextHeader = styled.div` + font-size: 36px; + font-weight: bold; + padding-top: 19px; + padding-bottom: 25px; +` + +const MissionTextParagraph = styled.div` + font-size: 20px; +` export default function About({ data }) { - const aboutData = data.prismicAboutPage.data + const aboutData = data.prismicAboutPage.data + + return ( + + + + About + + + + + + + + {aboutData.mission_heading} - return ( -
-

{aboutData.company_background_section_heading}

-
- ) + + {aboutData.mission_description} + + + + + ) } export const query = graphql` diff --git a/src/style/global.scss b/src/style/global.scss new file mode 100644 index 0000000..52a4ebb --- /dev/null +++ b/src/style/global.scss @@ -0,0 +1,4 @@ +html, body +{ + margin: 0px; padding: 0px +} \ No newline at end of file diff --git a/src/style/variables.js b/src/style/variables.js index 97ba3d0..c66d133 100644 --- a/src/style/variables.js +++ b/src/style/variables.js @@ -1,2 +1,2 @@ export const layoutPaddingDesktop = "80px" -export const layoutPaddingMobile = "25px" \ No newline at end of file +export const layoutPaddingMobile = "16px" \ No newline at end of file From 4c421120b01ea28b912fcc0978c68356454bac7f Mon Sep 17 00:00:00 2001 From: Viviana Date: Fri, 26 Mar 2021 12:09:56 -0400 Subject: [PATCH 02/41] #18 Added styling to Industry Context Section for the About page --- src/pages/about.js | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/src/pages/about.js b/src/pages/about.js index ca4e8e7..ac97dc7 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -64,10 +64,59 @@ const MissionTextHeader = styled.div` const MissionTextParagraph = styled.div` font-size: 20px; ` +const IndustryContextSection = styled.div` + padding-top: 130px; + padding-left: +` +const IndustryContextHeader = styled.div` + +` +const IndustryContextHeaderText = styled.div` + font-size: 36px; + font-weight: bold; + padding-top: 26px; +` + +const IndustryContextExamples = styled.div` + display: flex; + @media (max-width: ${dimensions.maxwidthTablet}px) { + flex-wrap: wrap; + } +` +// I'm still working on the spacing between each example +// and changing the sizing of the content box changing as +// the screen size changes +const IndustryContextGroup = styled.div` + padding-top: 26px; + margin-right: 41px; + width: 316px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-left: auto; + margin-right: auto; + padding-top: 38px; + } +` + +const IndustryContextImage = styled.div` + background-color: #CACACA; + height: 243px; + width: 316px; +` + +const IndustryContextExampleParagraph = styled.div` + font-size: 16px; + padding-top: 26px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 316px; + } +` + export default function About({ data }) { const aboutData = data.prismicAboutPage.data + console.log(aboutData.industry_context_explanation); return ( @@ -87,6 +136,24 @@ export default function About({ data }) { + + + + + {aboutData.industry_context_heading} + + + + {aboutData.industry_context_explanation.map(example => { + return ( + + + {example.explanation_description} + + )})} + + + ) } From f91a057d764718a0fd1f5d313aa6816e6ec3dea9 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 26 Mar 2021 12:32:20 -0400 Subject: [PATCH 03/41] updating space between and mobile structure --- src/pages/about.js | 62 ++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/src/pages/about.js b/src/pages/about.js index ac97dc7..557b420 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -66,57 +66,61 @@ const MissionTextParagraph = styled.div` ` const IndustryContextSection = styled.div` padding-top: 130px; - padding-left: -` -const IndustryContextHeader = styled.div` - + padding-left: ; ` +const IndustryContextHeader = styled.div`` const IndustryContextHeaderText = styled.div` - font-size: 36px; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); font-weight: bold; padding-top: 26px; ` const IndustryContextExamples = styled.div` - display: flex; - @media (max-width: ${dimensions.maxwidthTablet}px) { - flex-wrap: wrap; + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; } ` -// I'm still working on the spacing between each example -// and changing the sizing of the content box changing as +// I'm still working on the spacing between each example +// and changing the sizing of the content box changing as // the screen size changes const IndustryContextGroup = styled.div` padding-top: 26px; - margin-right: 41px; - width: 316px; + // margin-right: 82px; + width: 22vw; @media (max-width: ${dimensions.maxwidthTablet}px) { - margin-left: auto; - margin-right: auto; + margin-left: 0px; + margin-right: 0px; padding-top: 38px; + width: 100%; } ` const IndustryContextImage = styled.div` - background-color: #CACACA; + background-color: #cacaca; height: 243px; - width: 316px; + width: 22vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } ` const IndustryContextExampleParagraph = styled.div` font-size: 16px; padding-top: 26px; - + + width: 22vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 316px; + width: 100%; } ` - export default function About({ data }) { const aboutData = data.prismicAboutPage.data - console.log(aboutData.industry_context_explanation); + console.log(aboutData.industry_context_explanation) return ( @@ -140,20 +144,24 @@ export default function About({ data }) { - {aboutData.industry_context_heading} + + {aboutData.industry_context_heading} + {aboutData.industry_context_explanation.map(example => { return ( - - - {example.explanation_description} - - )})} + + + + {example.explanation_description} + + + ) + })} - ) } From f1b5f307aac28145d685f27e5ea10f487cbd616d Mon Sep 17 00:00:00 2001 From: Viviana Date: Tue, 30 Mar 2021 10:21:42 -0400 Subject: [PATCH 04/41] #18 Work-in-progress styling for the Competitor Comparison section on the About page. The grid of feature comparison requires revision on its spacing and alignment within the page. --- src/pages/about.js | 139 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 4 deletions(-) diff --git a/src/pages/about.js b/src/pages/about.js index 557b420..9cb20d9 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -81,9 +81,7 @@ const IndustryContextExamples = styled.div` justify-content: space-between; } ` -// I'm still working on the spacing between each example -// and changing the sizing of the content box changing as -// the screen size changes + const IndustryContextGroup = styled.div` padding-top: 26px; // margin-right: 82px; @@ -117,6 +115,100 @@ const IndustryContextExampleParagraph = styled.div` } ` + +const CompanyComparisonSection = styled.div` + padding-top: 148px; +` + +const CompanyComparisonSectionHeading = styled.div` + text-align: center; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +const ProductBenefitSection = styled.div` + padding-top: 68px; + display: flex; + flex-wrap: wrap; + justify-content: space-between; + +` + +const BenefitGroup = styled.div` + width: 15vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + flex: 50%; + } +` + +const BenefitImage = styled.div` + background-color: #9d9d9d; + height: 11vw; + width: 11vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 125px; + height: 125px; + } +` + +const BenefitTitle = styled.div` + font-size: calc(28px + (28 - 16) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +const ProductComparison = styled.div` + margin-top: 170px; + display: flex; +` + + +const FeatureTitleColumn = styled.div` + margin-top: 110px; +` + +const FeatureTitle = styled.div` + font-size: calc(28px + (28 - 14) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + margin-top: 50px; +` + +const CompetitorColumnGroup = styled.div` + display: flex; + margin-left: 12px; + +` + +const CompetitorColumn = styled.div` + margin-left: 51px; +` + + +const CompetitorName = styled.div` + font-size: calc(36px + (36 - 8) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + +` + +const IconGroup = styled.div` + margin-top: 68px; +` + +const CompetitorIcon = styled.div` + width: 60px; + height: 60px; + background-color: #626262; + margin-top: 36px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 31px; + height: 31px; + margin-left: 4vw; + } +` + + export default function About({ data }) { const aboutData = data.prismicAboutPage.data @@ -148,7 +240,6 @@ export default function About({ data }) { {aboutData.industry_context_heading} - {aboutData.industry_context_explanation.map(example => { return ( @@ -162,6 +253,46 @@ export default function About({ data }) { })} + + + {aboutData.company_comparison_section_heading} + + {aboutData.product_benefit.map(benefit => { + return ( + + + {benefit.product_benefit_title} + + ) + })} + + + + + {aboutData.product_feature.map(feature => { + return ( + {feature.product_feature_name} + ) + })} + + + {aboutData.company.map(competitor => { + return ( + + {competitor.company_name} + + + + + + + + + ) + })} + + + ) } From 5da558ee446d9a64a7768775b87f6f4c3e24c203 Mon Sep 17 00:00:00 2001 From: Viviana Date: Tue, 30 Mar 2021 11:39:02 -0400 Subject: [PATCH 05/41] #18 Added styling to the Company Background section on the About page --- src/pages/about.js | 109 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/src/pages/about.js b/src/pages/about.js index 9cb20d9..c2d844b 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -184,7 +184,6 @@ const CompetitorColumn = styled.div` margin-left: 51px; ` - const CompetitorName = styled.div` font-size: calc(36px + (36 - 8) * ((100vw - 300px) / (1440 - 300))); font-weight: bold; @@ -208,6 +207,93 @@ const CompetitorIcon = styled.div` } ` +const CompanyBackgroundSection = styled.div` + margin-top: 150px; +` + +const GeneralDescriptionSection = styled.div` + width: 46vw; + margin-left: auto; + margin-right: auto; + + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +const CompanyBackgroundHeading = styled.div` + font-weight: bold; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); + text-align: center; + padding-bottom: 50px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-bottom: 30px; + } +` + +const CompanyBackgroundDescription = styled.div` + font-size: calc(20px + (20 - 14) * ((100vw - 300px) / (1440 - 300))); +` + +const CompanyTeamSection = styled.div` + margin-top: 90px; + width: 65vw; + margin-left: auto; + margin-right: auto; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +const CompanyTeamHeading = styled.div` + font-weight: bold; + font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); + padding-bottom: 40px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + text-align: center; + } +` + +const CompanyTeamMemberGroup = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; + } +` + +const TeamMember = styled.div` + width: 30vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + padding-bottom: 32px; + } +` + +const MemberImage = styled.div` + background-color: #CACACA; + width: 30vw; + height: 292px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +const MemberTitle = styled.div` + font-weight: bold; + font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); + padding-top: 16px; + padding-bottom: 16px; +` + +const MemberDescription = styled.div` + font-size: calc(16px + (16 - 14) * ((100vw - 300px) / (1440 - 300))); +` + export default function About({ data }) { const aboutData = data.prismicAboutPage.data @@ -293,6 +379,27 @@ export default function About({ data }) { + + + + {aboutData.company_background_section_heading} + {aboutData.company_background_description} + + + {aboutData.company_team_heading} + + {aboutData.team_member_information.map(member => { + return ( + + + {member.team_member_title} + {member.team_member_description} + + ) + })} + + + ) } From 9060b6cc5b51996610dcc82a7b3164b590fb29bf Mon Sep 17 00:00:00 2001 From: Viviana Date: Wed, 31 Mar 2021 19:51:35 -0400 Subject: [PATCH 06/41] #31 Added styling to the Featured Product section on the Products page --- src/pages/products.js | 81 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/src/pages/products.js b/src/pages/products.js index 825eda0..41a128a 100644 --- a/src/pages/products.js +++ b/src/pages/products.js @@ -1,16 +1,85 @@ import React from "react" import { graphql } from "gatsby" +import Layout from "../components/layout" +import styled from "styled-components" +import dimensions from "../style/dimensions" + +const ProductPageHeading = styled.div` + font-size: calc(90px + (90 - 32) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +const FeaturedProductSection = styled.div` + width: 100%; + padding-top: 40px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + width: 86vw; + display: flex; + } +` + +const FeaturedProductImage = styled.div` + width: 47vw; + height: 432px; + background-color: #C4C4C4; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + height: 225px; + } +` + +const FeaturedProductText = styled.div` + padding-left: 5vw; + padding-top: 52px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-left: 0vw; + padding-top: 26px; + } +` + +const FeaturedProductHeading = styled.div` + font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); + text-transform: uppercase; +` + +const FeaturedProductName = styled.div` + font-size: calc(40px + (40 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + padding-top: 17px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 8px; + } +` + +const FeaturedProductDescription = styled.div` + font-size: calc(18px + (18 - 16) * ((100vw - 300px) / (1440 - 300))); + padding-top: 32px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 15px; + + } +` export default function ProductSection({ data }) { const productSectionData = data.prismicProductPage.data return ( -
- {/* Mapping over individual products. TODO: separate products based on category (homeowner or commerical) */} - {productSectionData.products.map(product => { - return

{product.product.document.data.product_title}

- })} -
+ + {productSectionData.product_page_main_heading} + + + + {productSectionData.featured_product_heading} + {productSectionData.featured_product_name} + {productSectionData.featured_product_description} + + + ) } From 2eb2fb50a9c488f663f0f2f74838b4d5e509e44b Mon Sep 17 00:00:00 2001 From: Viviana Date: Wed, 31 Mar 2021 20:43:27 -0400 Subject: [PATCH 07/41] 31 Added styling for Models Section for the Product page. Styling for each individual product requires revision once text for each product is visible. --- src/pages/products.js | 79 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/src/pages/products.js b/src/pages/products.js index 41a128a..05bf5a4 100644 --- a/src/pages/products.js +++ b/src/pages/products.js @@ -61,7 +61,63 @@ const FeaturedProductDescription = styled.div` @media (max-width: ${dimensions.maxwidthTablet}px) { padding-top: 15px; - + } +` + +const ModelScope = styled.div` + margin-top: 200px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 105px; + } +` + +const ModelScopeHeading = styled.div` + font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); + text-transform: uppercase; +` + +const ProductsGroup = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; + } +` + +const Product = styled.div` + padding-top: 33px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 35px; + } +` + +const ProductImage = styled.div` + background-color: #C4C4C4; + width: 21vw; + height: 245px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +const ProductName = styled.div` + font-size: calc(30px + (30 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + padding-top: 49px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 24px; + } +` + +const ProductDescription = styled.div` + font-size: 15px; + padding-top: 15px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + visibility: hidden; } ` @@ -79,6 +135,27 @@ export default function ProductSection({ data }) { {productSectionData.featured_product_description} + +
+ {productSectionData.model_scope.map(scope => { + return ( + + {scope.model_scope_heading} + + {productSectionData.products.map(product => { + return ( + + + {product.product_title} + {product.product_description} + + ) + })} + + + ) + })} +
) } From c5e1d954cbcc286979da8c7c7796dca75b2ce5de Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 1 Apr 2021 17:04:29 -0400 Subject: [PATCH 08/41] #18 moving about page to components folder and extracting styles --- src/components/about/about-style.js | 308 ++++++++++++++++++++++ src/components/about/about.js | 187 +++++++++++++ src/pages/about.js | 393 +--------------------------- 3 files changed, 497 insertions(+), 391 deletions(-) create mode 100644 src/components/about/about-style.js create mode 100644 src/components/about/about.js diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js new file mode 100644 index 0000000..9202397 --- /dev/null +++ b/src/components/about/about-style.js @@ -0,0 +1,308 @@ +import styled from "styled-components" +import dimensions from "../../style/dimensions" +export const IconPlaceholder = styled.div` + height: 50px; + width: 50px; + background-color: #9d9d9d; +` + +export const AboutHeaderText = styled.div` + font-size: 48px; + font-weight: bold; + padding-left: 20px; +` + +export const AboutHeader = styled.div` + display: flex; + align-items: center; + padding-top: 96px; +` + +export const MissionSection = styled.div` + padding-top: 21px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + padding-top: 96px; + } +` + +export const MissionImage = styled.div` + background-color: #9d9d9d; + height: 405px; + width: 45vw; + left: 0; + margin-left: -80px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100vw; + margin-left: -16px; + } +` + +export const MissionText = styled.div` + position: relative; + padding-top: 28px; + @media (min-width: ${dimensions.maxwidthTablet}px) { + width: 35vw; + position: relative; + padding-left: 75px; + padding-top: 0px; + } +` + +export const MissionTextHeader = styled.div` + font-size: 36px; + font-weight: bold; + padding-top: 19px; + padding-bottom: 25px; +` + +export const MissionTextParagraph = styled.div` + font-size: 20px; +` +export const IndustryContextSection = styled.div` + padding-top: 130px; + padding-left: ; +` +export const IndustryContextHeader = styled.div`` +export const IndustryContextHeaderText = styled.div` + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + padding-top: 26px; +` + +export const IndustryContextExamples = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; + } +` + +export const IndustryContextGroup = styled.div` + padding-top: 26px; + // margin-right: 82px; + width: 22vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-left: 0px; + margin-right: 0px; + padding-top: 38px; + width: 100%; + } +` + +export const IndustryContextImage = styled.div` + background-color: #cacaca; + height: 243px; + width: 22vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const IndustryContextExampleParagraph = styled.div` + font-size: 16px; + padding-top: 26px; + + width: 22vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const CompanyComparisonSection = styled.div` + padding-top: 148px; + width: 100%; + display: flex; + justify-content: center; + + th { + text-align: center; + padding-right: 51px; + } + + td.competitor-icon { + display: flex; + justify-content: center; + } +` + +export const CompanyComparisonSectionHeading = styled.div` + text-align: center; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +export const ProductBenefitSection = styled.div` + padding-top: 68px; + display: flex; + flex-wrap: wrap; + justify-content: space-between; +` + +export const BenefitGroup = styled.div` + width: 15vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + flex: 50%; + } +` + +export const BenefitImage = styled.div` + background-color: #9d9d9d; + height: 11vw; + width: 11vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 125px; + height: 125px; + } +` + +export const BenefitTitle = styled.div` + font-size: calc(28px + (28 - 16) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +export const ProductComparison = styled.div` + margin-top: 170px; + display: flex; +` + +export const FeatureTitleColumn = styled.div` + // margin-top: 110px; +` + +export const FeatureTitle = styled.div` + // font-size: calc(28px + (28 - 14) * ((100vw - 300px) / (1440 - 300))); + font-size: 28px; + + font-weight: bold; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + font-size: 14px; + } +` + +export const CompetitorColumnGroup = styled.div` + display: flex; + margin-left: 12px; +` + +export const CompetitorColumn = styled.div` + margin-left: 51px; +` + +export const CompetitorName = styled.div` + // font-size: calc(36px + (36 - 8) * ((100vw - 300px) / (1600 - 300))); + font-size: 36px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + font-size: 8px; + } + font-weight: bold; +` + +export const IconGroup = styled.div` + margin-top: 68px; +` + +export const CompetitorIcon = styled.div` + width: 60px; + height: 60px; + background-color: #626262; + margin-top: 36px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 31px; + height: 31px; + margin-left: 4vw; + } +` + +export const CompanyBackgroundSection = styled.div` + margin-top: 150px; +` + +export const GeneralDescriptionSection = styled.div` + width: 46vw; + margin-left: auto; + margin-right: auto; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const CompanyBackgroundHeading = styled.div` + font-weight: bold; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); + text-align: center; + padding-bottom: 50px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-bottom: 30px; + } +` + +export const CompanyBackgroundDescription = styled.div` + font-size: calc(20px + (20 - 14) * ((100vw - 300px) / (1440 - 300))); +` + +export const CompanyTeamSection = styled.div` + margin-top: 90px; + width: 65vw; + margin-left: auto; + margin-right: auto; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const CompanyTeamHeading = styled.div` + font-weight: bold; + font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); + padding-bottom: 40px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + text-align: center; + } +` + +export const CompanyTeamMemberGroup = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; + } +` + +export const TeamMember = styled.div` + width: 30vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + padding-bottom: 32px; + } +` + +export const MemberImage = styled.div` + background-color: #cacaca; + width: 30vw; + height: 292px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const MemberTitle = styled.div` + font-weight: bold; + font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); + padding-top: 16px; + padding-bottom: 16px; +` + +export const MemberDescription = styled.div` + font-size: calc(16px + (16 - 14) * ((100vw - 300px) / (1440 - 300))); +` + +export const FeatureSection = styled.div` + display: flex; +` diff --git a/src/components/about/about.js b/src/components/about/about.js new file mode 100644 index 0000000..bceb9ec --- /dev/null +++ b/src/components/about/about.js @@ -0,0 +1,187 @@ +import React from "react" +import { H1, P } from "../../style/type-styles" +import { + AboutHeader, + IconPlaceholder, + AboutHeaderText, + MissionSection, + MissionImage, + MissionTextHeader, + MissionTextParagraph, + IndustryContextSection, + IndustryContextHeaderText, + IndustryContextExamples, + IndustryContextGroup, + IndustryContextHeader, + IndustryContextImage, + IndustryContextExampleParagraph, + CompanyComparisonSection, + CompetitorName, + FeatureTitle, + CompetitorIcon, + CompanyBackgroundSection, + GeneralDescriptionSection, + CompanyBackgroundHeading, + CompanyBackgroundDescription, + CompanyTeamHeading, + CompanyTeamMemberGroup, + TeamMember, + MemberImage, + MemberTitle, + MemberDescription, + MissionText, + CompanyTeamSection +} from "./about-style" + +export default function About({ data }) { + return ( + <> + + + About + + + + + + + + {data.mission_heading} + + + {data.mission_description} + + + + + + + + + {data.industry_context_heading} + + + + {data.industry_context_explanation.map(example => { + return ( + + + + {example.explanation_description} + + + ) + })} + + + + {/* + + {aboutData.company_comparison_section_heading} + + + {aboutData.product_benefit.map(benefit => { + return ( + + + {benefit.product_benefit_title} + + ) + })} + + + + + {aboutData.product_feature.map(feature => { + return ( + + {feature.product_feature_name} + + + + + ) + })} + + + {aboutData.company.map(competitor => { + return ( + + {competitor.company_name} + + + + + + + + + ) + })} + + + */} + + + + + + {data.company.map(competitor => ( + <> + + + ))} + + {data.product_feature.map(feature => ( + + + + + + + + ))} +
+ {competitor.company_name} +
+ {feature.product_feature_name} + + + + + + +
+ + + + + + {data.company_background_section_heading} + + + {data.company_background_description} + + + + + {data.company_team_heading} + + + {data.team_member_information.map(member => { + return ( + + + {member.team_member_title} + + {member.team_member_description} + + + ) + })} + + + + + ) +} diff --git a/src/pages/about.js b/src/pages/about.js index c2d844b..9c8c964 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -3,403 +3,14 @@ import Layout from "../components/layout" import React from "react" import styled from "styled-components" import dimensions from "../style/dimensions" - -const IconPlaceholder = styled.div` - height: 50px; - width: 50px; - background-color: #9d9d9d; -` - -const AboutHeaderText = styled.div` - font-size: 48px; - font-weight: bold; - padding-left: 20px; -` - -const AboutHeader = styled.div` - display: flex; - align-items: center; - padding-top: 96px; -` - -const MissionSection = styled.div` - padding-top: 21px; - - @media (min-width: ${dimensions.maxwidthTablet}px) { - display: flex; - padding-top: 96px; - } -` - -const MissionImage = styled.div` - background-color: #9d9d9d; - height: 405px; - width: 45vw; - left: 0; - margin-left: -80px; - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100vw; - margin-left: -16px; - } -` - -const MissionText = styled.div` - position: relative; - padding-top: 28px; - @media (min-width: ${dimensions.maxwidthTablet}px) { - width: 35vw; - position: relative; - padding-left: 75px; - padding-top: 0px; - } -` - -const MissionTextHeader = styled.div` - font-size: 36px; - font-weight: bold; - padding-top: 19px; - padding-bottom: 25px; -` - -const MissionTextParagraph = styled.div` - font-size: 20px; -` -const IndustryContextSection = styled.div` - padding-top: 130px; - padding-left: ; -` -const IndustryContextHeader = styled.div`` -const IndustryContextHeaderText = styled.div` - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - padding-top: 26px; -` - -const IndustryContextExamples = styled.div` - @media (min-width: ${dimensions.maxwidthTablet}px) { - display: flex; - justify-content: space-between; - } -` - -const IndustryContextGroup = styled.div` - padding-top: 26px; - // margin-right: 82px; - width: 22vw; - @media (max-width: ${dimensions.maxwidthTablet}px) { - margin-left: 0px; - margin-right: 0px; - padding-top: 38px; - width: 100%; - } -` - -const IndustryContextImage = styled.div` - background-color: #cacaca; - height: 243px; - width: 22vw; - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - -const IndustryContextExampleParagraph = styled.div` - font-size: 16px; - padding-top: 26px; - - width: 22vw; - - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - - -const CompanyComparisonSection = styled.div` - padding-top: 148px; -` - -const CompanyComparisonSectionHeading = styled.div` - text-align: center; - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; -` - -const ProductBenefitSection = styled.div` - padding-top: 68px; - display: flex; - flex-wrap: wrap; - justify-content: space-between; - -` - -const BenefitGroup = styled.div` - width: 15vw; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - flex: 50%; - } -` - -const BenefitImage = styled.div` - background-color: #9d9d9d; - height: 11vw; - width: 11vw; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 125px; - height: 125px; - } -` - -const BenefitTitle = styled.div` - font-size: calc(28px + (28 - 16) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; -` - -const ProductComparison = styled.div` - margin-top: 170px; - display: flex; -` - - -const FeatureTitleColumn = styled.div` - margin-top: 110px; -` - -const FeatureTitle = styled.div` - font-size: calc(28px + (28 - 14) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - margin-top: 50px; -` - -const CompetitorColumnGroup = styled.div` - display: flex; - margin-left: 12px; - -` - -const CompetitorColumn = styled.div` - margin-left: 51px; -` - -const CompetitorName = styled.div` - font-size: calc(36px + (36 - 8) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - -` - -const IconGroup = styled.div` - margin-top: 68px; -` - -const CompetitorIcon = styled.div` - width: 60px; - height: 60px; - background-color: #626262; - margin-top: 36px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 31px; - height: 31px; - margin-left: 4vw; - } -` - -const CompanyBackgroundSection = styled.div` - margin-top: 150px; -` - -const GeneralDescriptionSection = styled.div` - width: 46vw; - margin-left: auto; - margin-right: auto; - - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - -const CompanyBackgroundHeading = styled.div` - font-weight: bold; - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); - text-align: center; - padding-bottom: 50px; - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-bottom: 30px; - } -` - -const CompanyBackgroundDescription = styled.div` - font-size: calc(20px + (20 - 14) * ((100vw - 300px) / (1440 - 300))); -` - -const CompanyTeamSection = styled.div` - margin-top: 90px; - width: 65vw; - margin-left: auto; - margin-right: auto; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - -const CompanyTeamHeading = styled.div` - font-weight: bold; - font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); - padding-bottom: 40px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - text-align: center; - } -` - -const CompanyTeamMemberGroup = styled.div` - @media (min-width: ${dimensions.maxwidthTablet}px) { - display: flex; - justify-content: space-between; - } -` - -const TeamMember = styled.div` - width: 30vw; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - padding-bottom: 32px; - } -` - -const MemberImage = styled.div` - background-color: #CACACA; - width: 30vw; - height: 292px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - -const MemberTitle = styled.div` - font-weight: bold; - font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); - padding-top: 16px; - padding-bottom: 16px; -` - -const MemberDescription = styled.div` - font-size: calc(16px + (16 - 14) * ((100vw - 300px) / (1440 - 300))); -` +import AboutPage from "../components/about/about" export default function About({ data }) { const aboutData = data.prismicAboutPage.data - - console.log(aboutData.industry_context_explanation) return ( - - - About - - - - - - - - {aboutData.mission_heading} - - - {aboutData.mission_description} - - - - - - - - - {aboutData.industry_context_heading} - - - - {aboutData.industry_context_explanation.map(example => { - return ( - - - - {example.explanation_description} - - - ) - })} - - - - - {aboutData.company_comparison_section_heading} - - {aboutData.product_benefit.map(benefit => { - return ( - - - {benefit.product_benefit_title} - - ) - })} - - - - - {aboutData.product_feature.map(feature => { - return ( - {feature.product_feature_name} - ) - })} - - - {aboutData.company.map(competitor => { - return ( - - {competitor.company_name} - - - - - - - - - ) - })} - - - - - - - {aboutData.company_background_section_heading} - {aboutData.company_background_description} - - - {aboutData.company_team_heading} - - {aboutData.team_member_information.map(member => { - return ( - - - {member.team_member_title} - {member.team_member_description} - - ) - })} - - - + ) } From 461ce1cc347f64bc537b864250fef62fe7c0bd48 Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 1 Apr 2021 18:05:22 -0400 Subject: [PATCH 09/41] #18 updating keys --- src/components/about/about.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/about/about.js b/src/components/about/about.js index bceb9ec..d233f19 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -62,9 +62,9 @@ export default function About({ data }) { - {data.industry_context_explanation.map(example => { + {data.industry_context_explanation.map((example, id) => { return ( - + {example.explanation_description} @@ -126,16 +126,16 @@ export default function About({ data }) { - {data.company.map(competitor => ( + {data.company.map((competitor, id) => ( <> - ))} - {data.product_feature.map(feature => ( - + {data.product_feature.map((feature, id) => ( + @@ -168,9 +168,9 @@ export default function About({ data }) { {data.company_team_heading} - {data.team_member_information.map(member => { + {data.team_member_information.map((member, id) => { return ( - + {member.team_member_title} From 2c8aa9671f2b9ec7f326ad728d407d17ccc83fb5 Mon Sep 17 00:00:00 2001 From: Viviana Date: Fri, 2 Apr 2021 13:03:35 -0400 Subject: [PATCH 10/41] #31 Extracted styling componenets into components folderr and removed unnecessary code in pages folder for the Product page --- src/components/products/products-styles.js | 119 ++++++++++++++++ src/components/products/products.js | 54 ++++++++ src/pages/products.js | 151 +-------------------- 3 files changed, 175 insertions(+), 149 deletions(-) create mode 100644 src/components/products/products-styles.js create mode 100644 src/components/products/products.js diff --git a/src/components/products/products-styles.js b/src/components/products/products-styles.js new file mode 100644 index 0000000..ed0be1b --- /dev/null +++ b/src/components/products/products-styles.js @@ -0,0 +1,119 @@ +import styled from "styled-components" +import dimensions from "../../style/dimensions" + +export const ProductPageHeading = styled.div` + font-size: calc(90px + (90 - 32) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; +` + +export const FeaturedProductSection = styled.div` + width: 100%; + padding-top: 40px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + width: 86vw; + display: flex; + } +` + +export const FeaturedProductImage = styled.div` + width: 47vw; + height: 432px; + background-color: #C4C4C4; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + height: 225px; + } +` + +export const FeaturedProductText = styled.div` + padding-left: 5vw; + padding-top: 52px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-left: 0vw; + padding-top: 26px; + } +` + +export const FeaturedProductHeading = styled.div` + font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); + text-transform: uppercase; +` + +export const FeaturedProductName = styled.div` + font-size: calc(40px + (40 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + padding-top: 17px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 8px; + } +` + +export const FeaturedProductDescription = styled.div` + font-size: calc(18px + (18 - 16) * ((100vw - 300px) / (1440 - 300))); + padding-top: 32px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 15px; + } +` + +export const ModelScope = styled.div` + margin-top: 200px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 105px; + } +` + +export const ModelScopeHeading = styled.div` + font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); + text-transform: uppercase; +` + +export const ProductsGroup = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + justify-content: space-between; + } +` + +export const Product = styled.div` + padding-top: 33px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 35px; + } +` + +export const ProductImage = styled.div` + background-color: #C4C4C4; + width: 21vw; + height: 245px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const ProductName = styled.div` + font-size: calc(30px + (30 - 24) * ((100vw - 300px) / (1440 - 300))); + font-weight: bold; + padding-top: 49px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 24px; + } +` + +export const ProductDescription = styled.div` + font-size: 15px; + padding-top: 15px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + visibility: hidden; + } +` \ No newline at end of file diff --git a/src/components/products/products.js b/src/components/products/products.js new file mode 100644 index 0000000..71ef81a --- /dev/null +++ b/src/components/products/products.js @@ -0,0 +1,54 @@ +import React from "react" +import { + ProductPageHeading, + FeaturedProductSection, + FeaturedProductImage, + FeaturedProductText, + FeaturedProductHeading, + FeaturedProductName, + FeaturedProductDescription, + ModelScope, + ModelScopeHeading, + ProductsGroup, + Product, + ProductImage, + ProductName, + ProductDescription, +} from "./products-styles" + +export default function ProductSection({ data }) { + return ( +
+ {data.product_page_main_heading} + + + + {data.featured_product_heading} + {data.featured_product_name} + {data.featured_product_description} + + + +
+ {data.model_scope.map(scope => { + return ( + + {scope.model_scope_heading} + + {data.products.map(product => { + return ( + + + {product.product_title} + {product.product_description} + + ) + })} + + + ) + })} +
+
+ ) +} \ No newline at end of file diff --git a/src/pages/products.js b/src/pages/products.js index 05bf5a4..2cb05de 100644 --- a/src/pages/products.js +++ b/src/pages/products.js @@ -1,161 +1,14 @@ import React from "react" import { graphql } from "gatsby" import Layout from "../components/layout" -import styled from "styled-components" -import dimensions from "../style/dimensions" - -const ProductPageHeading = styled.div` - font-size: calc(90px + (90 - 32) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; -` - -const FeaturedProductSection = styled.div` - width: 100%; - padding-top: 40px; - - @media (min-width: ${dimensions.maxwidthTablet}px) { - width: 86vw; - display: flex; - } -` - -const FeaturedProductImage = styled.div` - width: 47vw; - height: 432px; - background-color: #C4C4C4; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - height: 225px; - } -` - -const FeaturedProductText = styled.div` - padding-left: 5vw; - padding-top: 52px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-left: 0vw; - padding-top: 26px; - } -` - -const FeaturedProductHeading = styled.div` - font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); - text-transform: uppercase; -` - -const FeaturedProductName = styled.div` - font-size: calc(40px + (40 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - padding-top: 17px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 8px; - } -` - -const FeaturedProductDescription = styled.div` - font-size: calc(18px + (18 - 16) * ((100vw - 300px) / (1440 - 300))); - padding-top: 32px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 15px; - } -` - -const ModelScope = styled.div` - margin-top: 200px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - margin-top: 105px; - } -` - -const ModelScopeHeading = styled.div` - font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); - text-transform: uppercase; -` - -const ProductsGroup = styled.div` - @media (min-width: ${dimensions.maxwidthTablet}px) { - display: flex; - justify-content: space-between; - } -` - -const Product = styled.div` - padding-top: 33px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 35px; - } -` - -const ProductImage = styled.div` - background-color: #C4C4C4; - width: 21vw; - height: 245px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - } -` - -const ProductName = styled.div` - font-size: calc(30px + (30 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - padding-top: 49px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 24px; - } -` - -const ProductDescription = styled.div` - font-size: 15px; - padding-top: 15px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - visibility: hidden; - } -` +import ProductPage from "../components/products/products" export default function ProductSection({ data }) { const productSectionData = data.prismicProductPage.data return ( - {productSectionData.product_page_main_heading} - - - - {productSectionData.featured_product_heading} - {productSectionData.featured_product_name} - {productSectionData.featured_product_description} - - - -
- {productSectionData.model_scope.map(scope => { - return ( - - {scope.model_scope_heading} - - {productSectionData.products.map(product => { - return ( - - - {product.product_title} - {product.product_description} - - ) - })} - - - ) - })} -
+ ) } From 61844fbeb6b6f509eb2a9e18fc2feb0f71cf56d8 Mon Sep 17 00:00:00 2001 From: Viviana Date: Sun, 25 Apr 2021 18:53:23 -0400 Subject: [PATCH 11/41] #18 Updated styling for about page to match hi-fi wireframes. --- src/components/about/about-style.js | 188 +++++++++++++--------------- src/components/about/about.js | 120 +++++++++++------- src/pages/about.js | 33 ++++- src/schemas/About.json | 24 ++++ src/style/type-styles.js | 8 +- 5 files changed, 220 insertions(+), 153 deletions(-) diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index 9202397..121aa01 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -1,41 +1,36 @@ import styled from "styled-components" import dimensions from "../../style/dimensions" + export const IconPlaceholder = styled.div` - height: 50px; - width: 50px; - background-color: #9d9d9d; + img { + width: 6vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 10vw; + } + } ` export const AboutHeaderText = styled.div` - font-size: 48px; - font-weight: bold; - padding-left: 20px; -` - -export const AboutHeader = styled.div` - display: flex; - align-items: center; - padding-top: 96px; + margin-top: 89px; ` export const MissionSection = styled.div` - padding-top: 21px; - @media (min-width: ${dimensions.maxwidthTablet}px) { display: flex; - padding-top: 96px; } ` export const MissionImage = styled.div` - background-color: #9d9d9d; - height: 405px; - width: 45vw; - left: 0; - margin-left: -80px; - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100vw; - margin-left: -16px; + img { + height: 405px; + width: 45vw; + left: 0; + margin-left: -80px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + height: 100%; + width: 100vw; + margin-left: -16px; + } } ` @@ -50,25 +45,30 @@ export const MissionText = styled.div` } ` -export const MissionTextHeader = styled.div` - font-size: 36px; - font-weight: bold; - padding-top: 19px; - padding-bottom: 25px; -` - export const MissionTextParagraph = styled.div` - font-size: 20px; + width: 44vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } + ` export const IndustryContextSection = styled.div` - padding-top: 130px; - padding-left: ; + margin-top: 130px; + background-color: black; + width: 100%; ` -export const IndustryContextHeader = styled.div`` -export const IndustryContextHeaderText = styled.div` - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - padding-top: 26px; + +export const IndustryContextContainer = styled.div` + background-color: white; + width: 89%; + margin-top: 70px; + margin-bottom: 80px; + padding-top: 42px; + padding-left: 8%; + padding-right: 8%; + padding-bottom: 54px; + ` export const IndustryContextExamples = styled.div` @@ -79,9 +79,9 @@ export const IndustryContextExamples = styled.div` ` export const IndustryContextGroup = styled.div` - padding-top: 26px; - // margin-right: 82px; + margin-top: 26px; width: 22vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { margin-left: 0px; margin-right: 0px; @@ -91,18 +91,15 @@ export const IndustryContextGroup = styled.div` ` export const IndustryContextImage = styled.div` - background-color: #cacaca; - height: 243px; - width: 22vw; - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; + img { + width: 22vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } } ` export const IndustryContextExampleParagraph = styled.div` - font-size: 16px; - padding-top: 26px; - width: 22vw; @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -110,34 +107,19 @@ export const IndustryContextExampleParagraph = styled.div` } ` -export const CompanyComparisonSection = styled.div` - padding-top: 148px; - width: 100%; - display: flex; - justify-content: center; - - th { - text-align: center; - padding-right: 51px; - } - - td.competitor-icon { - display: flex; - justify-content: center; - } -` - -export const CompanyComparisonSectionHeading = styled.div` +export const ProductBenefitHeader = styled.div` text-align: center; - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; ` -export const ProductBenefitSection = styled.div` - padding-top: 68px; +export const ProductBenefitsContainer = styled.div` + margin-top: 68px; display: flex; flex-wrap: wrap; justify-content: space-between; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 40px; + } ` export const BenefitGroup = styled.div` @@ -149,18 +131,38 @@ export const BenefitGroup = styled.div` ` export const BenefitImage = styled.div` - background-color: #9d9d9d; - height: 11vw; - width: 11vw; + height: 118px; + text-align: center; @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 125px; height: 125px; } ` export const BenefitTitle = styled.div` - font-size: calc(28px + (28 - 16) * ((100vw - 300px) / (1440 - 300))); + text-align: center; +` + +export const CompanyComparisonSection = styled.div` + padding-top: 148px; + width: 100%; + display: flex; + justify-content: center; + + th { + text-align: center; + padding-right: 51px; + } + + td.competitor-icon { + display: flex; + justify-content: center; + } +` + +export const CompanyComparisonSectionHeading = styled.div` + text-align: center; + font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); font-weight: bold; ` @@ -235,21 +237,15 @@ export const GeneralDescriptionSection = styled.div` ` export const CompanyBackgroundHeading = styled.div` - font-weight: bold; - font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); text-align: center; - padding-bottom: 50px; + @media (max-width: ${dimensions.maxwidthTablet}px) { padding-bottom: 30px; } ` -export const CompanyBackgroundDescription = styled.div` - font-size: calc(20px + (20 - 14) * ((100vw - 300px) / (1440 - 300))); -` - export const CompanyTeamSection = styled.div` - margin-top: 90px; + margin-top: 154px; width: 65vw; margin-left: auto; margin-right: auto; @@ -260,9 +256,6 @@ export const CompanyTeamSection = styled.div` ` export const CompanyTeamHeading = styled.div` - font-weight: bold; - font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); - padding-bottom: 40px; @media (max-width: ${dimensions.maxwidthTablet}px) { text-align: center; } @@ -279,30 +272,19 @@ export const TeamMember = styled.div` width: 30vw; @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; - padding-bottom: 32px; + padding-bottom: 80px; } ` export const MemberImage = styled.div` - background-color: #cacaca; - width: 30vw; - height: 292px; - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; + img { + width: 30vw; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } } ` -export const MemberTitle = styled.div` - font-weight: bold; - font-size: calc(28px + (28 - 24) * ((100vw - 300px) / (1440 - 300))); - padding-top: 16px; - padding-bottom: 16px; -` - -export const MemberDescription = styled.div` - font-size: calc(16px + (16 - 14) * ((100vw - 300px) / (1440 - 300))); -` - export const FeatureSection = styled.div` display: flex; ` diff --git a/src/components/about/about.js b/src/components/about/about.js index d233f19..5ab4342 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -1,20 +1,22 @@ import React from "react" -import { H1, P } from "../../style/type-styles" +import { H2, H3, P, Body } from "../../style/type-styles" import { - AboutHeader, IconPlaceholder, AboutHeaderText, MissionSection, MissionImage, - MissionTextHeader, MissionTextParagraph, IndustryContextSection, - IndustryContextHeaderText, + IndustryContextContainer, IndustryContextExamples, IndustryContextGroup, - IndustryContextHeader, IndustryContextImage, IndustryContextExampleParagraph, + ProductBenefitHeader, + ProductBenefitsContainer, + BenefitGroup, + BenefitImage, + BenefitTitle, CompanyComparisonSection, CompetitorName, FeatureTitle, @@ -22,13 +24,10 @@ import { CompanyBackgroundSection, GeneralDescriptionSection, CompanyBackgroundHeading, - CompanyBackgroundDescription, CompanyTeamHeading, CompanyTeamMemberGroup, TeamMember, MemberImage, - MemberTitle, - MemberDescription, MissionText, CompanyTeamSection } from "./about-style" @@ -36,44 +35,71 @@ import { export default function About({ data }) { return ( <> - - - About - + +

About

+ - + + + - - {data.mission_heading} - + + + +

{data.mission_heading}

- {data.mission_description} + {data.mission_description} - - - - - {data.industry_context_heading} - - - - {data.industry_context_explanation.map((example, id) => { + + + + + + +

{data.industry_context_heading}

+ + {data.industry_context_explanation.map((example, id) => { + return ( + + + + + + {example.explanation_description} + + + ) + })} + + + + +
+ +

{data.company_comparison_section_heading}

+ + + {data.product_benefit.map((benefit, id) => { return ( - - - - {example.explanation_description} - - + + + + + + {benefit.product_benefit_title} + + + + ) })} - - + +
{/* @@ -129,7 +155,9 @@ export default function About({ data }) { {data.company.map((competitor, id) => ( <> ))} @@ -137,7 +165,9 @@ export default function About({ data }) { {data.product_feature.map((feature, id) => ( - - ))} -
+ {competitor.company_name}
{feature.product_feature_name} - {competitor.company_name} + +

{competitor.company_name}

+
- {feature.product_feature_name} + +

{feature.product_feature_name}

+ 		@@ -157,25 +187,23 @@ export default function About({ data }) { - {data.company_background_section_heading} +

{data.company_background_section_heading}

 - - {data.company_background_description} - + {data.company_background_description} - {data.company_team_heading} +

{data.company_team_heading}

 {data.team_member_information.map((member, id) => { return ( - - {member.team_member_title} - - {member.team_member_description} - + + + +

{member.team_member_title}

+ {member.team_member_description} ) })} diff --git a/src/pages/about.js b/src/pages/about.js index 9c8c964..4568f9f 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -26,26 +26,53 @@ export const query = graphql` company_background_section_heading company_comparison_section_heading company_team_heading - cta_button_destination + cta_button_destination { + url + } cta_button_text industry_context_explanation { explanation_description + explanation_image { + url + } } industry_context_heading + industry_context_icon { + url + } + industry_context_background_image { + url + } mission_description mission_heading + mission_icon { + url + } + mission_image { + url + } product_benefit { + product_benefit_image { + url + } product_benefit_title } product_feature { product_feature_name } - products_navigation_button_destination + products_navigation_button_destination { + url + } products_navigation_button_text team_member_information { - contact_button_destination + contact_button_destination { + url + } contact_button_text team_member_description + team_member_image { + url + } team_member_title } } diff --git a/src/schemas/About.json b/src/schemas/About.json index 42c100d..adc810e 100644 --- a/src/schemas/About.json +++ b/src/schemas/About.json @@ -1,6 +1,14 @@ { "Main": {}, "Mission Section": { + "mission_icon": { + "type": "Image", + "config": { + "constraint": {}, + "thumbnails": [], + "label": "Mission Icon" + } + }, "mission_heading": { "type": "Text", "config": { @@ -23,6 +31,22 @@ } }, "Industry Context Section": { + "industry_context_icon": { + "type": "Image", + "config": { + "constraint": {}, + "thumbnails": [], + "label": "Industry Context Icon" + } + }, + "industry_context_background_image": { + "type": "Image", + "config": { + "constraint": {}, + "thumbnails": [], + "label": "Industry Context Background Image" + } + }, "industry_context_heading": { "type": "Text", "config": { diff --git a/src/style/type-styles.js b/src/style/type-styles.js index bc7923f..d0490dc 100644 --- a/src/style/type-styles.js +++ b/src/style/type-styles.js @@ -5,6 +5,7 @@ const minSize = { h2: 30, h3: 20, p: 16, + body: 16, } const devices = { @@ -20,6 +21,7 @@ const fontSizes = { h2: `calc(${minSize.h2}px + (48 - ${minSize.h2}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, h3: `calc(${minSize.h3}px + (32 - ${minSize.h3}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, p: `calc(${minSize.p}px + (24 - ${minSize.p}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, + body: `calc(${minSize.p}px + (18 - ${minSize.p}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, } const H1 = styled.h1` @@ -41,4 +43,8 @@ const P = styled.p` font-size: ${fontSizes.p}; ` -export { H1, H2, H3, P } +const Body = styled.p` + font-size: ${fontSizes.body}; +` + +export { H1, H2, H3, P, Body } From d4c2f178964777531be304f929ca7a17de96a907 Mon Sep 17 00:00:00 2001 From: Viviana Date: Tue, 27 Apr 2021 20:24:21 -0400 Subject: [PATCH 12/41] #31 Renamed files relevant to styling the product page for more consistency throughout different folders. --- package-lock.json | 6 +++--- .../product-page-styles.js} | 0 .../{products/products.js => product_page/product-page.js} | 2 +- src/pages/{products.js => product_page.js} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/components/{products/products-styles.js => product_page/product-page-styles.js} (100%) rename src/components/{products/products.js => product_page/product-page.js} (98%) rename src/pages/{products.js => product_page.js} (96%) diff --git a/package-lock.json b/package-lock.json index bfd75cd..837179d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3735,9 +3735,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001158", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz", - "integrity": "sha512-s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g==" + "version": "1.0.30001218", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001218.tgz", + "integrity": "sha512-0ASydOWSy3bB88FbDpJSTt+PfDwnMqrym3yRZfqG8EXSQ06OZhF+q5wgYP/EN+jJMERItNcDQUqMyNjzZ+r5+Q==" }, "caseless": { "version": "0.12.0", diff --git a/src/components/products/products-styles.js b/src/components/product_page/product-page-styles.js similarity index 100% rename from src/components/products/products-styles.js rename to src/components/product_page/product-page-styles.js diff --git a/src/components/products/products.js b/src/components/product_page/product-page.js similarity index 98% rename from src/components/products/products.js rename to src/components/product_page/product-page.js index 71ef81a..b2b71d1 100644 --- a/src/components/products/products.js +++ b/src/components/product_page/product-page.js @@ -14,7 +14,7 @@ import { ProductImage, ProductName, ProductDescription, -} from "./products-styles" +} from "./product-page-styles" export default function ProductSection({ data }) { return ( diff --git a/src/pages/products.js b/src/pages/product_page.js similarity index 96% rename from src/pages/products.js rename to src/pages/product_page.js index 2cb05de..b6f1d02 100644 --- a/src/pages/products.js +++ b/src/pages/product_page.js @@ -1,7 +1,7 @@ import React from "react" import { graphql } from "gatsby" import Layout from "../components/layout" -import ProductPage from "../components/products/products" +import ProductPage from "../components/product_page/product-page" export default function ProductSection({ data }) { const productSectionData = data.prismicProductPage.data From ce8264c1ce6efff3f08b1ab3d0fd055cdaccd999 Mon Sep 17 00:00:00 2001 From: Viviana Date: Tue, 27 Apr 2021 21:35:35 -0400 Subject: [PATCH 13/41] #31 Updated styling of featured section on product page to match styling of Hi-fi wireframes. --- .../product_page/product-page-styles.js | 61 ++++--------------- src/components/product_page/product-page.js | 27 ++++---- src/pages/about.js | 12 +++- src/pages/product_page.js | 4 ++ src/style/type-styles.js | 21 ++++++- 5 files changed, 59 insertions(+), 66 deletions(-) diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index ed0be1b..89b8a7e 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -1,14 +1,9 @@ import styled from "styled-components" import dimensions from "../../style/dimensions" -export const ProductPageHeading = styled.div` - font-size: calc(90px + (90 - 32) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; -` - export const FeaturedProductSection = styled.div` width: 100%; - padding-top: 40px; + margin-top: 40px; @media (min-width: ${dimensions.maxwidthTablet}px) { width: 86vw; @@ -17,47 +12,23 @@ export const FeaturedProductSection = styled.div` ` export const FeaturedProductImage = styled.div` - width: 47vw; - height: 432px; - background-color: #C4C4C4; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; - height: 225px; + img { + width: 47vw; + margin-left: -80px; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + margin-left: 0px; + } } ` export const FeaturedProductText = styled.div` - padding-left: 5vw; - padding-top: 52px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-left: 0vw; - padding-top: 26px; - } -` - -export const FeaturedProductHeading = styled.div` - font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); - text-transform: uppercase; -` - -export const FeaturedProductName = styled.div` - font-size: calc(40px + (40 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; - padding-top: 17px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 8px; - } -` - -export const FeaturedProductDescription = styled.div` - font-size: calc(18px + (18 - 16) * ((100vw - 300px) / (1440 - 300))); - padding-top: 32px; + margin-left: 5vw; + margin-top: 52px; @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 15px; + margin-left: 0vw; + margin-top: 26px; } ` @@ -69,11 +40,6 @@ export const ModelScope = styled.div` } ` -export const ModelScopeHeading = styled.div` - font-size: calc(20px + (20 - 16) * ((100vw - 300px) / (1440 - 300))); - text-transform: uppercase; -` - export const ProductsGroup = styled.div` @media (min-width: ${dimensions.maxwidthTablet}px) { display: flex; @@ -100,8 +66,6 @@ export const ProductImage = styled.div` ` export const ProductName = styled.div` - font-size: calc(30px + (30 - 24) * ((100vw - 300px) / (1440 - 300))); - font-weight: bold; padding-top: 49px; @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -110,7 +74,6 @@ export const ProductName = styled.div` ` export const ProductDescription = styled.div` - font-size: 15px; padding-top: 15px; @media (max-width: ${dimensions.maxwidthTablet}px) { diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index b2b71d1..6bf717f 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -1,14 +1,10 @@ import React from "react" +import { H1, H2, H3, Body, Sub1 } from "../../style/type-styles" import { - ProductPageHeading, FeaturedProductSection, FeaturedProductImage, FeaturedProductText, - FeaturedProductHeading, - FeaturedProductName, - FeaturedProductDescription, ModelScope, - ModelScopeHeading, ProductsGroup, Product, ProductImage, @@ -19,13 +15,15 @@ import { export default function ProductSection({ data }) { return (
- {data.product_page_main_heading} +

{data.product_page_main_heading}

- + + {data.featured_product_image.alt}/ + - {data.featured_product_heading} - {data.featured_product_name} - {data.featured_product_description} + {data.featured_product_heading} +

{data.featured_product_name}

+ {data.featured_product_description} @@ -33,14 +31,17 @@ export default function ProductSection({ data }) { {data.model_scope.map(scope => { return ( - {scope.model_scope_heading} + {scope.model_scope_heading} {data.products.map(product => { return ( - {product.product_title} - {product.product_description} + + {product.product_title} + +

+ {product.product_description} ) })} diff --git a/src/pages/about.js b/src/pages/about.js index f500a48..3d352e5 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -23,7 +23,9 @@ export const query = graphql` company_background_section_heading company_comparison_section_heading company_team_heading - cta_button_destination + cta_button_destination { + url + } cta_button_text industry_context_explanation { explanation_description @@ -37,10 +39,14 @@ export const query = graphql` product_feature { product_feature_name } - products_navigation_button_destination + products_navigation_button_destination { + url + } products_navigation_button_text team_member_information { - contact_button_destination + contact_button_destination { + url + } contact_button_text team_member_description team_member_title diff --git a/src/pages/product_page.js b/src/pages/product_page.js index b6f1d02..a129e4a 100644 --- a/src/pages/product_page.js +++ b/src/pages/product_page.js @@ -19,6 +19,10 @@ export const query = graphql` data { featured_product_description featured_product_heading + featured_product_image { + alt + url + } featured_product_name learn_more_button_text learn_more_button_text_destination diff --git a/src/style/type-styles.js b/src/style/type-styles.js index bc7923f..84f983c 100644 --- a/src/style/type-styles.js +++ b/src/style/type-styles.js @@ -4,7 +4,10 @@ const minSize = { h1: 50, h2: 30, h3: 20, + nav: 16, + sub1: 25, p: 16, + body: 14, } const devices = { @@ -20,6 +23,9 @@ const fontSizes = { h2: `calc(${minSize.h2}px + (48 - ${minSize.h2}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, h3: `calc(${minSize.h3}px + (32 - ${minSize.h3}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, p: `calc(${minSize.p}px + (24 - ${minSize.p}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, + NavText: `calc(${minSize.nav}px + (24 - ${minSize.nav}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, + Sub1: `calc(${minSize.sub1}px + (36 - ${minSize.sub1}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, + body: `calc(${minSize.body}px + (18 - ${minSize.body}) * ((100vw - ${devices.mobile}px) / (${devices.desktop} - ${devices.mobile})))`, } const H1 = styled.h1` @@ -41,4 +47,17 @@ const P = styled.p` font-size: ${fontSizes.p}; ` -export { H1, H2, H3, P } +const NavText = styled.div` + font-size: ${fontSizes.nav}; +` + +const Sub1 = styled.div` + font-size: ${fontSizes.Sub1}; + text-transform: uppercase; +` + +const Body = styled.div` + font-size: ${fontSizes.body}; +` + +export { H1, H2, H3, P, NavText, Sub1, Body } From e4805ffa01284a4a0f995892ca3f589edc674a10 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 30 Apr 2021 12:26:08 -0400 Subject: [PATCH 14/41] adding conditional for product page --- .../product_page/product-page-styles.js | 9 +++ src/components/product_page/product-page.js | 81 ++++++++++++------- 2 files changed, 63 insertions(+), 27 deletions(-) diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index 89b8a7e..6297bb9 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -79,4 +79,13 @@ export const ProductDescription = styled.div` @media (max-width: ${dimensions.maxwidthTablet}px) { visibility: hidden; } +` + +export const HomeownerSection = styled.div` + + +` + +export const CommercialSection = styled.div` + ` \ No newline at end of file diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index 6bf717f..1d1d69a 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -1,33 +1,38 @@ import React from "react" import { H1, H2, H3, Body, Sub1 } from "../../style/type-styles" import { - FeaturedProductSection, - FeaturedProductImage, - FeaturedProductText, - ModelScope, - ProductsGroup, - Product, - ProductImage, - ProductName, - ProductDescription, + FeaturedProductSection, + FeaturedProductImage, + FeaturedProductText, + ModelScope, + ProductsGroup, + Product, + ProductImage, + ProductName, + ProductDescription, + HomeownerSection, + CommercialSection, } from "./product-page-styles" export default function ProductSection({ data }) { - return ( -
-

{data.product_page_main_heading}

- - - {data.featured_product_image.alt}/ - - - {data.featured_product_heading} -

{data.featured_product_name}

- {data.featured_product_description} - - + return ( +
+

{data.product_page_main_heading}

+ + + {data.featured_product_image.alt} + + + {data.featured_product_heading} +

{data.featured_product_name}

+ {data.featured_product_description} + + -
+ {/*
{data.model_scope.map(scope => { return ( @@ -49,7 +54,29 @@ export default function ProductSection({ data }) { ) })} -
-
- ) -} \ No newline at end of file +
*/} + +

{data.model_scope[0].model_scope_heading}

+ + {data.products.map(product => { + return ( + product.product.document.data.product_type === "Homeowner" && ( +

{product.product.document.data.product_type}

+ ) + ) + })} + + + +

{data.model_scope[1].model_scope_heading}

+ {data.products.map(product => { + return ( + product.product.document.data.product_type === "Commercial" && ( +

{product.product.document.data.product_type}

+ ) + ) + })} + +
+ ) +} From 070c8b424485e95a40876e7eacfb99c3995d9a0e Mon Sep 17 00:00:00 2001 From: Viviana Date: Fri, 30 Apr 2021 13:16:10 -0400 Subject: [PATCH 15/41] #31 Updated the styling of the models section in the product page to match hifi wireframes. --- package-lock.json | 4174 +++++++++++++++-- package.json | 4 + src/components/homepage/index.js | 3 +- .../product_page/product-page-styles.js | 45 +- src/components/product_page/product-page.js | 78 +- src/pages/{product_page.js => products.js} | 2 + 6 files changed, 3795 insertions(+), 511 deletions(-) rename src/pages/{product_page.js => products.js} (96%) diff --git a/package-lock.json b/package-lock.json index c1766e8..9537c0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1085,9 +1085,9 @@ } }, "@babel/standalone": { - "version": "7.12.6", - "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.12.6.tgz", - "integrity": "sha512-yA/OV3jN1nhr0JsAdYWAqbeZ7cAOw/6Fh52rxVMzujr0HF4Z3cau0JBzJfQppFfR9IArrUtcqhBu/+Q/IevoyQ==" + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.0.tgz", + "integrity": "sha512-PPkwh7AQyP+QBHUavMBNSnAVsW4xFe76CQn3d8kWorwwu9l5R7QDjA9v4GkF6jHhL5fen6so20eqY1KDaJjMEQ==" }, "@babel/template": { "version": "7.10.4", @@ -1690,6 +1690,334 @@ } } }, + "@jimp/bmp": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.14.0.tgz", + "integrity": "sha512-5RkX6tSS7K3K3xNEb2ygPuvyL9whjanhoaB/WmmXlJS6ub4DjTqrapu8j4qnIWmO4YYtFeTbDTXV6v9P1yMA5A==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "bmp-js": "^0.1.0" + } + }, + "@jimp/core": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.14.0.tgz", + "integrity": "sha512-S62FcKdtLtj3yWsGfJRdFXSutjvHg7aQNiFogMbwq19RP4XJWqS2nOphu7ScB8KrSlyy5nPF2hkWNhLRLyD82w==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "any-base": "^1.1.0", + "buffer": "^5.2.0", + "exif-parser": "^0.1.12", + "file-type": "^9.0.0", + "load-bmfont": "^1.3.1", + "mkdirp": "^0.5.1", + "phin": "^2.9.1", + "pixelmatch": "^4.0.2", + "tinycolor2": "^1.4.1" + }, + "dependencies": { + "file-type": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz", + "integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==" + } + } + }, + "@jimp/custom": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.14.0.tgz", + "integrity": "sha512-kQJMeH87+kWJdVw8F9GQhtsageqqxrvzg7yyOw3Tx/s7v5RToe8RnKyMM+kVtBJtNAG+Xyv/z01uYQ2jiZ3GwA==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/core": "^0.14.0" + } + }, + "@jimp/gif": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.14.0.tgz", + "integrity": "sha512-DHjoOSfCaCz72+oGGEh8qH0zE6pUBaBxPxxmpYJjkNyDZP7RkbBkZJScIYeQ7BmJxmGN4/dZn+MxamoQlr+UYg==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "gifwrap": "^0.9.2", + "omggif": "^1.0.9" + } + }, + "@jimp/jpeg": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.14.0.tgz", + "integrity": "sha512-561neGbr+87S/YVQYnZSTyjWTHBm9F6F1obYHiyU3wVmF+1CLbxY3FQzt4YolwyQHIBv36Bo0PY2KkkU8BEeeQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "jpeg-js": "^0.4.0" + } + }, + "@jimp/plugin-blit": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.14.0.tgz", + "integrity": "sha512-YoYOrnVHeX3InfgbJawAU601iTZMwEBZkyqcP1V/S33Qnz9uzH1Uj1NtC6fNgWzvX6I4XbCWwtr4RrGFb5CFrw==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-blur": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.14.0.tgz", + "integrity": "sha512-9WhZcofLrT0hgI7t0chf7iBQZib//0gJh9WcQMUt5+Q1Bk04dWs8vTgLNj61GBqZXgHSPzE4OpCrrLDBG8zlhQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-circle": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.14.0.tgz", + "integrity": "sha512-o5L+wf6QA44tvTum5HeLyLSc5eVfIUd5ZDVi5iRfO4o6GT/zux9AxuTSkKwnjhsG8bn1dDmywAOQGAx7BjrQVA==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-color": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.14.0.tgz", + "integrity": "sha512-JJz512SAILYV0M5LzBb9sbOm/XEj2fGElMiHAxb7aLI6jx+n0agxtHpfpV/AePTLm1vzzDxx6AJxXbKv355hBQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "tinycolor2": "^1.4.1" + } + }, + "@jimp/plugin-contain": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.14.0.tgz", + "integrity": "sha512-RX2q233lGyaxiMY6kAgnm9ScmEkNSof0hdlaJAVDS1OgXphGAYAeSIAwzESZN4x3ORaWvkFefeVH9O9/698Evg==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-cover": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.14.0.tgz", + "integrity": "sha512-0P/5XhzWES4uMdvbi3beUgfvhn4YuQ/ny8ijs5kkYIw6K8mHcl820HahuGpwWMx56DJLHRl1hFhJwo9CeTRJtQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-crop": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.14.0.tgz", + "integrity": "sha512-Ojtih+XIe6/XSGtpWtbAXBozhCdsDMmy+THUJAGu2x7ZgKrMS0JotN+vN2YC3nwDpYkM+yOJImQeptSfZb2Sug==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-displace": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.14.0.tgz", + "integrity": "sha512-c75uQUzMgrHa8vegkgUvgRL/PRvD7paFbFJvzW0Ugs8Wl+CDMGIPYQ3j7IVaQkIS+cAxv+NJ3TIRBQyBrfVEOg==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-dither": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.14.0.tgz", + "integrity": "sha512-g8SJqFLyYexXQQsoh4dc1VP87TwyOgeTElBcxSXX2LaaMZezypmxQfLTzOFzZoK8m39NuaoH21Ou1Ftsq7LzVQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-fisheye": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.14.0.tgz", + "integrity": "sha512-BFfUZ64EikCaABhCA6mR3bsltWhPpS321jpeIQfJyrILdpFsZ/OccNwCgpW1XlbldDHIoNtXTDGn3E+vCE7vDg==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-flip": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.14.0.tgz", + "integrity": "sha512-WtL1hj6ryqHhApih+9qZQYA6Ye8a4HAmdTzLbYdTMrrrSUgIzFdiZsD0WeDHpgS/+QMsWwF+NFmTZmxNWqKfXw==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-gaussian": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.14.0.tgz", + "integrity": "sha512-uaLwQ0XAQoydDlF9tlfc7iD9drYPriFe+jgYnWm8fbw5cN+eOIcnneEX9XCOOzwgLPkNCxGox6Kxjn8zY6GxtQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-invert": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.14.0.tgz", + "integrity": "sha512-UaQW9X9vx8orQXYSjT5VcITkJPwDaHwrBbxxPoDG+F/Zgv4oV9fP+udDD6qmkgI9taU+44Fy+zm/J/gGcMWrdg==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-mask": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.14.0.tgz", + "integrity": "sha512-tdiGM69OBaKtSPfYSQeflzFhEpoRZ+BvKfDEoivyTjauynbjpRiwB1CaiS8En1INTDwzLXTT0Be9SpI3LkJoEA==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-normalize": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.14.0.tgz", + "integrity": "sha512-AfY8sqlsbbdVwFGcyIPy5JH/7fnBzlmuweb+Qtx2vn29okq6+HelLjw2b+VT2btgGUmWWHGEHd86oRGSoWGyEQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-print": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.14.0.tgz", + "integrity": "sha512-MwP3sH+VS5AhhSTXk7pui+tEJFsxnTKFY3TraFJb8WFbA2Vo2qsRCZseEGwpTLhENB7p/JSsLvWoSSbpmxhFAQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "load-bmfont": "^1.4.0" + } + }, + "@jimp/plugin-resize": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.14.0.tgz", + "integrity": "sha512-qFeMOyXE/Bk6QXN0GQo89+CB2dQcXqoxUcDb2Ah8wdYlKqpi53skABkgVy5pW3EpiprDnzNDboMltdvDslNgLQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-rotate": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.14.0.tgz", + "integrity": "sha512-aGaicts44bvpTcq5Dtf93/8TZFu5pMo/61lWWnYmwJJU1RqtQlxbCLEQpMyRhKDNSfPbuP8nyGmaqXlM/82J0Q==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-scale": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.14.0.tgz", + "integrity": "sha512-ZcJk0hxY5ZKZDDwflqQNHEGRblgaR+piePZm7dPwPUOSeYEH31P0AwZ1ziceR74zd8N80M0TMft+e3Td6KGBHw==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-shadow": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.14.0.tgz", + "integrity": "sha512-p2igcEr/iGrLiTu0YePNHyby0WYAXM14c5cECZIVnq/UTOOIQ7xIcWZJ1lRbAEPxVVXPN1UibhZAbr3HAb5BjQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugin-threshold": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.14.0.tgz", + "integrity": "sha512-N4BlDgm/FoOMV/DQM2rSpzsgqAzkP0DXkWZoqaQrlRxQBo4zizQLzhEL00T/YCCMKnddzgEhnByaocgaaa0fKw==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0" + } + }, + "@jimp/plugins": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.14.0.tgz", + "integrity": "sha512-vDO3XT/YQlFlFLq5TqNjQkISqjBHT8VMhpWhAfJVwuXIpilxz5Glu4IDLK6jp4IjPR6Yg2WO8TmRY/HI8vLrOw==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/plugin-blit": "^0.14.0", + "@jimp/plugin-blur": "^0.14.0", + "@jimp/plugin-circle": "^0.14.0", + "@jimp/plugin-color": "^0.14.0", + "@jimp/plugin-contain": "^0.14.0", + "@jimp/plugin-cover": "^0.14.0", + "@jimp/plugin-crop": "^0.14.0", + "@jimp/plugin-displace": "^0.14.0", + "@jimp/plugin-dither": "^0.14.0", + "@jimp/plugin-fisheye": "^0.14.0", + "@jimp/plugin-flip": "^0.14.0", + "@jimp/plugin-gaussian": "^0.14.0", + "@jimp/plugin-invert": "^0.14.0", + "@jimp/plugin-mask": "^0.14.0", + "@jimp/plugin-normalize": "^0.14.0", + "@jimp/plugin-print": "^0.14.0", + "@jimp/plugin-resize": "^0.14.0", + "@jimp/plugin-rotate": "^0.14.0", + "@jimp/plugin-scale": "^0.14.0", + "@jimp/plugin-shadow": "^0.14.0", + "@jimp/plugin-threshold": "^0.14.0", + "timm": "^1.6.1" + } + }, + "@jimp/png": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.14.0.tgz", + "integrity": "sha512-0RV/mEIDOrPCcNfXSPmPBqqSZYwGADNRVUTyMt47RuZh7sugbYdv/uvKmQSiqRdR0L1sfbCBMWUEa5G/8MSbdA==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/utils": "^0.14.0", + "pngjs": "^3.3.3" + } + }, + "@jimp/tiff": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.14.0.tgz", + "integrity": "sha512-zBYDTlutc7j88G/7FBCn3kmQwWr0rmm1e0FKB4C3uJ5oYfT8645lftUsvosKVUEfkdmOaMAnhrf4ekaHcb5gQw==", + "requires": { + "@babel/runtime": "^7.7.2", + "utif": "^2.0.1" + } + }, + "@jimp/types": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.14.0.tgz", + "integrity": "sha512-hx3cXAW1KZm+b+XCrY3LXtdWy2U+hNtq0rPyJ7NuXCjU7lZR3vIkpz1DLJ3yDdS70hTi5QDXY3Cd9kd6DtloHQ==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/bmp": "^0.14.0", + "@jimp/gif": "^0.14.0", + "@jimp/jpeg": "^0.14.0", + "@jimp/png": "^0.14.0", + "@jimp/tiff": "^0.14.0", + "timm": "^1.6.1" + } + }, + "@jimp/utils": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.14.0.tgz", + "integrity": "sha512-MY5KFYUru0y74IsgM/9asDwb3ERxWxXEu3CRCZEvE7DtT86y1bR1XgtlSliMrptjz4qbivNGMQSvUBpEFJDp1A==", + "requires": { + "@babel/runtime": "^7.7.2", + "regenerator-runtime": "^0.13.3" + } + }, "@mdx-js/util": { "version": "2.0.0-next.8", "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-2.0.0-next.8.tgz", @@ -1875,6 +2203,17 @@ "resolved": "https://registry.npmjs.org/@turist/time/-/time-0.0.1.tgz", "integrity": "sha512-M2BiThcbxMxSKX8W4z5u9jKZn6datnM3+FpEU+eYw0//l31E2xhqi7vTAuJ/Sf0P3yhp66SDJgPu3bRRpvrdQQ==" }, + "@types/cacheable-request": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz", + "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==", + "requires": { + "@types/http-cache-semantics": "*", + "@types/keyv": "*", + "@types/node": "*", + "@types/responselike": "*" + } + }, "@types/common-tags": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.0.tgz", @@ -1919,6 +2258,11 @@ "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.8.tgz", "integrity": "sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==" }, + "@types/http-cache-semantics": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz", + "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" + }, "@types/http-proxy": { "version": "1.17.4", "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz", @@ -1949,6 +2293,11 @@ "@types/istanbul-lib-report": "*" } }, + "@types/json-patch": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/json-patch/-/json-patch-0.0.30.tgz", + "integrity": "sha512-MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw==" + }, "@types/json-schema": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", @@ -1959,6 +2308,14 @@ "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=" }, + "@types/keyv": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz", + "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==", + "requires": { + "@types/node": "*" + } + }, "@types/lodash": { "version": "4.14.165", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.165.tgz", @@ -2033,6 +2390,14 @@ "safe-buffer": "*" } }, + "@types/responselike": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", + "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", + "requires": { + "@types/node": "*" + } + }, "@types/rimraf": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.4.tgz", @@ -2061,17 +2426,17 @@ } }, "@types/yargs": { - "version": "15.0.9", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz", - "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==", + "version": "15.0.13", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz", + "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==", "requires": { "@types/yargs-parser": "*" } }, "@types/yargs-parser": { - "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", - "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz", + "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==" }, "@types/yoga-layout": { "version": "1.9.2", @@ -2530,6 +2895,21 @@ "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==" }, + "archive-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz", + "integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=", + "requires": { + "file-type": "^4.2.0" + }, + "dependencies": { + "file-type": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz", + "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=" + } + } + }, "are-we-there-yet": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", @@ -3163,32 +3543,311 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" - }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "optional": true, + "bin-build": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz", + "integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==", "requires": { - "file-uri-to-path": "1.0.0" + "decompress": "^4.0.0", + "download": "^6.2.2", + "execa": "^0.7.0", + "p-map-series": "^1.0.0", + "tempfile": "^2.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + } } }, - "bl": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", - "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", + "bin-check": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz", + "integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==", "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" + "execa": "^0.7.0", + "executable": "^4.1.0" }, "dependencies": { - "readable-stream": { - "version": "3.6.0", + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + } + } + }, + "bin-version": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz", + "integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==", + "requires": { + "execa": "^1.0.0", + "find-versions": "^3.0.0" + }, + "dependencies": { + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + } + } + }, + "bin-version-check": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz", + "integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==", + "requires": { + "bin-version": "^3.0.0", + "semver": "^5.6.0", + "semver-truncate": "^1.1.2" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "bin-wrapper": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz", + "integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==", + "requires": { + "bin-check": "^4.1.0", + "bin-version-check": "^4.0.0", + "download": "^7.1.0", + "import-lazy": "^3.1.0", + "os-filter-obj": "^2.0.0", + "pify": "^4.0.1" + }, + "dependencies": { + "download": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz", + "integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==", + "requires": { + "archive-type": "^4.0.0", + "caw": "^2.0.1", + "content-disposition": "^0.5.2", + "decompress": "^4.2.0", + "ext-name": "^5.0.0", + "file-type": "^8.1.0", + "filenamify": "^2.0.0", + "get-stream": "^3.0.0", + "got": "^8.3.1", + "make-dir": "^1.2.0", + "p-event": "^2.1.0", + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "file-type": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz", + "integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==" + }, + "filenamify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz", + "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==", + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.0", + "trim-repeated": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "import-lazy": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz", + "integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==" + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "requires": { + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "p-event": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz", + "integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==", + "requires": { + "p-timeout": "^2.0.1" + } + } + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, + "bl": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", + "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", + "requires": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { @@ -3209,6 +3868,11 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "bmp-js": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz", + "integrity": "sha1-4Fpj95amwf8l9Hcex62twUjAcjM=" + }, "bn.js": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", @@ -3505,6 +4169,35 @@ "ieee754": "^1.1.13" } }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "requires": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==" + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, + "buffer-equal": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz", + "integrity": "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=" + }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=" + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -3528,11 +4221,6 @@ "node-gyp-build": "^4.2.0" } }, - "builtin-modules": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz", - "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==" - }, "builtin-status-codes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", @@ -3625,6 +4313,30 @@ "lockfile": "^1.0.4" } }, + "cacheable-lookup": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz", + "integrity": "sha512-EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg==", + "requires": { + "@types/keyv": "^3.1.1", + "keyv": "^4.0.0" + }, + "dependencies": { + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "keyv": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz", + "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==", + "requires": { + "json-buffer": "3.0.1" + } + } + } + }, "cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -3749,11 +4461,27 @@ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, + "caw": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz", + "integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==", + "requires": { + "get-proxy": "^2.0.0", + "isurl": "^1.0.0-alpha5", + "tunnel-agent": "^0.6.0", + "url-to-options": "^1.0.1" + } + }, "ccount": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz", "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==" }, + "ccxt": { + "version": "1.49.17", + "resolved": "https://registry.npmjs.org/ccxt/-/ccxt-1.49.17.tgz", + "integrity": "sha512-Drxa6hdgVE9gXfp7LYq+xfZt0JkYTYVvP/z4vqFzJSJghnapMjlyUSd6w9cwuLbmxKkwsBziXHUs95RkwZ8LIw==" + }, "chalk": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", @@ -3985,16 +4713,6 @@ "restore-cursor": "^3.1.0" } }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", - "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" - } - }, "cli-width": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", @@ -4172,12 +4890,6 @@ "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "optional": true - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -4287,6 +4999,15 @@ "typedarray": "^0.0.6" } }, + "config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, "configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -4335,6 +5056,11 @@ "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, + "console-stream": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz", + "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=" + }, "constants-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", @@ -4359,61 +5085,77 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "contentful-management": { - "version": "5.28.0", - "resolved": "https://registry.npmjs.org/contentful-management/-/contentful-management-5.28.0.tgz", - "integrity": "sha512-o+qihN3zrD6+/BT/e8n26jl/zQvmV6+9S6NY5QDmzM+IaiSeCk6yvPMq74s+IZT9mOS54igl6qFTbeIpdJ9FDA==", - "requires": { - "axios": "^0.19.0", - "contentful-sdk-core": "^6.4.0", - "lodash": "^4.17.11", - "type-fest": "0.15.1" + "version": "7.17.4", + "resolved": "https://registry.npmjs.org/contentful-management/-/contentful-management-7.17.4.tgz", + "integrity": "sha512-kmxUr1n0ql93MSgcO2OaD2Wj189ZpjFjiog/QW3sQhglwCE1rIKHcu2tVFr6H2W9RinlAqqQCrPsnp68R9h3hQ==", + "requires": { + "@types/json-patch": "0.0.30", + "axios": "^0.21.0", + "contentful-sdk-core": "^6.7.0", + "fast-copy": "^2.1.0", + "lodash.isplainobject": "^4.0.6", + "type-fest": "0.20.2" }, "dependencies": { "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { - "follow-redirects": "1.5.10" + "follow-redirects": "^1.10.0" } }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + } + } + }, + "contentful-sdk-core": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.7.0.tgz", + "integrity": "sha512-+b8UXVE249Z6WzMLXvsu3CIvN/s5xXRZ9o+zY7zDdPkIYBMW15xcs9N2ATI6ncmc+s1uj4XZij/2skflletHiw==", + "requires": { + "fast-copy": "^2.1.0", + "qs": "^6.9.4" + }, + "dependencies": { + "get-intrinsic": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "requires": { - "ms": "2.0.0" + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" } }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "object-inspect": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.2.tgz", + "integrity": "sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==" + }, + "qs": { + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", + "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", "requires": { - "debug": "=3.1.0" + "side-channel": "^1.0.4" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "type-fest": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.15.1.tgz", - "integrity": "sha512-n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A==" + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } } } }, - "contentful-sdk-core": { - "version": "6.4.6", - "resolved": "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.4.6.tgz", - "integrity": "sha512-6KVLeCdn1akqjGvVMUgMxQ3B+zNIYeq3MUlqWsSLLJozr++0ZYWU76XmHf4n5MPTMoX9RGbRSR8hJAaKcUNDFw==", - "requires": { - "lodash": "^4.17.10", - "qs": "^6.5.2" - } - }, "convert-hrtime": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/convert-hrtime/-/convert-hrtime-3.0.0.tgz", @@ -4562,6 +5304,11 @@ } } }, + "create-gatsby": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/create-gatsby/-/create-gatsby-0.5.1.tgz", + "integrity": "sha512-iQ3Z757x02uw9Z3ereR/+RNjiQPCKLEAh3GLqfcTNNVeGgRd07XdgIgGIZrbuNaKL/3EGdfejd7ElJ1UBLQSHQ==" + }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -4740,14 +5487,14 @@ } }, "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", + "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" + "boolbase": "^1.0.0", + "css-what": "^3.2.1", + "domutils": "^1.7.0", + "nth-check": "^1.0.2" } }, "css-select-base-adapter": { @@ -4791,9 +5538,9 @@ } }, "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" }, "cssesc": { "version": "3.0.0", @@ -5014,6 +5761,43 @@ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, + "decompress": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", + "requires": { + "decompress-tar": "^4.0.0", + "decompress-tarbz2": "^4.0.0", + "decompress-targz": "^4.0.0", + "decompress-unzip": "^4.0.1", + "graceful-fs": "^4.1.10", + "make-dir": "^1.0.0", + "pify": "^2.3.0", + "strip-dirs": "^2.0.0" + }, + "dependencies": { + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "requires": { + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } + } + }, "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -5022,6 +5806,106 @@ "mimic-response": "^1.0.0" } }, + "decompress-tar": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz", + "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==", + "requires": { + "file-type": "^5.2.0", + "is-stream": "^1.1.0", + "tar-stream": "^1.5.2" + }, + "dependencies": { + "file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + } + } + }, + "decompress-tarbz2": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz", + "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==", + "requires": { + "decompress-tar": "^4.1.0", + "file-type": "^6.1.0", + "is-stream": "^1.1.0", + "seek-bzip": "^1.0.5", + "unbzip2-stream": "^1.0.9" + }, + "dependencies": { + "file-type": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz", + "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + } + } + }, + "decompress-targz": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz", + "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==", + "requires": { + "decompress-tar": "^4.1.1", + "file-type": "^5.2.0", + "is-stream": "^1.1.0" + }, + "dependencies": { + "file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + } + } + }, + "decompress-unzip": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz", + "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=", + "requires": { + "file-type": "^3.8.0", + "get-stream": "^2.2.0", + "pify": "^2.3.0", + "yauzl": "^2.4.2" + }, + "dependencies": { + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + }, + "get-stream": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz", + "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=", + "requires": { + "object-assign": "^4.0.1", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } + } + }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", @@ -5045,6 +5929,11 @@ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -5185,10 +6074,10 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, - "detect-indent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz", - "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==" + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, "detect-newline": { "version": "1.0.3", @@ -5403,9 +6292,9 @@ } }, "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "requires": { "dom-serializer": "0", "domelementtype": "1" @@ -5457,6 +6346,124 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==" }, + "download": { + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz", + "integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==", + "requires": { + "caw": "^2.0.0", + "content-disposition": "^0.5.2", + "decompress": "^4.0.0", + "ext-name": "^5.0.0", + "file-type": "5.2.0", + "filenamify": "^2.0.0", + "get-stream": "^3.0.0", + "got": "^7.0.0", + "make-dir": "^1.0.0", + "p-event": "^1.0.0", + "pify": "^3.0.0" + }, + "dependencies": { + "file-type": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz", + "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=" + }, + "filenamify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz", + "integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==", + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.0", + "trim-repeated": "^1.0.0" + } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "got": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz", + "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", + "requires": { + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "requires": { + "pify": "^3.0.0" + } + }, + "p-cancelable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz", + "integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==" + }, + "p-event": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz", + "integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=", + "requires": { + "p-timeout": "^1.1.1" + } + }, + "p-timeout": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz", + "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", + "requires": { + "p-finally": "^1.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "^1.0.1" + } + } + } + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -5498,23 +6505,23 @@ "integrity": "sha512-VJI21MucKaqyFw0oe3j9BIg+nDF4MHzUZAmUwZzrxho+s8zPCD13Fds07Rgu+MTtAadO4tYTKFdAUksKYUyIJw==" }, "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", + "bn.js": "^4.11.9", + "brorand": "^1.1.0", "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" }, "dependencies": { "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" } } }, @@ -5542,22 +6549,22 @@ } }, "engine.io": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.2.tgz", - "integrity": "sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz", + "integrity": "sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==", "requires": { "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "0.3.1", + "cookie": "~0.4.1", "debug": "~4.1.0", "engine.io-parser": "~2.2.0", - "ws": "^7.1.2" + "ws": "~7.4.2" }, "dependencies": { "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" }, "debug": { "version": "4.1.1", @@ -5568,9 +6575,9 @@ } }, "ws": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", - "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" } } }, @@ -6222,6 +7229,11 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, + "estree-util-is-identifier-name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz", + "integrity": "sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==" + }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -6318,6 +7330,26 @@ } } }, + "executable": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", + "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", + "requires": { + "pify": "^2.2.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } + } + }, + "exif-parser": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz", + "integrity": "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=" + }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -6363,6 +7395,11 @@ } } }, + "expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==" + }, "expand-tilde": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", @@ -6498,6 +7535,23 @@ } } }, + "ext-list": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz", + "integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==", + "requires": { + "mime-db": "^1.28.0" + } + }, + "ext-name": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz", + "integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==", + "requires": { + "ext-list": "^2.0.0", + "sort-keys-length": "^1.0.0" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -6606,6 +7660,11 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, + "fast-copy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-2.1.1.tgz", + "integrity": "sha512-Qod3DdRgFZ8GUIM6ygeoZYpQ0QLW9cf/FS9KhhjlYggcSZXWAemAw8BOCO5LuYCrR3Uj3qXDVTUzOUwG8C7beQ==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -6675,6 +7734,14 @@ "resolved": "https://registry.npmjs.org/fd/-/fd-0.0.3.tgz", "integrity": "sha512-iAHrIslQb3U68OcMSP0kkNWabp7sSN6d2TBSb2JO3gcLJVDd4owr/hKM4SFJovFOUeeXeItjYgouEDTMWiVAnA==" }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "requires": { + "pend": "~1.2.0" + } + }, "figgy-pudding": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", @@ -6733,6 +7800,21 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "optional": true }, + "filename-reserved-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", + "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=" + }, + "filenamify": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", + "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", + "requires": { + "filename-reserved-regex": "^2.0.0", + "strip-outer": "^1.0.1", + "trim-repeated": "^1.0.0" + } + }, "filesize": { "version": "3.5.11", "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", @@ -6867,6 +7949,14 @@ "locate-path": "^3.0.0" } }, + "find-versions": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz", + "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==", + "requires": { + "semver-regex": "^2.0.0" + } + }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -6958,6 +8048,11 @@ "readable-stream": "^2.0.0" } }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + }, "fs-exists-cached": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz", @@ -7172,25 +8267,74 @@ "yaml-loader": "^0.6.0" }, "dependencies": { + "@graphql-tools/utils": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.8.1.tgz", + "integrity": "sha512-LDbOweemjxPYgJuHXK5XZJgObsBkiD92ul98lcuZxgA49IzQazHho5Y1Hs3MluD93YtZpxsQg/f7gNPnAyR6yw==", + "requires": { + "@ardatan/aggregate-error": "0.0.6", + "camel-case": "4.1.2", + "tslib": "~2.2.0" + } + }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "color-convert": "^2.0.1" + } + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "requires": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==" + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "gatsby-cli": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.13.1.tgz", - "integrity": "sha512-k27GTZXQHIgIZHjyYTSzI7OhaxUOLuIIvgTcrKOx/t+9ztH941g0EhoBr0XbsvI1lknumuUPC7/66/RPYTsmTg==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-2.19.2.tgz", + "integrity": "sha512-Z6y0MgYC07uLF1jBtcLoFJfD9iX+CeaNMbpet7qrolNjig8v5ukyttvn5GUAliwC4ifwCJpbURkXKPFicr0KrA==", "requires": { "@babel/code-frame": "^7.10.4", "@hapi/joi": "^15.1.1", @@ -7201,13 +8345,14 @@ "common-tags": "^1.8.0", "configstore": "^5.0.1", "convert-hrtime": "^3.0.0", + "create-gatsby": "^0.5.1", "envinfo": "^7.7.3", "execa": "^3.4.0", "fs-exists-cached": "^1.0.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.4.0", - "gatsby-recipes": "^0.3.1", - "gatsby-telemetry": "^1.4.1", + "gatsby-core-utils": "^1.10.1", + "gatsby-recipes": "^0.9.2", + "gatsby-telemetry": "^1.10.1", "hosted-git-info": "^3.0.6", "is-valid-path": "^0.1.1", "lodash": "^4.17.20", @@ -7224,15 +8369,75 @@ "source-map": "0.7.3", "stack-trace": "^0.0.10", "strip-ansi": "^5.2.0", - "update-notifier": "^4.1.3", + "update-notifier": "^5.0.1", "uuid": "3.4.0", "yargs": "^15.4.1", "yoga-layout-prebuilt": "^1.9.6", - "yurnalist": "^1.1.2" + "yurnalist": "^2.1.0" }, "dependencies": { - "execa": { - "version": "3.4.0", + "@types/common-tags": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.0.tgz", + "integrity": "sha512-htRqZr5qn8EzMelhX/Xmx142z218lLyGaeZ3YR8jlze4TATRU9huKKvuBmAJEW4LCC4pnY1N6JAm6p85fMHjhg==" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "clipboardy": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", + "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", + "requires": { + "arch": "^2.1.1", + "execa": "^1.0.0", + "is-wsl": "^2.1.1" + }, + "dependencies": { + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + } + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "requires": { + "ms": "2.1.2" + } + }, + "execa": { + "version": "3.4.0", "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", "requires": { @@ -7246,18 +8451,376 @@ "p-finally": "^2.0.0", "signal-exit": "^3.0.2", "strip-final-newline": "^2.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "p-finally": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", + "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + } + } + }, + "gatsby-core-utils": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.10.1.tgz", + "integrity": "sha512-4P3feGCJckg+DRWWl2beFk7N9c63zmCryEGPaU1OHCp+ZT2bO0ihCBuXywDWuuEp6SYP9PZ1fs0YJ/Rt6q6lag==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "tmp": "^0.2.1", + "xdg-basedir": "^4.0.0" + } + }, + "gatsby-recipes": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.9.2.tgz", + "integrity": "sha512-+jcVzYh7RUxvU1yxdUdUfp06nrwl8y/G9FUWC7izho/t65R3IYTJo2danTwxiva6jPRWLfjfolNwD7m1rQ1KRA==", + "requires": { + "@babel/core": "^7.12.3", + "@babel/generator": "^7.12.5", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-proposal-optional-chaining": "^7.12.1", + "@babel/plugin-transform-react-jsx": "^7.12.5", + "@babel/standalone": "^7.12.6", + "@babel/template": "^7.10.4", + "@babel/types": "^7.12.6", + "@graphql-tools/schema": "^7.0.0", + "@graphql-tools/utils": "^7.0.2", + "@hapi/hoek": "8.x.x", + "@hapi/joi": "^15.1.1", + "better-queue": "^3.8.10", + "chokidar": "^3.4.2", + "contentful-management": "^7.5.1", + "cors": "^2.8.5", + "debug": "^4.3.1", + "detect-port": "^1.3.0", + "dotenv": "^8.2.0", + "execa": "^4.0.2", + "express": "^4.17.1", + "express-graphql": "^0.9.0", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.10.1", + "gatsby-telemetry": "^1.10.1", + "glob": "^7.1.6", + "graphql": "^14.6.0", + "graphql-compose": "^6.3.8", + "graphql-subscriptions": "^1.1.0", + "graphql-type-json": "^0.3.2", + "hicat": "^0.8.0", + "is-binary-path": "^2.1.0", + "is-url": "^1.2.4", + "jest-diff": "^25.5.0", + "lock": "^1.0.0", + "lodash": "^4.17.20", + "mitt": "^1.2.0", + "mkdirp": "^0.5.1", + "node-fetch": "^2.5.0", + "pkg-dir": "^4.2.0", + "prettier": "^2.0.5", + "prop-types": "^15.6.1", + "remark-mdx": "^2.0.0-next.4", + "remark-mdxjs": "^2.0.0-next.4", + "remark-parse": "^6.0.3", + "remark-stringify": "^8.1.0", + "resolve-from": "^5.0.0", + "semver": "^7.3.2", + "single-trailing-newline": "^1.0.0", + "strip-ansi": "^6.0.0", + "style-to-object": "^0.3.0", + "unified": "^8.4.2", + "unist-util-remove": "^2.0.0", + "unist-util-visit": "^2.0.2", + "uuid": "3.4.0", + "ws": "^7.3.0", + "xstate": "^4.9.1", + "yoga-layout-prebuilt": "^1.9.6" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "gatsby-telemetry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.10.1.tgz", + "integrity": "sha512-iIXWHD6CSePzL77ZeBnWVRHKh9MxB8QaEf1eRUODH8uqK7GnyV34zJclSD4EIGVFWwd419MhrWqI1oE9iouskA==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@turist/fetch": "^7.1.7", + "@turist/time": "^0.0.1", + "async-retry-ng": "^2.0.1", + "boxen": "^4.2.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.10.1", + "git-up": "^4.0.2", + "is-docker": "^2.1.1", + "lodash": "^4.17.20", + "node-fetch": "^2.6.1", + "uuid": "3.4.0" + } + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-valid-path": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz", + "integrity": "sha1-EQ+f90w39mPh7HkV60UfLbk6yd8=", + "requires": { + "is-invalid-path": "^0.1.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "^2.0.0" + } + }, + "pretty-error": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", + "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==", + "requires": { + "lodash": "^4.17.20", + "renderkid": "^2.0.4" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "requires": { + "resolve-from": "^5.0.0" + } + }, + "update-notifier": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", + "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", + "requires": { + "boxen": "^5.0.0", + "chalk": "^4.1.0", + "configstore": "^5.0.1", + "has-yarn": "^2.1.0", + "import-lazy": "^2.1.0", + "is-ci": "^2.0.0", + "is-installed-globally": "^0.4.0", + "is-npm": "^5.0.0", + "is-yarn-global": "^0.3.0", + "latest-version": "^5.1.0", + "pupa": "^2.1.1", + "semver": "^7.3.4", + "semver-diff": "^3.1.1", + "xdg-basedir": "^4.0.0" + }, + "dependencies": { + "boxen": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", + "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", + "requires": { + "ansi-align": "^3.0.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.0", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, + "yoga-layout-prebuilt": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.10.0.tgz", + "integrity": "sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==", + "requires": { + "@types/yoga-layout": "1.9.2" + } + }, + "yurnalist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-2.1.0.tgz", + "integrity": "sha512-PgrBqosQLM3gN2xBFIMDLACRTV9c365VqityKKpSTWpwR+U4LAFR3rSVyEoscWlu3EzX9+Y0I86GXUKxpHFl6w==", + "requires": { + "chalk": "^2.4.2", + "inquirer": "^7.0.0", + "is-ci": "^2.0.0", + "read": "^1.0.7", + "strip-ansi": "^5.2.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + } } } } }, "hosted-git-info": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz", - "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", + "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", "requires": { "lru-cache": "^6.0.0" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "requires": { + "tslib": "^2.0.3" + } + }, "lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -7266,15 +8829,49 @@ "yallist": "^4.0.0" } }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" + "no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "requires": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" }, "shebang-command": { "version": "2.0.0", @@ -7294,14 +8891,51 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + } } }, + "tslib": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -7310,6 +8944,31 @@ "isexe": "^2.0.0" } }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, + "ws": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" + }, "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -7339,6 +8998,221 @@ } } }, + "gatsby-cli": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.4.0.tgz", + "integrity": "sha512-mqf8SbaY0ZEQBUedkchnGwLlBR64HQSXJ/KA1kciDwWyHpOlipXByYpXNpakolA9VDKBfHYTu1tofPxcfM+0fA==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@types/common-tags": "^1.8.0", + "better-opn": "^2.0.0", + "chalk": "^4.1.0", + "clipboardy": "^2.3.0", + "common-tags": "^1.8.0", + "configstore": "^5.0.1", + "convert-hrtime": "^3.0.0", + "create-gatsby": "^1.4.0", + "envinfo": "^7.7.3", + "execa": "^3.4.0", + "fs-exists-cached": "^1.0.0", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^2.4.0", + "gatsby-recipes": "^0.15.0", + "gatsby-telemetry": "^2.4.0", + "hosted-git-info": "^3.0.6", + "is-valid-path": "^0.1.1", + "joi": "^17.4.0", + "lodash": "^4.17.21", + "meant": "^1.0.2", + "node-fetch": "^2.6.1", + "opentracing": "^0.14.4", + "pretty-error": "^2.1.1", + "progress": "^2.0.3", + "prompts": "^2.3.2", + "redux": "^4.0.5", + "resolve-cwd": "^3.0.0", + "semver": "^7.3.2", + "signal-exit": "^3.0.3", + "source-map": "0.7.3", + "stack-trace": "^0.0.10", + "strip-ansi": "^5.2.0", + "update-notifier": "^5.0.1", + "uuid": "3.4.0", + "yargs": "^15.4.1", + "yoga-layout-prebuilt": "^1.9.6", + "yurnalist": "^2.1.0" + }, + "dependencies": { + "@hapi/hoek": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz", + "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" + }, + "@hapi/topo": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", + "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", + "requires": { + "@hapi/hoek": "^9.0.0" + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "create-gatsby": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.4.0.tgz", + "integrity": "sha512-f25DzxInlwLqdy82ojGAnROzas1HCLSV9aaoA5Kjklsa/EgCJPfhRfvHPNKbuTTbzNwTRymh398e1xnu1JdLHQ==" + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", + "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "p-finally": "^2.0.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "gatsby-core-utils": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.4.0.tgz", + "integrity": "sha512-vGsPnEFSI+9ZcCVLB2am2eWnleadljUc+zDngea2szam/YUBxq2kSlNfpzlSSWpGyiIIHXXuSc0ttQOKgta1HQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "file-type": "^16.2.0", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "tmp": "^0.2.1", + "xdg-basedir": "^4.0.0" + } + }, + "gatsby-telemetry": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.4.0.tgz", + "integrity": "sha512-OF4Qj1bn+BeBn0DQ9wwbOxaFFz6IPyYIoZW7nxdb65wwotBlWNBkL2LhwpEpvQ6U4tydxVNGYEZSJ7TSVS/+Gg==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@turist/fetch": "^7.1.7", + "@turist/time": "^0.0.1", + "async-retry-ng": "^2.0.1", + "boxen": "^4.2.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^2.4.0", + "git-up": "^4.0.2", + "is-docker": "^2.1.1", + "lodash": "^4.17.21", + "node-fetch": "^2.6.1", + "uuid": "3.4.0" + } + }, + "hosted-git-info": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz", + "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "joi": { + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz", + "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==", + "requires": { + "@hapi/hoek": "^9.0.0", + "@hapi/topo": "^5.0.0", + "@sideway/address": "^4.1.0", + "@sideway/formula": "^3.0.0", + "@sideway/pinpoint": "^2.0.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "p-finally": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", + "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "gatsby-core-utils": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-1.4.0.tgz", @@ -7453,34 +9327,318 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + } + } + }, + "gatsby-plugin-react-svg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-react-svg/-/gatsby-plugin-react-svg-3.0.0.tgz", + "integrity": "sha512-myZl5NjVZwLLn4ovwSDM7cufa8yjaRiU5KoufJrz8FEalRroZ/hFSCCKNVna3blTwxcS0rZgISigYn9/xY7rkw==", + "requires": { + "svg-react-loader": "^0.4.4" + } + }, + "gatsby-plugin-sass": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-4.0.2.tgz", + "integrity": "sha512-ngiC/3Kka2pljqzZ4ZoXOKC+cXq1StLlZc7+FLvRm555RTMfJqgHWM8FCELZ5j5hxlBHIZ5cZ9Ur8GbScQD58g==", + "requires": { + "@babel/runtime": "^7.12.5", + "resolve-url-loader": "^3.1.2", + "sass-loader": "^10.1.1" + } + }, + "gatsby-plugin-sharp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/gatsby-plugin-sharp/-/gatsby-plugin-sharp-3.4.0.tgz", + "integrity": "sha512-qIdW+5p0wv+Tr8lv87tRh39H8WZFyaR2yyXVrDDde7HUWUbfUbbR7+WzXzHC9X5VEWnZDC4g/66CLpKzOnV2tQ==", + "requires": { + "@babel/runtime": "^7.12.5", + "async": "^3.2.0", + "bluebird": "^3.7.2", + "filenamify": "^4.2.0", + "fs-extra": "^9.1.0", + "gatsby-core-utils": "^2.4.0", + "gatsby-telemetry": "^2.4.0", + "got": "^10.7.0", + "imagemin": "^7.0.1", + "imagemin-mozjpeg": "^9.0.0", + "imagemin-pngquant": "^9.0.1", + "lodash": "^4.17.21", + "mini-svg-data-uri": "^1.2.3", + "potrace": "^2.1.8", + "probe-image-size": "^6.0.0", + "progress": "^2.0.3", + "semver": "^7.3.4", + "sharp": "^0.28.0", + "svgo": "1.3.2", + "uuid": "3.4.0" + }, + "dependencies": { + "@sindresorhus/is": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz", + "integrity": "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==" + }, + "@szmarczak/http-timer": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz", + "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==", + "requires": { + "defer-to-connect": "^2.0.0" + } + }, + "async": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==" + }, + "cacheable-request": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz", + "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==", + "requires": { + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^4.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^2.0.0" + } + }, + "decompress-response": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz", + "integrity": "sha512-TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw==", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==" + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "gatsby-core-utils": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.4.0.tgz", + "integrity": "sha512-vGsPnEFSI+9ZcCVLB2am2eWnleadljUc+zDngea2szam/YUBxq2kSlNfpzlSSWpGyiIIHXXuSc0ttQOKgta1HQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "file-type": "^16.2.0", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "tmp": "^0.2.1", + "xdg-basedir": "^4.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + } + } + }, + "gatsby-telemetry": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.4.0.tgz", + "integrity": "sha512-OF4Qj1bn+BeBn0DQ9wwbOxaFFz6IPyYIoZW7nxdb65wwotBlWNBkL2LhwpEpvQ6U4tydxVNGYEZSJ7TSVS/+Gg==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@turist/fetch": "^7.1.7", + "@turist/time": "^0.0.1", + "async-retry-ng": "^2.0.1", + "boxen": "^4.2.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^2.4.0", + "git-up": "^4.0.2", + "is-docker": "^2.1.1", + "lodash": "^4.17.21", + "node-fetch": "^2.6.1", + "uuid": "3.4.0" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + } + } + }, + "got": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/got/-/got-10.7.0.tgz", + "integrity": "sha512-aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg==", + "requires": { + "@sindresorhus/is": "^2.0.0", + "@szmarczak/http-timer": "^4.0.0", + "@types/cacheable-request": "^6.0.1", + "cacheable-lookup": "^2.0.0", + "cacheable-request": "^7.0.1", + "decompress-response": "^5.0.0", + "duplexer3": "^0.1.4", + "get-stream": "^5.0.0", + "lowercase-keys": "^2.0.0", + "mimic-response": "^2.1.0", + "p-cancelable": "^2.0.0", + "p-event": "^4.0.0", + "responselike": "^2.0.0", + "to-readable-stream": "^2.0.0", + "type-fest": "^0.10.0" + } + }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "keyv": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz", + "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==", + "requires": { + "json-buffer": "3.0.1" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" + }, + "normalize-url": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + }, + "p-cancelable": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz", + "integrity": "sha512-HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ==" + }, + "responselike": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", + "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", + "requires": { + "lowercase-keys": "^2.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" } + }, + "to-readable-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz", + "integrity": "sha512-o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==" + }, + "type-fest": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz", + "integrity": "sha512-EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==" + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, - "gatsby-plugin-react-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gatsby-plugin-react-svg/-/gatsby-plugin-react-svg-3.0.0.tgz", - "integrity": "sha512-myZl5NjVZwLLn4ovwSDM7cufa8yjaRiU5KoufJrz8FEalRroZ/hFSCCKNVna3blTwxcS0rZgISigYn9/xY7rkw==", - "requires": { - "svg-react-loader": "^0.4.4" - } - }, - "gatsby-plugin-sass": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gatsby-plugin-sass/-/gatsby-plugin-sass-4.0.2.tgz", - "integrity": "sha512-ngiC/3Kka2pljqzZ4ZoXOKC+cXq1StLlZc7+FLvRm555RTMfJqgHWM8FCELZ5j5hxlBHIZ5cZ9Ur8GbScQD58g==", - "requires": { - "@babel/runtime": "^7.12.5", - "resolve-url-loader": "^3.1.2", - "sass-loader": "^10.1.1" - } - }, "gatsby-plugin-typescript": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/gatsby-plugin-typescript/-/gatsby-plugin-typescript-2.6.0.tgz", @@ -7512,46 +9670,46 @@ } }, "gatsby-recipes": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.3.1.tgz", - "integrity": "sha512-006frKSNhL0Wuc0fNN31YDOZBUkRn5Vslsthz2Fw+P/ydM/WmWplhOrESpmAi2i5GQkePUmJSQ7p+/A51GU3DA==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.15.0.tgz", + "integrity": "sha512-obucDJnWXbOKoxCfNdI9IZ2tXZzfvp8HkRJ6T2xNX8Wwk9F/UuwoQAvWZXdfHR9+rO8ynRBLMPMRcszKa9x+iw==", "requires": { - "@babel/core": "^7.11.6", - "@babel/generator": "^7.11.6", + "@babel/core": "^7.12.3", + "@babel/generator": "^7.12.5", "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-proposal-optional-chaining": "^7.11.0", - "@babel/plugin-transform-react-jsx": "^7.10.4", - "@babel/standalone": "^7.11.6", + "@babel/plugin-proposal-optional-chaining": "^7.12.1", + "@babel/plugin-transform-react-jsx": "^7.12.5", + "@babel/standalone": "^7.12.6", "@babel/template": "^7.10.4", - "@babel/types": "^7.11.5", + "@babel/types": "^7.12.6", "@graphql-tools/schema": "^7.0.0", "@graphql-tools/utils": "^7.0.2", "@hapi/hoek": "8.x.x", "@hapi/joi": "^15.1.1", "better-queue": "^3.8.10", "chokidar": "^3.4.2", - "contentful-management": "^5.26.3", + "contentful-management": "^7.5.1", "cors": "^2.8.5", - "debug": "^4.1.1", + "debug": "^4.3.1", "detect-port": "^1.3.0", "dotenv": "^8.2.0", "execa": "^4.0.2", "express": "^4.17.1", "express-graphql": "^0.9.0", "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.4.0", - "gatsby-telemetry": "^1.4.1", + "gatsby-core-utils": "^2.4.0", + "gatsby-telemetry": "^2.4.0", "glob": "^7.1.6", - "graphql": "^14.6.0", - "graphql-compose": "^6.3.8", + "graphql": "^15.4.0", + "graphql-compose": "~7.25.0", "graphql-subscriptions": "^1.1.0", "graphql-type-json": "^0.3.2", - "hicat": "^0.7.0", + "hicat": "^0.8.0", "is-binary-path": "^2.1.0", "is-url": "^1.2.4", "jest-diff": "^25.5.0", "lock": "^1.0.0", - "lodash": "^4.17.20", + "lodash": "^4.17.21", "mitt": "^1.2.0", "mkdirp": "^0.5.1", "node-fetch": "^2.5.0", @@ -7577,13 +9735,13 @@ }, "dependencies": { "@graphql-tools/utils": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz", - "integrity": "sha512-VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.8.1.tgz", + "integrity": "sha512-LDbOweemjxPYgJuHXK5XZJgObsBkiD92ul98lcuZxgA49IzQazHho5Y1Hs3MluD93YtZpxsQg/f7gNPnAyR6yw==", "requires": { "@ardatan/aggregate-error": "0.0.6", - "camel-case": "4.1.1", - "tslib": "~2.0.1" + "camel-case": "4.1.2", + "tslib": "~2.2.0" } }, "ansi-regex": { @@ -7592,14 +9750,23 @@ "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "requires": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "requires": { "ms": "2.1.2" } @@ -7613,6 +9780,56 @@ "path-exists": "^4.0.0" } }, + "gatsby-core-utils": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.4.0.tgz", + "integrity": "sha512-vGsPnEFSI+9ZcCVLB2am2eWnleadljUc+zDngea2szam/YUBxq2kSlNfpzlSSWpGyiIIHXXuSc0ttQOKgta1HQ==", + "requires": { + "ci-info": "2.0.0", + "configstore": "^5.0.1", + "file-type": "^16.2.0", + "fs-extra": "^8.1.0", + "node-object-hash": "^2.0.0", + "proper-lockfile": "^4.1.1", + "tmp": "^0.2.1", + "xdg-basedir": "^4.0.0" + } + }, + "gatsby-telemetry": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.4.0.tgz", + "integrity": "sha512-OF4Qj1bn+BeBn0DQ9wwbOxaFFz6IPyYIoZW7nxdb65wwotBlWNBkL2LhwpEpvQ6U4tydxVNGYEZSJ7TSVS/+Gg==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@turist/fetch": "^7.1.7", + "@turist/time": "^0.0.1", + "async-retry-ng": "^2.0.1", + "boxen": "^4.2.0", + "configstore": "^5.0.1", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^2.4.0", + "git-up": "^4.0.2", + "is-docker": "^2.1.1", + "lodash": "^4.17.21", + "node-fetch": "^2.6.1", + "uuid": "3.4.0" + } + }, + "graphql": { + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.0.tgz", + "integrity": "sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA==" + }, + "graphql-compose": { + "version": "7.25.1", + "resolved": "https://registry.npmjs.org/graphql-compose/-/graphql-compose-7.25.1.tgz", + "integrity": "sha512-TPXTe1BoQkMjp/MH93yA0SQo8PiXxJAv6Eo6K/+kpJELM9l2jZnd5PCduweuXFcKv+nH973wn/VYzYKDMQ9YoQ==", + "requires": { + "graphql-type-json": "0.3.2", + "object-path": "0.11.5" + } + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -7629,6 +9846,28 @@ "p-locate": "^4.1.0" } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "requires": { + "tslib": "^2.0.3" + } + }, + "no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "requires": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, "p-locate": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", @@ -7637,6 +9876,15 @@ "p-limit": "^2.2.0" } }, + "pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -7664,14 +9912,14 @@ } }, "tslib": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", - "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", + "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" }, "ws": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", - "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" } } }, @@ -7764,28 +10012,91 @@ } } }, - "gatsby-telemetry": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.4.1.tgz", - "integrity": "sha512-2OWhJq+u4p05ji33E0H+RDJxomG6kTVb3NtSruSZINQ9lTksXk9y8ROVUulIV+JAoKlPMBE89uKsGJFfwAjGWA==", - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/runtime": "^7.11.2", - "@turist/fetch": "^7.1.7", - "@turist/time": "^0.0.1", - "async-retry-ng": "^2.0.1", - "boxen": "^4.2.0", - "configstore": "^5.0.1", - "envinfo": "^7.7.3", - "fs-extra": "^8.1.0", - "gatsby-core-utils": "^1.4.0", - "git-up": "^4.0.2", - "is-docker": "^2.1.1", - "lodash": "^4.17.20", - "node-fetch": "^2.6.1", - "uuid": "3.4.0" - } - }, + "gatsby-telemetry": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-1.4.1.tgz", + "integrity": "sha512-2OWhJq+u4p05ji33E0H+RDJxomG6kTVb3NtSruSZINQ9lTksXk9y8ROVUulIV+JAoKlPMBE89uKsGJFfwAjGWA==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.11.2", + "@turist/fetch": "^7.1.7", + "@turist/time": "^0.0.1", + "async-retry-ng": "^2.0.1", + "boxen": "^4.2.0", + "configstore": "^5.0.1", + "envinfo": "^7.7.3", + "fs-extra": "^8.1.0", + "gatsby-core-utils": "^1.4.0", + "git-up": "^4.0.2", + "is-docker": "^2.1.1", + "lodash": "^4.17.20", + "node-fetch": "^2.6.1", + "uuid": "3.4.0" + } + }, + "gatsby-transformer-sharp": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/gatsby-transformer-sharp/-/gatsby-transformer-sharp-3.4.0.tgz", + "integrity": "sha512-Hdohyzeef8lRV7D/UK/WWZL2PfPe3FcMW4/MPAuZvRskPPkKcdLm0Qo3XXugt8KyfzaWzJSi0ltvpRpxA7aj9g==", + "requires": { + "@babel/runtime": "^7.12.5", + "bluebird": "^3.7.2", + "common-tags": "^1.8.0", + "fs-extra": "^9.1.0", + "potrace": "^2.1.8", + "probe-image-size": "^6.0.0", + "semver": "^7.3.4", + "sharp": "^0.28.0" + }, + "dependencies": { + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -7854,6 +10165,14 @@ "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz", "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=" }, + "get-proxy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", + "integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==", + "requires": { + "npm-conf": "^1.1.0" + } + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -7880,6 +10199,15 @@ "assert-plus": "^1.0.0" } }, + "gifwrap": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.2.tgz", + "integrity": "sha512-fcIswrPaiCDAyO8xnWvHSZdWChjKXUanKKpAiWWJ/UTkEi/aYKn5+90e7DE820zbEaVR9CE2y4z9bzhQijZ0BA==", + "requires": { + "image-q": "^1.1.1", + "omggif": "^1.0.10" + } + }, "git-up": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/git-up/-/git-up-4.0.2.tgz", @@ -7889,6 +10217,11 @@ "parse-url": "^5.0.0" } }, + "github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -7931,11 +10264,18 @@ } }, "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", + "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", "requires": { - "ini": "^1.3.5" + "ini": "2.0.0" + }, + "dependencies": { + "ini": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", + "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" + } } }, "global-modules": { @@ -8162,11 +10502,11 @@ } }, "graphql-subscriptions": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.1.0.tgz", - "integrity": "sha512-6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-1.2.1.tgz", + "integrity": "sha512-95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g==", "requires": { - "iterall": "^1.2.1" + "iterall": "^1.3.0" } }, "graphql-type-json": { @@ -8362,25 +10702,18 @@ "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" }, "hicat": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/hicat/-/hicat-0.7.0.tgz", - "integrity": "sha1-pwTLP1fkn719OMLt16ujj/CzUmM=", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/hicat/-/hicat-0.8.0.tgz", + "integrity": "sha512-om8L9O5XwqeSdwl5NtHgrzK3wcF4fT9T4gb/NktoH8EyoZipas/tvUZLV48xT7fQfMYr9qvb0WEutqdf0LWSqA==", "requires": { - "highlight.js": "^8.1.0", - "minimist": "^0.2.0" - }, - "dependencies": { - "minimist": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.1.tgz", - "integrity": "sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==" - } + "highlight.js": "^10.4.1", + "minimist": "^1.2.5" } }, "highlight.js": { - "version": "8.9.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz", - "integrity": "sha1-uKnFSTISqTkvAiK2SclhFJfr+4g=" + "version": "10.7.2", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz", + "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==" }, "hmac-drbg": { "version": "1.0.1", @@ -8646,6 +10979,67 @@ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" }, + "image-q": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/image-q/-/image-q-1.1.1.tgz", + "integrity": "sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY=" + }, + "imagemin": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-7.0.1.tgz", + "integrity": "sha512-33AmZ+xjZhg2JMCe+vDf6a9mzWukE7l+wAtesjE7KyteqqKjzxv7aVQeWnul1Ve26mWvEQqyPwl0OctNBfSR9w==", + "requires": { + "file-type": "^12.0.0", + "globby": "^10.0.0", + "graceful-fs": "^4.2.2", + "junk": "^3.1.0", + "make-dir": "^3.0.0", + "p-pipe": "^3.0.0", + "replace-ext": "^1.0.0" + }, + "dependencies": { + "file-type": { + "version": "12.4.2", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz", + "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==" + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "imagemin-mozjpeg": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-9.0.0.tgz", + "integrity": "sha512-TwOjTzYqCFRgROTWpVSt5UTT0JeCuzF1jswPLKALDd89+PmrJ2PdMMYeDLYZ1fs9cTovI9GJd68mRSnuVt691w==", + "requires": { + "execa": "^4.0.0", + "is-jpg": "^2.0.0", + "mozjpeg": "^7.0.0" + } + }, + "imagemin-pngquant": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/imagemin-pngquant/-/imagemin-pngquant-9.0.2.tgz", + "integrity": "sha512-cj//bKo8+Frd/DM8l6Pg9pws1pnDUjgb7ae++sUX1kUVdv2nrngPykhiUOgFeE0LGY/LmUbCf4egCHC4YUcZSg==", + "requires": { + "execa": "^4.0.0", + "is-png": "^2.0.0", + "is-stream": "^2.0.0", + "ow": "^0.17.0", + "pngquant-bin": "^6.0.0" + } + }, "imgix-url-params": { "version": "11.11.2", "resolved": "https://registry.npmjs.org/imgix-url-params/-/imgix-url-params-11.11.2.tgz", @@ -8767,9 +11161,9 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "inline-style-parser": { "version": "0.1.1", @@ -8960,14 +11354,6 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, - "is-builtin-module": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.0.0.tgz", - "integrity": "sha512-/93sDihsAD652hrMEbJGbMAVBf1qc96kyThHQ0CAOONHaE3aROLpTjDe4WQ5aoC5ITHFxEq1z8XqSU7km+8amw==", - "requires": { - "builtin-modules": "^3.0.0" - } - }, "is-callable": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", @@ -9077,6 +11463,11 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, + "is-function": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz", + "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==" + }, "is-glob": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", @@ -9091,12 +11482,12 @@ "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" }, "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", + "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" + "global-dirs": "^3.0.0", + "is-path-inside": "^3.0.2" } }, "is-invalid-path": { @@ -9122,15 +11513,25 @@ } } }, + "is-jpg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz", + "integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=" + }, + "is-natural-number": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz", + "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=" + }, "is-negative-zero": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" }, "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", + "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" }, "is-number": { "version": "3.0.0", @@ -9201,6 +11602,11 @@ "isobject": "^3.0.1" } }, + "is-png": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-png/-/is-png-2.0.0.tgz", + "integrity": "sha512-4KPGizaVGj2LK7xwJIz8o5B2ubu1D/vcQsgOGFEDlpcvgZHto4gBnyd0ig7Ws+67ixmwKoNmu0hYnpo6AaKb5g==" + }, "is-promise": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", @@ -9452,6 +11858,18 @@ } } }, + "jimp": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.14.0.tgz", + "integrity": "sha512-8BXU+J8+SPmwwyq9ELihpSV4dWPTiOKBWCEgtkbnxxAVMjXdf3yGmyaLSshBfXc8sP/JQ9OZj5R8nZzz2wPXgA==", + "requires": { + "@babel/runtime": "^7.7.2", + "@jimp/custom": "^0.14.0", + "@jimp/plugins": "^0.14.0", + "@jimp/types": "^0.14.0", + "regenerator-runtime": "^0.13.3" + } + }, "joi": { "version": "17.3.0", "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz", @@ -9479,6 +11897,11 @@ } } }, + "jpeg-js": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz", + "integrity": "sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==" + }, "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", @@ -9594,6 +12017,11 @@ "object.assign": "^4.1.1" } }, + "junk": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", + "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==" + }, "keyv": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", @@ -9652,11 +12080,6 @@ "package-json": "^6.3.0" } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -9671,6 +12094,28 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, + "load-bmfont": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz", + "integrity": "sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==", + "requires": { + "buffer-equal": "0.0.1", + "mime": "^1.3.4", + "parse-bmfont-ascii": "^1.0.3", + "parse-bmfont-binary": "^1.0.5", + "parse-bmfont-xml": "^1.1.4", + "phin": "^2.9.1", + "xhr": "^2.0.1", + "xtend": "^4.0.0" + }, + "dependencies": { + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + } + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -9875,11 +12320,6 @@ "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" - }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -9890,11 +12330,36 @@ "resolved": "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz", "integrity": "sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=" }, + "logalot": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz", + "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=", + "requires": { + "figures": "^1.3.5", + "squeak": "^1.0.0" + }, + "dependencies": { + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + } + } + }, "loglevel": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==" }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, "longest-streak": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz", @@ -9908,15 +12373,6 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, - "loud-rejection": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-2.2.0.tgz", - "integrity": "sha512-S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ==", - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.2" - } - }, "lower-case": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", @@ -9930,6 +12386,27 @@ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" }, + "lpad-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz", + "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=", + "requires": { + "get-stdin": "^4.0.1", + "indent-string": "^2.1.0", + "longest": "^1.0.0", + "meow": "^3.3.0" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "^2.0.0" + } + } + } + }, "lru-cache": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz", @@ -10024,6 +12501,61 @@ "unist-util-visit": "^2.0.0" } }, + "mdast-util-mdx": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-0.1.1.tgz", + "integrity": "sha512-9nncdnHNYSb4HNxY3AwE6gU632jhbXsDGXe9PkkJoEawYWJ8tTwmEOHGlGa2TCRidtkd6FF5I8ogDU9pTDlQyA==", + "requires": { + "mdast-util-mdx-expression": "~0.1.0", + "mdast-util-mdx-jsx": "~0.1.0", + "mdast-util-mdxjs-esm": "~0.1.0", + "mdast-util-to-markdown": "^0.6.1" + } + }, + "mdast-util-mdx-expression": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-0.1.1.tgz", + "integrity": "sha512-SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA==", + "requires": { + "strip-indent": "^3.0.0" + } + }, + "mdast-util-mdx-jsx": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.4.tgz", + "integrity": "sha512-67KOAvCmypBSpr+AJEAVQg1Obig5Wnguo4ETTxASe5WVP4TLt57bZjDX/9EW5sWYQsO4gPqLxkUOlypVn5rkhg==", + "requires": { + "mdast-util-to-markdown": "^0.6.0", + "parse-entities": "^2.0.0", + "stringify-entities": "^3.1.0", + "unist-util-remove-position": "^3.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + } + }, + "mdast-util-mdxjs-esm": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-0.1.1.tgz", + "integrity": "sha512-kBiYeashz+nuhfv+712nc4THQhzXIH2gBFUDbuLxuDCqU/fZeg+9FAcdRBx9E13dkpk1p2Xwufzs3wsGJ+mISQ==" + }, + "mdast-util-to-markdown": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz", + "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==", + "requires": { + "@types/unist": "^2.0.0", + "longest-streak": "^2.0.0", + "mdast-util-to-string": "^2.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.0.0", + "zwitch": "^1.0.0" + } + }, + "mdast-util-to-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==" + }, "mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", @@ -10175,6 +12707,92 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, + "micromark": { + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", + "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "requires": { + "debug": "^4.0.0", + "parse-entities": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "requires": { + "ms": "2.1.2" + } + } + } + }, + "micromark-extension-mdx": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/micromark-extension-mdx/-/micromark-extension-mdx-0.2.1.tgz", + "integrity": "sha512-J+nZegf1ExPz1Ft6shxu8M9WfRom1gwRIx6gpJK1SEEqKzY5LjOR1d/WHRtjwV4KoMXrL53+PoN7T1Rw1euJew==", + "requires": { + "micromark": "~2.11.0", + "micromark-extension-mdx-expression": "~0.3.0", + "micromark-extension-mdx-jsx": "~0.3.0", + "micromark-extension-mdx-md": "~0.1.0" + } + }, + "micromark-extension-mdx-expression": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-0.3.2.tgz", + "integrity": "sha512-Sh8YHLSAlbm/7TZkVKEC4wDcJE8XhVpZ9hUXBue1TcAicrrzs/oXu7PHH3NcyMemjGyMkiVS34Y0AHC5KG3y4A==", + "requires": { + "micromark": "~2.11.0", + "vfile-message": "^2.0.0" + } + }, + "micromark-extension-mdx-jsx": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-0.3.3.tgz", + "integrity": "sha512-kG3VwaJlzAPdtIVDznfDfBfNGMTIzsHqKpTmMlew/iPnUCDRNkX+48ElpaOzXAtK5axtpFKE3Hu3VBriZDnRTQ==", + "requires": { + "estree-util-is-identifier-name": "^1.0.0", + "micromark": "~2.11.0", + "micromark-extension-mdx-expression": "^0.3.2", + "vfile-message": "^2.0.0" + } + }, + "micromark-extension-mdx-md": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-0.1.1.tgz", + "integrity": "sha512-emlFQEyfx/2aPhwyEqeNDfKE6jPH1cvLTb5ANRo4qZBjaUObnzjLRdzK8RJ4Xc8+/dOmKN8TTRxFnOYF5/EAwQ==" + }, + "micromark-extension-mdxjs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-0.3.0.tgz", + "integrity": "sha512-NQuiYA0lw+eFDtSG4+c7ao3RG9dM4P0Kx/sn8OLyPhxtIc6k+9n14k5VfLxRKfAxYRTo8c5PLZPaRNmslGWxJw==", + "requires": { + "acorn": "^8.0.0", + "acorn-jsx": "^5.0.0", + "micromark": "~2.11.0", + "micromark-extension-mdx-expression": "~0.3.0", + "micromark-extension-mdx-jsx": "~0.3.0", + "micromark-extension-mdx-md": "~0.1.0", + "micromark-extension-mdxjs-esm": "~0.3.0" + }, + "dependencies": { + "acorn": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.2.2.tgz", + "integrity": "sha512-VrMS8kxT0e7J1EX0p6rI/E0FbfOVcvBpbIqHThFv+f8YrZIlMfVotYcXKVPmTvPW8sW5miJzfUFrrvthUZg8VQ==" + } + } + }, + "micromark-extension-mdxjs-esm": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-0.3.1.tgz", + "integrity": "sha512-tuLgcELrgY1a5tPxjk+MrI3BdYtwW67UaHZdzKiDYD8loNbxwIscfdagI6A2BKuAkrfeyHF6FW3B8KuDK3ZMXw==", + "requires": { + "micromark": "~2.11.0", + "micromark-extension-mdx-expression": "^0.3.0", + "vfile-message": "^2.0.0" + } + }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -10333,6 +12951,11 @@ } } }, + "mini-svg-data-uri": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.2.3.tgz", + "integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ==" + }, "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -10460,6 +13083,11 @@ "minimist": "^1.2.5" } }, + "mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" + }, "moment": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", @@ -10488,6 +13116,16 @@ } } }, + "mozjpeg": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-7.0.0.tgz", + "integrity": "sha512-mH7atSbIusVTO3A4H43sEdmveN3aWn54k6V0edefzCEvOsTrbjg5murY2TsNznaztWnIgaRbWxeLVp4IgKdedQ==", + "requires": { + "bin-build": "^3.0.0", + "bin-wrapper": "^4.0.0", + "logalot": "^2.1.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -10552,6 +13190,11 @@ "to-regex": "^3.0.1" } }, + "napi-build-utils": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==" + }, "native-url": { "version": "0.2.6", "resolved": "https://registry.npmjs.org/native-url/-/native-url-0.2.6.tgz", @@ -10565,6 +13208,16 @@ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" }, + "needle": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", + "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -10594,14 +13247,26 @@ "tslib": "^1.10.0" } }, - "node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", + "node-abi": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz", + "integrity": "sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==", "requires": { - "lodash.toarray": "^4.4.0" + "semver": "^5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } } }, + "node-addon-api": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz", + "integrity": "sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==" + }, "node-eta": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.9.0.tgz", @@ -10829,6 +13494,11 @@ } } }, + "noop-logger": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" + }, "nopt": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", @@ -12635,6 +15305,22 @@ } } }, + "npm-conf": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", + "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "requires": { + "config-chain": "^1.1.11", + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + } + } + }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -12866,6 +15552,11 @@ "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" }, + "omggif": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz", + "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -12959,11 +15650,34 @@ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" }, + "os-filter-obj": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz", + "integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==", + "requires": { + "arch": "^2.1.0" + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, + "ow": { + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/ow/-/ow-0.17.0.tgz", + "integrity": "sha512-i3keDzDQP5lWIe4oODyDFey1qVrq2hXKTuTH2VpqwpYtzPiKZt2ziRI4NBQmgW40AnV5Euz17OyWweCb+bNEQA==", + "requires": { + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + } + } + }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -12974,6 +15688,24 @@ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-3.0.0.tgz", "integrity": "sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==" }, + "p-event": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz", + "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==", + "requires": { + "p-timeout": "^3.1.0" + }, + "dependencies": { + "p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "requires": { + "p-finally": "^1.0.0" + } + } + } + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -13008,6 +15740,24 @@ "aggregate-error": "^3.0.0" } }, + "p-map-series": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz", + "integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=", + "requires": { + "p-reduce": "^1.0.0" + } + }, + "p-pipe": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz", + "integrity": "sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==" + }, + "p-reduce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz", + "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=" + }, "p-retry": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", @@ -13124,6 +15874,25 @@ "safe-buffer": "^5.1.1" } }, + "parse-bmfont-ascii": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz", + "integrity": "sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU=" + }, + "parse-bmfont-binary": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz", + "integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY=" + }, + "parse-bmfont-xml": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz", + "integrity": "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==", + "requires": { + "xml-parse-from-string": "^1.0.0", + "xml2js": "^0.4.5" + } + }, "parse-entities": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", @@ -13137,6 +15906,11 @@ "is-hexadecimal": "^1.0.0" } }, + "parse-headers": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz", + "integrity": "sha512-QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==" + }, "parse-json": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz", @@ -13279,11 +16053,21 @@ "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz", "integrity": "sha512-mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg==" }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "phin": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz", + "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==" + }, "physical-cpu-count": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/physical-cpu-count/-/physical-cpu-count-2.0.0.tgz", @@ -13312,6 +16096,14 @@ "pinkie": "^2.0.0" } }, + "pixelmatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz", + "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=", + "requires": { + "pngjs": "^3.0.0" + } + }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", @@ -13320,6 +16112,22 @@ "find-up": "^3.0.0" } }, + "pngjs": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", + "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==" + }, + "pngquant-bin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-6.0.0.tgz", + "integrity": "sha512-oXWAS9MQ9iiDAJRdAZ9KO1mC5UwhzKkJsmetiu0iqIjJuW7JsuLhmc4JdRm7uJkIWRzIAou/Vq2VcjfJwz30Ow==", + "requires": { + "bin-build": "^3.0.0", + "bin-wrapper": "^4.0.1", + "execa": "^4.0.0", + "logalot": "^2.0.0" + } + }, "pnp-webpack-plugin": { "version": "1.6.4", "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", @@ -14055,6 +16863,35 @@ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, + "potrace": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/potrace/-/potrace-2.1.8.tgz", + "integrity": "sha512-V9hI7UMJyEhNZjM8CbZaP/804ZRLgzWkCS9OOYnEZkszzj3zKR/erRdj0uFMcN3pp6x4B+AIZebmkQgGRinG/g==", + "requires": { + "jimp": "^0.14.0" + } + }, + "prebuild-install": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz", + "integrity": "sha512-PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ==", + "requires": { + "detect-libc": "^1.0.3", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.3", + "mkdirp-classic": "^0.5.3", + "napi-build-utils": "^1.0.1", + "node-abi": "^2.21.0", + "noop-logger": "^0.1.1", + "npmlog": "^4.0.1", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^3.0.3", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0" + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -14158,6 +16995,16 @@ } } }, + "probe-image-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-6.0.0.tgz", + "integrity": "sha512-99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA==", + "requires": { + "deepmerge": "^4.0.0", + "needle": "^2.5.2", + "stream-parser": "~0.3.1" + } + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -14212,6 +17059,11 @@ "signal-exit": "^3.0.2" } }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + }, "protocols": { "version": "1.4.8", "resolved": "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz", @@ -15037,15 +17889,13 @@ } }, "remark-mdx": { - "version": "2.0.0-next.8", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz", - "integrity": "sha512-mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw==", + "version": "2.0.0-next.9", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.9.tgz", + "integrity": "sha512-I5dCKP5VE18SMd5ycIeeEk8Hl6oaldUY6PIvjrfm65l7d0QRnLqknb62O2g3QEmOxCswcHTtwITtz6rfUIVs+A==", "requires": { - "parse-entities": "^2.0.0", - "remark-stringify": "^8.1.0", - "stringify-entities": "^3.0.1", - "strip-indent": "^3.0.0", - "unist-util-stringify-position": "^2.0.3" + "mdast-util-mdx": "^0.1.1", + "micromark-extension-mdx": "^0.2.0", + "micromark-extension-mdxjs": "^0.3.0" } }, "remark-mdxjs": { @@ -15102,9 +17952,9 @@ } }, "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "requires": { "ms": "2.1.2" } @@ -15150,6 +18000,35 @@ "is-decimal": "^1.0.0", "is-hexadecimal": "^1.0.0" } + }, + "unist-util-is": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", + "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==" + }, + "unist-util-remove-position": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", + "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "requires": { + "unist-util-visit": "^1.1.0" + } + }, + "unist-util-visit": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", + "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", + "requires": { + "unist-util-visit-parents": "^2.0.0" + } + }, + "unist-util-visit-parents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz", + "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", + "requires": { + "unist-util-is": "^3.0.0" + } } } }, @@ -15180,13 +18059,13 @@ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" }, "renderkid": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz", - "integrity": "sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz", + "integrity": "sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==", "requires": { - "css-select": "^1.1.0", + "css-select": "^2.0.2", "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", + "htmlparser2": "^3.10.1", "lodash": "^4.17.20", "strip-ansi": "^3.0.0" } @@ -15711,6 +18590,14 @@ } } }, + "seek-bzip": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz", + "integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==", + "requires": { + "commander": "^2.8.1" + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -15744,6 +18631,26 @@ } } }, + "semver-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz", + "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==" + }, + "semver-truncate": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz", + "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", + "requires": { + "semver": "^5.3.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -15915,6 +18822,44 @@ "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" }, + "sharp": { + "version": "0.28.1", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.28.1.tgz", + "integrity": "sha512-4mCGMEN4ntaVuFGwHx7FvkJQkIgbI+S+F9a3bI7ugdvKjPr4sF7/ibvlRKhJyzhoQi+ODM+XYY1de8xs7MHbfA==", + "requires": { + "color": "^3.1.3", + "detect-libc": "^1.0.3", + "node-addon-api": "^3.1.0", + "prebuild-install": "^6.1.1", + "semver": "^7.3.5", + "simple-get": "^3.1.0", + "tar-fs": "^2.1.1", + "tunnel-agent": "^0.6.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -15990,6 +18935,36 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" }, + "simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" + }, + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "requires": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + }, + "dependencies": { + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "requires": { + "mimic-response": "^2.0.0" + } + }, + "mimic-response": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", + "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" + } + } + }, "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -16149,15 +19124,15 @@ } }, "socket.io": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz", - "integrity": "sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz", + "integrity": "sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==", "requires": { "debug": "~4.1.0", - "engine.io": "~3.4.0", + "engine.io": "~3.5.0", "has-binary2": "~1.0.2", "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.3.0", + "socket.io-client": "2.4.0", "socket.io-parser": "~3.4.0" }, "dependencies": { @@ -16168,6 +19143,102 @@ "requires": { "ms": "^2.1.1" } + }, + "engine.io-client": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.1.tgz", + "integrity": "sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==", + "requires": { + "component-emitter": "~1.3.0", + "component-inherit": "0.0.3", + "debug": "~3.1.0", + "engine.io-parser": "~2.2.0", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parseqs": "0.0.6", + "parseuri": "0.0.6", + "ws": "~7.4.2", + "xmlhttprequest-ssl": "~1.5.4", + "yeast": "0.1.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=" + }, + "parseqs": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz", + "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==" + }, + "parseuri": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz", + "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==" + }, + "socket.io-client": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz", + "integrity": "sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==", + "requires": { + "backo2": "1.0.2", + "component-bind": "1.0.0", + "component-emitter": "~1.3.0", + "debug": "~3.1.0", + "engine.io-client": "~3.5.0", + "has-binary2": "~1.0.2", + "indexof": "0.0.1", + "parseqs": "0.0.6", + "parseuri": "0.0.6", + "socket.io-parser": "~3.3.0", + "to-array": "0.1.4" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "socket.io-parser": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", + "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", + "requires": { + "component-emitter": "~1.3.0", + "debug": "~3.1.0", + "isarray": "2.0.1" + } + } + } + }, + "ws": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz", + "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==" } } }, @@ -16353,6 +19424,29 @@ } } }, + "sort-keys-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz", + "integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=", + "requires": { + "sort-keys": "^1.0.0" + }, + "dependencies": { + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "requires": { + "is-plain-obj": "^1.0.0" + } + } + } + }, "sort-media-queries": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/sort-media-queries/-/sort-media-queries-0.2.2.tgz", @@ -16505,6 +19599,40 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, + "squeak": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz", + "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=", + "requires": { + "chalk": "^1.0.0", + "console-stream": "^0.1.1", + "lpad-align": "^1.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", @@ -16625,6 +19753,29 @@ "xtend": "^4.0.0" } }, + "stream-parser": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz", + "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=", + "requires": { + "debug": "2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "stream-shift": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", @@ -16782,6 +19933,14 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" }, + "strip-dirs": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz", + "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==", + "requires": { + "is-natural-number": "^4.0.1" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -16805,6 +19964,14 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" }, + "strip-outer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", + "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "requires": { + "escape-string-regexp": "^1.0.2" + } + }, "strtok3": { "version": "6.0.8", "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz", @@ -17107,6 +20274,80 @@ } } }, + "tar-fs": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", + "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==", + "requires": { + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "requires": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + } + } + } + }, + "tar-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", + "requires": { + "bl": "^1.0.0", + "buffer-alloc": "^1.2.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.1", + "xtend": "^4.0.0" + }, + "dependencies": { + "bl": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", + "requires": { + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" + } + } + } + }, + "temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" + }, + "tempfile": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", + "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "requires": { + "temp-dir": "^1.0.0", + "uuid": "^3.0.1" + } + }, "term-size": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", @@ -17211,6 +20452,11 @@ "setimmediate": "^1.0.4" } }, + "timm": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz", + "integrity": "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==" + }, "timsort": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", @@ -17224,6 +20470,11 @@ "curriable": "^1.3.0" } }, + "tinycolor2": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", + "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==" + }, "tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -17242,6 +20493,11 @@ "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" }, + "to-buffer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", + "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -17328,6 +20584,14 @@ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" }, + "trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", + "requires": { + "escape-string-regexp": "^1.0.2" + } + }, "trim-trailing-lines": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz", @@ -17457,6 +20721,15 @@ "is-typedarray": "^1.0.0" } }, + "unbzip2-stream": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", + "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==", + "requires": { + "buffer": "^5.2.1", + "through": "^2.3.8" + } + }, "unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", @@ -17553,47 +20826,24 @@ } }, "unist-util-is": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz", - "integrity": "sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==" }, "unist-util-remove": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.1.tgz", - "integrity": "sha512-YtuetK6o16CMfG+0u4nndsWpujgsHDHHLyE0yGpJLLn5xSjKeyGyzEBOI2XbmoUHCYabmNgX52uxlWoQhcvR7Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz", + "integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==", "requires": { "unist-util-is": "^4.0.0" } }, "unist-util-remove-position": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz", - "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-3.0.0.tgz", + "integrity": "sha512-17kIOuolVuK16LMb9KyMJlqdfCtlfQY5FjY3Sdo9iC7F5wqdXhNjMq0PBvMpkVNNnAmHxXssUW+rZ9T2zbP0Rg==", "requires": { - "unist-util-visit": "^1.1.0" - }, - "dependencies": { - "unist-util-is": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz", - "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==" - }, - "unist-util-visit": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz", - "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==", - "requires": { - "unist-util-visit-parents": "^2.0.0" - } - }, - "unist-util-visit-parents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz", - "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==", - "requires": { - "unist-util-is": "^3.0.0" - } - } + "unist-util-visit": "^2.0.0" } }, "unist-util-stringify-position": { @@ -17703,25 +20953,31 @@ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, "update-notifier": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", - "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", + "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", "requires": { - "boxen": "^4.2.0", - "chalk": "^3.0.0", + "boxen": "^5.0.0", + "chalk": "^4.1.0", "configstore": "^5.0.1", "has-yarn": "^2.1.0", "import-lazy": "^2.1.0", "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.1", - "is-npm": "^4.0.0", + "is-installed-globally": "^0.4.0", + "is-npm": "^5.0.0", "is-yarn-global": "^0.3.0", - "latest-version": "^5.0.0", - "pupa": "^2.0.1", + "latest-version": "^5.1.0", + "pupa": "^2.1.1", + "semver": "^7.3.4", "semver-diff": "^3.1.1", "xdg-basedir": "^4.0.0" }, "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -17730,15 +20986,26 @@ "color-convert": "^2.0.1" } }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "boxen": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", + "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-align": "^3.0.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.0", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" } }, + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==" + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -17752,18 +21019,64 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "has-flag": "^4.0.0" + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==" + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, @@ -17853,6 +21166,14 @@ "node-gyp-build": "^4.2.0" } }, + "utif": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz", + "integrity": "sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==", + "requires": { + "pako": "^1.0.5" + } + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -17939,13 +21260,12 @@ } }, "vfile": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.0.tgz", - "integrity": "sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", "requires": { "@types/unist": "^2.0.0", "is-buffer": "^2.0.0", - "replace-ext": "1.0.0", "unist-util-stringify-position": "^2.0.0", "vfile-message": "^2.0.0" }, @@ -18804,6 +22124,22 @@ "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==" }, + "xhr": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz", + "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==", + "requires": { + "global": "~4.4.0", + "is-function": "^1.0.1", + "parse-headers": "^2.0.0", + "xtend": "^4.0.0" + } + }, + "xml-parse-from-string": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz", + "integrity": "sha1-qQKekp09vN7RafPG4oI42VpdWig=" + }, "xml2js": { "version": "0.4.17", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.17.tgz", @@ -18846,9 +22182,9 @@ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "yaeti": { "version": "0.0.6", @@ -18961,6 +22297,15 @@ "decamelize": "^1.2.0" } }, + "yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "requires": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", @@ -18980,29 +22325,15 @@ } }, "yurnalist": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-1.1.2.tgz", - "integrity": "sha512-y7bsTXqL+YMJQ2De2CBtSftJNLQnB7gWIzzKm10GDyC8Fg4Dsmd2LG5YhT8pudvUiuotic80WVXt/g1femRVQg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/yurnalist/-/yurnalist-2.1.0.tgz", + "integrity": "sha512-PgrBqosQLM3gN2xBFIMDLACRTV9c365VqityKKpSTWpwR+U4LAFR3rSVyEoscWlu3EzX9+Y0I86GXUKxpHFl6w==", "requires": { - "babel-runtime": "^6.26.0", "chalk": "^2.4.2", - "cli-table3": "^0.5.1", - "debug": "^4.1.1", - "deep-equal": "^1.1.0", - "detect-indent": "^6.0.0", "inquirer": "^7.0.0", - "invariant": "^2.2.0", - "is-builtin-module": "^3.0.0", "is-ci": "^2.0.0", - "leven": "^3.1.0", - "loud-rejection": "^2.2.0", - "node-emoji": "^1.10.0", - "object-path": "^0.11.2", "read": "^1.0.7", - "rimraf": "^3.0.0", - "semver": "^6.3.0", - "strip-ansi": "^5.2.0", - "strip-bom": "^4.0.0" + "strip-ansi": "^5.2.0" }, "dependencies": { "ansi-regex": { @@ -19020,19 +22351,6 @@ "supports-color": "^5.3.0" } }, - "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", - "requires": { - "ms": "2.1.2" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -19040,13 +22358,13 @@ "requires": { "ansi-regex": "^4.1.0" } - }, - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" } } + }, + "zwitch": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", + "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==" } } } diff --git a/package.json b/package.json index 6052d68..325a102 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,17 @@ }, "dependencies": { "@walltowall/gatsby-source-prismic-schemas": "^1.1.0", + "ccxt": "^1.49.17", "gatsby": "^2.26.1", "gatsby-background-image": "^1.5.0", + "gatsby-cli": "^3.4.0", "gatsby-plugin-exclude": "^1.0.2", "gatsby-plugin-netlify-headers": "^1.0.1", "gatsby-plugin-react-svg": "^3.0.0", "gatsby-plugin-sass": "^4.0.2", + "gatsby-plugin-sharp": "^3.4.0", "gatsby-source-prismic": "^3.3.3", + "gatsby-transformer-sharp": "^3.4.0", "install": "^0.13.0", "node-sass": "^5.0.0", "npm": "^7.9.0", diff --git a/src/components/homepage/index.js b/src/components/homepage/index.js index 1d4cf56..0f25a66 100644 --- a/src/components/homepage/index.js +++ b/src/components/homepage/index.js @@ -28,8 +28,9 @@ import { Helmet } from "react-helmet" export default function HomePage({ data }) { return ( <> + - + diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index 6297bb9..50be851 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -32,31 +32,17 @@ export const FeaturedProductText = styled.div` } ` -export const ModelScope = styled.div` - margin-top: 200px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - margin-top: 105px; - } -` - export const ProductsGroup = styled.div` + margin-top: 20px; + @media (min-width: ${dimensions.maxwidthTablet}px) { display: flex; justify-content: space-between; - } -` - -export const Product = styled.div` - padding-top: 33px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 35px; + margin-top: 35px; } ` export const ProductImage = styled.div` - background-color: #C4C4C4; width: 21vw; height: 245px; @@ -65,27 +51,6 @@ export const ProductImage = styled.div` } ` -export const ProductName = styled.div` - padding-top: 49px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - padding-top: 24px; - } -` - -export const ProductDescription = styled.div` - padding-top: 15px; - - @media (max-width: ${dimensions.maxwidthTablet}px) { - visibility: hidden; - } -` - -export const HomeownerSection = styled.div` - - -` - -export const CommercialSection = styled.div` +export const HomeownerSection = styled.div`` -` \ No newline at end of file +export const CommercialSection = styled.div`` \ No newline at end of file diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index 1d1d69a..5278ed4 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -4,12 +4,8 @@ import { FeaturedProductSection, FeaturedProductImage, FeaturedProductText, - ModelScope, ProductsGroup, - Product, ProductImage, - ProductName, - ProductDescription, HomeownerSection, CommercialSection, } from "./product-page-styles" @@ -32,50 +28,48 @@ export default function ProductSection({ data }) { - {/*
- {data.model_scope.map(scope => { - return ( - - {scope.model_scope_heading} - - {data.products.map(product => { - return ( - - - - {product.product_title} - -

- {product.product_description} - - ) - })} - - - ) - })} -
*/} -

{data.model_scope[0].model_scope_heading}

- - {data.products.map(product => { - return ( - product.product.document.data.product_type === "Homeowner" && ( -

{product.product.document.data.product_type}

+ {data.model_scope[0].model_scope_heading} + + {data.products.map(product => { + return ( + product.product.document.data.product_type === "Homeowner" && ( +
+ + {product.product.document.data.product_images[0].image.alt}/ + +

{product.product.document.data.product_title}

+

{product.product.document.data.product_price}

+ +
+ ) ) - ) - })} + })} + -

{data.model_scope[1].model_scope_heading}

- {data.products.map(product => { - return ( - product.product.document.data.product_type === "Commercial" && ( -

{product.product.document.data.product_type}

+ {data.model_scope[1].model_scope_heading} + + {data.products.map(product => { + return ( + product.product.document.data.product_type === "Commercial" && ( +
+ + {product.product.document.data.product_images[0].image.alt}/ + +

{product.product.document.data.product_title}

+

{product.product.document.data.product_price}

+ +
+ ) ) - ) - })} + })} +
) diff --git a/src/pages/product_page.js b/src/pages/products.js similarity index 96% rename from src/pages/product_page.js rename to src/pages/products.js index 92781aa..324d7f1 100644 --- a/src/pages/product_page.js +++ b/src/pages/products.js @@ -60,9 +60,11 @@ export const query = graphql` } product_images { image { + alt url } } + product_price product_type } } From c9b572424369b887ae757df04433c7cc84a33fc9 Mon Sep 17 00:00:00 2001 From: samgildea Date: Mon, 3 May 2021 10:28:04 -0400 Subject: [PATCH 16/41] #56 process page styling --- src/components/process/process-styles.js | 111 +++++++++++++++++++++++ src/components/process/process.js | 90 ++++++++++++++++++ src/pages/process.js | 38 +++----- src/schemas/process.json | 22 +++-- 4 files changed, 229 insertions(+), 32 deletions(-) create mode 100644 src/components/process/process-styles.js create mode 100644 src/components/process/process.js diff --git a/src/components/process/process-styles.js b/src/components/process/process-styles.js new file mode 100644 index 0000000..259cdf4 --- /dev/null +++ b/src/components/process/process-styles.js @@ -0,0 +1,111 @@ +import styled from "styled-components" +import colors from "../../style/colors" +import dimensions from "../../style/dimensions" +import { + layoutPaddingDesktop, + layoutPaddingMobile, +} from "../../style/variables" +export const ProcessContainer = styled.div`` + +export const HowItWorks = styled.div` + min-height: 100vh; + position: relative; + z-index: 1; +` + +export const HowHeader = styled.div` + padding-top: 216px; + color: ${colors.blue900}; +` + +export const HowImage = styled.div` + img { + width: 627px; + height: 581px; + object-fit: cover; + } +` + +export const HowCarousel = styled.div` + display: flex; + margin-bottom: 242px; +` + +export const HowText = styled.div` + width: 36vw; + background-color: ${colors.white900}; + height: 581px; +` + +export const HowParagraph = styled.div` + padding-left: 90px; + padding-top: 108px; + padding-right: 72px; +` + +export const BlueBackground = styled.div` + width: 63vw; + position: absolute; + right: 0; + min-height: calc(100vh + 242px); + background-color: ${colors.softblue900}; + top: 127px; + z-index: 0; +` + +export const FindSection = styled.div` + position: relative; + min-height: 100vh; +` + +export const FindImage = styled.div` + img { + width: 100vw; + left: -${layoutPaddingDesktop}; + position: absolute; + z-index: 0; + height: 100vh; + object-fit: cover; + } +` +export const FindText = styled.div` + position: relative; + z-index: 1; + color: ${colors.blue900}; + padding-top: 350px; +` +export const FindButton = styled.a` + background-color: ${colors.orange900}; + text-transform: uppercase; + color: ${colors.white900}; + padding-left: 48px; + font-size: 16px; + padding-right: 48px; + padding-top: 16px; + padding-bottom: 16px; +` + +export const StepsSection = styled.div` + + +` + +export const Step = styled.div` + +display: flex; +align-items: center; + +` + +export const StepImage = styled.div` + +margin-top: 230px; +margin-left: -${layoutPaddingDesktop}; + +` + +export const StepText = styled.div` +justify-content: center; +padding-left: 238px; +width: 32vw; +` \ No newline at end of file diff --git a/src/components/process/process.js b/src/components/process/process.js new file mode 100644 index 0000000..48fd234 --- /dev/null +++ b/src/components/process/process.js @@ -0,0 +1,90 @@ +import React from "react" +import { + ProcessContainer, + HowItWorks, + HowHeader, + HowImage, + HowCarousel, + HowText, + HowParagraph, + BlueBackground, + FindSection, + FindImage, + FindText, + FindButton, + StepsSection, + Step, + StepImage, + StepText +} from "./process-styles" +import { H1, P, H2, H3, Body } from "../../style/type-styles" + +export default function Process({ data }) { + return ( + + + + + +

{data.prismicProcessPage.data.how_header}

+ + + + + + + + + + { + data.prismicProcessPage.data.how_images[0].how_paragraph[0] + .text + } + + + + + + + + + + + + +

{data.prismicProcessPage.data.find_header}

+ + + {data.prismicProcessPage.data.find_button_text} + + + + + + {console.log(data.prismicProcessPage.data.steps[0])} + {data.prismicProcessPage.data.steps.map(step => { + return ( + + + + + + + +

+ {step.step_title} +

+ + {step.step_description} + + + + + ) + })} + + + ) +} diff --git a/src/pages/process.js b/src/pages/process.js index 1b5c615..f84ac12 100644 --- a/src/pages/process.js +++ b/src/pages/process.js @@ -1,13 +1,14 @@ import { graphql } from "gatsby" import Layout from "../components/layout" import React from "react" +import ProcessComponent from "../components/process/process" export default function Process({ data }) { const processData = data.prismicProcessPage.data return ( -

{processData.process_header}

+ ) } @@ -16,40 +17,27 @@ export const query = graphql` query ProcessQuery { prismicProcessPage { data { - find_button_destination - find_button_text - find_description - find_header - header_image { - url - dimensions { - width - height - } - } - how_description { - text - } how_header how_images { how_image { url - dimensions { - width - height - } + } + how_paragraph { + text } } - process_header + find_header + find_image { + url + } + + find_button_text + steps { - step_description step_image { url - dimensions { - width - height - } } + step_description step_title } } diff --git a/src/schemas/process.json b/src/schemas/process.json index d067820..5b18ab2 100644 --- a/src/schemas/process.json +++ b/src/schemas/process.json @@ -23,13 +23,6 @@ "label" : "How Header" } }, - "how_description" : { - "type" : "StructuredText", - "config" : { - "multi" : "paragraph", - "label" : "How Description" - } - }, "how_images" : { "type" : "Group", "config" : { @@ -41,6 +34,13 @@ "thumbnails" : [ ], "label" : "How Image" } + }, + "how_paragraph" : { + "type" : "StructuredText", + "config" : { + "multi" : "paragraph", + "label" : "How Paragraph" + } } }, "label" : "How Images" @@ -71,6 +71,14 @@ "config" : { "label" : "Find Button Destination" } + }, + "find_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Find Image" + } } }, "Steps" : { From 3c2a64c38e1e2f94fd89a292296b37c203b10b9f Mon Sep 17 00:00:00 2001 From: samgildea Date: Mon, 3 May 2021 11:01:18 -0400 Subject: [PATCH 17/41] #56 updating mobile layout --- src/components/process/process-styles.js | 90 +++++++++++++++++------- src/components/process/process.js | 30 ++++---- 2 files changed, 75 insertions(+), 45 deletions(-) diff --git a/src/components/process/process-styles.js b/src/components/process/process-styles.js index 259cdf4..50dad12 100644 --- a/src/components/process/process-styles.js +++ b/src/components/process/process-styles.js @@ -20,37 +20,60 @@ export const HowHeader = styled.div` export const HowImage = styled.div` img { - width: 627px; - height: 581px; + width: 100%; + height: 299px; object-fit: cover; } + @media (min-width: ${dimensions.maxwidthTablet}px) { + img { + width: 627px; + height: 581px; + object-fit: cover; + } + } ` export const HowCarousel = styled.div` - display: flex; margin-bottom: 242px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + } ` export const HowText = styled.div` - width: 36vw; - background-color: ${colors.white900}; - height: 581px; + width: 100%; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + height: 581px; + width: 36vw; + background-color: ${colors.white900}; + } ` export const HowParagraph = styled.div` - padding-left: 90px; - padding-top: 108px; - padding-right: 72px; + padding-top: 24px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + padding-left: 90px; + padding-top: 108px; + padding-right: 72px; + } ` export const BlueBackground = styled.div` - width: 63vw; position: absolute; - right: 0; + width: 188px; + left: 0; min-height: calc(100vh + 242px); background-color: ${colors.softblue900}; top: 127px; z-index: 0; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + right: 0; + width: 63vw; + } ` export const FindSection = styled.div` @@ -61,12 +84,23 @@ export const FindSection = styled.div` export const FindImage = styled.div` img { width: 100vw; - left: -${layoutPaddingDesktop}; + left: -${layoutPaddingMobile}; position: absolute; z-index: 0; height: 100vh; object-fit: cover; } + + @media (min-width: ${dimensions.maxwidthTablet}px) { + img { + width: 100vw; + left: -${layoutPaddingDesktop}; + position: absolute; + z-index: 0; + height: 100vh; + object-fit: cover; + } + } ` export const FindText = styled.div` position: relative; @@ -85,27 +119,29 @@ export const FindButton = styled.a` padding-bottom: 16px; ` -export const StepsSection = styled.div` - - -` +export const StepsSection = styled.div`` export const Step = styled.div` - -display: flex; -align-items: center; - + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + align-items: center; + } ` export const StepImage = styled.div` + margin-top: 230px; + margin-left: -${layoutPaddingDesktop}; -margin-top: 230px; -margin-left: -${layoutPaddingDesktop}; - + img { + width: 100%; + } ` export const StepText = styled.div` -justify-content: center; -padding-left: 238px; -width: 32vw; -` \ No newline at end of file + padding-left: 98px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + padding-left: 238px; + width: 32vw; + } +` diff --git a/src/components/process/process.js b/src/components/process/process.js index 48fd234..b6af500 100644 --- a/src/components/process/process.js +++ b/src/components/process/process.js @@ -15,7 +15,7 @@ import { StepsSection, Step, StepImage, - StepText + StepText, } from "./process-styles" import { H1, P, H2, H3, Body } from "../../style/type-styles" @@ -65,24 +65,18 @@ export default function Process({ data }) { {console.log(data.prismicProcessPage.data.steps[0])} {data.prismicProcessPage.data.steps.map(step => { - return ( - + return ( + + + + - - - - - -

- {step.step_title} -

- - {step.step_description} - - - - - ) + +

{step.step_title}

+ {step.step_description} + + + ) })} From a94601aca3253052dfc889d2484ab819bfa548c9 Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 5 May 2021 18:07:06 -0400 Subject: [PATCH 18/41] #61 hamburger functionality/updating footer links and mailchimp functionality --- src/components/footer/footer-styles.js | 9 +-- src/components/footer/footer.js | 38 +++++++---- src/components/header/header-styles.js | 77 ++++++++++++++++++++-- src/components/header/header.jsx | 86 +++++++++++++++++++++---- src/components/homepage/index-styles.js | 9 +-- src/vectors/CloseIcon.svg | 5 ++ 6 files changed, 183 insertions(+), 41 deletions(-) create mode 100644 src/vectors/CloseIcon.svg diff --git a/src/components/footer/footer-styles.js b/src/components/footer/footer-styles.js index c6afa5c..9440b4f 100644 --- a/src/components/footer/footer-styles.js +++ b/src/components/footer/footer-styles.js @@ -23,7 +23,6 @@ export const SocialSection = styled.div` padding-left: 80px; padding-top: 50px; - @media (max-width: ${dimensions.maxwidthTablet}px) { padding-left: 32px; } @@ -167,7 +166,6 @@ export const FooterSection = styled.div` export const SockContainer = styled.div` z-index: 1; position: relative; - ` export const SockContent = styled.div` @@ -184,9 +182,7 @@ export const SockContent = styled.div` ` export const ConnectTitle = styled.div` -color: ${colors.blue900}; - - + color: ${colors.blue900}; ` export const SockEmailForm = styled.form` @@ -231,10 +227,11 @@ export const SockDescription = styled.div` } ` -export const SockCTA = styled.a` +export const SockCTA = styled.button` font-size: 16px; padding-right: 60px; padding-left: 60px; + border: none; padding-top: 16px; padding-bottom: 16px; background-color: ${colors.orange900}; diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js index 4814665..bfb1498 100644 --- a/src/components/footer/footer.js +++ b/src/components/footer/footer.js @@ -57,6 +57,8 @@ export default function footer({ data }) { alt={data.prismicFooter.data.footer_image_alt} src={data.prismicFooter.data.footer_image.url} /> + + {/* */} @@ -64,16 +66,24 @@ export default function footer({ data }) { - + - - - {data.prismicFooter.data.sock_description} - + + {data.prismicFooter.data.sock_description} + - - Sign Up - + + Sign Up + + @@ -93,13 +103,13 @@ export default function footer({ data }) { @@ -107,13 +117,13 @@ export default function footer({ data }) { diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 1f25c03..12de43f 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -3,18 +3,26 @@ import dimensions from "../../style/dimensions" import colors from "../../style/colors" export const NavContainer = styled.div` - z-index: 1; + z-index: 2; padding-bottom: 32px; &.colorChange { - background-color: rgb(0, 0, 0, 0.55); + background-color: ${colors.blue900}; color: ${colors.white900}; - } position: fixed; width: 100%; transition: 0.5s all ease; + + color: ${colors.white900}; + + svg { + cursor: pointer; + } +` +export const LogoLink = styled.a` color: ${colors.black900}; + text-decoration: none; &.home-header { color: ${colors.white900}; @@ -26,7 +34,6 @@ export const Logo = styled.div` font-size: 24px; padding-top: 32px; padding-left: 80px; - color: ${colors.black900}; @media (max-width: ${dimensions.maxwidthTablet}px) { text-align: center; @@ -35,8 +42,16 @@ export const Logo = styled.div` padding-left: 0px; } + &.colorChange { + a { + color: ${colors.white900}; + } + } + &.home-header { - color: ${colors.white900}; + a { + color: ${colors.white900} !important; + } } ` @@ -63,13 +78,15 @@ export const NavLink = styled.a` padding-left: 100px; text-decoration: none; + &.colorChange { + color: ${colors.white900}; + } color: ${colors.black900}; &.home-header { color: ${colors.white900}; } - ` export const MobileIcon = styled.div` @@ -83,3 +100,51 @@ export const MobileIcon = styled.div` position: absolute; } ` + +export const OpenNavContainer = styled.div` + display: none; + + &.open { + position: absolute; + top: 0; + z-index: 4; + width: 100%; + height: 100vh; + background-color: ${colors.blue900}; + display: inherit; + } +` + +export const CloseButton = styled.div` + position: absolute; + top: 17px; + right: 24px; +` + +export const MobileLink = styled.li` + margin-bottom: 14.5vh; + display: flex; + z-index: 5; + position: relative; + + a { + color: ${colors.white900}; + font-size: 24px; + text-decoration: none; + margin-left: 36px; + } +` + +export const MobileLinks = styled.ul` + margin-top: 8vh; + list-style: none; +` +export const NodeLine = styled.div` + width: 4px; + height: 80vh; + position: absolute; + top: 8vh; + left: 55px; + z-index: 3; + background-color: ${colors.orange900}; +` diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index d8f2a97..1dc4c1b 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,13 +1,22 @@ import React, { useState } from "react" import Hamburger from "../../vectors/hamburger.svg" +import CloseIcon from "../../vectors/CloseIcon.svg" import { NavContainer, Logo, MobileIcon, NavLinks, NavLink, + OpenNavContainer, + CloseButton, + MobileLink, + MobileLinks, + NodeLine, + LogoLink, } from "./header-styles" +import Circle from "../../vectors/circle.svg" + import { NavText } from "../../style/type-styles" export const Header = ({ home }) => { @@ -23,28 +32,83 @@ export const Header = ({ home }) => { typeof window !== "undefined" && window.addEventListener("scroll", changeNavbarColor) return ( - - PowerHouse + + +
+ + PowerHouse + +
+ setOpen(!open)} className={open ? "open" : ""}> + + + setOpen(!open)} + className={open ? "open" : ""} + > + + + + + + + + + PowerHouse + + + + + About + + + + + Process + + + + + Products + + + + + Solutions + + + + - + ABOUT - + PROCESS - + PRODUCTS - + SOLUTIONS diff --git a/src/components/homepage/index-styles.js b/src/components/homepage/index-styles.js index caaa1d1..e5019b4 100644 --- a/src/components/homepage/index-styles.js +++ b/src/components/homepage/index-styles.js @@ -204,7 +204,7 @@ export const HomePageContainer = styled.div` ` export const SolutionsSection = styled.div` - height: 100vh; + min-height: 100vh; margin-top: 200px; color: ${colors.blue900}; padding-bottom: 100px; @@ -262,9 +262,10 @@ a { } ` export const CTASection = styled.div` - height: 100vh; + min-height: 100vh; + position: relative; @media (max-width: ${dimensions.maxwidthTablet}px) { - margin-top: 480px; + margin-top: 100px; } ` @@ -273,7 +274,7 @@ export const CTAImage = styled.div` margin-bottom: 100px; img { object-fit: cover; - width: 351px; + width: 100%; height: 234px; } diff --git a/src/vectors/CloseIcon.svg b/src/vectors/CloseIcon.svg new file mode 100644 index 0000000..f7d7811 --- /dev/null +++ b/src/vectors/CloseIcon.svg @@ -0,0 +1,5 @@ + + + + + From 03bce8beb9e286a6c12f3a3ec3d1d287156a5c5c Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 5 May 2021 18:10:58 -0400 Subject: [PATCH 19/41] #31 merging master --- src/components/header/header-styles.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 1f25c03..64134b4 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -8,7 +8,6 @@ export const NavContainer = styled.div` &.colorChange { background-color: rgb(0, 0, 0, 0.55); color: ${colors.white900}; - } position: fixed; @@ -63,13 +62,11 @@ export const NavLink = styled.a` padding-left: 100px; text-decoration: none; - color: ${colors.black900}; &.home-header { color: ${colors.white900}; } - ` export const MobileIcon = styled.div` From c3f5bf7537fcb2f21ff116e79220cc8d403f53c7 Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 5 May 2021 18:58:05 -0400 Subject: [PATCH 20/41] #56 adding carousel functionality --- src/components/process/process-styles.js | 23 ++++++++++++++++++++++- src/components/process/process.js | 17 ++++++++++++++--- src/vectors/solidcircle.svg | 3 +++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/vectors/solidcircle.svg diff --git a/src/components/process/process-styles.js b/src/components/process/process-styles.js index 50dad12..ec67cba 100644 --- a/src/components/process/process-styles.js +++ b/src/components/process/process-styles.js @@ -43,6 +43,7 @@ export const HowCarousel = styled.div` export const HowText = styled.div` width: 100%; + position: relative; @media (min-width: ${dimensions.maxwidthTablet}px) { height: 581px; @@ -51,6 +52,23 @@ export const HowText = styled.div` } ` +export const Indicators = styled.div` + display: flex; + justify-content: center; + + position: absolute; + width: 100%; + bottom: 52px; + + svg { + margin-right: 14px; + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + display: none; + } +` + export const HowParagraph = styled.div` padding-top: 24px; @@ -64,12 +82,15 @@ export const HowParagraph = styled.div` export const BlueBackground = styled.div` position: absolute; width: 188px; - left: 0; min-height: calc(100vh + 242px); background-color: ${colors.softblue900}; top: 127px; z-index: 0; + @media (max-width: ${dimensions.maxwidthTablet}px) { + left: 0; + } + @media (min-width: ${dimensions.maxwidthTablet}px) { right: 0; width: 63vw; diff --git a/src/components/process/process.js b/src/components/process/process.js index b6af500..7194552 100644 --- a/src/components/process/process.js +++ b/src/components/process/process.js @@ -1,4 +1,4 @@ -import React from "react" +import React, { useState } from "react" import { ProcessContainer, HowItWorks, @@ -16,10 +16,15 @@ import { Step, StepImage, StepText, + Indicators, } from "./process-styles" +import Circle from "../../vectors/circle.svg" +import SolidCircle from "../../vectors/solidcircle.svg" import { H1, P, H2, H3, Body } from "../../style/type-styles" export default function Process({ data }) { + const [howNumber, setHowNumber] = useState(0) + return ( @@ -32,18 +37,24 @@ export default function Process({ data }) { { - data.prismicProcessPage.data.how_images[0].how_paragraph[0] + data.prismicProcessPage.data.how_images[howNumber].how_paragraph[0] .text } + + + {data.prismicProcessPage.data.how_images.map((how_button, id) => { + return howNumber === id ? setHowNumber(id)} /> : setHowNumber(id)} /> + })} + diff --git a/src/vectors/solidcircle.svg b/src/vectors/solidcircle.svg new file mode 100644 index 0000000..96609e0 --- /dev/null +++ b/src/vectors/solidcircle.svg @@ -0,0 +1,3 @@ + + + From b12b3c63c52486d03862c30b381c72ca7ad09e2e Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 5 May 2021 23:56:50 -0400 Subject: [PATCH 21/41] #18 updating schema --- src/components/about/about-style.js | 2 +- src/components/process/process.js | 95 ++++++ src/pages/about.js | 7 +- src/schemas/About.json | 449 ++++++++++++++-------------- 4 files changed, 333 insertions(+), 220 deletions(-) create mode 100644 src/components/process/process.js diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index 121aa01..a160eb5 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -11,7 +11,7 @@ export const IconPlaceholder = styled.div` ` export const AboutHeaderText = styled.div` - margin-top: 89px; + padding-top: 89px; ` export const MissionSection = styled.div` diff --git a/src/components/process/process.js b/src/components/process/process.js new file mode 100644 index 0000000..7194552 --- /dev/null +++ b/src/components/process/process.js @@ -0,0 +1,95 @@ +import React, { useState } from "react" +import { + ProcessContainer, + HowItWorks, + HowHeader, + HowImage, + HowCarousel, + HowText, + HowParagraph, + BlueBackground, + FindSection, + FindImage, + FindText, + FindButton, + StepsSection, + Step, + StepImage, + StepText, + Indicators, +} from "./process-styles" +import Circle from "../../vectors/circle.svg" +import SolidCircle from "../../vectors/solidcircle.svg" +import { H1, P, H2, H3, Body } from "../../style/type-styles" + +export default function Process({ data }) { + const [howNumber, setHowNumber] = useState(0) + + return ( + + + + + +

{data.prismicProcessPage.data.how_header}

+ + + + + + + + + + { + data.prismicProcessPage.data.how_images[howNumber].how_paragraph[0] + .text + } + + + + + {data.prismicProcessPage.data.how_images.map((how_button, id) => { + return howNumber === id ? setHowNumber(id)} /> : setHowNumber(id)} /> + })} + + + + + + + + + + + +

{data.prismicProcessPage.data.find_header}

+ + + {data.prismicProcessPage.data.find_button_text} + + + + + + {console.log(data.prismicProcessPage.data.steps[0])} + {data.prismicProcessPage.data.steps.map(step => { + return ( + + + + + + +

{step.step_title}

+ {step.step_description} + + + ) + })} + + + ) +} diff --git a/src/pages/about.js b/src/pages/about.js index 4568f9f..85e4e3d 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -5,7 +5,6 @@ import styled from "styled-components" import dimensions from "../style/dimensions" import AboutPage from "../components/about/about" - export default function About({ data }) { const aboutData = data.prismicAboutPage.data return ( @@ -51,6 +50,12 @@ export const query = graphql` mission_image { url } + rows { + feature_name + first_company_check + second_company + third_company + } product_benefit { product_benefit_image { url diff --git a/src/schemas/About.json b/src/schemas/About.json index 22a1686..3bbc45b 100644 --- a/src/schemas/About.json +++ b/src/schemas/About.json @@ -1,243 +1,256 @@ { - "Main": {}, - "Mission Section": { - "mission_icon": { - "type": "Image", - "config": { - "constraint": {}, - "thumbnails": [], - "label": "Mission Icon" + "Main" : { }, + "Mission Section" : { + "mission_icon" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Mission Icon" + } + }, + "mission_heading" : { + "type" : "Text", + "config" : { + "label" : "Mission Heading" + } + }, + "mission_description" : { + "type" : "Text", + "config" : { + "label" : "Mission Description" + } + }, + "mission_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Mission Image" + } + } + }, + "Industry Context Section" : { + "industry_context_icon" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Industry Context Icon" + } + }, + "industry_context_background_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Industry Context Background Image" + } + }, + "industry_context_heading" : { + "type" : "Text", + "config" : { + "label" : "Industry Context Heading" + } + }, + "industry_context_explanation" : { + "type" : "Group", + "config" : { + "fields" : { + "explanation_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Explanation Image" } - }, - "mission_heading": { - "type": "Text", - "config": { - "label": "Mission Heading" + }, + "explanation_description" : { + "type" : "Text", + "config" : { + "label" : "Explanation Description" } + } }, - "mission_description": { - "type": "Text", - "config": { - "label": "Mission Description" + "label" : "Industry Context Explanation" + } + }, + "cta_button_text" : { + "type" : "Text", + "config" : { + "label" : "CTA Button Text" + } + }, + "cta_button_destination" : { + "type" : "Link", + "config" : { + "label" : "CTA Button Destination" + } + } + }, + "Company Background Section" : { + "company_background_section_heading" : { + "type" : "Text", + "config" : { + "label" : "Company Background Section Heading" + } + }, + "company_background_description" : { + "type" : "Text", + "config" : { + "label" : "Company Background Description" + } + }, + "company_team_heading" : { + "type" : "Text", + "config" : { + "label" : "Company Team Heading" + } + }, + "team_member_information" : { + "type" : "Group", + "config" : { + "fields" : { + "team_member_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Team Member Image" } - }, - "mission_image": { - "type": "Image", - "config": { - "constraint": {}, - "thumbnails": [], - "label": "Mission Image" + }, + "team_member_title" : { + "type" : "Text", + "config" : { + "label" : "Team Member Title" } - } - }, - "mission_image" : { - "type" : "Image", - "config" : { - "constraint" : { }, - "thumbnails" : [ ], - "label" : "Mission Image" - } - } - }, - "Industry Context Section": { - "industry_context_icon": { - "type": "Image", - "config": { - "constraint": {}, - "thumbnails": [], - "label": "Industry Context Icon" + }, + "team_member_description" : { + "type" : "Text", + "config" : { + "label" : "Team Member Description" } - }, - "industry_context_background_image": { - "type": "Image", - "config": { - "constraint": {}, - "thumbnails": [], - "label": "Industry Context Background Image" + }, + "contact_button_text" : { + "type" : "Text", + "config" : { + "label" : "Contact Button Text" } }, - "industry_context_heading": { - "type": "Text", - "config": { - "label": "Industry Context Heading" + "contact_button_destination" : { + "type" : "Link", + "config" : { + "label" : "Contact Button Destination" } + } }, - "industry_context_explanation": { - "type": "Group", - "config": { - "fields": { - "explanation_image": { - "type": "Image", - "config": { - "constraint": {}, - "thumbnails": [], - "label": "Explanation Image" - } - }, - "explanation_description": { - "type": "Text", - "config": { - "label": "Explanation Description" - } - } - }, - "label": "Industry Context Explanation" + "label" : "Team Member Information" + } + } + }, + "Company Comparison Section" : { + "company_comparison_section_heading" : { + "type" : "Text", + "config" : { + "label" : "Company Comparison Section Heading" + } + }, + "product_benefit" : { + "type" : "Group", + "config" : { + "fields" : { + "product_benefit_image" : { + "type" : "Image", + "config" : { + "constraint" : { }, + "thumbnails" : [ ], + "label" : "Product Benefit Image" + } + }, + "product_benefit_title" : { + "type" : "Text", + "config" : { + "label" : "Product Benefit Title" } + } }, - "cta_button_text": { - "type": "Text", - "config": { - "label": "CTA Button Text" + "label" : "Product Benefit" + } + }, + "company" : { + "type" : "Group", + "config" : { + "fields" : { + "company_name" : { + "type" : "Text", + "config" : { + "label" : "Company Name" } + } }, - "cta_button_destination": { - "type": "Link", - "config": { - "label": "CTA Button Destination" + "label" : "Company" + } + }, + "product_feature" : { + "type" : "Group", + "config" : { + "fields" : { + "product_feature_name" : { + "type" : "Text", + "config" : { + "label" : "Product Feature Name" } - } - }, - "cta_button_text" : { - "type" : "Text", - "config" : { - "label" : "CTA Button Text" - } - }, - "cta_button_destination" : { - "type" : "Link", - "config" : { - "label" : "CTA Button Destination" - } - } - }, - "Company Background Section" : { - "company_background_section_heading" : { - "type" : "Text", - "config" : { - "label" : "Company Background Section Heading" - } - }, - "company_background_description" : { - "type" : "Text", - "config" : { - "label" : "Company Background Description" - } - }, - "company_team_heading" : { - "type" : "Text", - "config" : { - "label" : "Company Team Heading" - } - }, - "team_member_information" : { - "type" : "Group", - "config" : { - "fields" : { - "team_member_image" : { - "type" : "Image", - "config" : { - "constraint" : { }, - "thumbnails" : [ ], - "label" : "Team Member Image" - } - }, - "team_member_title" : { - "type" : "Text", - "config" : { - "label" : "Team Member Title" - } - }, - "team_member_description" : { - "type" : "Text", - "config" : { - "label" : "Team Member Description" - } - }, - "contact_button_text" : { - "type" : "Text", - "config" : { - "label" : "Contact Button Text" - } - }, - "contact_button_destination" : { - "type" : "Link", - "config" : { - "label" : "Contact Button Destination" - } + } + }, + "label" : "Product Feature" + } + }, + "rows" : { + "type" : "Group", + "config" : { + "fields" : { + "feature_name" : { + "type" : "Text", + "config" : { + "label" : "Feature Name" } }, - "label" : "Team Member Information" - } - } - }, - "Company Comparison Section" : { - "company_comparison_section_heading" : { - "type" : "Text", - "config" : { - "label" : "Company Comparison Section Heading" - } - }, - "product_benefit" : { - "type" : "Group", - "config" : { - "fields" : { - "product_benefit_image" : { - "type" : "Image", - "config" : { - "constraint" : { }, - "thumbnails" : [ ], - "label" : "Product Benefit Image" - } - }, - "product_benefit_title" : { - "type" : "Text", - "config" : { - "label" : "Product Benefit Title" - } + "first_company_check" : { + "type" : "Select", + "config" : { + "options" : [ "Yes", "No" ], + "label" : "First Company" } }, - "label" : "Product Benefit" - } - }, - "company" : { - "type" : "Group", - "config" : { - "fields" : { - "company_name" : { - "type" : "Text", - "config" : { - "label" : "Company Name" - } + "second_company" : { + "type" : "Select", + "config" : { + "options" : [ "Yes", "No" ], + "label" : "Second Company" } }, - "label" : "Company" - } - }, - "product_feature" : { - "type" : "Group", - "config" : { - "fields" : { - "product_feature_name" : { - "type" : "Text", - "config" : { - "label" : "Product Feature Name" - } + "third_company" : { + "type" : "Select", + "config" : { + "options" : [ "Yes", "No" ], + "label" : "Third Company" } - }, - "label" : "Product Feature" - } - }, - "products_navigation_button_text" : { - "type" : "Text", - "config" : { - "label" : "Products Navigation Button Text" - } - }, - "products_navigation_button_destination" : { - "type" : "Link", - "config" : { - "label" : "Products Navigation Button Destination" - } + } + }, + "label" : "Rows" + } + }, + "products_navigation_button_text" : { + "type" : "Text", + "config" : { + "label" : "Products Navigation Button Text" + } + }, + "products_navigation_button_destination" : { + "type" : "Link", + "config" : { + "label" : "Products Navigation Button Destination" } } - } \ No newline at end of file + } +} \ No newline at end of file From fbe7eca3002c74cffa8b9a5bfc2ab135f1b1edd2 Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 6 May 2021 20:57:25 -0400 Subject: [PATCH 22/41] #18 updating about page styling and adding relavent queries --- src/components/about/about-style.js | 109 +++++++++++++--- src/components/about/about.js | 196 +++++++++++++--------------- src/pages/about.js | 1 + src/vectors/Check.png | Bin 0 -> 2071 bytes src/vectors/CheckIcon.svg | 4 + src/vectors/Xicon.png | Bin 0 -> 2204 bytes src/vectors/check.svg | 4 + src/vectors/xicon.svg | 4 + 8 files changed, 196 insertions(+), 122 deletions(-) create mode 100644 src/vectors/Check.png create mode 100644 src/vectors/CheckIcon.svg create mode 100644 src/vectors/Xicon.png create mode 100644 src/vectors/check.svg create mode 100644 src/vectors/xicon.svg diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index a160eb5..b4671a5 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -1,6 +1,10 @@ import styled from "styled-components" import dimensions from "../../style/dimensions" - +import colors from "../../style/colors" +import { + layoutPaddingDesktop, + layoutPaddingMobile, +} from "../../style/variables" export const IconPlaceholder = styled.div` img { width: 6vw; @@ -51,24 +55,23 @@ export const MissionTextParagraph = styled.div` @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; } - ` export const IndustryContextSection = styled.div` margin-top: 130px; - background-color: black; - width: 100%; + display: flex; + justify-content: center; + background-color: white; ` export const IndustryContextContainer = styled.div` background-color: white; width: 89%; + position: relative; + z-index: 1; margin-top: 70px; - margin-bottom: 80px; padding-top: 42px; - padding-left: 8%; - padding-right: 8%; - padding-bottom: 54px; - + padding-left: 109px; + padding-right: 109px; ` export const IndustryContextExamples = styled.div` @@ -109,6 +112,11 @@ export const IndustryContextExampleParagraph = styled.div` export const ProductBenefitHeader = styled.div` text-align: center; + margin-top: 158px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 54px; + } ` export const ProductBenefitsContainer = styled.div` @@ -143,17 +151,55 @@ export const BenefitTitle = styled.div` text-align: center; ` +export const ComparisonCTA = styled.div` + margin-top: 90px; + margin-bottom: 114px; + + display: flex; + justify-content: center; + a { + background-color: ${colors.orange900}; + text-transform: uppercase; + color: ${colors.white900}; + padding-left: 48px; + font-size: 16px; + padding-right: 48px; + padding-top: 16px; + padding-bottom: 16px; + text-decoration: none; + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-bottom: 40px; + margin-top: 56px; + } +` + export const CompanyComparisonSection = styled.div` padding-top: 148px; - width: 100%; + width: 100vw; + margin-top: 141px; display: flex; + margin-left: -${layoutPaddingDesktop}; justify-content: center; + background-color: rgb(110, 168, 192, 0.07); + th { text-align: center; padding-right: 51px; } + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-left: -${layoutPaddingMobile}; + padding-top: 53px; + + th { + text-align: center; + padding-right: 16px; + } + } + td.competitor-icon { display: flex; justify-content: center; @@ -176,13 +222,15 @@ export const FeatureTitleColumn = styled.div` ` export const FeatureTitle = styled.div` - // font-size: calc(28px + (28 - 14) * ((100vw - 300px) / (1440 - 300))); font-size: 28px; - + margin-bottom: 25px; + margin-top: 25px; + margin-right: 16px; font-weight: bold; @media (max-width: ${dimensions.maxwidthTablet}px) { - font-size: 14px; + font-size: 12px; + width: 70px; } ` @@ -196,15 +244,23 @@ export const CompetitorColumn = styled.div` ` export const CompetitorName = styled.div` - // font-size: calc(36px + (36 - 8) * ((100vw - 300px) / (1600 - 300))); font-size: 36px; + text-align: center; + padding-bottom: 68px; + + color: ${colors.black900}; + display: flex; + justify-content: center; @media (max-width: ${dimensions.maxwidthTablet}px) { - font-size: 8px; + font-size: 12px; + padding-bottom: 18px; } font-weight: bold; ` +export const CompetitorTH = styled.th`` + export const IconGroup = styled.div` margin-top: 68px; ` @@ -255,6 +311,18 @@ export const CompanyTeamSection = styled.div` } ` +export const CheckIcon = styled.div` + display: flex; + justify-content: center; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + svg { + width: 27px; + height: 27px; + } + } +` + export const CompanyTeamHeading = styled.div` @media (max-width: ${dimensions.maxwidthTablet}px) { text-align: center; @@ -288,3 +356,14 @@ export const MemberImage = styled.div` export const FeatureSection = styled.div` display: flex; ` + +export const IndustryContextBackgroundImage = styled.div` + position: absolute; + left: 0; + z-index: 0; + img { + width: 100vw; + height: calc(100vh + 160px); + object-fit: cover; + } +` diff --git a/src/components/about/about.js b/src/components/about/about.js index 5ab4342..4468706 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -29,9 +29,16 @@ import { TeamMember, MemberImage, MissionText, - CompanyTeamSection + CompanyTeamSection, + CheckIcon, + CompetitorTH, + ComparisonCTA, + IndustryContextBackgroundImage, } from "./about-style" +import Check from "../../vectors/CheckIcon.svg" +import Xicon from "../../vectors/xicon.svg" + export default function About({ data }) { return ( <> @@ -41,12 +48,12 @@ export default function About({ data }) { - + - +

{data.mission_heading}

@@ -55,28 +62,38 @@ export default function About({ data }) { - - + + + + - - - -

{data.industry_context_heading}

- - {data.industry_context_explanation.map((example, id) => { - return ( - - - - - - {example.explanation_description} - - - ) - })} - - +
+ + + +

{data.industry_context_heading}

+ + {data.industry_context_explanation.map((example, id) => { + return ( + + + + + + {example.explanation_description} + + + ) + })} + + + + + {data.cta_button_text} + + +
+
@@ -88,100 +105,65 @@ export default function About({ data }) { return ( - + {benefit.product_benefit_title} - - ) })} -
- - {/* - - {aboutData.company_comparison_section_heading} - - - {aboutData.product_benefit.map(benefit => { - return ( - - - {benefit.product_benefit_title} - - ) - })} - - - - - {aboutData.product_feature.map(feature => { - return ( - - {feature.product_feature_name} - - - - - ) - })} - - - {aboutData.company.map(competitor => { - return ( - - {competitor.company_name} - - - - - - - - - ) - })} - - - */} + - - - - {data.company.map((competitor, id) => ( - <> - - +
+
- -

{competitor.company_name}

- -
+ + + {data.company.map((competitor, id) => ( + <> + + {competitor.company_name} + + + ))} + + {data.rows.map((feature, id) => ( + + + + + + + ))} - - {data.product_feature.map((feature, id) => ( - - - - +
+ {feature.feature_name} + + + {feature.first_company_check == "Yes" ? ( + + ) : ( + + )} + + + + {feature.second_company == "Yes" ? : } + + + + {feature.third_company == "Yes" ? : } + +
- -

{feature.product_feature_name}

- - 		- - - -
- 		- -
+ + + {data.products_navigation_button_text} + + + @@ -200,7 +182,7 @@ export default function About({ data }) { return ( - +

{member.team_member_title}

{member.team_member_description} diff --git a/src/pages/about.js b/src/pages/about.js index 85e4e3d..aa49993 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -28,6 +28,7 @@ export const query = graphql` cta_button_destination { url } + cta_button_text industry_context_explanation { explanation_description diff --git a/src/vectors/Check.png b/src/vectors/Check.png new file mode 100644 index 0000000000000000000000000000000000000000..491722d82f3b7430a842de78a380b1cda8ae2ed8 GIT binary patch literal 2071 zcmV+y2C~fdTdGgYV5fg)$P<^p~zz5WXLPEp@ zZBKnrUsM#HRJa-;h@~xW6cR0{@BpUJ0=3-Tj=$gB?cD6%-v7Pp)o*gWo!QyF{d9ga z^PAtyGANP8gZ>5pJ)i;e>l%BUbMSM31_scimczU;%o_v7Zkwig(F6zsL`UX_Ms7n1 z#K1!lq@h*q2F?SR3_x)TIFn6DpPKnc=VzZHzt8wFq?BKYXg07TE6bcJUOLJ>34Q;4bO4LsSt zb~l*38!v5;H$gDpmKVjRP{?#L(E=VEKZfupZ245%__wF7|NN(rhjIp{4oTO1U5vvU zYCb_$we0j9)Ty-KjP=&_oqsde`{V>nus-HHjYEiEUWjdRPFpAFE1IF4GH+gosrPpQ z|L2C9Jsjnc?YWqER$ywc3D_npuUxg7PSnP!wj)1$Df7t0BRsMx8+1lsH&_CtPbG+; z>0>DYy*iWAqCo~B>^CZGb$e&Uz>?@$s@vX?X?)hDIC`9ldwK3k3p~-bwpVSl1nXP> zEL56&8=kX4qgMH}s?K!fb+^ok;MyRX#{nxX%y`QVs8s1omWyw4ToPLMw!iVtfswz@ zIm@QBVQ0Ig4yt-b&b|JOYWjdh>&(|}!P3xENo_WpsBbC$6Ij|ZDuvC3bv(ls3)&DhXWh*<4BnA2`+&w)ww_tgv=u#aiI)-n0RPDg(> zNMEr=G{b}#x?;8tOajx)$2J7DyaKaT!nBi?X{%)kY%u7O#}!<=)G5)FGLy)()77#7 zrk)w|16F3G)-HKf)Dzz)Upfo4Z}SUkGGI9)TKtdEYMr6^Y$evN>PB)57({+Kk+D3h ztw)yCGO0n8nB~QR8MIhuj160%(&Y4+4fOb`TC)w8Of*eP8skriToHILDr`=%1UH9u$3B4B9pQz!PACoqF$8@yQpOV5dHKOM1C!1K}Vrbij-W~NG5LT+0+Z4~iw;VK zt%<{`zOLsYL|kCEgta?Rvgx7I`Bz2vpNqY5Nns()^f12g#KTr@Y3H@l<8rV8*TU{91)(_8#OD0!w@~I z<;jsLM?l}_ES3UHy_w0mEJ&tZ@z4p_$d6yi91U2v)ibMd4FEh88a#xyFUMwaGYqg* zrZ_&^3GApoPG)d8T-Sg8Gq=)uy4!U4ANf^d`ZIVarZTbNpK(_6sN6tO5#n*!>AwAH z?r?qRx9#aJNgLuJX9S(?O4Y9c`9ie~)qfX}5N(D#y*G>zWJ}`x*~d$qRAPE+Q3+${4)IT8&*A z!r^kCy15itX>(~U!iKZHCz02F>B(SoFD@ou1gbhgcxD_!u03_3!NYmnvCvlluw6r}i!rgM z%XSZ1kELA%hJT}2pUwLx5|H8*fU_rUQ#`8#mI+6}Xv@}K-BeUnOaz--(ZmlX)~8bL zMesCBqHhZ8XbTp*zT`pS;n=lNF#o!oc*$eP?dJq2e)p)8fqdnO?Ird>bpn$+fxLPj zipT#J4{FKd7qzfAhgb_fVM~GVJb5G_2cl4SIM)s-7kLV-YCITdFyOA=1PGvavl6o! zXe}DseUn;_Rs%3pe47CqL0bHnS7T5=;3cH0{{WDzx~mzaG~@sP002ovPDHLkV1icI B-yr}1 literal 0 HcmV?d00001 diff --git a/src/vectors/CheckIcon.svg b/src/vectors/CheckIcon.svg new file mode 100644 index 0000000..c36ab40 --- /dev/null +++ b/src/vectors/CheckIcon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/vectors/Xicon.png b/src/vectors/Xicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4d08647869fc6b7880b6d60d54f2a02d2737cb29 GIT binary patch literal 2204 zcmV;N2xIq&P)7-JrKAdhY7K?qBWum|I`ut7J>Olqa^RxMZ5=xw?rG>@Y3&~Z3m*5c&gC_?62rgcXYDKe0R5#EJ4D(y}b|lY_=hg zqiwtK@0Ri{bx~Kts)9+W3>N4tvhsm3GBP3{o|V!l5r8k_^LpK@u7>dzZ%8HC6U%`t zk;~;|-MV#I9G=v~J?MJ3*ad6dSCjDY@bKACpC#FxEF)aFaDk*bJeEn*yt})*f2ws) zM>Qc#c?389qKRn6=VTe;_U+rUXV0F(+qZAoJsl+;*tTuk-2MCa{|;Zjgs>J=_+~-p zkk99Tlw}MAD$?KIKlS?cYes7WQu0mxJ9g~I-@A9OqCZzN>8!l(w;sn>`3SIS)21TY zIxeN*lBT^D|1O5FtMJl?4jsxMR=uH#dQ8q#l7{l!Ur1@3CW)9#eOENxMp9VLsr`@_fRmcqq6S#?wc5COItzk8GI4Gl{UKlO|gYZ6!>Q6g3+XPqr&p)^@_2^@KD_a7Hu6`K)QI zSh1qwoP<5CF}5UxV2US|4$4*k+0Vuh85x~gGWfu($<{<3$KkRUg9}ef0;uJU5#=#E z5%g)Fv`I~Sp2vT-E=p+wGhKL}7)HIJhZzcx&Ps?hHEn`)XJ;p4i?R~YjyV!8Xab{z zql~jjl7_`Hx^mQM(O;*A&AAT% z-uJCKEpj&y4}8Mhs-RsP%dAaK1X?9cg~2!3qM0*t?(Yd#G3(RKYT5Lxryl7>_hS6z zwOLJ6PE6{dWjUxv<40p?`H^0iiP*Rb>4s3w$`;L>_4~_-cqFPlB)J_N+HmDvD_5@U z!ZPHaT$zgk-0$LkzS$|069GOS?Qqp{C^c1=JaW<&u4NYuGC3aZDQ|kInE$FJ2|dlT zueY~%($v_TG!7m-$Y}919L^{aoz*wjuU{``Vk>4#YL!hVe9^?X+zwDFZ{ED&66s$` zL{rY`WQl6i!;>)S7wXvV?(R-x+GZLL9z3wPk4&_+ZImz3>Q;EFkNK?@-Ll@blG z{|pWey4+r{9C7T}F$<>4O>;je5##35u-GMwZdLbqaBl=i2ipe-2cGW{NEenHX;>ef z6nEzZYuiPx4}kuZG;eMo85$b$*J3{e=%6-k+~}LJyw@zj4X0m+H?ruc zNthsMjIH!?TwM%EJ0ShZlP6F9#V|JCZqlbtosyZEnY9QNf7bde@gK_mMoYbs^3cq6 z!BqZGdm00HDElDuwr<^8OnR(V8%u+|SPWxr^%MK-orQ&k{ZSSIn@YT^-Fc&-`*J8} zk|NIf9zT9;J%9e3AB~Ku=LaaN?aSj)S3R3vY2YqBDea8u3H_8qIfK~O<6<<|XXBFR zeVosNqy;kEx;#pvp-t&8(1*w2pw2f_cdVrqmCmKZI9{a=7mc~hg>|maa>){E;`Z4+})PL;X>qT|&9il{KMc%~*DG;_yfy;34cxY8og07h2} zY3k7A5c(E}F(<||irTS@GR5sjCcmdhY + + + diff --git a/src/vectors/xicon.svg b/src/vectors/xicon.svg new file mode 100644 index 0000000..658b223 --- /dev/null +++ b/src/vectors/xicon.svg @@ -0,0 +1,4 @@ + + + + From 7a8276e1ff1ba2c959ae584b948a1d47df46447a Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 00:06:21 -0400 Subject: [PATCH 23/41] #31 updating product page styles --- .../product_page/product-page-styles.js | 62 +++++++- src/components/product_page/product-page.js | 56 ++++++-- src/pages/products.js | 5 +- src/schemas/product_page.json | 132 ++++++++++-------- 4 files changed, 183 insertions(+), 72 deletions(-) diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index 50be851..72488a0 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -1,9 +1,12 @@ import styled from "styled-components" import dimensions from "../../style/dimensions" +import colors from "../../style/colors" export const FeaturedProductSection = styled.div` width: 100%; margin-top: 40px; + margin-bottom: 148px; + color: ${colors.blue900}; @media (min-width: ${dimensions.maxwidthTablet}px) { width: 86vw; @@ -11,6 +14,26 @@ export const FeaturedProductSection = styled.div` } ` +export const FeaturedCTA = styled.div` + margin-top: 64px; + a { + background-color: ${colors.orange900}; + text-transform: uppercase; + color: ${colors.white900}; + padding-left: 48px; + font-size: 16px; + padding-right: 48px; + padding-top: 16px; + padding-bottom: 16px; + text-decoration: none; + } +` + +export const ProductsHeading = styled.div` + padding-top: 135px; + color: ${colors.blue900}; +` + export const FeaturedProductImage = styled.div` img { width: 47vw; @@ -25,6 +48,7 @@ export const FeaturedProductImage = styled.div` export const FeaturedProductText = styled.div` margin-left: 5vw; margin-top: 52px; + color: ${colors.blue900}; @media (max-width: ${dimensions.maxwidthTablet}px) { margin-left: 0vw; @@ -46,11 +70,45 @@ export const ProductImage = styled.div` width: 21vw; height: 245px; + img { + width: 21vw; + height: 245px; + object-fit: cover; + } + @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; + + img { + width: 100%; + height: 244px; + object-fit: cover; + } } ` -export const HomeownerSection = styled.div`` +export const HomeownerSection = styled.div` + color: ${colors.blue900}; +` + +export const CommercialSection = styled.div` + color: ${colors.blue900}; +` + +export const ProductCTA = styled.div` +margin-top: 58px; +margin-bottom: 58px; -export const CommercialSection = styled.div`` \ No newline at end of file + a { + padding-right: 60px; + padding-left: 60px; + padding-top: 16px; + padding-bottom: 16px; + border: solid ${colors.orange900}; 1px; + font-size: 16px; + font-weight: bold; + text-decoration: none; + text-transform: uppercase; + color: ${colors.orange900}; + } +` diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index 5278ed4..4efc108 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -8,14 +8,20 @@ import { ProductImage, HomeownerSection, CommercialSection, + ProductsHeading, + FeaturedCTA, + ProductCTA, } from "./product-page-styles" export default function ProductSection({ data }) { return (
-

{data.product_page_main_heading}

+ +

{data.product_page_main_heading}

+ + {console.log(data.featured_product_image)} {data.featured_product_image.alt}{data.featured_product_heading}

{data.featured_product_name}

{data.featured_product_description} + + {console.log(data)} + + {data.learn_more_button_text} + + @@ -36,13 +48,25 @@ export default function ProductSection({ data }) { product.product.document.data.product_type === "Homeowner" && (
- {product.product.document.data.product_images[0].image.alt}/ + {

{product.product.document.data.product_title}

{product.product.document.data.product_price}

- + {product.product_description} + + + {product.button_text} + +
) ) @@ -53,18 +77,32 @@ export default function ProductSection({ data }) { {data.model_scope[1].model_scope_heading} + {console.log(data.products)} {data.products.map(product => { return ( product.product.document.data.product_type === "Commercial" && (
- {product.product.document.data.product_images[0].image.alt}/ + {

{product.product.document.data.product_title}

+

{product.product.document.data.product_price}

- + {product.product_description} + + + {product.button_text} + +
) ) diff --git a/src/pages/products.js b/src/pages/products.js index 324d7f1..6f7480c 100644 --- a/src/pages/products.js +++ b/src/pages/products.js @@ -8,7 +8,7 @@ export default function ProductSection({ data }) { return ( - + ) } @@ -32,9 +32,12 @@ export const query = graphql` product_page_main_heading products { + button_text + product_description product { document { ... on PrismicProduct { + uid data { product_title button_destination diff --git a/src/schemas/product_page.json b/src/schemas/product_page.json index 8cdba23..3a43bda 100644 --- a/src/schemas/product_page.json +++ b/src/schemas/product_page.json @@ -1,89 +1,101 @@ { - "Main" : { }, - "Featured Section" : { - "product_page_main_heading" : { - "type" : "Text", - "config" : { - "label" : "Product Page Main Heading" + "Main": {}, + "Featured Section": { + "product_page_main_heading": { + "type": "Text", + "config": { + "label": "Product Page Main Heading" } }, - "featured_product_heading" : { - "type" : "Text", - "config" : { - "label" : "Featured Product Heading" + "featured_product_heading": { + "type": "Text", + "config": { + "label": "Featured Product Heading" } }, - "featured_product_name" : { - "type" : "Text", - "config" : { - "label" : "Featured Product Name" + "featured_product_name": { + "type": "Text", + "config": { + "label": "Featured Product Name" } }, - "featured_product_description" : { - "type" : "Text", - "config" : { - "label" : "Featured Product Description" + "featured_product_description": { + "type": "Text", + "config": { + "label": "Featured Product Description" } }, - "featured_product_image" : { - "type" : "Image", - "config" : { - "constraint" : { }, - "thumbnails" : [ ], - "label" : "Featured Product Image" + "featured_product_image": { + "type": "Image", + "config": { + "constraint": {}, + "thumbnails": [], + "label": "Featured Product Image" } }, - "learn_more_button_text" : { - "type" : "Text", - "config" : { - "label" : "Learn More Button Text" + "learn_more_button_text": { + "type": "Text", + "config": { + "label": "Learn More Button Text" } }, - "learn_more_button_text_destination" : { - "type" : "Text", - "config" : { - "label" : "Learn More Button Text Destination" + "learn_more_button_text_destination": { + "type": "Text", + "config": { + "label": "Learn More Button Text Destination" } } }, - "Models Section" : { - "model_scope" : { - "type" : "Group", - "config" : { - "fields" : { - "model_scope_heading" : { - "type" : "Text", - "config" : { - "label" : "Model Scope Heading" + "Models Section": { + "model_scope": { + "type": "Group", + "config": { + "fields": { + "model_scope_heading": { + "type": "Text", + "config": { + "label": "Model Scope Heading" } } }, - "label" : "Model Scope" + "label": "Model Scope" } }, - "products" : { - "type" : "Group", - "config" : { - "fields" : { - "product" : { - "type" : "Link", - "config" : { - "select" : "document", - "customtypes" : [ "product" ], - "label" : "product" + "products": { + "type": "Group", + "config": { + "fields": { + "product": { + "type": "Link", + "config": { + "select": "document", + "customtypes": ["product"], + "label": "product" + } + }, + "button_text": { + "type": "Text", + "config": { + "label": "Button Text" + } + }, + "product_description": { + "type": "Text", + "config": { + "label": "Product Description" } } }, - "label" : "Products" + "label": "Products" } }, - "test" : { - "type" : "Link", - "config" : { - "select" : "document", - "customtypes" : [ "product" ], - "label" : "test" + "test": { + "type": "Link", + "config": { + "select": "document", + "customtypes": ["product"], + "label": "test" } } } -} \ No newline at end of file +} From 97eba93cf378cec7b1bbe97760a62d47a142e1a8 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 00:18:11 -0400 Subject: [PATCH 24/41] #31 product card link --- src/components/product_page/product-page-styles.js | 5 +++++ src/components/product_page/product-page.js | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index 72488a0..d455265 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -34,6 +34,11 @@ export const ProductsHeading = styled.div` color: ${colors.blue900}; ` +export const ProductCard = styled.a` + color: ${colors.blue900}; + text-decoration: none; +` + export const FeaturedProductImage = styled.div` img { width: 47vw; diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index 4efc108..8937309 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -11,6 +11,7 @@ import { ProductsHeading, FeaturedCTA, ProductCTA, + ProductCard, } from "./product-page-styles" export default function ProductSection({ data }) { @@ -46,7 +47,7 @@ export default function ProductSection({ data }) { {data.products.map(product => { return ( product.product.document.data.product_type === "Homeowner" && ( -
+ -
+ ) ) })} @@ -81,7 +82,7 @@ export default function ProductSection({ data }) { {data.products.map(product => { return ( product.product.document.data.product_type === "Commercial" && ( -
+ -
+ ) ) })} From 118b7163df5946f7ee07b2618e1232775be2a4b9 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 15:05:30 -0400 Subject: [PATCH 25/41] #61 updating overflow scroll --- package-lock.json | 145 ++++++++ package.json | 1 + src/components/header/header.jsx | 16 +- .../singular-product-styles.js | 313 ++++++++++++++++++ 4 files changed, 471 insertions(+), 4 deletions(-) create mode 100644 src/components/singular-product/singular-product-styles.js diff --git a/package-lock.json b/package-lock.json index da83241..00fac03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1135,6 +1135,109 @@ "to-fast-properties": "^2.0.0" } }, + "@emotion/babel-plugin": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz", + "integrity": "sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA==", + "requires": { + "@babel/helper-module-imports": "^7.12.13", + "@babel/plugin-syntax-jsx": "^7.12.13", + "@babel/runtime": "^7.13.10", + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.5", + "@emotion/serialize": "^1.0.2", + "babel-plugin-macros": "^2.6.1", + "convert-source-map": "^1.5.0", + "escape-string-regexp": "^4.0.0", + "find-root": "^1.1.0", + "source-map": "^0.5.7", + "stylis": "^4.0.3" + }, + "dependencies": { + "@babel/helper-module-imports": { + "version": "7.13.12", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz", + "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==", + "requires": { + "@babel/types": "^7.13.12" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz", + "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==" + }, + "@babel/helper-validator-identifier": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz", + "integrity": "sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==" + }, + "@babel/plugin-syntax-jsx": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz", + "integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==", + "requires": { + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/runtime": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.0.tgz", + "integrity": "sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@babel/types": { + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.1.tgz", + "integrity": "sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==", + "requires": { + "@babel/helper-validator-identifier": "^7.14.0", + "to-fast-properties": "^2.0.0" + } + }, + "@emotion/memoize": { + "version": "0.7.5", + "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", + "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + } + } + }, + "@emotion/cache": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz", + "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==", + "requires": { + "@emotion/memoize": "^0.7.4", + "@emotion/sheet": "^1.0.0", + "@emotion/utils": "^1.0.0", + "@emotion/weak-memoize": "^0.2.5", + "stylis": "^4.0.3" + } + }, + "@emotion/css": { + "version": "11.1.3", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.1.3.tgz", + "integrity": "sha512-RSQP59qtCNTf5NWD6xM08xsQdCZmVYnX/panPYvB6LQAPKQB6GL49Njf0EMbS3CyDtrlWsBcmqBtysFvfWT3rA==", + "requires": { + "@emotion/babel-plugin": "^11.0.0", + "@emotion/cache": "^11.1.3", + "@emotion/serialize": "^1.0.0", + "@emotion/sheet": "^1.0.0", + "@emotion/utils": "^1.0.0" + } + }, + "@emotion/hash": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", + "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + }, "@emotion/is-prop-valid": { "version": "0.8.8", "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz", @@ -1148,6 +1251,23 @@ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz", "integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==" }, + "@emotion/serialize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz", + "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==", + "requires": { + "@emotion/hash": "^0.8.0", + "@emotion/memoize": "^0.7.4", + "@emotion/unitless": "^0.7.5", + "@emotion/utils": "^1.0.0", + "csstype": "^3.0.2" + } + }, + "@emotion/sheet": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz", + "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==" + }, "@emotion/stylis": { "version": "0.8.5", "resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz", @@ -1158,6 +1278,16 @@ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, + "@emotion/utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz", + "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA==" + }, + "@emotion/weak-memoize": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", + "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + }, "@endemolshinegroup/cosmiconfig-typescript-loader": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz", @@ -3246,6 +3376,11 @@ } } }, + "body-scroll-lock": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz", + "integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg==" + }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -6859,6 +6994,11 @@ } } }, + "find-root": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -16890,6 +17030,11 @@ } } }, + "stylis": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz", + "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==" + }, "subscriptions-transport-ws": { "version": "0.9.18", "resolved": "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz", diff --git a/package.json b/package.json index 6052d68..58d642f 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "test": "echo \"Write tests! -> https://gatsby.dev/unit-testing\" && exit 1" }, "dependencies": { + "@emotion/css": "^11.1.3", "@walltowall/gatsby-source-prismic-schemas": "^1.1.0", "gatsby": "^2.26.1", "gatsby-background-image": "^1.5.0", diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 1dc4c1b..4ba6f13 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,4 +1,4 @@ -import React, { useState } from "react" +import React, { useState, useEffect } from "react" import Hamburger from "../../vectors/hamburger.svg" import CloseIcon from "../../vectors/CloseIcon.svg" import { @@ -14,10 +14,15 @@ import { NodeLine, LogoLink, } from "./header-styles" - import Circle from "../../vectors/circle.svg" - import { NavText } from "../../style/type-styles" +import { createGlobalStyle } from "styled-components" + +const GlobalStyle = createGlobalStyle` + body { + overflow: ${props => (props.open == "open" ? "hidden" : "visible")};; + } +` export const Header = ({ home }) => { const [open, setOpen] = useState(false) @@ -29,10 +34,14 @@ export const Header = ({ home }) => { setColorchange(false) } } + typeof window !== "undefined" && window.addEventListener("scroll", changeNavbarColor) + return ( + + {
- setOpen(!open)} className={open ? "open" : ""}> diff --git a/src/components/singular-product/singular-product-styles.js b/src/components/singular-product/singular-product-styles.js new file mode 100644 index 0000000..fe01071 --- /dev/null +++ b/src/components/singular-product/singular-product-styles.js @@ -0,0 +1,313 @@ +import styled from "styled-components" +import dimensions from "../../style/dimensions" +import { + layoutPaddingDesktop, + layoutPaddingMobile, +} from "../../style/variables" +import colors from "../../style/colors" + + +export const SingularProductContainer = styled.div`` + +export const HeroSection = styled.div` + padding-top: 130px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + padding-top: 114px; + } +` + +export const ImageContainer = styled.div` + display: flex; + flex-wrap: wrap; + img { + width: 4vw; + height: 56px; + object-fit: cover; + margin-right: 18px; + margin-top: 44px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 39px; + height: 39px; + margin-right: 12px; + margin-top: 32px; + } + + &.main-image { + object-fit: cover; + width: 47vw; + height: 432px; + flex: 100%; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + height: 225px; + } + } + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + justify-content: center; + } +` + +export const SmallImageContainer = styled.div` + display: flex; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + justify-content: center; + } +` + +export const TextContainer = styled.div` + padding-left: 67px; + + color: ${colors.blue900}; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-left: 0px; + } +` + +export const ProductType = styled.div` + padding-top: 49px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + padding-top: 26px; + } +` + +export const IconSection = styled.div` + margin-top: 127px; + background-color: rgb(110, 168, 192, 0.07); + width: 100vw; + margin-left: -${layoutPaddingDesktop}; + padding-top: 80px; + padding-bottom: 80px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-left: -${layoutPaddingMobile}; + } +` + +export const IconContainer = styled.div` + display: flex; + margin-top: 80px; + justify-content: space-between; + margin-left: ${layoutPaddingDesktop}; + margin-right: ${layoutPaddingDesktop}; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + flex-wrap: wrap; + justify-content: center; + margin-top: 54px; + margin-left: 0px; + margin-right: 0px; + } +` + +export const Icon = styled.div` + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 30px; + } +` + +export const IconHeader = styled.div` + margin-left: ${layoutPaddingDesktop}; + color: ${colors.blue900}; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + text-align: center; + margin-left: 0px; + } +` + +export const IconImage = styled.div` + width: 54px; + height: 55px; + margin-left: auto; + margin-right: auto; +` + +export const IconCaption = styled.div` + margin-top: 25px; + width: 12vw; + color: ${colors.blue900}; + + text-align: center; + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 44vw; + } +` + +export const ImageHighlightSection = styled.div` + padding-top: 76px; + position: relative; +` + +export const ImageHighlightHeading = styled.div` + padding-top: 147px; + margin-left: 4vw; + color: ${colors.blue900}; +` + +export const ImageHighlightGroupContainer = styled.div`` + +export const ImageHighlightGroup = styled.div` + color: ${colors.blue900}; + + &.second-section { + position: absolute; + right: 0; + top: 200px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + position: relative; + top: 0px; + } + } +` + +export const HighlightedImage = styled.div` + &.first-image { + img { + margin-left: -${layoutPaddingDesktop}; + margin-top: 60px; + width: 50vw; + height: 372px; + object-fit: cover; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + margin-left: auto; + margin-right: auto; + } + } + } + + &.second-image { + img { + width: 28vw; + height: 357px; + object-fit: cover; + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + img { + width: 100%; + height: 275px; + object-fit: cover; + } + } + } + + img { + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + margin-left: auto; + margin-right: auto; + margin-top: 25px; + } + } +` + +export const ImageHighlightDescription = styled.div` + font-size: calc(18px + (18 - 16) * ((100vw - 300px) / (1440 - 300))); + width: 35vw; + padding-top: 40px; + + &.second-section { + padding-top: 88px; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + } + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + } +` + +export const ThirdSection = styled.div` + &.third-section { + display: flex; + flex-direction: row-reverse; + align-items: center; + margin-top: 97px; + margin-right: -${layoutPaddingDesktop}; + justify-content: space-between; + + img { + width: 56vw; + height: 372px; + object-fit: cover; + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + display: block; + width: 100%; + margin-top: 25px; + flex-direction: none; + + img { + width: 100%; + height: 275px; + object-fit: cover; + } + } + } +` + +export const FeatureSpecSection = styled.div` + margin-top: 100px; + color: ${colors.blue900}; +` + +export const FeatureIcon = styled.div` + width: 3vw; + height: 45px; +` + +export const Feature = styled.div` + padding-top: 90px; + + @media (min-width: ${dimensions.maxwidthTablet}px) { + display: flex; + } +` + +export const FeatureName = styled.div` + width: 20vw; + padding-right: 2vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + padding-right: 0px; + } +` + +export const FeatureImage = styled.div` + img { + &.not-image { + display: none; + } + } + + @media (max-width: ${dimensions.maxwidthTablet}px) { + img { + width: 87vw; + } + } +` + +export const FeatureDescription = styled.div` + font-size: 15px; + width: 35vw; + + @media (max-width: ${dimensions.maxwidthTablet}px) { + width: 100%; + padding-top: 16px; + } +` From 6d87787e99a995beb24d2f6ed50f4a169289f4ff Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 16:27:15 -0400 Subject: [PATCH 26/41] updating homepage colors --- src/components/homepage/index-styles.js | 30 ++++++++++++------------- src/style/colors.js | 10 +++++++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/components/homepage/index-styles.js b/src/components/homepage/index-styles.js index caaa1d1..39653bd 100644 --- a/src/components/homepage/index-styles.js +++ b/src/components/homepage/index-styles.js @@ -47,7 +47,7 @@ export const HeroDescription = styled.div`` export const HeroCTA = styled.div` margin-top: 64px; a { - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; @@ -65,7 +65,7 @@ export const ImpactSection = styled.div` min-height: 100vh; z-index: 1; position: relative; - + color: ${colors.ocean900}; background-color: ${colors.white900}; justify-content: center; @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -154,7 +154,7 @@ export const FutureImage = styled.div` export const FutureHeader = styled.div` font-weight: bold; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (min-width: ${dimensions.maxwidthTablet}px) { } ` @@ -175,7 +175,7 @@ export const FutureSolarIcon = styled.div` export const FutureDescription = styled.div` margin-top: 32px; font-size: 18px; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { font-size: 16px; @@ -189,12 +189,12 @@ export const FutureCTA = styled.div` padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - border: solid ${colors.orange900}; 1px; + border: solid ${colors.seafoam900}; 1px; font-size: 16px; font-weight: bold; text-decoration: none; text-transform: uppercase; - color: ${colors.orange900}; + color: ${colors.seafoam900}; } ` @@ -206,14 +206,14 @@ export const HomePageContainer = styled.div` export const SolutionsSection = styled.div` height: 100vh; margin-top: 200px; - color: ${colors.blue900}; + color: ${colors.ocean900}; padding-bottom: 100px; ` export const SolutionsCard = styled.div` a { text-decoration: none; - color: ${colors.blue900}; + color: ${colors.ocean900}; } @media (max-width: ${dimensions.maxwidthTablet}px) { img { @@ -253,12 +253,12 @@ a { padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - border: solid ${colors.orange900}; 1px; + border: solid ${colors.seafoam900}; 1px; font-size: 16px; font-weight: bold; text-decoration: none; text-transform: uppercase; - color: ${colors.orange900}; + color: ${colors.seafoam900}; } ` export const CTASection = styled.div` @@ -298,7 +298,7 @@ export const CTAContent = styled.div` ` export const CTAText = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (min-width: ${dimensions.maxwidthTablet}px) { margin-left: 133px; @@ -314,12 +314,12 @@ a { padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - border: solid ${colors.orange900}; 1px; + border: solid ${colors.seafoam900}; 1px; font-size: 16px; font-weight: bold; text-decoration: none; text-transform: uppercase; - color: ${colors.orange900}; + color: ${colors.seafoam900}; } ` export const NodeLine = styled.div` @@ -328,7 +328,7 @@ export const NodeLine = styled.div` left: -80px; margin-top: 64px; z-index: 0; - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; @media (min-width: ${dimensions.maxwidthDesktop}px) { width: 70%; @@ -344,7 +344,7 @@ export const MobileNodeLine = styled.div` left: -${layoutPaddingMobile}; margin-top: 64px; z-index: 0; - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; @media (max-width: ${dimensions.maxwidthTablet}px) { width: 55.8%; diff --git a/src/style/colors.js b/src/style/colors.js index caf71eb..7b15bb7 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -13,7 +13,13 @@ const colors = { lighterblue900: "#6EA8C0", softblue900: "#ECF3F7", gray900: "#585858", - black_overlay: "rgb(0, 0, 0, 0.55)" + black_overlay: "rgb(0, 0, 0, 0.55)", + ocean900: "#00667B", + seafoam900: "#5AC7AC", + solar900: "#FFB729", + grass900: "#B2DD8E", + frost900: "#ECF3F7", + stone900: "#585858", } -export default colors \ No newline at end of file +export default colors From bdbc4f7fe57195fd9b2e92d9dfba20efe3abe72f Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 16:30:45 -0400 Subject: [PATCH 27/41] updating colors on about --- src/templates/use-case-styles.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/templates/use-case-styles.js b/src/templates/use-case-styles.js index 1b05c02..f5687dd 100644 --- a/src/templates/use-case-styles.js +++ b/src/templates/use-case-styles.js @@ -44,7 +44,7 @@ export const IntroTextSection = styled.div` ` export const IntroHeader = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const ImageTwo = styled.div` @@ -87,7 +87,7 @@ export const WhyHeader = styled.div` margin-top: 118px; margin-bottom: 88px; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (min-width: ${dimensions.maxwidthTablet}px) { margin-top: 152px; @@ -116,7 +116,7 @@ export const SpecificImage = styled.div` export const SpecificReasonHeading = styled.div` text-align: center; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (min-width: ${dimensions.maxwidthTablet}px) { } @@ -135,7 +135,7 @@ export const WhyCTA = styled.div` justify-content: center; a { - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; @@ -181,6 +181,6 @@ iframe { export const DemoHeading = styled.div` -color: ${colors.blue900}; +color: ${colors.ocean900}; ` From 5f5e5f5bda46171c58093c379079c6b0dd90d3ed Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 17:07:28 -0400 Subject: [PATCH 28/41] updating icons --- src/components/footer/footer-styles.js | 20 ++++------ src/components/homepage/index-styles.js | 2 +- src/components/solutions/solutions-styles.js | 15 ++++--- src/templates/use-case-styles.js | 42 ++++++++------------ src/vectors/circle.svg | 2 +- src/vectors/old.svg | 17 ++++++++ src/vectors/plant-icon.svg | 15 +++---- src/vectors/renewable-tree-icon.svg | 37 +++++++++++------ src/vectors/solar-panel.svg | 22 +++++----- src/vectors/sun-icon.svg | 2 +- 10 files changed, 95 insertions(+), 79 deletions(-) create mode 100644 src/vectors/old.svg diff --git a/src/components/footer/footer-styles.js b/src/components/footer/footer-styles.js index c6afa5c..80486e4 100644 --- a/src/components/footer/footer-styles.js +++ b/src/components/footer/footer-styles.js @@ -23,7 +23,6 @@ export const SocialSection = styled.div` padding-left: 80px; padding-top: 50px; - @media (max-width: ${dimensions.maxwidthTablet}px) { padding-left: 32px; } @@ -96,7 +95,7 @@ export const EmailSection = styled.div` width: 20vw; height: 36px; margin-top: 10px; - border: solid ${colors.blue900} 1px; + border: solid ${colors.ocean900} 1px; } @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -104,7 +103,7 @@ export const EmailSection = styled.div` width: 80%; height: 36px; margin-top: 10px; - border: solid ${colors.blue900} 1px; + border: solid ${colors.ocean900} 1px; } } @@ -167,7 +166,6 @@ export const FooterSection = styled.div` export const SockContainer = styled.div` z-index: 1; position: relative; - ` export const SockContent = styled.div` @@ -184,9 +182,7 @@ export const SockContent = styled.div` ` export const ConnectTitle = styled.div` -color: ${colors.blue900}; - - + color: ${colors.ocean900}; ` export const SockEmailForm = styled.form` @@ -198,11 +194,11 @@ export const SockEmailForm = styled.form` background: transparent; border: none; width: 36vw; - border-bottom: 4px solid ${colors.blue900}; + border-bottom: 4px solid ${colors.ocean900}; } input[type="text"]::placeholder { - color: ${colors.blue900}; + color: ${colors.ocean900}; } @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -211,14 +207,14 @@ export const SockEmailForm = styled.form` background: transparent; border: none; width: 100%; - border-bottom: 4px solid ${colors.blue900}; + border-bottom: 4px solid ${colors.ocean900}; } } input[type="text"], select { font-size: calc(20px + (32 - 20) * ((100vw - 320px) / (1440 - 320))); - color: ${colors.blue900}; + color: ${colors.ocean900}; } ` @@ -237,7 +233,7 @@ export const SockCTA = styled.a` padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; ` diff --git a/src/components/homepage/index-styles.js b/src/components/homepage/index-styles.js index 39653bd..4087733 100644 --- a/src/components/homepage/index-styles.js +++ b/src/components/homepage/index-styles.js @@ -328,7 +328,7 @@ export const NodeLine = styled.div` left: -80px; margin-top: 64px; z-index: 0; - background-color: ${colors.seafoam900}; + background-color: ${colors.grass900}; @media (min-width: ${dimensions.maxwidthDesktop}px) { width: 70%; diff --git a/src/components/solutions/solutions-styles.js b/src/components/solutions/solutions-styles.js index 0a42ce2..9479bfb 100644 --- a/src/components/solutions/solutions-styles.js +++ b/src/components/solutions/solutions-styles.js @@ -1,4 +1,4 @@ -import styled from '@emotion/styled' +import styled from "@emotion/styled" import colors from "../../style/colors" import dimensions from "../../style/dimensions" import { @@ -11,10 +11,10 @@ export const SolutionsContainer = styled.div`` export const TaglineSection = styled.div`` export const TaglineHeader = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const TaglineDescription = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const TaglineImage = styled.div` @@ -61,7 +61,7 @@ export const UseCaseCard = styled.div` width: 100%; a { text-decoration: none; - color: ${colors.blue900}; + color: ${colors.ocean900}; } @media (min-width: ${dimensions.maxwidthTablet}px) { @@ -76,12 +76,12 @@ a { padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - border: solid ${colors.orange900}; 1px; + border: solid ${colors.seafoam900}; 1px; font-size: 16px; font-weight: bold; text-decoration: none; text-transform: uppercase; - color: ${colors.orange900}; + color: ${colors.seafoam900}; } ` @@ -125,7 +125,6 @@ export const ModelCTAText = styled.div` margin-bottom: 116px; margin-top: 116px; - color: ${colors.blue900}; @media (min-width: ${dimensions.maxwidthTablet}px) { margin-left: 76px; margin-top: 72px; @@ -137,7 +136,7 @@ export const ModelsButton = styled.div` margin-top: 42px; a { - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; diff --git a/src/templates/use-case-styles.js b/src/templates/use-case-styles.js index f5687dd..a0d80a9 100644 --- a/src/templates/use-case-styles.js +++ b/src/templates/use-case-styles.js @@ -148,39 +148,31 @@ export const WhyCTA = styled.div` ` export const DemoVideoSection = styled.div` -margin-top: 75px; -margin-bottom: 75px; - -@media (min-width: ${dimensions.maxwidthTablet}px) { - margin-top: 192px; - margin-bottom: 192px; - justify-content: center; - display: flex; -} - - + margin-top: 75px; + margin-bottom: 75px; + @media (min-width: ${dimensions.maxwidthTablet}px) { + margin-top: 192px; + margin-bottom: 192px; + justify-content: center; + display: flex; + } ` export const DemoVideo = styled.div` - -iframe { - width: 72vw; - height: 562px; -} - -@media (max-width: ${dimensions.maxwidthTablet}px) { iframe { - width: 100%; - height: 173px; + width: 72vw; + height: 562px; } -} + @media (max-width: ${dimensions.maxwidthTablet}px) { + iframe { + width: 100%; + height: 173px; + } + } ` - export const DemoHeading = styled.div` - -color: ${colors.ocean900}; - + color: ${colors.ocean900}; ` diff --git a/src/vectors/circle.svg b/src/vectors/circle.svg index feb8825..fc26665 100644 --- a/src/vectors/circle.svg +++ b/src/vectors/circle.svg @@ -1,3 +1,3 @@ - + diff --git a/src/vectors/old.svg b/src/vectors/old.svg new file mode 100644 index 0000000..fb9f112 --- /dev/null +++ b/src/vectors/old.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/vectors/plant-icon.svg b/src/vectors/plant-icon.svg index 630d513..3bb1140 100644 --- a/src/vectors/plant-icon.svg +++ b/src/vectors/plant-icon.svg @@ -1,8 +1,9 @@ - - - - - - - + + + + + + + + diff --git a/src/vectors/renewable-tree-icon.svg b/src/vectors/renewable-tree-icon.svg index 75ed21b..8a1c8d2 100644 --- a/src/vectors/renewable-tree-icon.svg +++ b/src/vectors/renewable-tree-icon.svg @@ -1,20 +1,31 @@ - - - + + + + + + + + - - - + + + - - - - - + + + + + - - + + + + + + + + diff --git a/src/vectors/solar-panel.svg b/src/vectors/solar-panel.svg index f34794c..4f36b0c 100644 --- a/src/vectors/solar-panel.svg +++ b/src/vectors/solar-panel.svg @@ -1,12 +1,12 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/vectors/sun-icon.svg b/src/vectors/sun-icon.svg index f32b261..9f4fd05 100644 --- a/src/vectors/sun-icon.svg +++ b/src/vectors/sun-icon.svg @@ -1,3 +1,3 @@ - + From 995aca84082a37f13f95304fe22c32c65282978a Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 17:18:34 -0400 Subject: [PATCH 29/41] #updating svg colors --- src/components/contact/contact-styles.js | 8 ++++---- src/components/faq/faq-question/FAQQuestion.styles.js | 4 ++-- src/components/faq/topics-picker/TopicsPicker.styles.js | 8 ++++---- src/style/colors.js | 2 ++ src/vectors/close.svg | 4 ++-- src/vectors/open.svg | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/contact/contact-styles.js b/src/components/contact/contact-styles.js index 63dcbea..557f373 100644 --- a/src/components/contact/contact-styles.js +++ b/src/components/contact/contact-styles.js @@ -54,7 +54,7 @@ export const ContactButton = styled.a` padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; @@ -62,7 +62,7 @@ export const ContactButton = styled.a` transition: all 0.1s ease-in-out; &:hover { - box-shadow: 0 0 46px -9px ${colors.orange900}; + box-shadow: 0 0 46px -9px ${colors.seafoam900}; } ` @@ -99,12 +99,12 @@ export const SpecificContactInfo = styled.div` export const EmailSection = styled.div` margin-right: 127px; margin-top: 64px; - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const AddressSection = styled.div` margin-top: 64px; - color: ${colors.blue900}; + color: ${colors.ocean900}; width: 228px; margin-bottom: 110px; ` diff --git a/src/components/faq/faq-question/FAQQuestion.styles.js b/src/components/faq/faq-question/FAQQuestion.styles.js index d65db58..fd138be 100644 --- a/src/components/faq/faq-question/FAQQuestion.styles.js +++ b/src/components/faq/faq-question/FAQQuestion.styles.js @@ -11,12 +11,12 @@ export const ToggleContainer = styled.div` ` export const FAQQuestionTitle = styled(H4)` - color: ${colors.blue900}; + color: ${colors.ocean900}; margin: 0; ` export const FAQAnswer = styled(Body)` - color: ${colors.blue900}; + color: ${colors.ocean900}; padding-left: 24px; width: 90%; line-height: 32px; diff --git a/src/components/faq/topics-picker/TopicsPicker.styles.js b/src/components/faq/topics-picker/TopicsPicker.styles.js index 9c1c834..990166d 100644 --- a/src/components/faq/topics-picker/TopicsPicker.styles.js +++ b/src/components/faq/topics-picker/TopicsPicker.styles.js @@ -10,8 +10,8 @@ export const TopicsContainer = styled.div` ` const SelectedBox = css` - border: 3px solid ${colors.orange900}; - background-color: ${colors.orange900_transparent}; + border: 3px solid ${colors.seafoam900}; + background-color: ${colors.seafoam900_transparent}; ` export const TopicBox = styled.div` @@ -26,10 +26,10 @@ export const TopicBox = styled.div` font-weight: bolder; cursor: pointer; - border: 2px solid ${colors.orange900}; + border: 2px solid ${colors.seafoam900}; background-color: transparent; transition: all 0.1s ease-in-out; - color: ${colors.orange900}; + color: ${colors.seafoam900}; text-transform: uppercase; ${props => props.selected && SelectedBox}; diff --git a/src/style/colors.js b/src/style/colors.js index 17df1ba..f02c54b 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -21,6 +21,8 @@ const colors = { grass900: "#B2DD8E", frost900: "#ECF3F7", stone900: "#585858", + seafoam900_transparent: "rgb(90, 199, 172, .07)", + } export default colors diff --git a/src/vectors/close.svg b/src/vectors/close.svg index c3cf8cd..8d56ce5 100644 --- a/src/vectors/close.svg +++ b/src/vectors/close.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/vectors/open.svg b/src/vectors/open.svg index 733b2d2..7b85b27 100644 --- a/src/vectors/open.svg +++ b/src/vectors/open.svg @@ -1,5 +1,5 @@ - - - + + + From ef97e4e8338aa041718ce83477ff507ff23bb18b Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 17:42:56 -0400 Subject: [PATCH 30/41] #18 updating about page colors --- src/components/about/about-style.js | 25 +++++++++++++++++++++++-- src/style/colors.js | 13 +++++++++++-- src/vectors/CheckIcon.svg | 4 ++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index b4671a5..a7123c1 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -16,9 +16,12 @@ export const IconPlaceholder = styled.div` export const AboutHeaderText = styled.div` padding-top: 89px; + color: ${colors.ocean900}; ` export const MissionSection = styled.div` + color: ${colors.ocean900}; + @media (min-width: ${dimensions.maxwidthTablet}px) { display: flex; } @@ -39,6 +42,8 @@ export const MissionImage = styled.div` ` export const MissionText = styled.div` + color: ${colors.ocean900}; + position: relative; padding-top: 28px; @media (min-width: ${dimensions.maxwidthTablet}px) { @@ -51,6 +56,7 @@ export const MissionText = styled.div` export const MissionTextParagraph = styled.div` width: 44vw; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; @@ -61,6 +67,7 @@ export const IndustryContextSection = styled.div` display: flex; justify-content: center; background-color: white; + color: ${colors.ocean900}; ` export const IndustryContextContainer = styled.div` @@ -72,6 +79,7 @@ export const IndustryContextContainer = styled.div` padding-top: 42px; padding-left: 109px; padding-right: 109px; + color: ${colors.ocean900}; ` export const IndustryContextExamples = styled.div` @@ -113,6 +121,7 @@ export const IndustryContextExampleParagraph = styled.div` export const ProductBenefitHeader = styled.div` text-align: center; margin-top: 158px; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { margin-top: 54px; @@ -123,6 +132,8 @@ export const ProductBenefitsContainer = styled.div` margin-top: 68px; display: flex; flex-wrap: wrap; + color: ${colors.ocean900}; + justify-content: space-between; @media (max-width: ${dimensions.maxwidthTablet}px) { @@ -154,11 +165,12 @@ export const BenefitTitle = styled.div` export const ComparisonCTA = styled.div` margin-top: 90px; margin-bottom: 114px; + color: ${colors.ocean900}; display: flex; justify-content: center; a { - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; @@ -179,6 +191,8 @@ export const CompanyComparisonSection = styled.div` padding-top: 148px; width: 100vw; margin-top: 141px; + color: ${colors.ocean900}; + display: flex; margin-left: -${layoutPaddingDesktop}; justify-content: center; @@ -210,6 +224,7 @@ export const CompanyComparisonSectionHeading = styled.div` text-align: center; font-size: calc(36px + (36 - 24) * ((100vw - 300px) / (1440 - 300))); font-weight: bold; + color: ${colors.ocean900}; ` export const ProductComparison = styled.div` @@ -219,11 +234,14 @@ export const ProductComparison = styled.div` export const FeatureTitleColumn = styled.div` // margin-top: 110px; + color: ${colors.ocean900}; ` export const FeatureTitle = styled.div` font-size: 28px; margin-bottom: 25px; + color: ${colors.ocean900}; + margin-top: 25px; margin-right: 16px; font-weight: bold; @@ -248,7 +266,7 @@ export const CompetitorName = styled.div` text-align: center; padding-bottom: 68px; - color: ${colors.black900}; + color: ${colors.ocean900}; display: flex; justify-content: center; @@ -286,6 +304,7 @@ export const GeneralDescriptionSection = styled.div` width: 46vw; margin-left: auto; margin-right: auto; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; @@ -294,6 +313,7 @@ export const GeneralDescriptionSection = styled.div` export const CompanyBackgroundHeading = styled.div` text-align: center; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { padding-bottom: 30px; @@ -305,6 +325,7 @@ export const CompanyTeamSection = styled.div` width: 65vw; margin-left: auto; margin-right: auto; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { width: 100%; diff --git a/src/style/colors.js b/src/style/colors.js index caf71eb..f02c54b 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -8,12 +8,21 @@ const colors = { white900: "#FFFFFF", orange900: "#F27A28", + orange900_transparent: "rgb(242, 106, 33, .07)", blue900: "#245373", lightblue900: "#6480A5", lighterblue900: "#6EA8C0", softblue900: "#ECF3F7", gray900: "#585858", - black_overlay: "rgb(0, 0, 0, 0.55)" + black_overlay: "rgb(0, 0, 0, 0.55)", + ocean900: "#00667B", + seafoam900: "#5AC7AC", + solar900: "#FFB729", + grass900: "#B2DD8E", + frost900: "#ECF3F7", + stone900: "#585858", + seafoam900_transparent: "rgb(90, 199, 172, .07)", + } -export default colors \ No newline at end of file +export default colors diff --git a/src/vectors/CheckIcon.svg b/src/vectors/CheckIcon.svg index c36ab40..e4bc1f0 100644 --- a/src/vectors/CheckIcon.svg +++ b/src/vectors/CheckIcon.svg @@ -1,4 +1,4 @@ - - + + From 11f89f8cbedf90d6a8ae1730bf25853090de12bd Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 17:51:45 -0400 Subject: [PATCH 31/41] #31 updating products page colors --- .../product_page/product-page-styles.js | 18 +++++++++--------- src/style/colors.js | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/product_page/product-page-styles.js b/src/components/product_page/product-page-styles.js index d455265..d8845ca 100644 --- a/src/components/product_page/product-page-styles.js +++ b/src/components/product_page/product-page-styles.js @@ -6,7 +6,7 @@ export const FeaturedProductSection = styled.div` width: 100%; margin-top: 40px; margin-bottom: 148px; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (min-width: ${dimensions.maxwidthTablet}px) { width: 86vw; @@ -17,7 +17,7 @@ export const FeaturedProductSection = styled.div` export const FeaturedCTA = styled.div` margin-top: 64px; a { - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; @@ -31,11 +31,11 @@ export const FeaturedCTA = styled.div` export const ProductsHeading = styled.div` padding-top: 135px; - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const ProductCard = styled.a` - color: ${colors.blue900}; + color: ${colors.ocean900}; text-decoration: none; ` @@ -53,7 +53,7 @@ export const FeaturedProductImage = styled.div` export const FeaturedProductText = styled.div` margin-left: 5vw; margin-top: 52px; - color: ${colors.blue900}; + color: ${colors.ocean900}; @media (max-width: ${dimensions.maxwidthTablet}px) { margin-left: 0vw; @@ -93,11 +93,11 @@ export const ProductImage = styled.div` ` export const HomeownerSection = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const CommercialSection = styled.div` - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const ProductCTA = styled.div` @@ -109,11 +109,11 @@ margin-bottom: 58px; padding-left: 60px; padding-top: 16px; padding-bottom: 16px; - border: solid ${colors.orange900}; 1px; + border: solid ${colors.seafoam900}; 1px; font-size: 16px; font-weight: bold; text-decoration: none; text-transform: uppercase; - color: ${colors.orange900}; + color: ${colors.seafoam900}; } ` diff --git a/src/style/colors.js b/src/style/colors.js index 929e416..f02c54b 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -15,6 +15,14 @@ const colors = { softblue900: "#ECF3F7", gray900: "#585858", black_overlay: "rgb(0, 0, 0, 0.55)", + ocean900: "#00667B", + seafoam900: "#5AC7AC", + solar900: "#FFB729", + grass900: "#B2DD8E", + frost900: "#ECF3F7", + stone900: "#585858", + seafoam900_transparent: "rgb(90, 199, 172, .07)", + } export default colors From 781311860751e5024695702202f702436c72ed69 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 19:48:33 -0400 Subject: [PATCH 32/41] #56 changing svg colors --- src/vectors/circle.svg | 2 +- src/vectors/solidcircle.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vectors/circle.svg b/src/vectors/circle.svg index feb8825..cb561af 100644 --- a/src/vectors/circle.svg +++ b/src/vectors/circle.svg @@ -1,3 +1,3 @@ - + diff --git a/src/vectors/solidcircle.svg b/src/vectors/solidcircle.svg index 96609e0..892df54 100644 --- a/src/vectors/solidcircle.svg +++ b/src/vectors/solidcircle.svg @@ -1,3 +1,3 @@ - + From 005e4f0568b7346db21a9e5492ceb61cdb1a42f0 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 7 May 2021 20:08:18 -0400 Subject: [PATCH 33/41] #56 updating process styles --- src/components/process/process-styles.js | 8 +++----- src/components/process/process.js | 14 ++++++++++---- src/style/colors.js | 8 ++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/components/process/process-styles.js b/src/components/process/process-styles.js index ec67cba..5039da1 100644 --- a/src/components/process/process-styles.js +++ b/src/components/process/process-styles.js @@ -15,7 +15,7 @@ export const HowItWorks = styled.div` export const HowHeader = styled.div` padding-top: 216px; - color: ${colors.blue900}; + color: ${colors.ocean900}; ` export const HowImage = styled.div` @@ -126,11 +126,11 @@ export const FindImage = styled.div` export const FindText = styled.div` position: relative; z-index: 1; - color: ${colors.blue900}; + color: ${colors.ocean900}; padding-top: 350px; ` export const FindButton = styled.a` - background-color: ${colors.orange900}; + background-color: ${colors.seafoam900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; @@ -159,8 +159,6 @@ export const StepImage = styled.div` ` export const StepText = styled.div` - padding-left: 98px; - @media (min-width: ${dimensions.maxwidthTablet}px) { padding-left: 238px; width: 32vw; diff --git a/src/components/process/process.js b/src/components/process/process.js index 7194552..95a9cb2 100644 --- a/src/components/process/process.js +++ b/src/components/process/process.js @@ -37,22 +37,28 @@ export default function Process({ data }) { { - data.prismicProcessPage.data.how_images[howNumber].how_paragraph[0] - .text + data.prismicProcessPage.data.how_images[howNumber] + .how_paragraph[0].text } {data.prismicProcessPage.data.how_images.map((how_button, id) => { - return howNumber === id ? setHowNumber(id)} /> : setHowNumber(id)} /> + return howNumber === id ? ( + setHowNumber(id)} /> + ) : ( + setHowNumber(id)} /> + ) })} diff --git a/src/style/colors.js b/src/style/colors.js index 929e416..f02c54b 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -15,6 +15,14 @@ const colors = { softblue900: "#ECF3F7", gray900: "#585858", black_overlay: "rgb(0, 0, 0, 0.55)", + ocean900: "#00667B", + seafoam900: "#5AC7AC", + solar900: "#FFB729", + grass900: "#B2DD8E", + frost900: "#ECF3F7", + stone900: "#585858", + seafoam900_transparent: "rgb(90, 199, 172, .07)", + } export default colors From 61a84e8d05d41e431770f0849103aa8a258b6959 Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 12 May 2021 18:22:41 -0400 Subject: [PATCH 34/41] #61 updating gatsby links and logo image --- src/components/footer/footer.js | 4 +--- src/components/header/header-styles.js | 11 ++++++++--- src/components/header/header.jsx | 24 +++++++++++++++++------- src/images/navlogo.png | Bin 0 -> 6259 bytes src/images/navlogohomepage.png | Bin 0 -> 4768 bytes src/vectors/powerhouselogo.png | Bin 0 -> 4768 bytes 6 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 src/images/navlogo.png create mode 100644 src/images/navlogohomepage.png create mode 100644 src/vectors/powerhouselogo.png diff --git a/src/components/footer/footer.js b/src/components/footer/footer.js index bfb1498..d5ea1cf 100644 --- a/src/components/footer/footer.js +++ b/src/components/footer/footer.js @@ -57,8 +57,6 @@ export default function footer({ data }) { alt={data.prismicFooter.data.footer_image_alt} src={data.prismicFooter.data.footer_image.url} /> - - {/* */} @@ -95,7 +93,7 @@ export default function footer({ data }) { {data.prismicFooter.data.powerhouse_title} - {data.prismicFooter.data.address}{" "} + {data.prismicFooter.data.address} diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 12de43f..2034a4c 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -1,10 +1,10 @@ import styled from "styled-components" import dimensions from "../../style/dimensions" import colors from "../../style/colors" +import { Link } from "gatsby" export const NavContainer = styled.div` z-index: 2; - padding-bottom: 32px; &.colorChange { background-color: ${colors.blue900}; color: ${colors.white900}; @@ -27,6 +27,11 @@ export const LogoLink = styled.a` &.home-header { color: ${colors.white900}; } + + img { + width: 186px; + margin-bottom: 32px; + } ` export const Logo = styled.div` @@ -73,7 +78,7 @@ export const NavLinks = styled.div` } ` -export const NavLink = styled.a` +export const NavLink = styled(Link)` font-weight: bold; padding-left: 100px; text-decoration: none; @@ -146,5 +151,5 @@ export const NodeLine = styled.div` top: 8vh; left: 55px; z-index: 3; - background-color: ${colors.orange900}; + background-color: ${colors.grass900}; ` diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 4ba6f13..0a0f8f2 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -1,6 +1,8 @@ import React, { useState, useEffect } from "react" import Hamburger from "../../vectors/hamburger.svg" import CloseIcon from "../../vectors/CloseIcon.svg" +import { Link } from "gatsby" + import { NavContainer, Logo, @@ -17,6 +19,8 @@ import { import Circle from "../../vectors/circle.svg" import { NavText } from "../../style/type-styles" import { createGlobalStyle } from "styled-components" +import LogoHomepage from "../../images/navlogohomepage.png" +import NavLogo from "../../images/navlogo.png" const GlobalStyle = createGlobalStyle` body { @@ -27,28 +31,34 @@ const GlobalStyle = createGlobalStyle` export const Header = ({ home }) => { const [open, setOpen] = useState(false) const [colorChange, setColorchange] = useState(false) + const [logoImage, setLogoImage] = useState() const changeNavbarColor = () => { if (typeof window !== "undefined" && window.scrollY >= 80) { setColorchange(true) + setLogoImage(LogoHomepage) } else { setColorchange(false) + !home && setLogoImage(NavLogo) } } + useEffect(() => { + home ? setLogoImage(LogoHomepage) : setLogoImage(NavLogo) + }, [setLogoImage]) + typeof window !== "undefined" && window.addEventListener("scroll", changeNavbarColor) return ( -
- PowerHouse +
@@ -69,27 +79,27 @@ export const Header = ({ home }) => { - PowerHouse + PowerHouse - About + About - Process + Process - Products + Products - Solutions + Solutions diff --git a/src/images/navlogo.png b/src/images/navlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..412a10cbb446b8e3635d4f77f3850a5ccb4d1f8f GIT binary patch literal 6259 zcma)>Rag{U)b9xyx?||>?ye!E2Zj((8i@f0K}s09yIZ^uNJzM9s!F;@NXYIlz77W9rN-olAO25VRE^z` zkjPm6E68fP%oi^~WH((E1*E!3>Z6y&D?5-D2nne%0sFxc4GD=HLrn>!{|Wgt*Zc$Z zl1I-}?hh7@vC21?l=FBxxSPot*<-mvwUnv|K^^h*S8iFE>d`1< z3n)RF6pK}K@j-o%EFNQ8fgsCWqK=t?S}dbPw!jJH$kIc|0lokDI0=V!^C^LNPO za#GE1c4r&#vyOutI4@E^KhFQB31wrD6a3!neiv9{6w<{szP+2_*7GvEoj=f$JY0gH zLEi2~=wl1yfvo>6Dr=($(qtrA!)f`^9UYeD;$d_UD9XHprlUxB@F`$JXYehWn01KJTDfbMZd$a=fRAI zGWlrZ%@$;%0wG?XwnE2HiJiUyLy8k9?!KHj+RGJDi^PJ!s}enHJp;W1$6csbK;TPq zY>}>6r)!63EQlD@?ZdY~iI$mNDI4MbH{0A#IpIJ|WYRz*E(hJx_g^Y>Ksg~qr+9kw? ztu)K8STj$a^#}8nb4F`+etOLX1cQRRNDg#4Cj*-AL@}z7gt?L#6Pm-MCs7>!c4ED-PPzg^ z5S3%;7bN*M0CpvhOf`i@JMh!&1v%NjW*l#E@3$#cEZt!Ha!exO<+?>-yz@DPhw~J%x{@W zANNFq$hz0!_ZGiTm@9NWKG@)s=judy7Z?1kO&=b@VVBR*Ntk586y%Q84eV(eqyHGQ zI;sDf!Ruyr0lecVo*+lIreDCQ2nz6S2_a<5E#MwT+ZBX)TcOXbmEkPC)MqQ&6Y|Go;x>#y9{`*1{}(cv~<)sQdVr zj+Jeb{X4dp=e>_I?Kf7$Wkg>BLmDS?BJReij=ykew9)f+!V3Lq(PN4@wec!yXjRWh zTKY+}EVk!@l^=sl8t|=X(dyGo`-gM`nN>;b-|Qey1nA7u0vAo6;X|JZ2I(qx!gEwm z7o7x5+9Bo3Z&q85?%jvlPo!>5pjedOTW)aJy1IuJB`ayqO7Tcr(6&hM%7k@DElC)H zR8TFk*A!>%g*%`8g;F8L;I(C_Y!AqHrMy6iu{;p)`7Wl7X^nepe#h2Y5lw`dv)*)3 zD#N+87zJHj5ckL8u`$hI(H3oN>WKjNim_ z8hZ=LqysK7YD`@5S#|Xr%+@y>2Yea5H7?Fh? zA593AViV^Ag*~+4%(#)H-11jL6fA(X;S{KWAfgQ@nBw=7Sw$^z`Wi0iZkvdWlL9^L zZ;Bl08H>B3BpVa>)u9v+>J8*nn$7Ji5NNHE5Wpvn=pRQgGI_mPyfarM=b8Pzh5O8A zV<%ENXQ`GM;c3)lpioNVjiB{0pQj)Wi{ADV9T^ZRf|zJuWaW#=>Ggf3!^l)De4@ZX zO<0hpI_qc35B!ZTUau2htn;h`FL{?4ksfwB1&z6R1}&pPa*RRh+t}_>ngW%cW?_%T zk|e7Vpve(&Cy|kOYHlTF5pu+)v5VEM@^b_>qGick>o#mW4NR3&2sl@(s9F6 z@OqOj-gxjbLg|Y!h*2~)V4PyG87>SC@ zqKC%L+%yKK{odblNRRyj>AiJA-7>K2yhgm5jq|a|_KCjpEkeb=M%i%FY{FtTM15WPf&Vb?0R^zm;Dqn#@LNf-FSG9hxZ60M&;);bE_He@2)NI1j#Yj!l`pS) zUVS~jI1P(q|4Gq+s`d$6syg7JC?0J4S+^2LyY;;Ie9JmczCV7kAYK@CCNr<8nm*1( z{NWcFw`1A9=iPmRP$wp_Lb@wJcHuR#!Nt{*lOAw=F#uit!f!*bsnP5&4IY9Ai{N5K zc7)(BZH+IY=5f8KsnuYb%na0dulTSg#g9pyx%q0CV>658Sj4Mojc(&D4ix)@zndSs zcF~l7*UtZQr#R`dwhwcjd|Ox?X0f7;J;JRIL-pEbp?mdF%DxBTQu6E$B`Yeh&vrXE z>=~eA&4fdN6;IVJPN2a^sYNDX%~ksCT~OGCg2Jg*qF zde}Y%TT4$xOA1{Ay}wT?1A1IH^VNo}FpQ?MJzW z&%1n^!}6nmXa8Qe0HV`9(o#HfUN?NqQ!&Jn&d1T>y*0z87PnGA=yyq7tYUxg5<*jKNp2cJ1qo}F{ zQ)T7O^mdUl_Zne7=Oj-RWQ!lE24Jb`w*FlyIQ16j0*MwI`r%%tZkAg2HPHC^)>2|cT73|{tE88(BC+Cw)V85lf(WNy$)$T z-_!DHXWWp3P9VNa37+i)&Y#Lp^bcq_H;-G-cFmCNh~=+sMc)7jy~*dqL(zQeG(l>O zt(PifCq`t_Dn&r|mA!Q9DXj3I0*XXRf_i2#xnxfX^Qym^4x+-?T)k#jcDj9Z5aj9d zIq|xQxT_3T`ixJT6%Cs4hE}!YXZw!7BEt*M(E+|`?L4yHc>F;M(_=btx3&+2grw=g zE8m&`G0annmdEH{ra2TWUKA)j)JcvW`Mg_~9+Hw8b zcb4zhz6Obh;HeKQa_gHXtS;k04x1rT>vMbBw7RxeSbp7)>zIZE{#YwCPQNH4DoGAN zwjMO%0KuPrEd`D;*C7fIRIx-_f9B-q)m1m+Rhj%*UHJ*}{sHG2=%(q5sXxa#1kRBq zl?n0%3&g0C@=O<3lz1%U$6o#!A-{k*91T@xw}zZjYPtBW?tbrDc#0SVZ05qmv?$9C zQD{<{zU$FpnytQ@VM38?4FQT>PLOw*i962KzD6*g1JMMv)k6ye6 z50i!5kDDB8x=9>AP~(-5ov^KDYXaJJLTJ)ZOWa`f`vSaB%Vfioqfo9YQ}3@DUFhMF zEk@9L{6)?IHNfQ_NJnP6Ka!=)Krtz zwO}PSf?IO$T~Fsu=LzVf^*K^FtOyZF!uT$&e`v2sxgATp)#JtA+OuB3U-54{Bx?VLbUuMOHyabTGxe*@+eNM) zG4+HQM64h=4@Fo^30SyS*&V+*D;LM6(iu2-M+Tl3*p_C2bD8N)0g!4;VK zJLYIpNyYr4#-SyyJGp!38%*|q5cU9rzATWuk)v2^2yK400vHup!T#*xd%M;(U) z?9z7^HQokv<9VN76K_jOLu-rr7xK?pv}7dr<5<0Fe1f-A}0!#heV&hmi-$zi#eP6%bm1ev+8i={P*!yjUeE%c;GRq zD3x~M;Ng`2ipnW}hH9L-glXEwdbf`x!YV32PKQgOrE!eih{~~%YDRAQjhBEfuDj48 zso{o)plCbVCRQ)K3hN4AT#cMuEYHLv9>lbr(R4?rjEJCC2WLG<4SjE->^sf%cw2oh zDD)MCHbNj8eybRN1aJHpk?5ABfC5^dqs{pAcn10gdfVjrUFll>*G3Iv4t18oZa^7l z`R4`^d~l>)=10&iWt-gWl`%^0tU`*XxUzZ-`7%mwA4z{Mpnr%Uf}?D}-elU*Q2q!g zs?gR@^i5^T?5$#ovN2q`=8`(;=C_}mS=?y1Ru1rkKY6ECR^Irl2rmDW?N-#^5s7or z)Hjy7qbu2(R^@ZfXZ)F9Vd3eEcXXX({Om>i$&Nv%k;n0fznh}t;+dPMFa`dOAn@zk zKtgW&sG=LG;-<-r-|B8K5q~t-iMm3e#K4bV#Zg4rdFq-oV^d=UqSt3_6$g+jyzx&2 zR+Zj=c)sP*GF|ny1O&nq={igfY7ei|iUH6gJHBl<%ty`9jXsArweHPcWc4jxs`*2& z9RT5Q2>M7U^BvaI%8V9|@Tn7-l&9kQ?Ow#?=9C{sX9o5szNzdbVNr0QEyWwRMYAn+ zjSd!%GtNYLdmHmGl{h_lcmo!!LmNUqI2tDVC9&tN(I>0~7aigEf#J1Km4O|}tl^2o z>a~#5v9ziaQzFEI3B|`ae38@g$J|2gh%Om&!8 za^k>Bi~0}|sqcD7d5N26O|lfRR+b1@9qTWkAatdP+w8gCKs<7pAqm2Cix^`o{%ugP zE@=BRt186Etufg*Dso*wQpHw`#HV6&W71Cr^7d&VIn?9^<<(hU^XKZFc=e(8Hlp(% z3PrJbNB0UAeX-tS3C9 zFQMMq9NEB}cV5{4`Ek(&LlHo2W+g zV`ZC_{qILTO?a>yiM($iLGjh~t{CrPZz-|D_hbS6W4f3*O7}8_H+s^96v*<4o;=E# zJ&RI;orQS(m?8v)YWI$fq8SA_3n?8GFxsP%L|bs*;Xm#1i=qqcUyO`i#4Rgr@;B|r zBH+iH%)gOG4fbBWt0hn_P<0r@RQVZH%yx5lc6K^Pz4+=HC$981Ee zP2Vgd_~uh;`X(;)_?(xdaHhb?8@uv2NRnVrxVuX~42U~xt5GU-_|pV`IhilJ{g2&& zp?5TEbX&vsWC><}C0vP1xo;nlVUvtEcB&QKojQH35Un4g`YV%HVH4{)ra7|*@zAMM zh(yOF1QVe7pjC96&q?im`jv`k2+_;K6Hf4g5SmUCY+8=a$5hIR_jD8H>#X-pF+Cer zz1WFuX_&QANaCHGIjtb7UK}DV=+)nhFD9@pZ87^My_=Bv?7%8c$?FWTM+qC7=3zzA zlQZ6O)1fr?X2^%N$T<~Xn_*vB)3Z!*AvzDdN#^<2vvg?|_>pp)L{~sD-GuO7o!#El zD{YH^CYZp16LaqV81=@?2)l?G+Xy`1j3ic{xa~pg=+9J$Y-on)61qeh6;_ULW85!c zhc|Pre45mHRF$ebgOw2ocfKg#^g=v9CjjhBY7p;%xRL>VrB+e9l%YziY<-q$5}R7O z!CXe&w#X9z6f;g&Z|?&2{v*q;1aVk_Lce1Rr#vQKnDBFKFz&aHKgkFMaQblq2?-9z zD284}De>>3JfdOhy(bSpLRI9RUP#^rvS}v0AW@ZY#e$PLb2IDH97}Rm*%c)_Y=~AK zoCQF<^FzwqP+nf^;j~`kznunHv*b5X2S)k+mp-RtLf-zHdI^X2pyXPT?+5-L;ipFV zX0sRcLc5Qmwg?Wh1jr6wn6FH-W`Ra8RE;9sGCVbu(&xm{g8aoL@{AUI>HUA&1olWi a63L<9RDqeK&C4GFlA1DDsZPNn_6He#{O0^Zmr?YO9bwWPFH+hexWWs-%yHchC3ktP3Ezv&6hf zz5i`qs%AcTcyv$yTlduTxeo7~_k8qKz{5ggNj6BQ0m&T5R-nD z+!u4zR4O5OuDn?ql7iFZuLOlN2db&QaUbri)(OUY-9AXnUn-~xBXW8c&+sqQXlNZT z@paMI%?Z{fbdiERk^&6)f6TlZhpgW9@jPcsI&=RVuT%e!Fxg#NpR_gAT`uU}eHr%1 zU4RA8D8lfrlz<{>J_Yz~)E58=C;4cJQZmn-%;%Ua#Nnsie92LZ+sdmdG*{t!zp#t4DAr zYN_OA%O)@gn$ov=|MGqEyTEzktL$!L%aZqU8_16inv633381kc$Hmz{r$km;LN>aukt8YOTxeghDze z;s>egS5$=mS(yMf{=vp2C@iQ~|Lwb4pd5e)P<}@=<$A`y%k+5Bhgda)pWf`9gm z)G|Uo!>)n*=tbjp2n9UMfIekeX%*+5kL7D9q!C=CF<|#>W|ewEqg#$|Yisa<^Mk!d zm-EJ@+OKQ-^_eqN4vKxLF9|PPiqU(g@c4klTkBnl62ptMw>a?(opZF6)yuth;|m=J z5^usK=kX;bPmiuF$ln3z4p9L~oGOzonb+P=)RC=0e$_Fej+s3VEr|Pc40E9Ev37Na z@;2g{XzllCIxkPf`0VV&sw6vRR7YkMR7rGh2%5qbV;U%5$>B1pfmMUbqK6=aW+u~_ z(HfI&`MLJ@K){F@Brg@ZJIR8aBl?RZW*u-FAYi0s+zT#aMyh)J`-F)m`DW1~leu5? z=vT(cfUa?w42z(0Tt(#%L6q${hVtW;cxiJ}f>yH=ZlH{Nj`(k}00)dWmVcq-@gSap zV=ZlIrZ}-rRt4>3H7`MVjEXfzHrLr0Va#_@dSC3{fqJ`wN?xc*QejoOFQW(I*@)wc zx8Y(a&j{SKcHV9#-hD1R;62ekD-fw&N*zUj$qECUTwJAJwtBlkURqi5kR2esu=13= zKR;bW^K}k{)I2|k(QK_bTVJ6Q9@UWSX_^ZZqIWLne^8RI@$>U=_=zCwldaJz6@6`3r_c&ajJSQ7R75{%<=eqbYw88J=grrnS{`I`01l!p-N7%Tn`HfE z-T&j7pB)Z-H7av`(=qT|yC`cekZ&F$L9@3YLdG1raVvvS5@Ti_EyVT7?3+KyG8Pevmb#*EzB3F2i;aSU{PYvGLC=&P_AdURqeXuZ1KljCqazDSs>N4 zn7p{!sL9*$vNq9tin+nJib8V{Qs+YR`aAh-AAdD(@4{G@s&q1DpF6djYCh!`lEF>& zmiLI+OfZPH{^7t2tLNP?yCP8*Ui2rj+9T<__eKTu_uzO3=Tt zL?A3Tzl}|ut4TnV`UxKz&fDvB_cOQyP=-zK?J^gxIkHHIXn(doc`p`SfxAs<$F(+e zKkSGOo3P)!MP99{`ifOu#h#rBR4+F(&!Y>I{#3`z-3FVL4>>sH=+34<$HZ%AV!K*| z8$HO`*$w?-#`4oRCzl_tiKfLv;AGhoa#qprd^IB~LeEH3_(ja+>)*%Ml=X=MIBv zoMnNW((I+>!yX@JkI6)}w3UcfRPdhER=#=5PP)}#8$nXsukUL0NPkZ~)x;+??nSKdSoRsVg2{oD4Y*$$B zXdh-ht;|0dgjs$Y_V8*7clqAaJ5Je)=;<`U{tMuVyDAah-F+z6$@L9rt)7J&NIL@>@F&kxANa{oT=V=48K2PEG_DZnHEs5d} ztZ(fgqkHb66gB8%7|&XDr;CSBr1}VPl1yB z$=Rabukawld}++6mE&y?f%a z4@`FKkS-+Xr7_bfT8nZw5+%RwH_N1b#Rx0sT4(jy+d2X3@i>dEl8&A^bZVch&kc1i%|}_LYaF&i{q3UqP@RH}Uk&a{=;$y} z!DINe&N3)vn5KTsCbUxs?o7?f#qSZt$VSfGn*z-s7WA}J;pbjkA-AYaBmF*}Dj-?s zGuO<5&uP_Z@3psuyt(%7ZV!|92ym$PoAFN>JO;h{d`Z7eR*l_&Ogp9_e+NkWHCch= zmOHRCgfHg0KI}tz>E9UP-^2>|1K{(znhpu=B>sgeta}IJaFXVqT9RKr$2%d=db(>-c{N7 zJs~lYT1o7lmV_w?YWrUREUsmO>7EFFshq0$D-lKsgp^V1HFG)NXjB%_?G>;6rmXw zMq~bAQp{%Rtpf$r-O9ndLudD?=t)c-jUveXkDMjIR>zoGPqH4IF6AGL~9gga_%bTlrzbZa;A4 zCNo^`)2DdN9TSGoP6)i4HQ~`UET%@ZC&;v%mL$wN=ti}Pcmi|~^VV7`!39i4d&1L1 zl@s7XLynI|7Y{nLgbj1YIRwsBx=knDjMD?LTu|_&8mGysj(L(XU#`mzOK-hgI!m`% zb&V{mwz6QNFj8LpTz7l2G1bUk#WL^K^yTlWoWnmt7d)u2-z^9e)t2*ymv?=fjarp3i{>;4+fB@>2$Vv2k2nvKZB9(nn+ z^&bYC)uw@s=Rfa@Ee!538q}VPF%Wi}#*S-nGCro*YJoC$ZSfc;d(0}v7pj?sAg8Yk zGeHR{Mfa)q@{Km0@rq-YRWY-EKp0bw*i<5)O~o>u|I+go>Pq#zz#9=)abyh2(l&k* zHz?B3IXIAREoAWpdm-uX(EAx)`l|)ZSyr3AZ}!2rMc@VFC}0AKqC9|Ub@;*G=4qg9 zGdsus=Dr{9r98tgUJ;g5;m=h!BZ|S9(y`{LmR%5#PLYL!;srb1460J5L7D3?LS=oM z4SFXt7j?XgdpYC011EX2d*6)CnxqBf%}F7 zQNR@TN%DLnw2p&bQiZ_I>J$y>vjj|ll_deZ;A-q^(IRuwC+TLeXcBfGG zJ1EhT{TLZY*HyeXBo$AwS&gc%-L#wrsX*m?E?EXnp zYd(^2y)ZJT*l|(ii7=Af2>;wN|NS!To89t#Wmo_!#SVNtf95zsA)0}s3E`E~4=%#m z6?(dbRzsc)oeg7U;JNg`X+3(An^)3Ob%FWnI+kgLw=Q%nS9`3MpA}etSZ@Z~Tb~nv ze3kC2mdQ4sYHK7msI?_o%~tG@PXH68jX&t1nC1Mfb|tWeHiSb9y<<*#A=&BkS*J=F zg{5V`OF1ZlJR>i!NfchTd~&8q(j6&-FXAPRYy$kU1<~U})D-y4h<=0ZoDFizN70sV zEkXW@Pet!F$!Ib=Qf3v6|3qCotyM{Ye`@0!%{40L2AhDvZF+;){Xw_)M$+905+64e zq!$7xqXMG@>%3$mGpd zU+n?Tj@YvH9-cqQrq4vxSwk;o;U*thzwP;ulzMj@1zNzThF`Vg7hQa9dX#)$^Y{e< z+83jigOH1cLW-nr*Gtt&f>s8K`Ipkpt^cIfe~By95&9I2DHD>vojts&^VqoHt2Y+c z>pXQ%u(cqB6)ap|$KBBlVi7`w#@u83b9g>AxG$=nRN}A41A0ozJJ~*qA7;&b$1GBm ziG)UN9!b8u)8G#X=(g0>k0Ahdu5eqx-yY4*r&p9&+7bEBpu_|x#L+b8(# z$D~7CsS|61!_Dpf&Y)?OC+U;qQ3p!nZ69sgmKh)6`q|HEc5@2*LKoKEa@ U>&IPpKnYLnrM6Nv_*MA-03dEBXaE2J literal 0 HcmV?d00001 diff --git a/src/vectors/powerhouselogo.png b/src/vectors/powerhouselogo.png new file mode 100644 index 0000000000000000000000000000000000000000..06adf5776ba6dbe7c118716d7fd5b43df8413bb7 GIT binary patch literal 4768 zcmai&6He#{O0^Zmr?YO9bwWPFH+hexWWs-%yHchC3ktP3Ezv&6hf zz5i`qs%AcTcyv$yTlduTxeo7~_k8qKz{5ggNj6BQ0m&T5R-nD z+!u4zR4O5OuDn?ql7iFZuLOlN2db&QaUbri)(OUY-9AXnUn-~xBXW8c&+sqQXlNZT z@paMI%?Z{fbdiERk^&6)f6TlZhpgW9@jPcsI&=RVuT%e!Fxg#NpR_gAT`uU}eHr%1 zU4RA8D8lfrlz<{>J_Yz~)E58=C;4cJQZmn-%;%Ua#Nnsie92LZ+sdmdG*{t!zp#t4DAr zYN_OA%O)@gn$ov=|MGqEyTEzktL$!L%aZqU8_16inv633381kc$Hmz{r$km;LN>aukt8YOTxeghDze z;s>egS5$=mS(yMf{=vp2C@iQ~|Lwb4pd5e)P<}@=<$A`y%k+5Bhgda)pWf`9gm z)G|Uo!>)n*=tbjp2n9UMfIekeX%*+5kL7D9q!C=CF<|#>W|ewEqg#$|Yisa<^Mk!d zm-EJ@+OKQ-^_eqN4vKxLF9|PPiqU(g@c4klTkBnl62ptMw>a?(opZF6)yuth;|m=J z5^usK=kX;bPmiuF$ln3z4p9L~oGOzonb+P=)RC=0e$_Fej+s3VEr|Pc40E9Ev37Na z@;2g{XzllCIxkPf`0VV&sw6vRR7YkMR7rGh2%5qbV;U%5$>B1pfmMUbqK6=aW+u~_ z(HfI&`MLJ@K){F@Brg@ZJIR8aBl?RZW*u-FAYi0s+zT#aMyh)J`-F)m`DW1~leu5? z=vT(cfUa?w42z(0Tt(#%L6q${hVtW;cxiJ}f>yH=ZlH{Nj`(k}00)dWmVcq-@gSap zV=ZlIrZ}-rRt4>3H7`MVjEXfzHrLr0Va#_@dSC3{fqJ`wN?xc*QejoOFQW(I*@)wc zx8Y(a&j{SKcHV9#-hD1R;62ekD-fw&N*zUj$qECUTwJAJwtBlkURqi5kR2esu=13= zKR;bW^K}k{)I2|k(QK_bTVJ6Q9@UWSX_^ZZqIWLne^8RI@$>U=_=zCwldaJz6@6`3r_c&ajJSQ7R75{%<=eqbYw88J=grrnS{`I`01l!p-N7%Tn`HfE z-T&j7pB)Z-H7av`(=qT|yC`cekZ&F$L9@3YLdG1raVvvS5@Ti_EyVT7?3+KyG8Pevmb#*EzB3F2i;aSU{PYvGLC=&P_AdURqeXuZ1KljCqazDSs>N4 zn7p{!sL9*$vNq9tin+nJib8V{Qs+YR`aAh-AAdD(@4{G@s&q1DpF6djYCh!`lEF>& zmiLI+OfZPH{^7t2tLNP?yCP8*Ui2rj+9T<__eKTu_uzO3=Tt zL?A3Tzl}|ut4TnV`UxKz&fDvB_cOQyP=-zK?J^gxIkHHIXn(doc`p`SfxAs<$F(+e zKkSGOo3P)!MP99{`ifOu#h#rBR4+F(&!Y>I{#3`z-3FVL4>>sH=+34<$HZ%AV!K*| z8$HO`*$w?-#`4oRCzl_tiKfLv;AGhoa#qprd^IB~LeEH3_(ja+>)*%Ml=X=MIBv zoMnNW((I+>!yX@JkI6)}w3UcfRPdhER=#=5PP)}#8$nXsukUL0NPkZ~)x;+??nSKdSoRsVg2{oD4Y*$$B zXdh-ht;|0dgjs$Y_V8*7clqAaJ5Je)=;<`U{tMuVyDAah-F+z6$@L9rt)7J&NIL@>@F&kxANa{oT=V=48K2PEG_DZnHEs5d} ztZ(fgqkHb66gB8%7|&XDr;CSBr1}VPl1yB z$=Rabukawld}++6mE&y?f%a z4@`FKkS-+Xr7_bfT8nZw5+%RwH_N1b#Rx0sT4(jy+d2X3@i>dEl8&A^bZVch&kc1i%|}_LYaF&i{q3UqP@RH}Uk&a{=;$y} z!DINe&N3)vn5KTsCbUxs?o7?f#qSZt$VSfGn*z-s7WA}J;pbjkA-AYaBmF*}Dj-?s zGuO<5&uP_Z@3psuyt(%7ZV!|92ym$PoAFN>JO;h{d`Z7eR*l_&Ogp9_e+NkWHCch= zmOHRCgfHg0KI}tz>E9UP-^2>|1K{(znhpu=B>sgeta}IJaFXVqT9RKr$2%d=db(>-c{N7 zJs~lYT1o7lmV_w?YWrUREUsmO>7EFFshq0$D-lKsgp^V1HFG)NXjB%_?G>;6rmXw zMq~bAQp{%Rtpf$r-O9ndLudD?=t)c-jUveXkDMjIR>zoGPqH4IF6AGL~9gga_%bTlrzbZa;A4 zCNo^`)2DdN9TSGoP6)i4HQ~`UET%@ZC&;v%mL$wN=ti}Pcmi|~^VV7`!39i4d&1L1 zl@s7XLynI|7Y{nLgbj1YIRwsBx=knDjMD?LTu|_&8mGysj(L(XU#`mzOK-hgI!m`% zb&V{mwz6QNFj8LpTz7l2G1bUk#WL^K^yTlWoWnmt7d)u2-z^9e)t2*ymv?=fjarp3i{>;4+fB@>2$Vv2k2nvKZB9(nn+ z^&bYC)uw@s=Rfa@Ee!538q}VPF%Wi}#*S-nGCro*YJoC$ZSfc;d(0}v7pj?sAg8Yk zGeHR{Mfa)q@{Km0@rq-YRWY-EKp0bw*i<5)O~o>u|I+go>Pq#zz#9=)abyh2(l&k* zHz?B3IXIAREoAWpdm-uX(EAx)`l|)ZSyr3AZ}!2rMc@VFC}0AKqC9|Ub@;*G=4qg9 zGdsus=Dr{9r98tgUJ;g5;m=h!BZ|S9(y`{LmR%5#PLYL!;srb1460J5L7D3?LS=oM z4SFXt7j?XgdpYC011EX2d*6)CnxqBf%}F7 zQNR@TN%DLnw2p&bQiZ_I>J$y>vjj|ll_deZ;A-q^(IRuwC+TLeXcBfGG zJ1EhT{TLZY*HyeXBo$AwS&gc%-L#wrsX*m?E?EXnp zYd(^2y)ZJT*l|(ii7=Af2>;wN|NS!To89t#Wmo_!#SVNtf95zsA)0}s3E`E~4=%#m z6?(dbRzsc)oeg7U;JNg`X+3(An^)3Ob%FWnI+kgLw=Q%nS9`3MpA}etSZ@Z~Tb~nv ze3kC2mdQ4sYHK7msI?_o%~tG@PXH68jX&t1nC1Mfb|tWeHiSb9y<<*#A=&BkS*J=F zg{5V`OF1ZlJR>i!NfchTd~&8q(j6&-FXAPRYy$kU1<~U})D-y4h<=0ZoDFizN70sV zEkXW@Pet!F$!Ib=Qf3v6|3qCotyM{Ye`@0!%{40L2AhDvZF+;){Xw_)M$+905+64e zq!$7xqXMG@>%3$mGpd zU+n?Tj@YvH9-cqQrq4vxSwk;o;U*thzwP;ulzMj@1zNzThF`Vg7hQa9dX#)$^Y{e< z+83jigOH1cLW-nr*Gtt&f>s8K`Ipkpt^cIfe~By95&9I2DHD>vojts&^VqoHt2Y+c z>pXQ%u(cqB6)ap|$KBBlVi7`w#@u83b9g>AxG$=nRN}A41A0ozJJ~*qA7;&b$1GBm ziG)UN9!b8u)8G#X=(g0>k0Ahdu5eqx-yY4*r&p9&+7bEBpu_|x#L+b8(# z$D~7CsS|61!_Dpf&Y)?OC+U;qQ3p!nZ69sgmKh)6`q|HEc5@2*LKoKEa@ U>&IPpKnYLnrM6Nv_*MA-03dEBXaE2J literal 0 HcmV?d00001 From 54fe1dbbeed80586981347554e61012c21f53d16 Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 12 May 2021 18:32:28 -0400 Subject: [PATCH 35/41] #56 updating alt for images and circle colors --- src/components/process/process.js | 15 +++++++++++---- src/vectors/processcircle.svg | 3 +++ src/vectors/processsolidcircle.svg | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 src/vectors/processcircle.svg create mode 100644 src/vectors/processsolidcircle.svg diff --git a/src/components/process/process.js b/src/components/process/process.js index 95a9cb2..a098b64 100644 --- a/src/components/process/process.js +++ b/src/components/process/process.js @@ -18,8 +18,8 @@ import { StepText, Indicators, } from "./process-styles" -import Circle from "../../vectors/circle.svg" -import SolidCircle from "../../vectors/solidcircle.svg" +import Circle from "../../vectors/processcircle.svg" +import SolidCircle from "../../vectors/processsolidcircle.svg" import { H1, P, H2, H3, Body } from "../../style/type-styles" export default function Process({ data }) { @@ -37,6 +37,10 @@ export default function Process({ data }) { { - + {data.prismicProcessPage.data.find_header} @@ -85,7 +92,7 @@ export default function Process({ data }) { return ( - + {step.step_description} diff --git a/src/vectors/processcircle.svg b/src/vectors/processcircle.svg new file mode 100644 index 0000000..95b889d --- /dev/null +++ b/src/vectors/processcircle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/vectors/processsolidcircle.svg b/src/vectors/processsolidcircle.svg new file mode 100644 index 0000000..396e359 --- /dev/null +++ b/src/vectors/processsolidcircle.svg @@ -0,0 +1,3 @@ + + + From 0ee31d79801d3755364bfc07c989d37f11275a74 Mon Sep 17 00:00:00 2001 From: samgildea Date: Wed, 12 May 2021 20:04:54 -0400 Subject: [PATCH 36/41] #18 about image alts and removing frragments --- src/components/about/about-style.js | 4 +++ src/components/about/about.js | 45 ++++++++++++++++++++--------- src/components/process/process.js | 1 - src/pages/about.js | 7 +++++ 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index a7123c1..ee9b8af 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -388,3 +388,7 @@ export const IndustryContextBackgroundImage = styled.div` object-fit: cover; } ` + +export const AboutContainer = styled.div` + +` diff --git a/src/components/about/about.js b/src/components/about/about.js index 4468706..ca87277 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -34,6 +34,7 @@ import { CompetitorTH, ComparisonCTA, IndustryContextBackgroundImage, + AboutContainer, } from "./about-style" import Check from "../../vectors/CheckIcon.svg" @@ -41,19 +42,19 @@ import Xicon from "../../vectors/xicon.svg" export default function About({ data }) { return ( - <> +

About

 - + {data.mission_image.alt} - + {data.mission_icon.alt}

{data.mission_heading}

@@ -64,12 +65,18 @@ export default function About({ data }) { - + {data.industry_context_background_image.alt}
- + {data.industry_context_icon.alt}

{data.industry_context_heading}

@@ -77,7 +84,13 @@ export default function About({ data }) { return ( - + { {example.explanation_description} @@ -105,7 +118,10 @@ export default function About({ data }) { return ( - + {benefit.product_benefit_image.alt} {benefit.product_benefit_title} @@ -122,11 +138,9 @@ export default function About({ data }) { {data.company.map((competitor, id) => ( - <> - - {competitor.company_name} - - + + {competitor.company_name} + ))} {data.rows.map((feature, id) => ( @@ -182,7 +196,10 @@ export default function About({ data }) { return ( - + {member.team_member_image.alt}

{member.team_member_title}

{member.team_member_description} @@ -192,6 +209,6 @@ export default function About({ data }) { - + ) } diff --git a/src/components/process/process.js b/src/components/process/process.js index a098b64..b11be06 100644 --- a/src/components/process/process.js +++ b/src/components/process/process.js @@ -87,7 +87,6 @@ export default function Process({ data }) { - {console.log(data.prismicProcessPage.data.steps[0])} {data.prismicProcessPage.data.steps.map(step => { return ( diff --git a/src/pages/about.js b/src/pages/about.js index aa49993..332d563 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -34,22 +34,27 @@ export const query = graphql` explanation_description explanation_image { url + alt } } industry_context_heading industry_context_icon { url + alt } industry_context_background_image { url + alt } mission_description mission_heading mission_icon { url + alt } mission_image { url + alt } rows { feature_name @@ -60,6 +65,7 @@ export const query = graphql` product_benefit { product_benefit_image { url + alt } product_benefit_title } @@ -78,6 +84,7 @@ export const query = graphql` team_member_description team_member_image { url + alt } team_member_title } From e1112dc94f9e51f4af7c21bf3d4d4321ee100082 Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 13 May 2021 14:02:00 -0400 Subject: [PATCH 37/41] #18 updating background image using code from FAQ CTA --- src/components/about/about-style.js | 66 ++++++++++++++++------ src/components/about/about.js | 88 ++++++++++++++--------------- 2 files changed, 94 insertions(+), 60 deletions(-) diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index ee9b8af..712ea80 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -21,6 +21,7 @@ export const AboutHeaderText = styled.div` export const MissionSection = styled.div` color: ${colors.ocean900}; + margin-bottom: 183px; @media (min-width: ${dimensions.maxwidthTablet}px) { display: flex; @@ -65,20 +66,51 @@ export const MissionTextParagraph = styled.div` export const IndustryContextSection = styled.div` margin-top: 130px; display: flex; + justify-content: center; background-color: white; color: ${colors.ocean900}; + @media (max-width: ${dimensions.maxwidthTablet}px) { + margin-top: 26px; + padding-left: 43px; + padding-right: 43px; + padding-top: 26px; + } +` + +export const Banner = styled.div` + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: center; + background-image: url(${props => props.imageUrl}); + width: 100vw; + padding: 40px 60px; + margin: -${layoutPaddingDesktop}; + min-height: 100vh; + + @media (max-width: ${dimensions.maxwidthMobile}px) { + min-height: 100vh; + margin: -${layoutPaddingMobile}; + } +` + +export const IndustryContextBackground = styled.div` + min-height: 100%; + + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + background-color: ${colors.white900}; + @media (min-width: ${dimensions.maxwidthTablet}px) { + min-width: 100%; + } ` export const IndustryContextContainer = styled.div` background-color: white; - width: 89%; position: relative; - z-index: 1; - margin-top: 70px; - padding-top: 42px; - padding-left: 109px; - padding-right: 109px; color: ${colors.ocean900}; ` @@ -90,9 +122,7 @@ export const IndustryContextExamples = styled.div` ` export const IndustryContextGroup = styled.div` - margin-top: 26px; - width: 22vw; - + margin-right: 78px; @media (max-width: ${dimensions.maxwidthTablet}px) { margin-left: 0px; margin-right: 0px; @@ -103,9 +133,13 @@ export const IndustryContextGroup = styled.div` export const IndustryContextImage = styled.div` img { - width: 22vw; + width: 20vw; + height: 232px; + object-fit: cover; @media (max-width: ${dimensions.maxwidthTablet}px) { - width: 100%; + width: 241px; + height: 232px; + object-fit: cover; } } ` @@ -134,7 +168,7 @@ export const ProductBenefitsContainer = styled.div` flex-wrap: wrap; color: ${colors.ocean900}; - justify-content: space-between; + justify-content: center; @media (max-width: ${dimensions.maxwidthTablet}px) { margin-top: 40px; @@ -146,6 +180,8 @@ export const BenefitGroup = styled.div` @media (max-width: ${dimensions.maxwidthTablet}px) { flex: 50%; + + margin-bottom: 53px; } ` @@ -167,6 +203,7 @@ export const ComparisonCTA = styled.div` margin-bottom: 114px; color: ${colors.ocean900}; + text-align: center; display: flex; justify-content: center; a { @@ -233,7 +270,6 @@ export const ProductComparison = styled.div` ` export const FeatureTitleColumn = styled.div` - // margin-top: 110px; color: ${colors.ocean900}; ` @@ -389,6 +425,4 @@ export const IndustryContextBackgroundImage = styled.div` } ` -export const AboutContainer = styled.div` - -` +export const AboutContainer = styled.div`` diff --git a/src/components/about/about.js b/src/components/about/about.js index ca87277..3db0f7f 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -35,6 +35,8 @@ import { ComparisonCTA, IndustryContextBackgroundImage, AboutContainer, + Banner, + IndustryContextBackground, } from "./about-style" import Check from "../../vectors/CheckIcon.svg" @@ -63,51 +65,49 @@ export default function About({ data }) { - - - {data.industry_context_background_image.alt} - - - + + + +
From 76a317bd45e8bb838652875f02b07c3d50d6e968 Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 13 May 2021 14:24:50 -0400 Subject: [PATCH 38/41] using emotion styled components --- src/components/footer/footer-styles.js | 2 +- src/components/homepage/index-styles.js | 2 +- src/components/process/process-styles.js | 2 +- src/components/singular-product/singular-product-styles.js | 2 +- src/pages/about.js | 2 +- src/templates/use-case-styles.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/footer/footer-styles.js b/src/components/footer/footer-styles.js index 5549b6a..40b5625 100644 --- a/src/components/footer/footer-styles.js +++ b/src/components/footer/footer-styles.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../../style/dimensions" import colors from "../../style/colors" import { diff --git a/src/components/homepage/index-styles.js b/src/components/homepage/index-styles.js index 074150d..0878408 100644 --- a/src/components/homepage/index-styles.js +++ b/src/components/homepage/index-styles.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../../style/dimensions" import { layoutPaddingDesktop, diff --git a/src/components/process/process-styles.js b/src/components/process/process-styles.js index 5039da1..679ad40 100644 --- a/src/components/process/process-styles.js +++ b/src/components/process/process-styles.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import colors from "../../style/colors" import dimensions from "../../style/dimensions" import { diff --git a/src/components/singular-product/singular-product-styles.js b/src/components/singular-product/singular-product-styles.js index fe01071..2ad2dfb 100644 --- a/src/components/singular-product/singular-product-styles.js +++ b/src/components/singular-product/singular-product-styles.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../../style/dimensions" import { layoutPaddingDesktop, diff --git a/src/pages/about.js b/src/pages/about.js index 332d563..e68ff12 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -1,7 +1,7 @@ import { graphql } from "gatsby" import Layout from "../components/layout" import React from "react" -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../style/dimensions" import AboutPage from "../components/about/about" diff --git a/src/templates/use-case-styles.js b/src/templates/use-case-styles.js index a0d80a9..7722718 100644 --- a/src/templates/use-case-styles.js +++ b/src/templates/use-case-styles.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../style/dimensions" import { layoutPaddingDesktop, layoutPaddingMobile } from "../style/variables" import colors from "../style/colors" From e2e2ca9371c81469bbb611da1018c49215572c44 Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 13 May 2021 16:45:17 -0400 Subject: [PATCH 39/41] updating emotion styled components --- src/components/about/about-style.js | 2 +- src/components/layout.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/about/about-style.js b/src/components/about/about-style.js index 712ea80..e51dc21 100644 --- a/src/components/about/about-style.js +++ b/src/components/about/about-style.js @@ -1,4 +1,4 @@ -import styled from "styled-components" +import styled from "@emotion/styled" import dimensions from "../../style/dimensions" import colors from "../../style/colors" import { diff --git a/src/components/layout.js b/src/components/layout.js index 2117e43..f6cb8cc 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -1,5 +1,5 @@ import React from "react" -import styled from "styled-components" +import styled from "@emotion/styled" import Footer from "../components/footer/footer" import Header from "../components/header/header" import dimensions from "../style/dimensions" From 2b3e2d73df579c9f1f2e384b1c6dad14a5e294eb Mon Sep 17 00:00:00 2001 From: samgildea Date: Thu, 13 May 2021 17:02:00 -0400 Subject: [PATCH 40/41] emotion styled --- src/components/footer/footer-styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/footer/footer-styles.js b/src/components/footer/footer-styles.js index 40b5625..5549b6a 100644 --- a/src/components/footer/footer-styles.js +++ b/src/components/footer/footer-styles.js @@ -1,4 +1,4 @@ -import styled from "@emotion/styled" +import styled from "styled-components" import dimensions from "../../style/dimensions" import colors from "../../style/colors" import { From 71cdcd1dc42dc3bbdfe9ee88b1d09199377f79ad Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 14 May 2021 19:51:35 -0400 Subject: [PATCH 41/41] #31 removing console.logs and adding keys --- src/components/product_page/product-page.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/product_page/product-page.js b/src/components/product_page/product-page.js index 8937309..3c14f41 100644 --- a/src/components/product_page/product-page.js +++ b/src/components/product_page/product-page.js @@ -22,7 +22,6 @@ export default function ProductSection({ data }) { - {console.log(data.featured_product_image)} {data.featured_product_image.alt}{data.featured_product_name} {data.featured_product_description} - {console.log(data)} {data.learn_more_button_text} @@ -44,10 +42,10 @@ export default function ProductSection({ data }) { {data.model_scope[0].model_scope_heading} - {data.products.map(product => { + {data.products.map((product, id) => { return ( product.product.document.data.product_type === "Homeowner" && ( - + {data.model_scope[1].model_scope_heading} - {console.log(data.products)} - {data.products.map(product => { + {data.products.map((product, id) => { return ( product.product.document.data.product_type === "Commercial" && ( - +