Skip to content

Commit be6ee8a

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/create-ns
Signed-off-by: lennartrommeiss <lennart.rommeiss@deutschebahn.com>
2 parents d537708 + eb091e7 commit be6ee8a

File tree

126 files changed

+1282
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1282
-652
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ public/
44
resources/
55
hugo.exe
66
.hugo_build.lock
7+
.DS_Store
78
.venv

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ repos:
1212
rev: v5.0.0
1313
hooks:
1414
- id: check-added-large-files
15+
args: [--maxkb=2048]
1516
- id: check-case-conflict
1617
- id: check-executables-have-shebangs
1718
- id: check-json

CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,17 @@ Now, enable `pre-commit` to run the check every time you want to commit changes:
6464
```zsh
6565
pre-commit install
6666
```
67+
68+
### Add new pages
69+
70+
To add a new country:
71+
72+
```zsh
73+
hugo new country/${COUNTRY} # Replace ${COUNTRY} with the English country name in lowercase
74+
```
75+
76+
To add a new operator:
77+
78+
```zsh
79+
hugo new operator/${OPERATOR} # Replace ${OPERATOR} with the English operator name in lowercase
80+
```

archetypes/country.de.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

archetypes/country.en.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

archetypes/country/index.de.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
draft: false
3+
title: '{{ .File.ContentBaseName | title }}' # Ändere den Name auf den deutschen Ländername
4+
country: '{{ .File.ContentBaseName }}'
5+
---
6+
7+
<!-- Entferne das "WIP" Snippet, wenn die Inhalte der Seite vollständig sind -->
8+
{{< snippet wip >}}
9+
10+
## FIP Nutzung
11+
12+
<!--
13+
Ein kurzer zusammenfassender Text, der folgende Fragen in dieser Reihenfolge beantworten sollte:
14+
- Welche FIP Fahrtkarten (FIP 50/FIP Freifahrtsscheine) werden im Land anerkannt und bei welchen Bahngesellschaften?
15+
- Welche Besonderheiten bei der Nutzung von FIP gibt es bei den jeweiligen Bahngesellschaften? (Verlinkung zur Bahngesellschaft hinzufügen)
16+
- Welche Bahngesellschaften erkennen keine FIP-Fahrkarten an und wie erkennt man diese Bahngesellschaften in der Verbindungsaufkunft?
17+
-->
18+
19+
## Wissenswertes
20+
21+
<!--
22+
Ein kurzer Abschnitt über die allgemeine Zugsituation im Land. Folgende Themen können bspw. behandelt werden:
23+
- Ausbaustand des Bahnnetzes
24+
- wichtige Verbindungen
25+
- Qualität und Zustand der Züge
26+
- Pünktlichkeit
27+
- Taktung
28+
- Besondere Züge/Strecken/Linien
29+
- Schöne Bahnhöfe
30+
-->
31+
32+
## FIP Bewertung
33+
34+
<!--
35+
Die Bewertungskriterien befinden sich noch im Aufbau.
36+
-->
37+
38+
## Betreiber ohne FIP
39+
<!-- Ersetze den generischen Link mit dem Link zum jeweiligen Betreiber -->
40+
- [Name der Bahngesellschaft](../../operator)

archetypes/country/index.en.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
draft: false
3+
title: '{{ .File.ContentBaseName | title }}'
4+
country: '{{ .File.ContentBaseName }}'
5+
---
6+
7+
<!-- Remove the WIP snippet if the page is complete -->
8+
{{< snippet wip >}}
9+
10+
## FIP Information
11+
12+
<!--
13+
A short summary text that should answer the following questions in this order:
14+
- Which FIP tickets (FIP 50/FIP free travel tickets) are recognized in the country and by which railway operator?
15+
- What are the special features of using FIP with the respective railway operator? (Add link to the railway operator)
16+
- Which railway operators do not recognize FIP tickets and how can you identify these operators in the connection information?
17+
-->
18+
19+
## Interesting
20+
21+
<!--
22+
A short section about the general train situation in the country. The following topics can be covered, for example:
23+
- State of the railway network
24+
- Important connections
25+
- Quality and condition of the trains
26+
- Punctuality
27+
- Frequency
28+
- Special trains/routes/lines
29+
- Beautiful train stations
30+
-->
31+
32+
## FIP Rating
33+
34+
<!--
35+
The rating criteria are still under development
36+
-->
37+
38+
## Operators without FIP
39+
<!-- Replace the general link with a link to the operator -->
40+
- [Name of the operator](../../operator)

archetypes/operator.de.md

Lines changed: 0 additions & 139 deletions
This file was deleted.

0 commit comments

Comments
 (0)