Merge pull request #1142 from Office-of-Digital-Services/6.1.0-meta-u…

…pdates meta updates
Office-of-Digital-Services · Dec 23, 2022 · 5efa15f · 5efa15f
2 parents 472d488 + 462f491
commit 5efa15f
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 126 deletions.
diff --git a/.github/workflows/master_as-cdt-pub-migr-templatews-ww-p-001(stage).yml b/.github/workflows/master_as-cdt-pub-migr-templatews-ww-p-001(stage).yml
diff --git a/beta-dev-build-staging.yml b/beta-dev-build-staging.yml
@@ -3,79 +3,76 @@
 # Add steps that analyze code, save build artifacts, deploy, and more:
 # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
 
-trigger: 
-- beta-dev
+trigger:
+  - beta-dev
 
 pr: none
 
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: "ubuntu-latest"
 
 steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: "18.x"
+    displayName: "Install Node.js"
 
-- task: NodeTool@0
-  inputs:
-    versionSpec: '18.x'
-  displayName: 'Install Node.js'
+  - task: Npm@1
+    inputs:
+      command: "install"
+    displayName: "npm install"
 
-- task: Npm@1
-  inputs:
-    command: 'install'
-  displayName: "npm install"
+  # - script: npm run test
+  #   displayName: "npm test"
+  #   env:
+  #     CI: true
 
-# - script: npm run test
-#   displayName: "npm test"
-#   env:
-#     CI: true
+  # - task: PublishCodeCoverageResults@1
+  #   inputs:
+  #     codeCoverageTool: 'Cobertura'
+  #     summaryFileLocation: 'coverage/cobertura-coverage.xml'
+  #     reportDirectory: 'coverage'
+  #   displayName: 'Publish Code Coverage'
 
-# - task: PublishCodeCoverageResults@1
-#   inputs:
-#     codeCoverageTool: 'Cobertura'
-#     summaryFileLocation: 'coverage/cobertura-coverage.xml'
-#     reportDirectory: 'coverage'
-#   displayName: 'Publish Code Coverage'
-
-- script: npm run build
-  displayName: "npm build"
+  - script: npm run build
+    displayName: "npm build"
 
-- task: CopyFiles@2
-  inputs:
-    Contents: '_site/**' # Pull the build directory
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
-- task: PublishBuildArtifacts@1
-  inputs: 
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)/_site' # build files
-    ArtifactName: 'drop' # output artifact named drop
-- task: ArchiveFiles@2
-  inputs:
-    rootFolderOrFile: '$(Build.ArtifactStagingDirectory)'
-    includeRootFolder: true
-    archiveType: 'zip'
-    archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip'
-    replaceExistingArchive: true
+  - task: CopyFiles@2
+    inputs:
+      Contents: "_site/**" # Pull the build directory
+      TargetFolder: "$(Build.ArtifactStagingDirectory)"
+  - task: PublishBuildArtifacts@1
+    inputs:
+      PathtoPublish: "$(Build.ArtifactStagingDirectory)/_site" # build files
+      ArtifactName: "drop" # output artifact named drop
+  - task: ArchiveFiles@2
+    inputs:
+      rootFolderOrFile: "$(Build.ArtifactStagingDirectory)"
+      includeRootFolder: true
+      archiveType: "zip"
+      archiveFile: "$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip"
+      replaceExistingArchive: true
 
-- task: Veracode@3
-  inputs:
-    ConnectionDetailsSelection: 'Endpoint'
-    AnalysisService: 'Veracode'
-    veracodeAppProfile: '$(system.teamProject)'
-    version: '$(build.buildNumber)'
-    filepath: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip'
-    createProfile: true
-    maximumWaitTime: '360'
+  - task: Veracode@3
+    inputs:
+      ConnectionDetailsSelection: "Endpoint"
+      AnalysisService: "Veracode"
+      veracodeAppProfile: "$(system.teamProject)"
+      version: "$(build.buildNumber)"
+      filepath: "$(Build.ArtifactStagingDirectory)/$(Build.BuildId).zip"
+      createProfile: true
+      maximumWaitTime: "360"
 
+  - task: SonarQubePrepare@5
+    inputs:
+      SonarQube: "sonar"
+      scannerMode: "CLI"
+      configMode: "manual"
+      cliProjectKey: "beta.template.webtools.website"
+      cliProjectName: "beta.template.webtools.website"
+      cliSources: "$(build.artifactstagingdirectory)"
+  - task: SonarQubeAnalyze@5
 
-- task: SonarQubePrepare@5
-  inputs:
-    SonarQube: 'sonar'
-    scannerMode: 'CLI'
-    configMode: 'manual'
-    cliProjectKey: 'beta.template.webtools.website'
-    cliProjectName: 'beta.template.webtools.website'
-    cliSources: '$(build.artifactstagingdirectory)'
-- task: SonarQubeAnalyze@5
-
-- task: SonarQubePublish@5
-  inputs:
-
-    pollingTimeoutSec: '300'
+  - task: SonarQubePublish@5
+    inputs:
+      pollingTimeoutSec: "300"
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,7 @@
 # Version History
 
 
-## 6.0.9
+## 6.1.0
 - Updated alert banner
 - Added 8 new icons to the CAGov icons font
 - Added side navigation component

diff --git a/src/_includes/head-js-css.njk b/src/_includes/head-js-css.njk
@@ -1,9 +1,3 @@
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="HandheldFriendly" content="True">
-<meta name="MobileOptimized" content="320">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
-<meta property="og:image" content="https://california.azureedge.net/cdt/statetemplate/global/images/social_media_preview_image.png">
-
 <link rel="stylesheet" href="/css/cagov.core.min.css">
 {% if colortheme %}
       <link rel="stylesheet" href="{{colortheme}}" />

diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
@@ -4,8 +4,32 @@
   <title>{{ title }}</title> 
   <meta charset="utf-8">
   <meta name="Author" content="State of California" />
-  <meta name="Description" content="State of California" />
+  <meta name="Description" content="Version 6 of the State Web Template is California's latest web design standard." />
   <meta name="Keywords" content="California, government" />
+
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="HandheldFriendly" content="True">
+  <meta name="MobileOptimized" content="320">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
+
+  <!-- Primary Meta Tags -->
+  <meta name="title" content="California State Web Template">
+  <meta name="description" content="Version 6 of the State Web Template is California's latest web design standard.">
+
+  <!-- Open Graph / Facebook -->
+  <meta property="og:type" content="website">
+  <meta property="og:url" content="https://template.webstandards.ca.gov/">
+  <meta property="og:title" content="California State Web Template">
+  <meta property="og:description" content="Version 6 of the State Web Template is California's latest web design standard.">
+  <meta property="og:image" content="https://california.azureedge.net/cdt/statetemplate/global/images/social_media_preview_image.png">
+
+  <!-- Twitter -->
+  <meta property="twitter:card" content="summary_large_image">
+  <meta property="twitter:url" content="https://template.webstandards.ca.gov/">
+  <meta property="twitter:title" content="California State Web Template">
+  <meta property="twitter:description" content="Version 6 of the State Web Template is California's latest web design standard.">
+  <meta property="twitter:image" content="https://california.azureedge.net/cdt/statetemplate/global/images/social_media_preview_image.png">
+
   {% include "../head-js-css.njk" %}
 </head>
 <body class="primary">