Skip to content

Commit

Permalink
Quarto (#12)
Browse files Browse the repository at this point in the history
* feat: remove github pages config

* feat: quarto support added

* ci: quarto ci improvment

* ci: test

* docs: Quarto added

* ci: update labeler

* fix: merge conflict

* fix: implement dual licensing

* feat: improve rendering by changing licenses file format

---------

Co-authored-by: mtwente <[email protected]>
  • Loading branch information
maehr and mtwente authored May 6, 2024
1 parent a358226 commit b1aac62
Show file tree
Hide file tree
Showing 19 changed files with 171 additions and 89 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
triage:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: '${{ secrets.GITHUB_TOKEN }}'
80 changes: 80 additions & 0 deletions .github/workflows/quarto-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
on:
push:
branches:
- main
workflow_dispatch:

name: Render and Publish

# you need these permissions to publish to GitHub pages
permissions:
contents: write
pages: write

jobs:
build-deploy:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Set up Quarto
uses: quarto-dev/quarto-actions/setup@v2
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# To install LaTeX to build PDF book outputs, uncomment below
# tinytex: true
# uncomment below and fill to pin a version
# version: SPECIFIC-QUARTO-VERSION-HERE

# add software dependencies here and any libraries

# From https://github.com/actions/setup-python
# - name: Setup Python
# uses: actions/setup-python@v3

# From https://github.com/r-lib/actions/tree/v2-branch/setup-r
# - name: Setup R
# uses: r-lib/actions/setup-r@v2

# From https://github.com/julia-actions/setup-julia
# - name: Setup Julia
# uses: julia-actions/setup-julia@v1

# See more at https://github.com/quarto-dev/quarto-actions/blob/main/examples/example-03-dependencies.md

# To publish to Netlify, RStudio Connect, or GitHub Pages, uncomment
# the appropriate block below

# - name: Publish to Netlify (and render)
# uses: quarto-dev/quarto-actions/publish@v2
# with:
# target: netlify
# NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

# - name: Publish to RStudio Connect (and render)
# uses: quarto-dev/quarto-actions/publish@v2
# with:
# target: connect
# CONNECT_SERVER: enter-the-server-url-here
# CONNECT_API_KEY: ${{ secrets.CONNECT_API_KEY }}

# NOTE: If Publishing to GitHub Pages, set the permissions correctly (see top of this yaml)
- name: Publish to GitHub Pages (and render)
uses: quarto-dev/quarto-actions/publish@v2
with:
target: gh-pages
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # this secret is always available for github actions


# - name: Publish to confluence
# uses: quarto-dev/quarto-actions/publish@v2
# with:
# target: confluence
# env:
# CONFLUENCE_USER_EMAIL: ${{ secrets.CONFLUENCE_USER_EMAIL }}
# CONFLUENCE_AUTH_TOKEN: ${{ secrets.CONFLUENCE_AUTH_TOKEN }}
# CONFLUENCE_DOMAIN: ${{ secrets.CONFLUENCE_DOMAIN }}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Quarto
.quarto/
_site/

# Exclude example.env
!example.env

Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ This GitHub template is independent of the (research) data and its format. It fo
- [CHANGELOG.md](CHANGELOG.md) according to [keepachangelog.com](https://keepachangelog.com/)
- Automated [CHANGELOG.md](CHANGELOG.md) via [git-cliff](https://github.com/orhun/git-cliff)
- [package.json](package.json) via [npm docs](https://docs.npmjs.com/cli/v7/configuring-npm/package-json)
- Accessible documentation via [gh-pages](https://help.github.com/en/articles/configuring-a-publishing-source-for-github-pages)
- Accessible documentation via [gh-pages](https://help.github.com/en/articles/configuring-a-publishing-source-for-github-pages) and [Quarto](https://quarto.org/)

### Consistency

Expand Down Expand Up @@ -79,6 +79,7 @@ npm run prepare
- [ ] run `npm run commit` to commit all changes
- [ ] run `npm run changelog` and include the output in [CHANGELOG.md](CHANGELOG.md)
- [ ] enable [gh-pages](https://help.github.com/en/articles/configuring-a-publishing-source-for-github-pages)
- [ ] customize the documentation with [Quarto](https://quarto.org/docs/websites/#workflow)

3. optional tasks:

Expand Down Expand Up @@ -140,5 +141,6 @@ See also the list of [contributors](https://github.com/maehr/open-research-data-

## License

The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBY](LICENSE-CCBY) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.
The code in this repository is released under the GNU Affero General Public License v3.0 - see the [LICENSE-AGPL](LICENSE-AGPL) file for details. By using this code, you agree to make any modifications available under the same license.
The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBY](LICENSE-CCBY.md) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.

The code in this repository is released under the GNU Affero General Public License v3.0 - see the [LICENSE-AGPL](LICENSE-AGPL.md) file for details. By using this code, you agree to make any modifications available under the same license.
4 changes: 2 additions & 2 deletions README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ See also the list of [contributors](https://github.com/USERNAME/REPO_NAME/graphs

## License

The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBY](LICENSE-CCBY) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.
The data in this repository is released under the Creative Commons Attribution 4.0 International (CC BY 4.0) License - see the [LICENSE-CCBY](LICENSE-CCBY.md) file for details. By using this data, you agree to give appropriate credit to the original author(s) and to indicate if any modifications have been made.

The code in this repository is released under the GNU Affero General Public License v3.0 - see the [LICENSE-AGPL](LICENSE-AGPL) file for details. By using this code, you agree to make any modifications available under the same license.
The code in this repository is released under the GNU Affero General Public License v3.0 - see the [LICENSE-AGPL](LICENSE-AGPL.md) file for details. By using this code, you agree to make any modifications available under the same license.
3 changes: 0 additions & 3 deletions _config.yml

This file was deleted.

62 changes: 0 additions & 62 deletions _layouts/default.html

This file was deleted.

62 changes: 62 additions & 0 deletions _quarto.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
project:
type: website

website:
title: REPO_NAME
favicon: android-chrome-512x512.png
open-graph: true
twitter-card: true
site-url: https://USERNAME.github.io/REPO_NAME/
repo-url: https://github.com/USERNAME/REPO_NAME/
issue-url: https://github.com/USERNAME/REPO_NAME/issues/new/choose
repo-actions: [edit, issue]
page-navigation: true
bread-crumbs: true
back-to-top-navigation: true
search:
show-item-context: true
type: overlay
navbar:
logo: android-chrome-512x512.png
logo-alt: ''
title: REPO_NAME
tools:
- icon: github
url: https://github.com/USERNAME/REPO_NAME/
left:
- text: Readme
href: index.qmd
- text: Report
href: report.md

sidebar:
contents:
- section: REPO_NAME
href: index.qmd
contents:
- text: Changelog
href: CHANGELOG.md
- text: Code of Conduct
href: CODE_OF_CONDUCT.md
- text: Contributing
href: CONTRIBUTING.md
- text: License (Data)
href: LICENSE-CCBY.md
- text: License (Code)
href: LICENSE-AGPL.md
- text: Security
href: SECURITY.md
- href: report.md
contents: project-management/*

format:
html:
toc: true
theme: cosmo
code-copy: true
code-overflow: wrap
css: styles.css

freeze: true

editor: visual
13 changes: 0 additions & 13 deletions assets/css/style.scss

This file was deleted.

Empty file removed assets/images/.gitkeep
Empty file.
1 change: 1 addition & 0 deletions index.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{< include README.md >}}
4 changes: 3 additions & 1 deletion project-management/communication.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO
<!-- TODO -->

# Communication

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
4 changes: 3 additions & 1 deletion project-management/people.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO
<!-- TODO -->

# People

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
4 changes: 3 additions & 1 deletion project-management/project-report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO
<!-- TODO -->

# Project Report

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
4 changes: 3 additions & 1 deletion project-management/tools.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO
<!-- TODO -->

# Tools

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
4 changes: 3 additions & 1 deletion report.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# TODO
<!-- TODO -->

# Report

Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
1 change: 1 addition & 0 deletions styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* css styles */

0 comments on commit b1aac62

Please sign in to comment.