Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
41ba4cc
Install elleventy with nunjucks
mark-ohanesian Nov 19, 2025
1342591
Add Eleventy scripts to package.json
mark-ohanesian Nov 19, 2025
d690ee5
Build site with eleventy
mark-ohanesian Nov 19, 2025
2bfc384
Create standard eleventy config file; config to allow processing .htm…
mark-ohanesian Nov 19, 2025
8cb7ab7
Create .njk file for global footer
mark-ohanesian Nov 19, 2025
e3a7818
Update eleventy config to passthrough copy images to build to fix bro…
mark-ohanesian Nov 20, 2025
d1d7c6f
Update build
mark-ohanesian Nov 20, 2025
1f811b6
Add footer via nunjucks to index.html
mark-ohanesian Nov 20, 2025
845ef73
Add _site folder to .gitignore to disclude build updates from git his…
mark-ohanesian Nov 20, 2025
a8542e8
Add nunjucks footer to all pages
mark-ohanesian Nov 20, 2025
9928cf3
Move html to src folder
mark-ohanesian Nov 20, 2025
50144ec
Delete old _site folder
mark-ohanesian Nov 20, 2025
c424699
Hide node modules from git history (add to gitignore)
mark-ohanesian Nov 20, 2025
ddc3e5c
Delete node_modules
mark-ohanesian Nov 20, 2025
56bedb2
Reinstall node modules
mark-ohanesian Nov 20, 2025
36e8f39
Fix paths
mark-ohanesian Nov 20, 2025
f8bfffc
Restore spanish pages and move to src/es for eleventy
mark-ohanesian Nov 20, 2025
adda588
Fix path to css
mark-ohanesian Nov 20, 2025
8285b59
Formatting
mark-ohanesian Nov 20, 2025
c7a61b5
Create spanish global footer
mark-ohanesian Nov 20, 2025
15c69dd
Replace static footer with global in es pages
mark-ohanesian Nov 20, 2025
caaa58b
Fix homepage translation link
mark-ohanesian Nov 20, 2025
120405d
Create global main header for es
mark-ohanesian Nov 20, 2025
0cb00fc
Add global header to es pages
mark-ohanesian Nov 20, 2025
76775c4
Fix spanish pages paths to css and images
mark-ohanesian Nov 20, 2025
e3b59bf
Fix paths to styles and images on es homepage
mark-ohanesian Nov 20, 2025
37661b2
fix all translation and banner/home links on spanish pages
mark-ohanesian Nov 20, 2025
0c3851a
Fix spanish individual page and translation links on english pages
mark-ohanesian Nov 20, 2025
1009fc6
Create universal bottom section (bottom links) for spanish
mark-ohanesian Nov 20, 2025
d56765c
Update bottom section es
mark-ohanesian Nov 20, 2025
c07c9d5
Add universal bottom section to spanish pages
mark-ohanesian Nov 20, 2025
087fa3f
Fix content not centered on spanish pages bottom links area
mark-ohanesian Nov 20, 2025
a8368b0
Create global bottom section
mark-ohanesian Nov 20, 2025
7e9c494
Implement global bottom section for all eng pages
mark-ohanesian Nov 20, 2025
8091faf
Create global nav for eng pages
mark-ohanesian Nov 20, 2025
982812f
Implement global nav on all eng pages
mark-ohanesian Nov 20, 2025
fcc8188
Fix spanish homepage filename, update path to es home
mark-ohanesian Nov 20, 2025
b9f0c58
Adding prettier formatting
carterm Nov 20, 2025
acc42e7
extension recommendations
carterm Nov 20, 2025
6c2b4b9
Merge pull request #65 from Office-of-Digital-Services/cmedlin-updates
mark-ohanesian Nov 20, 2025
74f0a3c
Fix redundant p tag, prettier
mark-ohanesian Nov 20, 2025
ead773f
use front matter variables for head tags and page permalink
mark-ohanesian Nov 20, 2025
d87c8b7
Use original navigation links
mark-ohanesian Nov 20, 2025
48fd3ea
Update front matter for all pages in eng and es
mark-ohanesian Nov 20, 2025
95e5d7b
Update front matter
mark-ohanesian Nov 20, 2025
5d501a9
Reorganize file structure
mark-ohanesian Nov 20, 2025
dd2ba53
Add config to pass through docs and root utility files
mark-ohanesian Nov 20, 2025
5539466
Move css and images into src folder
mark-ohanesian Nov 20, 2025
148ccee
Update config to pass through css and images
mark-ohanesian Nov 20, 2025
716be02
Fix spanish pdf download link
mark-ohanesian Nov 20, 2025
2a6b1f6
Add permalink + front matter for Spanish homepag
mark-ohanesian Nov 21, 2025
353b73d
Remove extra index for spanish pages
mark-ohanesian Nov 21, 2025
bbba814
Feature/update architecture to Elleventy and file organization
mark-ohanesian Nov 21, 2025
d4a90d9
Update Build Pipeline for re-architecture - similar to CA.gov pipeline
sjohl-oet Nov 21, 2025
d61a600
Add Azure DevOps development build pipeline for re-architecture of pr…
sjohl-oet Nov 21, 2025
4fd0fa4
Add Test Build pipeline for re-architecture similar to CA.gov pipeline
sjohl-oet Nov 21, 2025
e164e5e
Delete azure-pipelines.yml - Old pipeline after re-architecture
sjohl-oet Nov 21, 2025
3a9707c
Delete azure-dev-build-pipelines.yml - Old after re-architecture effort
sjohl-oet Nov 21, 2025
c81fbf5
Merge pull request #70 from Office-of-Digital-Services/devsecops-buil…
sjohl-oet Nov 21, 2025
b14452a
updated spanish links
kkoryaka Nov 22, 2025
b0bd82f
Merge pull request #71 from Office-of-Digital-Services/spanish-fix
kkoryaka Nov 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .eleventy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = function (eleventyConfig) {
// Passthrough copy for static assets
eleventyConfig.addPassthroughCopy("src/images");
eleventyConfig.addPassthroughCopy("src/css");
eleventyConfig.addPassthroughCopy({
"src/root": "."
});
eleventyConfig.addPassthroughCopy({
"src/docs": "."
});
// Add more passthroughs if needed (e.g., fonts, js)
return {
dir: {
input: "src",
includes: "_includes",
output: "_site"
},
htmlTemplateEngine: "njk",
templateFormats: ["html", "njk"]
};
};
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
.DS_Store

/_site
/node_modules
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_site
25 changes: 25 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"arrowParens": "avoid",
"trailingComma": "none",
"tabWidth": 2,
"bracketSameLine": true,
"singleAttributePerLine": false,
"embeddedLanguageFormatting": "off",
"overrides": [
{
"files": "web.config",
"options": {
"parser": "html",
"printWidth": 120
}
},
{
"files": ["*.svg", "*.xml"],
"options": {
"parser": "html",
"printWidth": 9999
}
}
]
}
7 changes: 7 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"recommendations": [
"esbenp.prettier-vscode",
"tombonnike.vscode-status-bar-format-toggle",
"ambooth.git-rename"
]
}
18 changes: 16 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
{
"liveServer.settings.port": 5501
}
"terminal.integrated.defaultProfile.windows": "Git Bash",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.tabSize": 2,
"editor.detectIndentation": false,
"formattingToggle.affects": ["editor.formatOnSave"],
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"prettier.documentSelectors": ["**/web.config", "**/*.svg", "**/*.xml"]
}
18 changes: 0 additions & 18 deletions azure-dev-build-pipelines.yml

This file was deleted.

46 changes: 46 additions & 0 deletions azure-development-build-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

# Node.js
# Build a general Node.js project with npm.
# Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript

trigger:
- development
pr: none

pool:
vmImage: "ubuntu-latest"

steps:
- script: |
echo "##vso[build.addbuildtag]trigger-$(Build.Reason)"
displayName: "Tag build with trigger reason"

- task: NodeTool@0
inputs:
versionSpec: "18.x"
displayName: "Install Node.js"

- task: Npm@1
inputs:
command: "install"
displayName: "npm install"

- 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
46 changes: 46 additions & 0 deletions azure-main-build-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

# Node.js
# Build a general Node.js project with npm.
# Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript

trigger:
- main
pr: none

pool:
vmImage: "ubuntu-latest"

steps:
- script: |
echo "##vso[build.addbuildtag]trigger-$(Build.Reason)"
displayName: "Tag build with trigger reason"

- task: NodeTool@0
inputs:
versionSpec: "18.x"
displayName: "Install Node.js"

- task: Npm@1
inputs:
command: "install"
displayName: "npm install"

- 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
18 changes: 0 additions & 18 deletions azure-pipelines.yml

This file was deleted.

46 changes: 46 additions & 0 deletions azure-test-build-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

# Node.js
# Build a general Node.js project with npm.
# Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript

trigger:
- test
pr: none

pool:
vmImage: "ubuntu-latest"

steps:
- script: |
echo "##vso[build.addbuildtag]trigger-$(Build.Reason)"
displayName: "Tag build with trigger reason"

- task: NodeTool@0
inputs:
versionSpec: "18.x"
displayName: "Install Node.js"

- task: Npm@1
inputs:
command: "install"
displayName: "npm install"

- 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
Loading
Loading