Merge branch 'BULL-1787' into 'master'

fix:various grammar changes to party bus onboarding page.

See merge request !173

src/router/index.js

@@ -117,19 +117,6 @@ const routes = [
       breadcrumb: "Onboarding",
     },
   },
-  {
-    path: "/products/party-bus/onboarding/faqs",
-    name: "PartyBusOnboardingFAQs",
-    component: () =>
-      import(
-        /* webpackChunkName: "party-bus-onboarding-faqs" */ "@/views/PartyBusOnboardingFAQs.vue"
-      ),
-    meta: {
-      title: "Platform One | Products | The Party Bus Onboarding FAQs",
-      bodyClass: "party-bus-onboarding-faqs-page",
-      breadcrumb: "FAQs",
-    },
-  },
   { path: "/bigbangonboarding", redirect: "/products/big-bang/onboarding" },
   { path: "/bigbang-onboarding", redirect: "/products/big-bang/onboarding" },
   {

src/views/PartyBusOnboarding.vue

@@ -104,13 +104,14 @@
             software.
           </p>
           <p>
-            Don't come to the Tech Intake & Technical Fit until your team has
-            prepared by reviewing the Party Bus Service catalog.
+            Ensure Party Bus is the right fit for you and your team by reviewing
+            our service catalog prior to a Tech fit session with one of our
+            experts.
           </p>
           <p>
             During Intake our Customer Success Team will collaborate with you to
             provide all the essential information about the Party Bus, your
-            application and review the
+            application, and review the
             <a href="https://p1.dso.mil/products/party-bus/service-catalog"
               >Party Bus Service Catalog.</a
             >
@@ -183,11 +184,11 @@
           <p>
             The
             <b>PB Anchors will determine the application is a good fit.</b> If
-            it is approved then you'll move on to the
+            it is approved, then you'll move on to the
             <i>Pricing Quote Phase.</i>
           </p>
           <p>
-            If your application is not accepted then a team member will
+            If your application is not accepted, then a team member will
             communicate what adjustments are necessary to refactor your
             application, or outline why Party Bus may not be ideal for your
             application.
@@ -243,7 +244,6 @@
               <p>Step Four Resources:</p>
               <a href="https://sso-info.il2.dso.mil/new_account.html">
                 • P1 SSO Self-Registration
-                <v-icon small left class="ml-n1 mb-0">mdi-lock</v-icon>
               </a>
               <br />
               <ExternalLink
@@ -289,8 +289,8 @@
           <p>
             You may need to associate your Platform One account with your CAC to
             access Party Bus Tools and Pipelines. Fill out paperwork if you
-            don't have a CAC to associate with your account. See resources to
-            the right.
+            don't have a CAC to associate with your account. See resources
+            {{ this.resourceLocation() }}.
           </p>
         </v-col>
       </v-row>
@@ -342,6 +342,9 @@ export default {
   data() {
     return {
       PageMetaPartyBusOnboarding: PageMeta.PartyBusOnboarding,
+      resourceLocation() {
+        return this.$vuetify.breakpoint.mdAndUp ? "to the left" : "above";
+      },
     };
   },
 };

src/views/PartyBusOnboardingFAQs.vue

-<template>
-  <div class="party-bus-onboarding-faqs">
-    <PageHeader>
-      <template slot="title">
-        <h1>
-          {{ PageMetaFaq.title }}
-        </h1>
-      </template>
-    </PageHeader>
-    <div class="container pt-0">
-      <div class="row justify-content-center">
-        <div class="col-xs-12 col-md-10 pt-0">
-          <FAQsSection :searchText="searchText" />
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import PageHeader from "@/components/PageHeader";
-import { PageMeta } from "@/constants/PageMeta";
-import FAQsSection from "@/components/PartyBus/Onboarding/FAQs/FAQsSection";
-
-export default {
-  name: "PartyBusOnboardingFAQs",
-  components: {
-    PageHeader,
-    FAQsSection,
-  },
-  data() {
-    return {
-      PageMetaFaq: PageMeta.PartyBusOnboardingFAQs,
-      searchText: "",
-    };
-  },
-};
-</script>
-<style lang="scss">
-.party-bus-onboarding {
-  .section-container {
-    margin-bottom: 2rem;
-    .registration-card {
-      background-color: $bottom-bg;
-      min-height: 350px;
-      color: white;
-      p {
-        color: white;
-      }
-      h4 {
-        color: white;
-      }
-    }
-    .registration-action {
-      margin-bottom: 30px;
-      h4 {
-        color: white;
-      }
-    }
-  }
-}
-</style>

tests/e2e/support/commands.js

@@ -51,7 +51,11 @@ Cypress.Commands.add("checkLockIcons", () => {
         .then((href) => {
           cy.log("Link text: " + link.text());
           cy.log(href);
-          if (href.match(/(?<!(repo1|p1|login|onboarding|learn).*).dso.mil/)) {
+          if (
+            href.match(
+              /(?<!(repo1|p1|login|onboarding|learn|sso-info).*).dso.mil/
+            )
+          ) {
             cy.log("Expecting lock icon...");
             cy.wrap(link).within(() => {
               cy.get(".mdi-lock").should("exist");