Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: change docs website to hugo to align with other defense unicorns products #2020

Closed
wants to merge 58 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
452703f
Add Defense Unicorns template doc site
bdfinst Jul 13, 2023
4de48c8
chore: add docs config file
bdfinst Jul 15, 2023
c97f123
Add ignore path to configuration
bdfinst Jul 18, 2023
27a8949
Remove template doc
bdfinst Jul 18, 2023
a82a5cb
chore: update configs
bdfinst Aug 2, 2023
a9391d2
Merge remote-tracking branch 'origin' into new-website
bdfinst Aug 2, 2023
78786d8
Upgrade docs theme
bdfinst Aug 2, 2023
08e0aad
Update content path
bdfinst Aug 2, 2023
a718e7f
Don't ignore zarf docs path
bdfinst Aug 2, 2023
2ab50a8
Update transform script location
bdfinst Aug 2, 2023
699f827
Change conversion config file format
bdfinst Aug 2, 2023
509a34c
Merge branch 'main' into new-website
bdfinst Aug 2, 2023
1dc03d4
Add frontmatter to auto-gen docs
bdfinst Aug 3, 2023
879492c
Merge remote-tracking branch 'origin' into new-website
bdfinst Aug 3, 2023
68327f9
Convert docs
bdfinst Aug 3, 2023
c94b352
convert docs
bdfinst Aug 3, 2023
ee87843
Update conversion paths
bdfinst Aug 4, 2023
8fa21ff
Update theme version
bdfinst Aug 4, 2023
6f941e6
Update theme
bdfinst Aug 4, 2023
f166ffa
Merge branch 'main' into new-website
bdfinst Aug 7, 2023
555cad7
chore: add hugo cache clean
bdfinst Aug 7, 2023
39cbd69
chore: add --all flag
bdfinst Aug 7, 2023
0bb63f6
chore: remove --all flag
bdfinst Aug 7, 2023
b05fe24
chore: create example landing page
bdfinst Aug 8, 2023
cae3525
Add include shortcode
bdfinst Aug 8, 2023
b1454b4
Make doc assest findable
bdfinst Aug 8, 2023
1953b3e
Convert properties component to zarfprops shortcode
bdfinst Aug 9, 2023
9630d32
Add include and ignore functions to zarfprops shortcode
bdfinst Aug 9, 2023
d5f9f80
Add packages
bdfinst Aug 9, 2023
a2c14a1
Add contributor import
bdfinst Aug 9, 2023
55b9ed3
Copy arch image
bdfinst Aug 9, 2023
4b051d2
Upgrade conversion script
bdfinst Aug 9, 2023
8d9ae49
Upgrade to latest theme
bdfinst Aug 10, 2023
4975146
Upgrade devDeps
bdfinst Aug 10, 2023
144023e
Upgrade hugodocs
bdfinst Aug 10, 2023
756d120
upgrade theme to 0.2.2
bdfinst Aug 10, 2023
b1f871e
chore: upgrade theme
bdfinst Aug 11, 2023
e02d94c
Merge remote-tracking branch 'origin' into new-website
bdfinst Aug 15, 2023
1d02d9c
chore: upgrade theme version
bdfinst Aug 16, 2023
7eaa41d
chore: improve table format
bdfinst Aug 16, 2023
e8bd38e
Add logos and link to Slack
bdfinst Aug 16, 2023
2cc9459
chore: correct favicons
bdfinst Aug 16, 2023
410387d
Move images
bdfinst Aug 16, 2023
f5b6800
chore: upgrade dependencies
bdfinst Aug 16, 2023
0758f0c
Merge remote-tracking branch 'origin' into new-website
bdfinst Aug 16, 2023
8d1ccd8
Replace docs path
bdfinst Aug 16, 2023
59e1e99
Clean up setup script
bdfinst Aug 17, 2023
479576f
chore: fix annoying Hugo warning.
bdfinst Aug 18, 2023
f4b8ecb
chore: update deps
bdfinst Aug 18, 2023
525eead
chore: add conversaion process to README
bdfinst Aug 18, 2023
aec168b
Merge remote-tracking branch 'origin' into new-website
bdfinst Sep 19, 2023
03fe00c
chore: upgrade theme
bdfinst Sep 19, 2023
70974e5
Merge branch 'main' into new-website
bdfinst Sep 27, 2023
2efb6ed
Merge branch 'main' into new-website
Noxsios Oct 13, 2023
1f4ee8d
Merge branch 'main' into new-website
Nov 30, 2023
18fdad8
Merge branch 'main' into new-website
Racer159 Feb 8, 2024
85fa30f
Merge branch 'main' into new-website
bdfinst Mar 15, 2024
914264b
Merge branch 'main' into new-website
bdfinst Apr 4, 2024
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ zarf-sbom/
test-*.txt
__debug_bin
docs-website/static/zarf.schema.json
docs-hugo
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -227,3 +227,9 @@ cve-report: ## Create a CVE report for the current project (must `brew install g

lint-go: ## Run revive to lint the go code (must `brew install revive` first)
revive -config revive.toml -exclude src/cmd/viper.go -formatter stylish ./src/...

build-website:
find . -type d -empty -delete
# make docs-and-schema
cd docs-website-new && hugodocs && npm start

27 changes: 27 additions & 0 deletions docs-website-new/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Editor configuration, see https://editorconfig.org

root = true

# All files
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# Allow trailing spaces in md as that is the syntax for a newline
[*.md]
trim_trailing_whitespace = false

# 4 space indentation
[*.js]
indent_style = space
indent_size = 2

[*.json]
indent_style = space
indent_size = 2

[*.yml, *.yaml]
indent_style = space
indent_size = 2
12 changes: 12 additions & 0 deletions docs-website-new/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.idea/
.history/
public/
resources/
.DS_Store
node_modules/
.hugo_build.lock
!data/
!assets/
!zarf/
data/zarf_schema.json
static/includes
11 changes: 11 additions & 0 deletions docs-website-new/.hugo-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
mounts:
# Convert the docs folder to Hugo format
- source: "../docs"
docsRoot: "0-zarf-overview.md"
rootTitle: "Documentation"
target: "../docs-hugo"
ignores: [".templates"]

# Convert README.md files to be usable by Hugo
- source: "../examples"
target: "../docs-hugo/docs"
8 changes: 8 additions & 0 deletions docs-website-new/.linkinator.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recurse": true,
"skip": "^(https://example.com)",
"verbosity": "error",
"timeout": 0,
"markdown": true,
"directoryListing": true
}
6 changes: 6 additions & 0 deletions docs-website-new/.markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"default": true,
"MD033": false,
"MD013": false,
"MD036": false
}
12 changes: 12 additions & 0 deletions docs-website-new/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
public/
node_modules/
.cache
.history
dist
coverage
docs/app
__mocks__
userguide/
.release-please-manifest.json
CHANGELOG.md
.vscode/
19 changes: 19 additions & 0 deletions docs-website-new/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"printWidth": 120,
"proseWrap": "always",
"tabWidth": 2,
"semi": false,
"singleQuote": true,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "avoid",
"goTemplateBracketSpacing": true,
"overrides": [
{
"files": ["*.html"],
"options": {
"parser": "go-template"
}
}
]
}
201 changes: 201 additions & 0 deletions docs-website-new/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [2023] [Defense Unicorns]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
32 changes: 32 additions & 0 deletions docs-website-new/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Zarf Hugo Doc Site

This site is built using the [Defense Unicorns](https://github.com/defenseunicorns/defense-unicorns-hugo-theme) theme
for Hugo

## Contributing content

Content is created using standard markdown with [frontmatter](https://main--starlit-valkyrie-7f1dd9.netlify.app/docs/adding-content/content/#page-frontmatter) to control page order, title, menu title, etc. More rich
user interactions can be implemented using the [shortcodes from the theme](https://main--starlit-valkyrie-7f1dd9.netlify.app/docs/adding-content/shortcodes/) or by creating local shortcodes for
specialized interactions.

## Converting documents

The current documentation is formatted and structured for Docusaurus. In addition, the auto-generated docs are built
with that format. The `setup-docs.sh` script is run by `npm start` to copy some example files to reachable locations, convert all of the existing
documentation, and move the Docusaurus documentation to a backup folder pending deletion. Once the conversion
meets expectations, the old documentation will be removed and cleanup will begin.

### Post Conversion TODOs

- Modify the API documentation generator to create documents with the correct frontmatter and shortcodes
- Consolidate all scripts used for generating automated docs to simplify maintenance.

## Running Locally

To run the site for local development:

```bash
npm start
```

Then navigate to [http://localhost:1313/](http://localhost:1313/)
10 changes: 10 additions & 0 deletions docs-website-new/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
title: Defense Unicorns Docs Template
linkTitle: Documentation
menu: {main: {weight: 20}}
---

This is a blank template for creating documentation sites. This template uses the [Defense Unicorns Hugo
theme](https://github.com/defenseunicorns/defense-unicorns-hugo-theme). See the [user
guide](https://github.com/defenseunicorns/defense-unicorns-hugo-theme/tree/main/userguide) in the theme for more
configuration options.
6 changes: 6 additions & 0 deletions docs-website-new/archetypes/default.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: "{{ replace .Name "-" " " | title }}"
date: {{ .Date }}
draft: true
---

Loading
Loading