.gitlab/merge_request_templates/Default.md

+# Merge Request Checklist
+
+### Review
+
+- [ ] Make sure the pipeline has passed. You may have to check the mirrored repo in code.il2.dso.mil to see the pipelines.
+- [ ] Make sure that there are no errors in the development console.
+- [ ] Make sure everything in the the ticket is addressed and that the acceptance criteria (if applicable) is met.
+- [ ] Make sure all components and images match the design file or instruction given (if applicable).
+- [ ] Make sure to take out any unused code.
+- [ ] Make sure that common mistakes are not present in the code base. (See list under _Common Mistakes_ below).
+- [ ] Make sure the page is responsive (see the list for _Responsiveness_ below for checklist).
+- [ ] Check if any other issues may need to be checked (some examples can be found under _Other items to look out for_)
+
+#### Common Mistakes
+
+- [ ] Make sure all words are spelled correctly (if applicable).
+- [ ] Make sure the right images are used (if applicable).
+- [ ] Do not use any inline styles in the HTML component in files.
+- [ ] Make sure everything is aligned correctly.
+- [ ] Please avoid making global variables.
+- [ ] Make sure error handling is in appropriate places.
+- [ ] Remove all test code within the working sections when ready to push to master.
+
+### Responsiveness
+
+For all below check the following breakpoints for Vue apps
+| Devices | Code | Screen sizes |
+| ------ | ------ | ------ |
+| Extra Small | xs | < 600px |
+| Small | sm | 600px > < 960px |
+| Medium | md | 960px > < 1264px |
+| Large | lg | 1264px > < 1904px |
+| Extra Large | xl | > 1904px |
+
+- [ ] Check for bad word breaks within each breakpoint.
+- [ ] Check to see if components are misaligned or have bad spacing, padding, or margin.
+- [ ] Check to see if components overflow to either side of the viewport.
+- [ ] Check if there are any weird visual glitches at different breakpoints.
+
+#### Other items to look out for
+
+- [ ] Make sure new API calls use the correct HTTP verb and when working with JSON make sure it is validated. - With `GET`s, make sure that text/html return type is avoided and application/json is used when dealing with json data. - Avoid transmission of confidental data in URL parameters and unnecessary parameters. - Make sure all API calls are within a try catch block with appropriate error handling.
+- [ ] If dealing with forms, make sure the form has input validation.
+- [ ] Avoid logging confidental information.
+- [ ] Make sure `no-cache` is on confidental web pages.
+- [ ] Make sure `rel="noopener noreferer"` is on any link that opens to a new tab.

README.md

 # platform1-site
+# test commit
 
 Static site for https://p1.dso.mil
 Staging url: https://p1.staging.dso.mil
+test2
 
 ## Requirements
-- nodejs v16  installed
-    - Windows Installation:
-        - Download the latest LTS Version 16 here: https://nodejs.org/en/download/
-    - Linux Installation:
-        ```
-        npm cache clean -f 
-        npm install -g n
-        n 16
-        ```
+
+- nodejs v16 installed
+  - Windows Installation:
+    - Download the latest LTS Version 16 here: https://nodejs.org/en/download/
+  - Linux Installation:
+    ```
+    npm cache clean -f
+    npm install -g n
+    n 16
+    ```
 
 ## Project setup
 

cypress.json

 {
-  "pluginsFile": "tests/e2e/plugins/index.js"
+  "pluginsFile": "tests/e2e/plugins/index.js",
+  "numTestsKeptInMemory": 0,
+  "video": false
 }

package.json

@@ -6,13 +6,14 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
-    "test:e2e": "vue-cli-service test:e2e --mode=test",
+    "test:e2e": "vue-cli-service test:e2e --mode=development",
     "lint": "vue-cli-service lint",
     "build-staging": "NODE_ENV=production vue-cli-service build --mode=test",
     "preinstall": "cross-env NPM_CONFIG_YES=true npx npm-force-resolutions",
     "test": "npm run test:unit && npx vue-cli-service test:e2e --headless",
     "test:e2e-ci": "npx vue-cli-service test:e2e --headless",
-    "pretty-quick": "npx pretty-quick --staged"
+    "pretty-quick": "npx pretty-quick --staged",
+    "prepare": "husky install"
   },
   "pre-commit": [
     "pretty-quick"
@@ -38,7 +39,7 @@
     "@babel/plugin-transform-strict-mode": "^7.8.3",
     "@mdi/font": "^5.3.45",
     "@vue/cli-plugin-babel": "~4.3.0",
-    "@vue/cli-plugin-e2e-cypress": "~4.3.0",
+    "@vue/cli-plugin-e2e-cypress": "^5.0.1",
     "@vue/cli-plugin-eslint": "~4.3.0",
     "@vue/cli-plugin-router": "~4.3.0",
     "@vue/cli-plugin-unit-jest": "^4.4.1",
@@ -47,15 +48,16 @@
     "@vue/test-utils": "^1.0.3",
     "babel-eslint": "^10.1.0",
     "chokidar": "^3.5.2",
+    "cypress": "^9.5.1",
     "eslint": "^6.7.2",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-vue": "^6.2.2",
     "gulp-sass": "^5.0.0",
-    "husky": "^7.0.0",
+    "husky": "^7.0.4",
     "node-sass": "^6.0.1",
     "pre-commit": "^1.2.2",
-    "prettier": "^1.19.1",
+    "prettier": "^2.5.1",
     "pretty-quick": "^3.1.3",
     "sass": "^1.19.0",
     "sass-loader": "^10.2.0",

public/index.html

@@ -41,22 +41,22 @@
       content="https://p1.dso.mil/static/p1-meta-logo.png"
     />
 
-    <script nonce="PADAWAN_CSP_NONCE">window.globalNonce = "PADAWAN_CSP_NONCE";</script>
-
+    <script nonce="PADAWAN_CSP_NONCE">
+      window.globalNonce = "PADAWAN_CSP_NONCE";
+    </script>
 
     <link
       rel="icon"
       type="image/png"
       sizes="502x498"
-      href="./static/p1-logo.png"
+      href="/static/p1-logo.png"
     />
     <link
       rel="stylesheet"
       href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
     />
 
-    <link rel="stylesheet" href="./font.css" />
-    
+    <link rel="stylesheet" href="/font.css" />
   </head>
   <body>
     <noscript>
@@ -69,14 +69,13 @@
     <!-- built files will be auto injected -->
     <script nonce="PADAWAN_CSP_NONCE">
       document.origCreateElement = document.createElement;
-      document.createElement = (tag) => {
+      document.createElement = tag => {
         let elem = document.origCreateElement(tag);
         if (tag === "script" || tag === "style" || tag === "link") {
           elem.nonce = "PADAWAN_CSP_NONCE";
         }
         return elem;
-      }
+      };
     </script>
-  
   </body>
 </html>

src/assets/data/party-bus-courses.json

 [
-  {
-    "name": "P1 Party Bus 3-day Workshop 067",
-    "description": "3-day \"The Party Bus\" ABMS ADCE Onboarding",
-    "type": "3-day",
-    "startDate": "2022-02-14",
-    "endDate": "2022-02-16",
-    "maxSeats": 30,
-    "reservedSeats": 0
-  },
   {
     "name": "P1 Party Bus 3-day Workshop 068",
     "description": "3-day \"The Party Bus\" ABMS ADCE Onboarding",
@@ -44,6 +35,15 @@
     "maxSeats": 30,
     "reservedSeats": 0
   },
+  {
+    "name": "P1 Party Bus 3-day Workshop 072",
+    "description": "3-day \"The Party Bus\" ABMS ADCE Onboarding",
+    "type": "3-day",
+    "startDate": "2022-03-21",
+    "endDate": "2022-03-23",
+    "maxSeats": 30,
+    "reservedSeats": 0
+  },
   {
     "name": "Party Bus PM Workshop 18",
     "description": "PM Workshop",

src/components/Base/DownloadButton.vue

 <template>
   <a
+    data-cy="download"
     :href="internalFilePath"
     :relativeURL="true ? 'download' : undefined"
     class="download-button"
@@ -15,10 +16,11 @@
     >
       <v-icon
         left
+        :class="iconClass"
         :size="iconSize"
         :style="{
           fill: iconFillColor,
-          color: fileMultipleColor + ' !important'
+          color: fileMultipleColor + ' !important',
         }"
       >
         {{ icon }}
@@ -34,7 +36,7 @@
           right
           size="24"
           :style="{ color: downloadColor + ' !important' }"
-          class="mt-1 "
+          :class="downloadIconClass"
         >
           mdi-download
         </v-icon>
@@ -48,73 +50,81 @@ export default {
   props: {
     showDownload: {
       type: Boolean,
-      default: true
+      default: true,
     },
     text: {
       type: String,
-      default: ""
+      default: "",
     },
     internalFilePath: {
       type: String,
-      default: ""
+      default: "",
     },
     iconFillColor: {
       type: String,
-      default: "#FFFFFF"
+      default: "#FFFFFF",
     },
     fileMultipleColor: {
       type: String,
-      default: "#FFFFFF"
+      default: "#FFFFFF",
     },
     textColor: {
       type: String,
-      default: ""
+      default: "",
     },
     textSize: {
       type: String,
-      default: "16"
+      default: "16",
     },
     downloadColor: {
       type: String,
-      default: "#BDC931"
+      default: "#BDC931",
     },
     btnColor: {
       type: String,
-      default: "#002743"
+      default: "#002743",
     },
     btnSpanTextClass: {
       type: String,
-      default: "ml-2 mr-8"
+      default: "ml-2 mr-8",
     },
     btnClass: {
       type: String,
-      default: ""
+      default: "",
     },
     target: {
       type: String,
-      default: "_blank"
+      default: "_blank",
     },
     btnWidth: {
       type: String,
-      default: ""
+      default: "",
     },
     btnHeight: {
       type: String,
-      default: ""
+      default: "",
     },
     relativeURL: {
       type: String,
-      default: ""
+      default: "",
     },
     icon: {
       type: String,
-      default: "mdi-file-multiple"
+      default: "mdi-file-multiple",
     },
     iconSize: {
       type: Number,
-      default: 24
-    }
-  }
+      default: 24,
+    },
+    iconClass: {
+      type: String,
+      default: "",
+    },
+    downloadIconClass: {
+      type: String,
+      default: "mt-1",
+    },
+  },
 };
 </script>
 <style lang="scss" scoped></style>

src/components/Base/ServiceCard.vue

@@ -26,15 +26,15 @@ export default {
     icon: String,
     iconWidth: String,
     header: String,
-    subheader: String,
+    subheader: String
   },
+
   data() {
     return {
-      svgComponent: this.logoSvg,
+      svgComponent: this.logoSvg
     };
   },
-  methods: {},
+  methods: {}
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/components/Breadcrumb.vue

@@ -44,7 +44,7 @@ export default {
           if (routeMap[currentPath] && path.toLowerCase() !== "products") {
             breadcrumbArray.push({
               path: currentPath,
-              href: `#${currentPath}`,
+              href: currentPath,
               text: routeMap[currentPath]
             });
           }

src/components/Footer.vue

@@ -52,15 +52,9 @@
               <router-link to="/">
                 <h4 class="px-0 mb-3 mt-1">HOME</h4>
               </router-link>
-              <router-link to="/services">
-                Services
-              </router-link>
-              <router-link to="/who-we-are">
-                Who We Are
-              </router-link>
-              <router-link to="/contact-us">
-                Contact Us
-              </router-link>
+              <router-link to="/services"> Services </router-link>
+              <router-link to="/who-we-are"> Who We Are </router-link>
+              <router-link to="/contact-us"> Contact Us </router-link>
             </v-col>
             <v-col
               class="py-0 d-flex flex-column mt-4 mt-sm-0 link-column text-left"
@@ -75,18 +69,22 @@
               <a href="https://software.af.mil/training/" target="_blank">
                 DevSecOps Training
               </a>
-              <a href="https://repo1.dso.mil" target="_blank">
-                Repo One
-              </a>
+              <a href="https://repo1.dso.mil" target="_blank"> Repo One </a>
               <a href="https://repo1.dso.mil/dsawg-devsecops/" target="_blank">
                 DSAWG on Repo One
               </a>
               <a href="https://ironbank.dso.mil" target="_blank">
                 Iron Bank
+                <v-icon small left color="#E1E1E1" class="mr-0 mb-1"
+                  >mdi-lock</v-icon
+                >
               </a>
               <a href="https://registry1.dso.mil/" target="_blank"
-                >Registry One</a
-              >
+                >Registry One
+                <v-icon small left color="#E1E1E1" class="mr-0 mb-1"
+                  >mdi-lock</v-icon
+                >
+              </a>
             </v-col>
             <v-col
               class="py-0 d-flex flex-column mt-4 mt-md-0 link-column text-left"
@@ -109,6 +107,9 @@
                 target="_blank"
               >
                 Chat
+                <v-icon small left color="#E1E1E1" class="mr-0 mb-1"
+                  >mdi-lock</v-icon
+                >
               </a>
               <a href="https://onboarding.il2.dso.mil/" target="_blank">
                 Cohort On-boarding
@@ -138,8 +139,8 @@ export default {
     LinkedInLogo,
     YouTubeLogo,
     AirForceLogo,
-    MediumLogo
-  }
+    MediumLogo,
+  },
 };
 </script>
 <style lang="scss" scoped>