Merge branch 'develop' into 'staging'

more trailing slashes and content updates

See merge request !20

src/components/FeedbackForm.js

@@ -19,7 +19,7 @@ const korolevFont = 'korolev, Helvetica Neue, Helvetica, Arial, sans-serif';
 
 const FeedbackForm = ({ onClose }) => {
   const [submitting, setSubmitting] = useState();
-  const [success, setSuccess] = useState(true);
+  const [success, setSuccess] = useState();
 
   const handleSubmit = (event) => {
     const data = new FormData(event.target);

src/components/app/Footer.js

@@ -24,7 +24,7 @@ const Footer = () => {
             justify="center"
             align={isMobile ? 'center' : 'start'}
           >
-            <Link to="/about-us" color="light-1" size="small" weight="bold">
+            <Link to="/about-us/" color="light-1" size="small" weight="bold">
               About Us
             </Link>
           </Box>

src/components/mega-menu/MegaMenu.js

@@ -88,7 +88,7 @@ const MegaMenu = ({ sticky }) => {
             <GroupHeader
               label="Networking & Connectivity"
               icon={<DtNetConn />}
-              overview="/networking-connectivity"
+              overview="/networking-connectivity/"
             />
 
             <Box direction="row" flex={{ shrink: 0 }}>
@@ -123,7 +123,7 @@ const MegaMenu = ({ sticky }) => {
                 <GroupHeader
                   label="Compute & Store"
                   icon={<DtComputeStore />}
-                  overview="/compute-and-store"
+                  overview="/compute-and-store/"
                 />
                 <MenuGroup category="Compute & Store" />
               </Box>

src/components/mega-menu/MegaMobileMenu.js

@@ -18,12 +18,12 @@ const serviceLinks = [
   {
     name: 'Networking & Connectivity',
     to: '#categories',
-    overview: '/networking-connectivity',
+    overview: '/networking-connectivity/',
   },
   {
     name: 'Compute & Store',
     to: '#categories',
-    overview: '/compute-and-store',
+    overview: '/compute-and-store/',
   },
   { name: 'Software Development & DevSecOps', to: '#categories' },
   { name: 'Digital Engineering', to: '#categories' },

src/components/pages/home/Solutions.js

@@ -104,7 +104,7 @@ const Solutions = () => {
         <SolutionGroup node={s2} isMobile={isMobile} />
       </Box>
       <Box width="300px" margin="large">
-        <PrimaryButton label="SEE MORE SOLUTIONS" href="/solutions" />
+        <PrimaryButton label="SEE MORE SOLUTIONS" href="/solutions/" />
       </Box>
     </Box>
   );

src/content/generic/about-us.md

 ---
-slug: '/about-us'
+slug: '/about-us/'
 title: About Us
 subtitle: AFLCMC / C3I&N
 description: Learn more about C3I&N's mission and our digital storefront.
@@ -16,7 +16,7 @@ To meet our mission, we offer a broad portfolio of IT services spanning networki
 
 ### What is “Digital Trinity?”
 
-Coined by Dr. Will Roper, the Assistant Secretary of the Air Force for Acquisition,  [Digital Trinity](https://software.af.mil/wp-content/uploads/2020/10/There-Is-No-Spoon-Digital-Acquisition-7-Oct-2020-digital-version.pdf) refers to three critical components of modern digital transformation efforts: 
+Coined by Dr. Will Roper, the former Assistant Secretary of the Air Force for Acquisition,  [Digital Trinity](https://software.af.mil/wp-content/uploads/2020/10/There-Is-No-Spoon-Digital-Acquisition-7-Oct-2020-digital-version.pdf) refers to three critical components of modern digital transformation efforts: 
 
 - Agile software development 
 - Modular, open systems architectures

src/content/other-programs/ches.md

@@ -2,19 +2,19 @@
 name: CHES
 index: 2
 ---
-### Cloud-hosted enterprise services (CHES)
+## 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.
 
-**Exchange Online**
+###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.
 
-**Teams**
+###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.
 
-**SharePoint Online**
+###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**
+###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

src/content/other-programs/eitaas.md

@@ -4,33 +4,32 @@ index: 1
 ---
 ## EITaaS
 
-#### Cloud Compute & Store
-
+###Cloud Compute & Store
 Compute & Store (C&S) provides secure access to cloud computing services, improving responsiveness to warfighter needs with faster access to systems and data for a more reliable, secure, consistent access to systems, data and just in time capacity for storage.
 
-**End-User Devices**
+###End-User Devices
 Users will be able to select government funded equipment through an online service portal, to include: desktops, laptops, mobile devices, thin clients, zero clients, and smart devices.
 
-**Video Teleconferencing (VTC)**
+###Video Teleconferencing (VTC)
 These services are comprised of the hardware, software, network, and scheduling components necessary to deliver real-time video and audio communications between end users at two or more locations. This includes the operation and maintenance of the VTC service.
 
-**Messaging**
+###Messaging
 EITaaS EUS connects to existing messaging services (like CHES Teams) while providing new devices supported by overall IT Service Management (ITSM).
 
-**Voice/VoIP**
+###Voice/VoIP
 Voice/VoIP is a capability that enables and allows users to communicate over IP Telephony, providing a secure and reliable voice network that enables access to DoD classified and unclassified data. Currently, VOIP implementation is only approved at Offutt AFB.
 
-**Network-as-a-Service (NaaS) –  WAN**
+###Network-as-a-Service (NaaS) –  WAN
 A geographically distributed private telecommunications network that interconnects multiple local area networks (LANs). This includes connections into Microsoft’s Azure for Government (MAG)/Office 365 Government Community Cloud, third-party cloud services, the internet and back into legacy Air Force and military networks.
 
-**Network-as-a-Service (NaaS) –  BAN**
+###Network-as-a-Service (NaaS) –  BAN
 Base Area Network (BAN) is a commercially designed network that is optimized, secure and robust, and contributes to an end-state that enables the concept of the ‘Mobile Airman.’ BAN is both wired and wireless and comprises of the following offerings: 
 - Inside Plant/Outside Plant: Inside Plant is defined as network transport (copper and fiber) within a building; Outside Plant is defined as network transportation (copper and fiber) outside a building (e.g. buried or aerial cable). A fully integrated access to BAN services for devices will provide a seamless UX.
 - Wireless: Fully integrated wireless access to BAN services for wireless-enabled devices (including MFD connectivity) to provide a seamless user experience regardless of how the device is connected.
 - Wired: Secure wired access to the commercial internet.
 - Cellular: Commercial infrastructure.
 
-**Network-as-a-Service (NaaS) – Remote Connect**
+###Network-as-a-Service (NaaS) – Remote Connect
 
-**Security Operations Center (SOC)**
+###Security Operations Center (SOC)
 The ESOC conducts security and defense operations in partnership with the 16 AF, 616 OC, and AF SOC/33 NWS. It integrates commercial capabilities with the 16 AF to conduct security incident response, with goals to automate security incident response, decrease response time, increase detection, and increase true positive rate of automation against incidents/events.

src/content/other-programs/more.md

@@ -2,13 +2,13 @@
 name: More
 index: 3
 ---
-### More
+## More
 
-**Air Force Portal**
+###Air Force Portal
 Online platform that allows users to quickly find authoritative, relevant data and information, applications and collaboration tools to help with tasks related to USAF jobs and life.
 
-**Enterprise IT Service Management**
+###Enterprise IT Service Management
 Enterprise IT Service Management System (EITSM) is an enterprise toolset to manage all IT support processes within an integrated ITSM environment.  EITSM supports over 850,000 customers with accounts on NIPR and SIPR environments.  The EITSM system is web-based with two physical locations at INOSC East (83 NOS) (NIPR/SIPR) and INOSC West (561 NOS)(NIPR. EITSM primarily provides incident and change management functionality.
 
-**Emergency Mass Notification System (EMNS)**
+###Emergency Mass Notification System (EMNS)
 The Emergency Mass Notification System (EMNS) service delivers emergency communications and critical alerts. The EMNS send notices to the Air Force populace through desktop, mobile application, telephone, text messaging alerts, and giant voice. This system provides individuals with near real-time notifications sent directly from the AF/MAJCOM/Installation command posts.

src/content/other-programs/security.md

@@ -2,65 +2,65 @@
 name: Security
 index: 0
 ---
-### Security
+## Security
 
-**AF Cyberspace Defense**
+###AF Cyberspace Defense
 Coordinates and executes resources needed to assess, analyze, and respond to AF network security incidents, intrusive activity, malicious logic (i.e., viruses) and vulnerabilities.  It is also a key capability employed by 16AF in its Cyber Security Service Provider (CSSP) role.  Lastly, the program administers ELICSAR, the AF’s Cyber BDP.  
 
-**AF Directory Services - Single Digital Identity Record**
+###AF Directory Services - Single Digital Identity Record
 Harvests identity data from multiple, authoritative data sources to create a single consolidated digital identity record. Provides contact data synchronization between all MAJCOMs, AF supported COCOMs and other organizations resulting in an AF-Enterprise wide Global Address List distribution service. Daily synchronization of contacts to AFIN, MAJCOMs, Combatant Commands, and DoD Organizations.
 
-**AF Vulnerability Management**
+###AF Vulnerability Management
 Provides EndPoint security.  ARAD provides AFNet endpoint management tool capable of examining and modifying enterprise clients in real time. ACAS is an integrated software solution that provides automated network vulnerability scanning, configuration assessment, and network discovery.  ESS is an Air Force (AF) enterprise-wide automated, standardized Information Assurance tool that enhances end-point system security against internal/external threats and implements AF security policies on all end-host systems.
 
-**Cyber Defense Analysis**
+###Cyber Defense Analysis
 Monitors, collects, analyzes and reports on information transmitted via unsecured telecommunications systems (telephony, radio frequency, E-mail and internet-based capabilities) for Network Defense, OPSEC and Force Protection
 
-**Cyber Vulnerability Assessment/Hunter**
+###Cyber Vulnerability Assessment/Hunter
 Identifies, characterizes, and mitigates cyberspace threats impacting critical operational capabilities within Air Force and DoD Networks. It also provides advanced calculated defensive missions or rapid response (i.e. Quick Response Forces ) engaging adversaries operating within the AF/DoD network via a blended approach to agility, precision employment, engagement tactics, techniques and procedures (TTP). Deployable capability with multiple tools to interrogate hosts to identify vulnerabilities and/or adversary actions on the end point. CVA/H also has advanced end point protection capabilities to prevent adversary actions on the end point.
 
-**Enterprise Logging Ingest and Cyber Situational Awareness Refinery (ELICSAR)**
+###Enterprise Logging Ingest and Cyber Situational Awareness Refinery (ELICSAR)
 The AF’s cyber Big Data Platform (BDP).  Utilizes cloud infrastructure to ingest various data types from the AFIN.  In turn, defensive cyber analyst can perform complex analytics against the data to identify and then take action against advanced cyber threats.
 
-#### Command and Control Integration
+## Command and Control Integration
 
-**AFNet Gateways**
+###AFNet Gateways
 Strategic entry points for Internet and DODIN network traffic. Includes Gateway Decommissioning project (forecast completion September 2022), Gateway dependency elimination (L3VPN, Guest Network), Gateway sustainment, replacement of IBM 3850 servers (now supported by Lenovo), and L3VPN Encryption Relief (for transition to JRSS/JIE environment)
 
-**Integrated Management Suite (IMS)**
+###Integrated Management Suite (IMS)
 The out-of-band management network operated by 26 NOS, 33 NWS (ACD Weapon System) and used by 83rd, 561st and 299th (CSCS) in order to manage remote network health and cybersecurity devices across the AFNet. We provide network logging and SIEM to DCO Operators. 
 IMS includes the following projects:
 - IMS Expansion Effort to upgrade throughput to 10Gbps, firewall capacity, Splunk infrastructure, and Active Directory Collapse (forecast completion Feb 2021)
 - Identity Automated Access Management (IAAM) An application allowing 26 NOS to manage ~1500 network administrator accounts supporting ACD, AFINC and CSCS, 38th, AFSN, and OSI
 - Agile Development Support of CS&D (ACD) Mod to IMS, EL2 effort places NIFI servers in the IMS enclave to deliver event logs to the Cloud for DCO cyber defense remediation.
 
-#### ICAM
+##Identity, Credential, and Access Management (ICAM)
 
-**Identity Management**
+###Identity Management
 The service provides the practices that establish, maintain, and terminate identities within the enterprise bringing together identities with authenticators and attributes for the enterprise.
 
-**Credential Management**
+###Credential Management
 The service provides the mechanisms to manage the life cycle of credentials that a user possesses and controls from creation through destruction. Credentials and authenticators verify a user’s identity and are used to authenticate when requesting access to resources.
 
-**Access Management**
+###Access Management
 The service provides the method for gaining access to resources (applications, services, systems, etc.). It provides a centralized capability for validating permissions and privileges via the credentials presented by the user.
 
-**Federation**
+###Federation
 This service enables one organization to accept another organizations identity through inter-organizational trust of policies and practices.
 
-**Governance**
+###Governance
 This service provides a method of identifying and enforcing policy based on documented STIGS, memorandums, instructions, etc., as well as specific application criteria like separation of duties, rights of least privileges, etc. These policies and rules for procedure validation will enable an organization to administer and support ICAM capabilities.
 
-#### Public Key Infrastructure (PKI)
+## Public Key Infrastructure (PKI)
 
-**Certificate issuance for devices and people**
+###Certificate issuance for devices and people
 We are the responsible authority for all certificate issuance issues and policy concerns regarding issuance within in AF. We also manage issuance locations across AF and support building and deployment of internal AF PKI for non-DoD supported devices.
 
-**Integration and extension of DoD PKI capabilities into AF**
+###Integration and extension of DoD PKI capabilities into AF
 The AF PKI program extends the DOD PKI capabilities for use with in the AF.  This includes enterprise capabilities for certificate revocation checking, issuance of primary and alternate people tokens, automated certificate issuance to non-person entities, and other DoD capabilities.
 
-**Operations and maintenance of AF PKI components**
+###Operations and maintenance of AF PKI components
 We manage all AF components of PKI and DOD integration, operate the issuance capabilities within AF, and address the needs for new capabilities.
 
-**Public Key Enabling engineering support (includes second-factor authentication)**
+###Public Key Enabling engineering support (includes two factor authentication)
 We work with application and program managers to support implementations of PKI-based user authentication.

src/content/service-category/compute-and-store.md

 ---
-slug: '/compute-and-store'
+slug: '/compute-and-store/'
 title: 'Compute and Store'
 categories:
   - Compute & Store

src/content/service-category/networking-connectivity.md

 ---
-slug: '/networking-connectivity'
+slug: '/networking-connectivity/'
 title: 'Networking & Connectivity'
 categories:
   - Global Connectivity / WAN

src/content/service-detail/af7.md

 ---
-slug: '/services/af7'
+slug: '/services/af7/'
 title: 'Air Force Special Enclave Video Enterprise Network (AF7)'
 shortTitle: 'AF7'
 categories: 
@@ -15,7 +15,7 @@ updated: March 23, 2021 at 2:54:52 PM EDT
 
 AF7 system is a network of geographically dispersed user video teleconferencing (VTC) sites connected to two mission support centers and operated at three security levels cleared for special access required (SAR) VTCs: Secret//SAR Level 3, Top Secret//SAR Level 4, and Top Secret//SAR-SCI Level 5.
 
-### Benefits & Features
+## Benefits & Features
 
 - Approved for all DoD SAPs.
 - Can be installed at contractor sites.
@@ -24,7 +24,7 @@ AF7 system is a network of geographically dispersed user video teleconferencing
 - Endpoint Tech Refresh (Gov' t/Con tractor) paid for by AF7 PMO.
 - Fielded Cisco VTC endpoint equipment covered under USAF Joint Enterprise License Agreement.
 
-### Requirements
+## Requirements
 
 - AF 1067 or ITNR
 - Deployment Approval Package
\ No newline at end of file

src/content/service-detail/afsen-coin.md

 ---
-slug: '/services/afsen-coin'
+slug: '/services/afsen-coin/'
 title: 'AFSEN-COIN'
 shortTitle: 'COIN'
 categories: 
@@ -16,4 +16,4 @@ updated: March 31
 ---
 AFSEN-COIN is designed to provide a standardized means of information transportation to improve service and connectivity between locations.
 
-AFSEN-COIN is a Virtual Private Network (VPN) service provided through the Defense Information Systems Agency (DISA) Global Information Grid (GIG). AFSEN-COIN provides the transport pipe for Secret//Special Access Required (SAR) up to Top Secret Sensitive Compartmented Information (SCI)//SAR traffic that is National Security Agency (NSA) Type-1 encrypted using DISA’s Layer 3-VPN service for long-haul transport. AFSEN-COIN provides customers with dedicated transport/bandwidth for Special Access Program (SAP) missions without having to compete with existing NIPRNet bandwidth. Private Network (VPN) service provided through the Defense Information Systems Agency (DISA) Global Information Grid (GIG). AFSEN-COIN provides the transport pipe for Secret//Special Access Required (SAR) up to Top Secret Sensitive Compartmented Information (SCI)//SAR traffic that is National Security Agency (NSA) Type-1 encrypted using DISA’s Layer 3-VPN service for long-haul transport. AFSEN-COIN provides customers with dedicated transport/bandwidth for Special Access Program (SAP) missions without having to compete with existing NIPRNet bandwidth.
+AFSEN-COIN is a Virtual Private Network (VPN) service provided through the Defense Information Systems Agency (DISA) Global Information Grid (GIG). AFSEN-COIN provides the transport pipe for Secret//Special Access Required (SAR) up to Top Secret Sensitive Compartmented Information (SCI)//SAR traffic that is National Security Agency (NSA) Type-1 encrypted using DISA’s Layer 3-VPN service for long-haul transport. AFSEN-COIN provides customers with dedicated transport/bandwidth for Special Access Program (SAP) missions without having to compete with existing NIPRNet bandwidth.

src/content/service-detail/atom.md

 ---
-slug: '/services/atom'
+slug: '/services/atom/'
 title: 'ATOM'
 shortTitle: 'ATOM'
 categories: 

src/content/service-detail/base-it.md

 ---
-slug: '/services/base-it-infrastructure'
+slug: '/services/base-it-infrastructure/'
 title: 'Base IT Infrastructure'
 shortTitle: 'BITI'
 categories: 
   - Networking & Connectivity
   - Local Connectivity / BAN
-  - Global Connectivity / WAN
 levels: 
   - U
   - S
@@ -16,19 +15,18 @@ updated: March 31
 
 Base IT Infrastructure services are centrally managed to provide both wired and wireless WAN and BAN capabilities.
 
-**Wired**
+### Wired
 - All switches, critical and non-critical, to be replaced with improved technology.
     - Software Defined Networking (SDN) capable
     - Enhanced network security (802.1x, 2FA)
 
-
-**Wireless**
+### Wireless
 - Replacement/addition of facility wireless and flight-line wireless.
     - Wi-Fi 6 capable 
     - Citizens Broadband Radio Service (CBRS) capable (flight-line only)
     - Private/Public/5G LTE delivery (flight-line only)
 
-**Centralized Management**
+### Centralized Management
 - Deploy centralized management system for management of wireless, wired and deployment of security policies.
 - Enables future deployment of SDN and Zero Trust capabilities.
 - Enables single focal point for managed service component.

src/content/service-detail/cloud-gateway.md

 ---
-slug: '/services/cloud-gateway'
+slug: '/services/cloud-gateway/'
 title: 'Cloud Gateway'
 categories:
   - Network & Connectivity

src/content/service-detail/cloud-one.md

 ---
-slug: '/services/cloud-one'
+slug: '/services/cloud-one/'
 title: 'Cloud One'
 categories:
   - Compute & Store
@@ -15,19 +15,19 @@ The ‘one-stop-shop’ for Air Force cloud computing, Cloud One provides cloud
 
 Visit the [Cloud One website](https://intelshare.intelink.gov/sites/AFCCE/Pages/Home.aspx) *(CAC required)*.
 
-##### Secure Cloud Hosting Platform
+### Secure Cloud Hosting Platform
 Cloud One delivers the secure cloud hosting platform from development to production that mission systems need to cost-efficiently deliver capability to the warfighter. Cloud One delivers that platform across multiple impact levels and clouds with inheritable controls and common services that enable DevSecOps and quick cloud adoption.
 
-##### Cloud Onboarding
+### Cloud Onboarding
 Cloud One engages with customers across a variety of mediums to ensure that mission owners have the information needed to effectively rationalize, plan, and budget for a cloud journey.
 
-##### Migration as a Service
+### Migration as a Service
 Cloud One provides the migration service to quickly and cost effectively transition workloads to commercial clouds. By providing the processes, expertise and contract, Cloud One delivers to mission owners the promise of cloud computing while avoiding common migration pitfalls.
 
-##### Data Transport
+### Data Transport
 Access to data is one of the driving factors for cloud adoption. Cloud One provides secure, performative data transport capabilities to access clouds, and then keeps data flowing between systems in the cloud(s) and on-premise.
 
-### Benefits and Features
+## Benefits and Features
 
 - **Common Computing Environment** – We provide the guardrails to the cloud in a standard manner so you can focus on your mission.
 - **Single, Federated, MFA Security Tier** – There is one login across all logins with one user that all management applications leverage, no secondary logins, and non-elevated machine accounts. Fully audited for all management activities.

src/content/service-detail/core-rock.md

 ---
-slug: '/services/core'
+slug: '/services/core/'
 title: 'CORE'
 categories: 
   - Communications
@@ -17,7 +17,7 @@ CORE is a suite of multi-level web applications that provide file sharing and we
 DoD, USAF and industry partners can utilize the capability.
 
 
-### Benefits & Features
+## Benefits & Features
 
 - Increased communication with AF, DoD, and industry
 - Reduces human errors of data transfer
@@ -34,7 +34,7 @@ DoD, USAF and industry partners can utilize the capability.
   - User SAP accesses pulled from JADE
   - Strips PII information for general users
 
-### Requirements
+## Requirements
 
 All necessary forms are provided by the Core Connections Team
 

src/content/service-detail/d1scovery.md

 ---
-slug: '/services/d1scovery'
+slug: '/services/d1scovery/'
 title: 'D1scovery'
 categories: 
   - Data Analysis
@@ -10,14 +10,14 @@ share: '../../images/share/ogimage-data_analysis.png'
 updated: March 31
 ---
 
-An enterprise Big Data Analytics platform hosted on Cloud One that provides advanced data analytics and data management tools up to IL-4.
+An enterprise Big Data Analytics platform hosted on [Cloud One](/services/cloud-one/) that provides advanced data analytics and data management tools up to IL-4.
 
 D1scovery provides an operational environment for analytics-based solutions and gives users access to cutting-edge commercial business intelligence and advanced data analytics tools and environment on Microsoft’s Azure Government Cloud.
 
 
-### Benefits & Features
+## Benefits & Features
 
-**Benefits**
+### Benefits
 
 - Reduce cost and time needed to field Data Analytics Solutions with Data Lab sandbox to test analyses and draft solutions. 
 - Publish vetted analytic solutions that can be shared with any CAC user via URL 
@@ -26,7 +26,7 @@ D1scovery provides an operational environment for analytics-based solutions and
 - Exploit the data analytics working environment and automated DevSecOps processes to deliver your proven solutions 
 - Utilize a comprehensive knowledge portal and on-demand toolbox resources to reduce training and start-up time.
 
-**Available Features**
+### Available Features
 
 - Apache NiFi
 - Apache Spark