-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## [1.5.0] - 2025-02-04 The ARF is aligned with the adopted Implementing Acts, covering articles 5a and 5c of the eIDAS Regulation. The ARF also includes changes in response to comments provided on Github and by other stakeholders. Over more than 275 comments lead to changes in the ARF. ----- Co-authored-by: David Bakker <75264147+david-bakker@users.noreply.github.com> Co-authored-by: JoranAF <jfrik@deloitte.com> Co-authored-by: Nikos Fotiou <nikosft@gmail.com> Co-authored-by: Paolo De Rosa <paolo.de.rosa@linux.com> Co-authored-by: Kristina <52878547+Sakurann@users.noreply.github.com> Co-authored-by: Paul Hin <phin@scytales.com> Co-authored-by: duviner <59258606+duviner@users.noreply.github.com> Co-authored-by: José Miranda <pinamiranda@users.noreply.github.com>
- Loading branch information
1 parent
ebc5847
commit a07a402
Showing
37 changed files
with
5,959 additions
and
4,819 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,7 @@ node_modules | |
dist | ||
build | ||
site | ||
docs/arf.html | ||
docs/arf.jpeg | ||
docs/arf.pdf | ||
docs/arf.png |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,31 @@ | ||
# Contributing to The European Digital Identity Wallet Architecture and Reference Framework | ||
|
||
We welcome contributions to [The European Digital Identity Wallet Architecture and Reference Framework](README.md) (ARF) Whether it's fixing a bug, proposing a new feature, or improving documentation, we appreciate any and all contributions that can help make the ARF better. | ||
We welcome contributions to [The European Digital Identity Wallet | ||
Architecture and Reference Framework](README.md) (ARF). Whether you are | ||
fixing a bug, proposing a new feature, or improving documentation, we | ||
appreciate any contributions that help improve the ARF. | ||
|
||
## How to contribute | ||
## How to Contribute | ||
|
||
1. Fork the repository and make your changes in a separate branch. | ||
3. Submit a pull request to the `main` branch. | ||
4. The pull request will be reviewed and potentially merged. | ||
1. Fork the repository and create your changes on a separate branch. | ||
2. Submit a pull request targeting the `main` branch. | ||
3. Your pull request will be reviewed and, if approved, merged. | ||
|
||
## Guidelines | ||
|
||
* Follow the existing style and conventions. | ||
* Document any addition or changes to existing text. | ||
* Proofread your copy thoroughly before submitting a pull request. | ||
* Keep your pull request focused on one specific change or fix. | ||
- Follow the existing style and conventions. | ||
- Document any additions or changes to the text. | ||
- Proofread your work thoroughly before submitting a pull request. | ||
- Keep each pull request focused on a single change or fix. | ||
|
||
## Code of Conduct | ||
|
||
We expect all contributors to abide by our [Code of Conduct](link) (pending). Please make sure you are familiar with its contents before contributing. | ||
All contributors are expected to abide by our | ||
[Code of Conduct](link) (pending). Please ensure you are familiar with its | ||
contents before contributing. | ||
|
||
## License | ||
|
||
By contributing to [The European Digital Identity Wallet Architecture and Reference Framework](README.md), you agree that your contributions will be licensed under the [Project's License](LICENSE). | ||
By contributing to [The European Digital Identity Wallet Architecture | ||
and Reference Framework](README.md), you agree that your contributions will | ||
be licensed under the [Project's License](LICENSE). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,68 +1,104 @@ | ||
# Makefile | ||
# Converts Markdown to other formats (HTML, PDF, DOCX, EPUB) using Pandoc and MkDocs | ||
# ----------------------------------------------------------------------------- | ||
# Converts Markdown to various formats (HTML via MkDocs, PDF, DOCX, EPUB) | ||
# using Pandoc and MkDocs. | ||
# | ||
# Run "make" (or "make all") to convert to all other formats | ||
# Run "make clean" to delete converted files | ||
|
||
# Prerequisites | ||
# Install pandoc, latex and mkdocs in your environment | ||
# - Ubuntu: `sudo apt-get install pandoc` | ||
# `sudo apt install python3 python3-pip -y` | ||
# `pip3 install mkdocs` | ||
# `pip install mkdocs-material mike` | ||
# `mkdocs --version` | ||
# Usage: | ||
# make - Convert Markdown files to PDF, DOCX, EPUB and build the MkDocs site. | ||
# make mkdocs - Build the MkDocs site. | ||
# make serve - Serve the MkDocs site locally. | ||
# make copy-pdfs - Copy all PDF files from the docs folder to build/pdf. | ||
# make zip-pdfs - Create a zip file of all files in the build/pdf folder. | ||
# make clean - Delete all generated files. | ||
# | ||
# Parameters and Variables | ||
# https://www.gnu.org/software/make/manual/html_node/Automatic-Variables.html#Automatic-Variables | ||
# Prerequisites: | ||
# - pandoc (Ubuntu: `sudo apt-get install pandoc`) | ||
# - a LaTeX distribution (for PDF conversion, e.g., xelatex) | ||
# - mkdocs (and optionally, mkdocs-material and mike) | ||
# | ||
|
||
# Convert .docx to .md | ||
# pandoc --extract-media ./assets input.docx -o output.md | ||
|
||
SOURCE_DOCS := $(wildcard docs/*.md) | ||
BUILD_DIR :=./build | ||
SITE_DIR :=./site | ||
EXPORTED_DOCS=\ | ||
$(SOURCE_DOCS:.md=.pdf) \ | ||
$(SOURCE_DOCS:.md=.docx) \ | ||
$(SOURCE_DOCS:.md=.epub) | ||
|
||
RM=/bin/rm | ||
PANDOC=pandoc | ||
MKDOCS=mkdocs | ||
|
||
PANDOC_OPTIONS=--toc --metadata title="The European Digital Identity Wallet Architecture and Reference Framework" --metadata lang="en" --data-dir docs/media | ||
PANDOC_PDF_OPTIONS= --pdf-engine=xelatex | ||
PANDOC_DOCX_OPTIONS= | ||
PANDOC_EPUB_OPTIONS=--to epub3 | ||
|
||
# Pattern-matching Rules | ||
|
||
# ----------------------------------------------------------------------------- | ||
|
||
# Source Files | ||
MAIN_DOC := docs/architecture-and-reference-framework-main.md | ||
ANNEXES_DOCS := $(wildcard docs/annexes/annex-[1-3]/*.md) | ||
SOURCE_DOCS := $(MAIN_DOC) $(ANNEXES_DOCS) | ||
|
||
# Directories and Build Information | ||
BUILD_DIR := ./build | ||
SITE_DIR := ./site | ||
VERSION := 1.5.0 | ||
BUILD := $(shell date +%Y%m%d.%H%M%S) | ||
|
||
# Pandoc configuration | ||
PANDOC_DATA_DIR := ./pandoc | ||
PDF_TEMPLATE := eisvogel | ||
|
||
# Exported Documents (the target names are based on the source file names) | ||
EXPORTED_DOCS := \ | ||
$(SOURCE_DOCS:.md=.pdf) \ | ||
$(SOURCE_DOCS:.md=.docx) \ | ||
$(SOURCE_DOCS:.md=.epub) | ||
|
||
# Tools | ||
RM := /bin/rm | ||
PANDOC := pandoc | ||
MKDOCS := mkdocs | ||
|
||
# Pandoc Options | ||
PANDOC_OPTIONS := --toc --from markdown+gfm_auto_identifiers --data-dir $(PANDOC_DATA_DIR) --metadata date="v$(VERSION) $(BUILD)" | ||
PANDOC_PDF_OPTIONS := --pdf-engine=pdflatex --template=$(PDF_TEMPLATE) --listings $(PANDOC_DATA_DIR)/metadata.yml | ||
PANDOC_DOCX_OPTIONS := | ||
PANDOC_EPUB_OPTIONS := --to epub3 | ||
|
||
# Pattern Rules for Conversions | ||
# ----------------------------------------------------------------------------- | ||
|
||
# Convert Markdown to PDF | ||
%.pdf : %.md | ||
mkdir -p $(BUILD_DIR)/pdf | ||
@mkdir -p $(BUILD_DIR)/pdf | ||
$(PANDOC) $(PANDOC_OPTIONS) $(PANDOC_PDF_OPTIONS) -o $(BUILD_DIR)/pdf/$(notdir $@) $< | ||
|
||
# Convert Markdown to DOCX | ||
%.docx : %.md | ||
mkdir -p $(BUILD_DIR)/docx | ||
@mkdir -p $(BUILD_DIR)/docx | ||
$(PANDOC) $(PANDOC_OPTIONS) $(PANDOC_DOCX_OPTIONS) -o $(BUILD_DIR)/docx/$(notdir $@) $< | ||
|
||
# Convert Markdown to EPUB | ||
%.epub : %.md | ||
mkdir -p $(BUILD_DIR)/epub | ||
@mkdir -p $(BUILD_DIR)/epub | ||
$(PANDOC) $(PANDOC_OPTIONS) $(PANDOC_EPUB_OPTIONS) -o $(BUILD_DIR)/epub/$(notdir $@) $< | ||
|
||
# Targets | ||
# ----------------------------------------------------------------------------- | ||
|
||
# Targets and dependencies | ||
|
||
.PHONY: all clean | ||
.PHONY: all mkdocs serve copy-pdfs zip-pdfs clean | ||
|
||
all : $(EXPORTED_DOCS) mkdocs | ||
# Default target: build all exported documents and the MkDocs site. | ||
all: $(EXPORTED_DOCS) zip-pdfs | ||
|
||
# Build the MkDocs site | ||
mkdocs: | ||
$(MKDOCS) build | ||
|
||
# Serve the MkDocs site locally | ||
serve: | ||
$(MKDOCS) serve | ||
|
||
# Copy all PDF files from the docs folder to the build/pdf directory. | ||
copy-pdfs: | ||
@echo "Copying PDF files from docs/ to $(BUILD_DIR)/pdf/..." | ||
@mkdir -p $(BUILD_DIR)/pdf | ||
@find docs -maxdepth 3 -type f -iname "*.pdf" -exec cp {} $(BUILD_DIR)/pdf \; | ||
@echo "PDF files have been copied." | ||
|
||
# Create a zip archive of all files in the build/pdf folder. | ||
zip-pdfs: copy-pdfs | ||
@echo "Creating zip archive of PDFs in $(BUILD_DIR)/pdf..." | ||
@cd $(BUILD_DIR) && zip -r arf-pdfs-v$(VERSION).zip pdf/* | ||
@echo "Zip archive created at $(BUILD_DIR)/pdf.zip." | ||
|
||
# Clean generated files and directories. | ||
clean: | ||
- $(RM) -rf $(BUILD_DIR) $(SITE_DIR) | ||
@echo "Cleaning build and site directories..." | ||
-$(RM) -rf $(BUILD_DIR) $(SITE_DIR) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.