diff --git a/gatsby-config.js b/gatsby-config.js index 27b43f6cf882afd60e691ebea81907e76c39273c..b7def9befaee84975665737c56702af73ec6365d 100644 --- a/gatsby-config.js +++ b/gatsby-config.js @@ -39,10 +39,10 @@ module.exports = { name: `AF Enterprise Digital Transformation Services`, short_name: `AFEIT`, start_url: `/`, - background_color: `#663399`, - theme_color: `#663399`, + background_color: `#1B337A`, + theme_color: `#1B337A`, display: `minimal-ui`, - icon: `src/images/usaf-logo.png`, // This path is relative to the root of the site. + icon: `src/images/favicon@2x.png`, // This path is relative to the root of the site. }, }, `gatsby-plugin-gatsby-cloud`, diff --git a/src/components/app/Nav.js b/src/components/app/Nav.js index 70bd397d8be98c8a0c9e1e65877f5ff73fdb74b0..b8c7dfac3fd2c8aa8153437d13587392c88d8693 100644 --- a/src/components/app/Nav.js +++ b/src/components/app/Nav.js @@ -39,6 +39,7 @@ const Nav = ({ sticky }) => { justify="end" gap="large" margin={{ right: sticky ? 'medium' : '0' }} + style={{ zIndex: 10 }} > { return ( - + {core && ( - - Core Transformation Service - + + + Core Transformation Service + + )} - + {!logo && ( {title} @@ -53,7 +73,11 @@ const Slide = ({ title, subtitle, core, cta, slug, logo }) => { )} - {subtitle && {subtitle}} + {subtitle && ( + + {subtitle} + + )} {cta && ( @@ -91,8 +115,19 @@ const Hero = () => { fluid(maxWidth: 600, quality: 100) { ...GatsbyImageSharpFluid_tracedSVG } - fixed(height: 30) { - ...GatsbyImageSharpFixed_tracedSVG + } + } + thumblogo { + childImageSharp { + fluid(maxWidth: 100) { + ...GatsbyImageSharpFluid_tracedSVG + } + } + } + thumb { + childImageSharp { + fluid(maxWidth: 300, quality: 100) { + ...GatsbyImageSharpFluid_tracedSVG } } } @@ -135,9 +170,10 @@ const Hero = () => { onClick={() => handleSetSlide(i)} style={{ position: 'relative' }} > - - - + { pad="small" align="center" > - {' '} - {node.logo && } - {!node.logo && {node.name}} + {index !== i && } + {node.thumblogo && ( + + )} + {!node.thumblogo && ( + + {node.name} + + )} ))} diff --git a/src/components/mega-menu/MegaMenu.js b/src/components/mega-menu/MegaMenu.js index aa23da467aff2c8697beceb9e997ceb99788471d..506bcf809e2ec2f397a7a5f8344b69607373128d 100644 --- a/src/components/mega-menu/MegaMenu.js +++ b/src/components/mega-menu/MegaMenu.js @@ -65,7 +65,7 @@ const MegaMenu = ({ sticky }) => { Available Services @@ -80,7 +80,11 @@ const MegaMenu = ({ sticky }) => { pad={{ vertical: 'medium' }} style={{ overflowY: 'auto' }} > - + } @@ -112,7 +116,12 @@ const MegaMenu = ({ sticky }) => { {isVert && } - + { const isLink = to.indexOf('#') === -1; @@ -75,14 +92,7 @@ const MenuServices = ({ onNavigate }) => ( The following services are available to your organization through C3I&N - {[ - { name: 'Networking & Connectivity', to: '#categories' }, - { name: 'Compute & Store', to: '#categories' }, - { name: 'Software Development & DevSecOps', to: '#categories' }, - { name: 'Digital Engineering', to: '#categories' }, - { name: 'Communications', to: '#categories' }, - { name: 'Data Analysis', to: '#categories' }, - ].map((item) => ( + {serviceLinks.map((item) => ( ( ); -const MenuCategory = ({ category, onNavigate }) => ( +const MenuCategory = ({ category, onNavigate, overview }) => ( - - + + {category} + {overview && ( + + + Overview + + + )} @@ -129,6 +152,8 @@ const MegaMobileMenu = ({ onClose }) => { setCategory(name); }; + const currentService = serviceLinks.find((item) => item.name === category); + return ( { {depth === 1 && } - {depth === 2 && ( - {}} /> + {depth === 2 && currentService && ( + {}} + /> )} diff --git a/src/content/other-programs/ches.md b/src/content/other-programs/ches.md index 73fedef3a54974194afe42811b3ad098262def44..9f32a9321609da6be8f03604631653d54920dd3a 100644 --- a/src/content/other-programs/ches.md +++ b/src/content/other-programs/ches.md @@ -4,9 +4,18 @@ index: 2 --- ### Cloud-hosted enterprise services (CHES) +CHES is the USAF’s adoption of Microsoft Office365. The core capabilities are email, messaging, document management and individual storage. Some of the current products are, OWA, Exchange, SharePoint Online, OneDrive and Teams. Below is a brief description of these services. -#### Office 365 +#### Exchange Online +Microsoft Exchange Online is a hosted messaging solution that delivers the capabilities of Microsoft Exchange Server as a cloud-based service. It gives users access to email, calendar, contacts, and tasks from PCs, the web, and mobile devices. -#### SharePoint +#### Teams +Microsoft Teams is the hub for teamwork in Microsoft 365. The Teams service enables instant messaging, audio and video calling, rich online meetings, mobile experiences, and extensive web conferencing capabilities. In addition, Teams provides file and data collaboration and extensibility features, and integrates with Microsoft 365. -#### Teams \ No newline at end of file +#### SharePoint Online +Microsoft SharePoint is used to create websites. It is a secure place to store, organize, share, and access information. SharePoint Online is the cloud-based service, hosted by Microsoft in the DoD IL5 environment. + +#### One Drive for Business +OneDrive is online storage space in the cloud that's provided for individual licensed users in an organization. Use it to help protect work files and access them across multiple devices. OneDrive lets you share files and collaborate on documents, and sync files to your computer. + +[Additional Information on 365](https://docs.microsoft.com/en-us/office365/servicedescriptions/office-365-service-descriptions-technet-library) \ No newline at end of file diff --git a/src/content/service-detail/atom.md b/src/content/service-detail/atom.md new file mode 100644 index 0000000000000000000000000000000000000000..bdd726307d9586866b7ee0c61abb2e0b521b61e5 --- /dev/null +++ b/src/content/service-detail/atom.md @@ -0,0 +1,23 @@ +--- +slug: '/services/atom' +title: 'ATOM' +shortTitle: 'ATOM' +categories: + - Compute & Store +levels: + - S-SAR + - TS-SAR + - TS-SCI +excerpt: 'A government owned/government operated hardware solution that provides a basic compute and store capability in a PL-3 environment.' +share: '../../images/share/ogimage-compute_and_store.png' +updated: April 1 +--- +ATOM is a government owned/government operated hardware solution that provides a basic compute and store capability in a PL-3 environment. + +This infrastructure-as-a-service (IaaS) model allows ATOM to host virtualized systems and field services supporting the USAF and DoD. ATOM supports both Level 3 and Level 4/5 production mission systems. + +### Benefits & Features + +- BYOAD +- Data Storage +- Management Console \ No newline at end of file diff --git a/src/content/service-detail/core-rock.md b/src/content/service-detail/core-rock.md index 58175518ecc7abd15f4565f5d9208fcdcfc41b37..0d051635f9fdc3a0b5296d1d3c0381741f6975c6 100644 --- a/src/content/service-detail/core-rock.md +++ b/src/content/service-detail/core-rock.md @@ -1,6 +1,6 @@ --- -slug: '/services/core-rock' -title: 'CORE (Rock)' +slug: '/services/core' +title: 'CORE' categories: - Communications levels: @@ -9,7 +9,7 @@ levels: - TS-SCI share: '../../images/share/ogimage-communications.png' excerpt: 'A suite of multi-level web applications that provide file sharing and webmail services enabling secure data and communication exchange between S//SAR, TS//SAR, and TS//SAR-SCI networks and users.' -updated: March 23, 2021 at 2:54:52 PM EDT +updated: April 1 --- CORE is a suite of multi-level web applications that provide file sharing and webmail services enabling secure data and communication exchange between S//SAR, TS//SAR, and TS//SAR-SCI networks and users. @@ -36,5 +36,5 @@ DoD, USAF and industry partners can utilize the capability. ### Requirements -All necessary forms are provided by the Rock Connections Team +All necessary forms are provided by the Core Connections Team diff --git a/src/content/service-detail/enterprise-virtual-environment-eve.md b/src/content/service-detail/enterprise-virtual-environment-eve.md deleted file mode 100644 index 3718dfed80148bc2df13233c9470a7ecb289d7fe..0000000000000000000000000000000000000000 --- a/src/content/service-detail/enterprise-virtual-environment-eve.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -slug: '/services/enterprise-virtual-environment' -title: 'Enterprise Virtual Environment (EVE)' -shortTitle: 'EVE' -categories: - - Compute & Store -levels: - - S-SAR - - TS-SAR - - TS-SCI -excerpt: 'A government owned/government operated hardware solution that provides a basic compute and store capability in a PL-3 environment.' -share: '../../images/share/ogimage-compute_and_store.png' -updated: March 23, 2021 at 2:54:52 PM EDT ---- - -This infrastructure-as-a-service (IaaS) model allows EVE to host virtualized systems and field services supporting the USAF and DoD. EVE supports both Level 3 and Level 4/5 production mission systems. - -### Benefits & Features - -- BYOAD -- Data Storage -- Management Console \ No newline at end of file diff --git a/src/content/service-detail/misty-sierra.md b/src/content/service-detail/misty-sierra.md index 888c27e56cb276094c734101e6814d2e26b0b5ec..128cccaa510369db1631f2623d82c41480fbfd45 100644 --- a/src/content/service-detail/misty-sierra.md +++ b/src/content/service-detail/misty-sierra.md @@ -10,7 +10,7 @@ levels: - TS-SCI excerpt: 'Misty Sierra is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions.' share: '../../images/share/ogimage-networking_and_connectivity.png' -updated: March 31 +updated: April 1 --- Misty Sierra is a compartmented WAN that includes trusted MLS services, specifically providing an integrated PL-4 desktop environment with Automated Information System tools and functions. @@ -44,7 +44,7 @@ Required Documentation - Scanning - DVD burning - Javelin -- [Rock](/services/core-rock) +- [CORE](/services/core) - Braces - Hawkeye - [FENCES](/services/fences) \ No newline at end of file diff --git a/src/data/hero/home.yaml b/src/data/hero/0_home.yaml similarity index 79% rename from src/data/hero/home.yaml rename to src/data/hero/0_home.yaml index f52302c86db30e708eecbd113c1d18a1be23a800..8231fa7365f480c38a3167875aa60109639d1956 100644 --- a/src/data/hero/home.yaml +++ b/src/data/hero/0_home.yaml @@ -1,5 +1,6 @@ name: Home title: 'Cutting-Edge Digital Transformation' subtitle: 'Enterprise IT to Power a Digital Air Force' -index: 0 image: '../../images/hero/1-hero-home.png' +thumb: '../../images/hero/thumb-home.png' +index: 0 diff --git a/src/data/hero/cloud-one.yaml b/src/data/hero/1_cloud-one.yaml similarity index 50% rename from src/data/hero/cloud-one.yaml rename to src/data/hero/1_cloud-one.yaml index e97ec4701d171bdd76567cedbef4879e08558f39..26438da9854ae16a063a8b3eb09135d62bb05b56 100644 --- a/src/data/hero/cloud-one.yaml +++ b/src/data/hero/1_cloud-one.yaml @@ -1,9 +1,11 @@ name: Cloud One title: Cloud One -subtitle: 'Fast, Secure, Streamlined' +subtitle: "USAF's preeminent cloud hosting platform" core: true -cta: Learn More +cta: 'Learn More' slug: '/services/cloud-one' image: '../../images/hero/2-hero-cloud-one.png' logo: '../../images/hero/logo-cloud-one.png' +thumb: '../../images/hero/thumb-cloud-one.png' +thumblogo: '../../images/hero/logo-cloud-one.png' index: 1 diff --git a/src/data/hero/platform-one.yaml b/src/data/hero/2_platform-one.yaml similarity index 51% rename from src/data/hero/platform-one.yaml rename to src/data/hero/2_platform-one.yaml index 20a039cc02ec78a53455a3a2af75edabaad85147..624c7b3899773e94ff40782dd5d935874865fdd3 100644 --- a/src/data/hero/platform-one.yaml +++ b/src/data/hero/2_platform-one.yaml @@ -1,9 +1,11 @@ name: Platform One title: Platform One -subtitle: 'Lorem Ipsum Change Me' +subtitle: Services and tools to get to the cloud faster core: true -cta: 'Learn More' +cta: Learn More slug: '/services/platform-one' image: '../../images/hero/3-hero-platform-one.png' logo: '../../images/hero/logo-platform-one.png' +thumb: '../../images/hero/thumb-platform-one.png' +thumblogo: '../../images/hero/logo-platform-one.png' index: 2 diff --git a/src/data/hero/fences.yaml b/src/data/hero/3_fences.yaml similarity index 57% rename from src/data/hero/fences.yaml rename to src/data/hero/3_fences.yaml index 7b34799baf7044dcec7fd0b99dbb061a1957d32b..ca3578220915af9b8704d7a184e065355c111eb8 100644 --- a/src/data/hero/fences.yaml +++ b/src/data/hero/3_fences.yaml @@ -1,9 +1,11 @@ name: Fences title: Fences -subtitle: Lispsum Ipsum Elementum +subtitle: Multi-level SAP cloud hosting core: true cta: Learn More slug: '/services/fences' image: '../../images/hero/4-hero-fences.png' logo: '../../images/hero/logo-fences.png' +thumb: '../../images/hero/thumb-fences.png' +thumblogo: '../../images/hero/logo-fences.png' index: 3 diff --git a/src/data/hero/4_summit.yaml b/src/data/hero/4_summit.yaml new file mode 100644 index 0000000000000000000000000000000000000000..9243045634d5113bf75033476e2536af911aed48 --- /dev/null +++ b/src/data/hero/4_summit.yaml @@ -0,0 +1,10 @@ +name: Summit +title: Summit +subtitle: SAP network-as-a-service +core: true +cta: Learn More +slug: '/services/summit' +image: '../../images/hero/5-hero-summit.png' +thumb: '../../images/hero/thumb-summit.png' +thumblogo: '../../images/hero/logo-summit.png' +index: 4 diff --git a/src/data/hero/5_dep.yaml b/src/data/hero/5_dep.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3649d9b590ff1692c3195847274dc6956816db37 --- /dev/null +++ b/src/data/hero/5_dep.yaml @@ -0,0 +1,10 @@ +name: Digital Engineering Platform +title: Digital Engineering Platform +subtitle: Modern development and collaboration tools +cta: Learn More +slug: '/services/digital-engineering-platform' +image: '../../images/hero/6-hero-dep.png' +logo: '../../images/hero/logo-dep.png' +thumb: '../../images/hero/thumb-dep.png' +thumblogo: '../../images/hero/logo-dep.png' +index: 5 diff --git a/src/data/hero/summit.yaml b/src/data/hero/summit.yaml deleted file mode 100644 index 754cd7483ab68adf709ab3d06b6c46295d5a9d60..0000000000000000000000000000000000000000 --- a/src/data/hero/summit.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: Summit -title: Summit -subtitle: 'Lorem Dipsum Fix This' -core: true -cta: 'Learn More' -slug: '/services/summit' -image: '../../images/hero/5-hero-summit.png' -index: 4 diff --git a/src/images/favicon@2x.png b/src/images/favicon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1e3275ce8499d086f44474b84e8cb8d6519311b8 Binary files /dev/null and b/src/images/favicon@2x.png differ diff --git a/src/images/hero/6-hero-dep.png b/src/images/hero/6-hero-dep.png new file mode 100644 index 0000000000000000000000000000000000000000..b434d0ecf4e37839b22b9fcc6207529660343011 Binary files /dev/null and b/src/images/hero/6-hero-dep.png differ diff --git a/src/images/hero/logo-dep.png b/src/images/hero/logo-dep.png new file mode 100644 index 0000000000000000000000000000000000000000..6e47a7c199637165d14cf3d6852578de6c8568c1 Binary files /dev/null and b/src/images/hero/logo-dep.png differ diff --git a/src/images/hero/logo-summit.png b/src/images/hero/logo-summit.png new file mode 100644 index 0000000000000000000000000000000000000000..8b07b91a7884ca4c2ae8d9b5d0972e5cdc3e5968 Binary files /dev/null and b/src/images/hero/logo-summit.png differ diff --git a/src/images/hero/thumb-cloud-one.png b/src/images/hero/thumb-cloud-one.png new file mode 100644 index 0000000000000000000000000000000000000000..be629b49b2d9902bc0da9ee9207df8083bc5f44b Binary files /dev/null and b/src/images/hero/thumb-cloud-one.png differ diff --git a/src/images/hero/thumb-dep.png b/src/images/hero/thumb-dep.png new file mode 100644 index 0000000000000000000000000000000000000000..c2db3976957c3b3d3b15143321874076de9c7751 Binary files /dev/null and b/src/images/hero/thumb-dep.png differ diff --git a/src/images/hero/thumb-fences.png b/src/images/hero/thumb-fences.png new file mode 100644 index 0000000000000000000000000000000000000000..cbf51a1e175b5201dd98b41834bf2f025be937f0 Binary files /dev/null and b/src/images/hero/thumb-fences.png differ diff --git a/src/images/hero/thumb-home.png b/src/images/hero/thumb-home.png new file mode 100644 index 0000000000000000000000000000000000000000..1701c0f921d1f802cbd0b94dc040907010fc39c3 Binary files /dev/null and b/src/images/hero/thumb-home.png differ diff --git a/src/images/hero/thumb-platform-one.png b/src/images/hero/thumb-platform-one.png new file mode 100644 index 0000000000000000000000000000000000000000..9e1feb10910a3ab151848063e28157d89dfb2005 Binary files /dev/null and b/src/images/hero/thumb-platform-one.png differ diff --git a/src/images/hero/thumb-summit.png b/src/images/hero/thumb-summit.png new file mode 100644 index 0000000000000000000000000000000000000000..a1626242d8a2075538bad8d0023a2826dc4e8ba1 Binary files /dev/null and b/src/images/hero/thumb-summit.png differ diff --git a/src/styles/theme.js b/src/styles/theme.js index bebd10b4caa1a76c4254cf1c1c5e805da47446fe..f6842d68de52bb9a42427b50cb43960661674324 100644 --- a/src/styles/theme.js +++ b/src/styles/theme.js @@ -138,6 +138,11 @@ export const themeOverrides = { paragraph: { fill: true, }, + layer: { + overlay: { + background: 'rgba(0, 0, 0, 0.9)', + }, + }, }; const theme = deepMerge(grommet, themeOverrides);