Resolve merge conflict

.gitlab-ci.yml

@@ -17,7 +17,7 @@ variables:
   DEPLOY_REPO: https://jdceanfa:${CI_STATIC_SITES_TOKEN}@repo1.dsop.io/platform-one/apps/static-sites.git #<---- hate this (need to fix) - don't want to use tokens
 
 .npm_template:
-  image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
+  image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
 
 lint code:
   extends: .npm_template
@@ -52,7 +52,7 @@ e2e tests:
     - p1
 
 #staging:
-#  image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
+#  image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
 #  extends: .staging-site
 #  script:
 #    - echo 'Publishing build outputs to staging'
@@ -60,7 +60,7 @@ e2e tests:
 #    - npm run build
 
 publish:
-  image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
+  image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
   extends: .copy-site
   script:
     - echo 'Publishing build outputs to MR for deployment'
@@ -70,7 +70,7 @@ publish:
     - p1
 
 publish-staging:
-  image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
+  image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
   extends: .copy-staging-site
   script:
     - echo 'Publishing build outputs to MR for deployment'
@@ -80,7 +80,7 @@ publish-staging:
     - p1
     
 publish:
-  image: registry.dsop.io/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
+  image: registry.dso.mil/platform-one/private/big-bang/pipeline-templates/ext-cypress:v0.2.0
   extends: .copy-site
   script:
     - echo 'Publishing build outputs to MR for deployment'

package-lock.json

@@ -1009,19 +1009,6 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@beyonk/google-fonts-webpack-plugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@beyonk/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-1.5.0.tgz",
-      "integrity": "sha512-jl4n6z+qgwjB+qJbEwznPdYMBAUQMJeuD+m7TRQA3brMRT/Z/Z2v1KYn0i4qwvjpLUh7mb3xQKa2QKpiRWqciA==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.4",
-        "md5": "^2.2.1",
-        "node-fetch": "^2.1.2",
-        "webpack-sources": "^1.1.0",
-        "yauzl": "^2.8.0"
-      }
-    },
     "@cnakazawa/watch": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
@@ -3935,12 +3922,6 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "charenc": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
-      "dev": true
-    },
     "check-more-types": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
@@ -4918,12 +4899,6 @@
         "which": "^1.2.9"
       }
     },
-    "crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
-      "dev": true
-    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -5285,12 +5260,6 @@
           "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
           "dev": true
         },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -6748,9 +6717,9 @@
           },
           "dependencies": {
             "minimist": {
-              "version": "1.2.5",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-              "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+              "version": "0.0.8",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+              "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
               "dev": true
             }
           }
@@ -10138,17 +10107,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dev": true,
-      "requires": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
-      }
-    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -10461,6 +10419,12 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
+    },
     "minipass": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -14557,24 +14521,16 @@
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
         },
         "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
           "dev": true,
           "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          },
-          "dependencies": {
-            "camelcase": {
-              "version": "5.3.1",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-              "dev": true
-            }
+            "camelcase": "^4.1.0"
           }
         }
       }
@@ -16005,19 +15961,19 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
         }
       }
     },
+    "yargs-parser": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      }
+    },
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",

package.json

@@ -32,7 +32,6 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-strict-mode": "^7.8.3",
-    "@beyonk/google-fonts-webpack-plugin": "^1.5.0",
     "@mdi/font": "^5.3.45",
     "@vue/cli-plugin-babel": "~4.3.0",
     "@vue/cli-plugin-e2e-cypress": "~4.3.0",

public/font.css

+@font-face {
+  font-family: Open Sans;
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(./font/OpenSans-Regular.eot);
+  src: local("Open Sans Regular"), local("OpenSans-Regular"),
+    url(./font/OpenSans-Regular.eot) format("embedded-opentype"),
+    url(./font/OpenSans-Regular.woff2) format("woff2"),
+    url(./font/OpenSans-Regular.woff) format("woff"),
+    url(./font/OpenSans-Regular.ttf) format("truetype"),
+    url(./font/OpenSans-Regular.svg) format("svg");
+}
+
+@font-face {
+  font-family: Open Sans;
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url(./font/OpenSans-SemiBold.eot);
+  src: local("Open Sans SemiBold"), local("OpenSans-SemiBold"),
+    url(./font/OpenSans-SemiBold.eot) format("embedded-opentype"),
+    url(./font/OpenSans-SemiBold.woff2) format("woff2"),
+    url(./font/OpenSans-SemiBold.woff) format("woff"),
+    url(./font/OpenSans-SemiBold.ttf) format("truetype"),
+    url(./font/OpenSans-SemiBold.svg) format("svg");
+}
+
+@font-face {
+  font-family: Open Sans;
+  font-style: normal;
+  font-weight: 800;
+  font-display: swap;
+  src: url(./font/OpenSans-ExtraBold.eot);
+  src: local("Open Sans ExtraBold"), local("OpenSans-ExtraBold"),
+    url(./font/OpenSans-ExtraBold.eot) format("embedded-opentype"),
+    url(./font/OpenSans-ExtraBold.woff2) format("woff2"),
+    url(./font/OpenSans-ExtraBold.woff) format("woff"),
+    url(./font/OpenSans-ExtraBold.ttf) format("truetype"),
+    url(./font/OpenSans-ExtraBold.svg) format("svg");
+}

public/index.html

@@ -23,7 +23,10 @@
       property="og:description"
       content="AN OFFICIAL DOD DEVSECOPS ENTERPRISE SERVICES TEAM"
     />
-    <meta property="og:image" content="https://p1.dsop.io/static/p1-meta-logo.png" />
+    <meta
+      property="og:image"
+      content="https://p1.dsop.io/static/p1-meta-logo.png"
+    />
 
     <!-- Twitter -->
     <meta property="twitter:card" content="summary_large_image" />
@@ -33,7 +36,10 @@
       property="twitter:description"
       content="AN OFFICIAL DOD DEVSECOPS ENTERPRISE SERVICES TEAM"
     />
-    <meta property="twitter:image" content="https://p1.dsop.io/static/p1-meta-logo.png" />
+    <meta
+      property="twitter:image"
+      content="https://p1.dsop.io/static/p1-meta-logo.png"
+    />
 
     <link
       rel="icon"
@@ -41,8 +47,15 @@
       sizes="502x498"
       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="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"
+    />
+    <link rel="stylesheet" href="./font.css" />
   </head>
   <body>
     <noscript>