From 63d1253b96c94b1434044f2f6a9e4268171e0642 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Tue, 6 Apr 2021 16:16:32 -0500 Subject: [PATCH 1/7] Fixing linting warnings --- src/templates/ServiceDetail.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/templates/ServiceDetail.js b/src/templates/ServiceDetail.js index d76482d..b32c709 100644 --- a/src/templates/ServiceDetail.js +++ b/src/templates/ServiceDetail.js @@ -1,4 +1,4 @@ -import React, { useContext } from 'react'; +import React from 'react'; import { graphql } from 'gatsby'; import { Box, Heading, ResponsiveContext } from 'grommet'; import { AppLayout, SEO } from '../components/app'; @@ -34,10 +34,6 @@ const ServiceDetailTemplate = ({ data }) => { {(size) => { const breakLayout = ['xsmall', 'small', 'medium'].includes(size); - const formBoxProps = { - basis: '460px', - flex: { shrink: 0 }, - }; return ( -- GitLab From 18fb81a20ecd427515004a275acd24c77980eb36 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Tue, 6 Apr 2021 19:29:42 -0500 Subject: [PATCH 2/7] Changing down hex arrow Updated gradient for Header Spacing on service hero Responsive layout for solution detail --- src/components/DownHex.js | 4 +-- src/components/app/Header.js | 2 +- src/components/hero/ServiceHero.js | 4 +-- src/templates/SolutionDetail.js | 50 +++++++++++++++++++----------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/components/DownHex.js b/src/components/DownHex.js index 4a81766..b3d768c 100644 --- a/src/components/DownHex.js +++ b/src/components/DownHex.js @@ -30,9 +30,9 @@ const DownHex = () => ( }} /> diff --git a/src/components/app/Header.js b/src/components/app/Header.js index acd1266..a6bc706 100644 --- a/src/components/app/Header.js +++ b/src/components/app/Header.js @@ -21,7 +21,7 @@ const StyledHeader = styled(GHeader)` right: 0; background: ${(props) => props.transparent && !props.sticky - ? 'linear-gradient(rgba(0, 0, 0, 0.6), rgba(0, 0, 0, 0))' + ? 'linear-gradient(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0))' : 'black'}; display: flex; height: ${(props) => diff --git a/src/components/hero/ServiceHero.js b/src/components/hero/ServiceHero.js index 3b7d698..e22e6e3 100644 --- a/src/components/hero/ServiceHero.js +++ b/src/components/hero/ServiceHero.js @@ -36,7 +36,7 @@ const ServiceHero = ({ title, subtitle, pretitle, categories, imageFluid }) => { )} @@ -44,7 +44,7 @@ const ServiceHero = ({ title, subtitle, pretitle, categories, imageFluid }) => { {title} - + {subtitle && ( {subtitle} diff --git a/src/templates/SolutionDetail.js b/src/templates/SolutionDetail.js index ea5beff..7d0fb9a 100644 --- a/src/templates/SolutionDetail.js +++ b/src/templates/SolutionDetail.js @@ -1,6 +1,6 @@ import React from 'react'; import { graphql } from 'gatsby'; -import { Box, Text } from 'grommet'; +import { Box, Text, ResponsiveContext } from 'grommet'; import { AppLayout, SEO } from '../components/app'; import { Container, Column } from '../components/layout'; import { ServiceHero } from '../components/hero'; @@ -32,24 +32,38 @@ const SolutionDetailTemplate = ({ data }) => { subtitle={frontmatter.useCase} imageFluid={images[0].node.childImageSharp.fluid} /> - - - - - - - - {`The following C3I&N services could be used together to help ${frontmatter.useCase}`} + + {(size) => { + const breakLayout = ['xsmall', 'small', 'medium'].includes(size); + return ( + + + + + + + + {`The following C3I&N services could be used together to help ${frontmatter.useCase}`} + + + + + + + - - - - - - - - - + + + ); + }} + ); }; -- GitLab From 9b1a85b1ae8cda9df7eb084ace60398f06ba3dd6 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Tue, 6 Apr 2021 19:36:54 -0500 Subject: [PATCH 3/7] Undoing break prop --- src/components/hero/ServiceHero.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/hero/ServiceHero.js b/src/components/hero/ServiceHero.js index e22e6e3..d42b846 100644 --- a/src/components/hero/ServiceHero.js +++ b/src/components/hero/ServiceHero.js @@ -44,7 +44,7 @@ const ServiceHero = ({ title, subtitle, pretitle, categories, imageFluid }) => { {title} - + {subtitle && ( {subtitle} -- GitLab From 242128679a6611e9d0377bf8bf2063835f8b2af4 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Wed, 7 Apr 2021 13:28:17 -0500 Subject: [PATCH 4/7] Removing VPC section Add modal for Let Us Know Update to service detail header categories line breaks Feedback form text size Spacing on solutions list content Fixes for primary button links --- src/components/ContactForm.js | 18 ++++++++++++--- src/components/FeedbackForm.js | 4 ++-- src/components/hero/Hero.js | 2 +- src/components/hero/ServiceHero.js | 17 +++++++------- src/components/mega-menu/MegaMenu.js | 8 ++----- src/components/pages/home/OfferAccordion.js | 8 ++----- src/components/pages/home/Solutions.js | 2 +- src/content/other-programs/eitaas.md | 5 ++-- .../networking-connectivity.md | 1 - .../service-detail/seitaas-remote-connect.md | 17 -------------- src/data/hero/4_summit.yaml | 2 +- src/pages/other-programs.js | 2 +- src/pages/solutions.js | 23 +++++++++++++++---- src/templates/ServiceDetail.js | 12 ++++++---- 14 files changed, 64 insertions(+), 57 deletions(-) delete mode 100644 src/content/service-detail/seitaas-remote-connect.md diff --git a/src/components/ContactForm.js b/src/components/ContactForm.js index 51f21b1..8a54f51 100644 --- a/src/components/ContactForm.js +++ b/src/components/ContactForm.js @@ -8,12 +8,15 @@ import { TextInput, TextArea, Spinner, + Button, } from 'grommet'; +import { Close } from 'grommet-icons'; + import { PrimaryButton } from './core'; const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif'; -const ContactForm = () => { +const ContactForm = ({ onClose }) => { const [submitting, setSubmitting] = useState(); const [success, setSuccess] = useState(); @@ -35,7 +38,13 @@ const ContactForm = () => { return ( - + { > REQUEST A CONSULTATION + {onClose && } { style={{ height: '100px' }} /> - + @@ -187,6 +198,7 @@ const ContactForm = () => {
reach out soon. + {onClose && + + + {modalOpen && ( + + + + )} )} diff --git a/src/templates/ServiceDetail.js b/src/templates/ServiceDetail.js index b32c709..88c9e3c 100644 --- a/src/templates/ServiceDetail.js +++ b/src/templates/ServiceDetail.js @@ -36,11 +36,15 @@ const ServiceDetailTemplate = ({ data }) => { const breakLayout = ['xsmall', 'small', 'medium'].includes(size); return ( - - Overview - - + + + Overview + {rawMarkdownBody} -- GitLab From 9af9b4515a38e1c13269254d0d883ba180760248 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Wed, 7 Apr 2021 13:45:26 -0500 Subject: [PATCH 5/7] Work on secondary button --- src/components/FeedbackFooter.js | 4 +-- src/components/FeedbackForm.js | 10 +++---- src/components/core/PrimaryButton.js | 9 ++---- src/components/core/SecondaryButton.js | 40 +++++++++++++++++++------- src/pages/solutions.js | 6 ++-- 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/components/FeedbackFooter.js b/src/components/FeedbackFooter.js index e78505c..d477b68 100644 --- a/src/components/FeedbackFooter.js +++ b/src/components/FeedbackFooter.js @@ -27,7 +27,7 @@ const FeedbackFooter = () => { gap="medium" > - We could use your feedback! + We could use your help! Send us feedback on this website or, better,
@@ -38,7 +38,7 @@ const FeedbackFooter = () => { diff --git a/src/components/FeedbackForm.js b/src/components/FeedbackForm.js index 67027b9..bf7ac7f 100644 --- a/src/components/FeedbackForm.js +++ b/src/components/FeedbackForm.js @@ -13,13 +13,13 @@ import { ThemeContext, } from 'grommet'; import { Close } from 'grommet-icons'; -import { PrimaryButton } from './core'; +import { PrimaryButton, SecondaryButton } from './core'; const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif'; const FeedbackForm = ({ onClose }) => { const [submitting, setSubmitting] = useState(); - const [success, setSuccess] = useState(); + const [success, setSuccess] = useState(true); const handleSubmit = (event) => { const data = new FormData(event.target); @@ -177,16 +177,16 @@ const FeedbackForm = ({ onClose }) => { )} {success && ( - + FEEDBACK SENT Thanks for sharing with us. - + ); export default SecondaryButton; diff --git a/src/pages/solutions.js b/src/pages/solutions.js index 88fb9fc..bcf1b44 100644 --- a/src/pages/solutions.js +++ b/src/pages/solutions.js @@ -5,7 +5,7 @@ import { AppLayout, SEO } from '../components/app'; import { Container, Column } from '../components/layout'; import { ServiceHero } from '../components/hero'; import { DtSquare } from '../components/icons'; -import { CtaLink } from '../components/core'; +import { CtaLink, SecondaryButton } from '../components/core'; import ContactForm from '../components/ContactForm'; const Solutions = ({ data }) => { @@ -73,10 +73,10 @@ const Solutions = ({ data }) => { Got a different need? - + /> -- GitLab From 72c9984a77fb5cfa29d3ecc916646ae6c5f388e1 Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Wed, 7 Apr 2021 14:17:05 -0500 Subject: [PATCH 6/7] Adding trailing slash plugin --- gatsby-config.js | 2 +- package-lock.json | 20 ++++++- package.json | 1 + src/components/app/Nav.js | 6 +-- src/components/pages/home/Steps.js | 86 +++++++++++++++++------------- src/pages/solutions.js | 2 +- 6 files changed, 75 insertions(+), 42 deletions(-) diff --git a/gatsby-config.js b/gatsby-config.js index 07916be..818b657 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -45,7 +45,7 @@ module.exports = { icon: `src/images/favicon@2x.png`, // This path is relative to the root of the site. }, }, - `gatsby-plugin-gatsby-cloud`, + `gatsby-plugin-force-trailing-slashes`, // this (optional) plugin enables Progressive Web App + Offline functionality // To learn more, visit: https://gatsby.dev/offline // `gatsby-plugin-offline`, diff --git a/package-lock.json b/package-lock.json index 54eedba..6eeaeba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "afeit-site", + "name": "afdigital-site", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -8555,6 +8555,24 @@ "micromatch": "^4.0.2" } }, + "gatsby-plugin-force-trailing-slashes": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/gatsby-plugin-force-trailing-slashes/-/gatsby-plugin-force-trailing-slashes-1.0.5.tgz", + "integrity": "sha512-RxRdW++bvSHv4Mho999W0LLNdiQX1OMOvY0v1TlafcaYqJ93fYV/Jp3DDD6PKS0PAKNS8Q8DRsD67cipFmZCFA==", + "requires": { + "@babel/runtime": "7.12.5" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, "gatsby-plugin-gatsby-cloud": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/gatsby-plugin-gatsby-cloud/-/gatsby-plugin-gatsby-cloud-1.0.2.tgz", diff --git a/package.json b/package.json index 52263f0..0e3bcc3 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "dependencies": { "gatsby": "^2.32.8", "gatsby-image": "^2.11.0", + "gatsby-plugin-force-trailing-slashes": "^1.0.5", "gatsby-plugin-gatsby-cloud": "^1.0.2", "gatsby-plugin-manifest": "^2.12.1", "gatsby-plugin-offline": "^3.10.2", diff --git a/src/components/app/Nav.js b/src/components/app/Nav.js index b8c7dfa..ea4ee82 100644 --- a/src/components/app/Nav.js +++ b/src/components/app/Nav.js @@ -43,7 +43,7 @@ const Nav = ({ sticky }) => { > { { ( - + + {/* TODO: Add this line */} + - - {number} - - - + + + {number} + + + + + {children} - {children} ); diff --git a/src/pages/solutions.js b/src/pages/solutions.js index bcf1b44..e214d05 100644 --- a/src/pages/solutions.js +++ b/src/pages/solutions.js @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { graphql } from 'gatsby'; -import { Box, Heading, Text, Button, ResponsiveContext, Layer } from 'grommet'; +import { Box, Heading, Text, ResponsiveContext, Layer } from 'grommet'; import { AppLayout, SEO } from '../components/app'; import { Container, Column } from '../components/layout'; import { ServiceHero } from '../components/hero'; -- GitLab From fd7104a032012110b259171b5614654f7e3d613c Mon Sep 17 00:00:00 2001 From: Anne Demey Date: Wed, 7 Apr 2021 14:32:04 -0500 Subject: [PATCH 7/7] Re deleting seitaas remote connect page --- .../service-detail/seitaas-remote-connect.md | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/content/service-detail/seitaas-remote-connect.md diff --git a/src/content/service-detail/seitaas-remote-connect.md b/src/content/service-detail/seitaas-remote-connect.md deleted file mode 100644 index 0604b12..0000000 --- a/src/content/service-detail/seitaas-remote-connect.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -slug: '/services/seitaas-remote-connect' -title: 'SEITaaS Remote Connect' -categories: - - Networking & Connectivity - - Virtual Private Connections -levels: - - S-SAR - - S-SCI - - TS-SAR - - TS-SCI -excerpt: 'SEITaaS will enable enterprise capabilities to be provided as a service to users accessing thin client, zero client, or connected self sustained performer LANs.' -share: '../../images/share/ogimage-networking_and_connectivity.png' -updated: April 6 ---- - -SEITaaS will enable enterprise capabilities to be provided as a service to users accessing thin client, zero client, or connected self sustained performer LANs. - -SEITaaS/Summit endpoints will be available to meet differing end-user needs. The network will offer thin client or zero client to users for a small form factor to support a network-agnostic solution. Additionally, Summit enterprise services, including MLS applications and cybersecurity services, will be made available to some user-maintained networks that will be designated as performer LANs. These LANs would be connected to and consume services from SEITaaS/Summit until they can be transitioned over to SEITaaS/Summit-managed endpoints. \ No newline at end of file -- GitLab