From e7926ed7aff753e330824ec376abf5c64ae6c66d Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 9 Apr 2021 13:19:16 -0400 Subject: [PATCH 1/5] #44 updating hero and nav styling --- src/components/header/header-styles.js | 7 ++++--- src/components/homepage/index-styles.js | 19 ++++++++++++++++++- src/components/homepage/index.js | 4 ++++ src/style/colors.js | 2 ++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 816aa08..392c627 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -4,15 +4,16 @@ import colors from "../../style/colors" export const NavContainer = styled.div` z-index: 1; - background-color: ${colors.gray_image}; padding-bottom: 32px; &.colorChange { - background-color: ${colors.gray_CTA}; + background-color: rgb(0, 0, 0, 0.55); } position: fixed; width: 100%; transition: 0.5s all ease; + color: ${colors.white900}; + ` export const Logo = styled.div` @@ -44,7 +45,7 @@ export const NavLink = styled.div` font-weight: bold; padding-left: 100px; text-decoration: none; - color: ${colors.black900}; + color: ${colors.white900}; ` export const MobileIcon = styled.div` diff --git a/src/components/homepage/index-styles.js b/src/components/homepage/index-styles.js index ba375dc..9a4615d 100644 --- a/src/components/homepage/index-styles.js +++ b/src/components/homepage/index-styles.js @@ -8,6 +8,20 @@ import { import "../../style/colors" import colors from "../../style/colors" + +export const HeroImage = styled.div` +position: absolute; +top: 0; +z-index: 0; +img { + + width: 100vw; + height: 100vh; + object-fit: cover; + +} +` + export const HeroContainer = styled.div` height: 100vh; background-color: ${colors.gray_image}; @@ -21,6 +35,9 @@ export const HeroContainer = styled.div` export const HeroTextSection = styled.div` padding-top: 275px; + z-index: 2; + color: ${colors.white900}; + position: relative; padding-left: ${layoutPaddingDesktop}; @media (max-width: ${dimensions.maxwidthTablet}px) { padding-left: ${layoutPaddingMobile}; @@ -34,7 +51,7 @@ export const HeroDescription = styled.div`` export const HeroCTA = styled.div` margin-top: 64px; a { - background-color: ${colors.gray_CTA}; + background-color: ${colors.orange900}; text-transform: uppercase; color: ${colors.white900}; padding-left: 48px; diff --git a/src/components/homepage/index.js b/src/components/homepage/index.js index f4f774a..c96a7a4 100644 --- a/src/components/homepage/index.js +++ b/src/components/homepage/index.js @@ -14,12 +14,16 @@ import { FutureCTA, FutureImage, HomePageContainer, + HeroImage } from "./index-styles" export default function HomePage({ data }) { return ( + + +

{data.hero_headline}

diff --git a/src/style/colors.js b/src/style/colors.js index 6b48546..9ae52f5 100644 --- a/src/style/colors.js +++ b/src/style/colors.js @@ -6,6 +6,8 @@ const colors = { black900: "#000000", white900: "#FFFFFF", + + orange900: '#F27A28' } export default colors From 9de5c4795ac4afc18e02681e5a9778ed13dfd410 Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 9 Apr 2021 13:28:39 -0400 Subject: [PATCH 2/5] #44 changing hamburger color --- src/components/header/header-styles.js | 1 + src/components/header/header.jsx | 2 +- src/vectors/hamburger.svg | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 392c627..50dad24 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -49,6 +49,7 @@ export const NavLink = styled.div` ` export const MobileIcon = styled.div` + @media (min-width: ${dimensions.maxwidthTablet}px) { display: none; } diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 759811c..27278ad 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -28,7 +28,7 @@ export const Header = () => { PowerHouse setOpen(!open)} className={open ? "open" : ""}> - + diff --git a/src/vectors/hamburger.svg b/src/vectors/hamburger.svg index 365600c..b538294 100644 --- a/src/vectors/hamburger.svg +++ b/src/vectors/hamburger.svg @@ -1,5 +1,5 @@ - - - + + + From acb38db297f9be41098bd287e023f31e545a7e2e Mon Sep 17 00:00:00 2001 From: samgildea Date: Fri, 9 Apr 2021 20:13:16 -0400 Subject: [PATCH 3/5] #44 adding react helmet --- package-lock.json | 21 +++++++++++++++++++++ package.json | 1 + src/components/homepage/index.js | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/package-lock.json b/package-lock.json index 96d0642..554ae5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12857,6 +12857,22 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-3.0.0.tgz", "integrity": "sha512-XzgvowFrwDo6TWcpJ/WTiarb9UI6lhA4PMzS7n1joK3sHfBBBOQHUc0U4u57D6DWO9vHv6lVSWx2Q/Ymfyv4hw==" }, + "react-fast-compare": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz", + "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" + }, + "react-helmet": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", + "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==", + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.7.2", + "react-fast-compare": "^3.1.1", + "react-side-effect": "^2.1.0" + } + }, "react-hot-loader": { "version": "4.13.0", "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz", @@ -12894,6 +12910,11 @@ "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz", "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg==" }, + "react-side-effect": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", + "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" + }, "read": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", diff --git a/package.json b/package.json index 4f0b8fb..5405b7d 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "node-sass": "^5.0.0", "react": "^16.12.0", "react-dom": "^16.12.0", + "react-helmet": "^6.1.0", "sass": "^1.32.8", "styled-components": "^5.2.1" }, diff --git a/src/components/homepage/index.js b/src/components/homepage/index.js index c96a7a4..0607f02 100644 --- a/src/components/homepage/index.js +++ b/src/components/homepage/index.js @@ -17,9 +17,14 @@ import { HeroImage } from "./index-styles" +import { Helmet } from "react-helmet" + + export default function HomePage({ data }) { return ( + + From 339543d440199259acb334f1ad74cb4da6d54af5 Mon Sep 17 00:00:00 2001 From: samgildea Date: Mon, 12 Apr 2021 17:39:50 -0400 Subject: [PATCH 4/5] #44 and #26 adding colors/styling nav and hero --- src/components/header/header-styles.js | 31 +++++++-- src/components/header/header.jsx | 17 +++-- src/components/homepage/index.js | 87 +++++++++++++------------- src/components/layout.js | 4 +- src/pages/about.js | 5 +- src/pages/index.js | 2 +- src/style/colors.js | 9 ++- 7 files changed, 95 insertions(+), 60 deletions(-) diff --git a/src/components/header/header-styles.js b/src/components/header/header-styles.js index 50dad24..1f25c03 100644 --- a/src/components/header/header-styles.js +++ b/src/components/header/header-styles.js @@ -7,13 +7,18 @@ export const NavContainer = styled.div` padding-bottom: 32px; &.colorChange { background-color: rgb(0, 0, 0, 0.55); + color: ${colors.white900}; + } position: fixed; width: 100%; transition: 0.5s all ease; - color: ${colors.white900}; + color: ${colors.black900}; + &.home-header { + color: ${colors.white900}; + } ` export const Logo = styled.div` @@ -21,6 +26,7 @@ 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; @@ -28,6 +34,10 @@ export const Logo = styled.div` padding-top: 24px; padding-left: 0px; } + + &.home-header { + color: ${colors.white900}; + } ` export const NavLinks = styled.div` @@ -35,21 +45,34 @@ export const NavLinks = styled.div` right: 80px; top: 40px; display: flex; + color: ${colors.black900}; + + &.home-header { + a { + color: ${colors.white900}; + } + } @media (max-width: ${dimensions.maxwidthTablet}px) { display: none; } ` -export const NavLink = styled.div` +export const NavLink = styled.a` font-weight: bold; padding-left: 100px; text-decoration: none; - color: ${colors.white900}; + + + color: ${colors.black900}; + + &.home-header { + color: ${colors.white900}; + } + ` export const MobileIcon = styled.div` - @media (min-width: ${dimensions.maxwidthTablet}px) { display: none; } diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx index 27278ad..c12f0df 100644 --- a/src/components/header/header.jsx +++ b/src/components/header/header.jsx @@ -10,7 +10,7 @@ import { import { NavText } from "../../style/type-styles" -export const Header = () => { +export const Header = ({ home }) => { const [open, setOpen] = useState(false) const [colorChange, setColorchange] = useState(false) const changeNavbarColor = () => { @@ -22,15 +22,20 @@ export const Header = () => { } typeof window !== "undefined" && window.addEventListener("scroll", changeNavbarColor) - + // return ( - - PowerHouse + + PowerHouse setOpen(!open)} className={open ? "open" : ""}> - + ABOUT @@ -40,7 +45,7 @@ export const Header = () => { PRODUCTS - + SOLUTIONS diff --git a/src/components/homepage/index.js b/src/components/homepage/index.js index 0607f02..2fe969b 100644 --- a/src/components/homepage/index.js +++ b/src/components/homepage/index.js @@ -14,57 +14,58 @@ import { FutureCTA, FutureImage, HomePageContainer, - HeroImage + HeroImage, } from "./index-styles" import { Helmet } from "react-helmet" - export default function HomePage({ data }) { return ( - - + <> + - - - - - - -

{data.hero_headline}

-
- -

{data.hero_subtext}

-
- - - {data.hero_cta_text} - - -
-
+ + + + + + + +

{data.hero_headline}

+
+ +

{data.hero_subtext}

+
+ + + {data.hero_cta_text} + + +
+
- - - - -

{data.section_title}

-
- -

{data.section_description}

-
+ + + + +

{data.section_title}

+
+ +

{data.section_description}

+
- - {data.button_text} - -
- -
-
+ + {data.button_text} + + + + +
+ ) } diff --git a/src/components/layout.js b/src/components/layout.js index ee0c856..0d2e5b4 100644 --- a/src/components/layout.js +++ b/src/components/layout.js @@ -18,10 +18,10 @@ const LayoutBody = styled.div` } ` -const Layout = ({ children }) => { +const Layout = ({ children, home }) => { return ( -
+
{children}