Skip to content

Commit 6aaaeb1

Browse files
author
Dominik Grenz
committed
Solve merge conflict
2 parents e504d67 + 4eda83d commit 6aaaeb1

Some content is hidden

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

46 files changed

+1480
-979
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,5 @@ nbdist/
185185
*.njsproj
186186
*.sln
187187
*.sw?
188+
189+
out
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
meta {
2+
name: Create Checklist
3+
type: http
4+
seq: 4
5+
}
6+
7+
post {
8+
url: http://localhost:39146/checklist
9+
body: json
10+
auth: inherit
11+
}
12+
13+
body:json {
14+
{
15+
"title": "Test",
16+
"checklistItems": []
17+
}
18+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
meta {
2+
name: Get Checklist with ID
3+
type: http
4+
seq: 4
5+
}
6+
7+
get {
8+
url: http://localhost:39146/checklist/d484de4c-2d58-435c-8210-bdb9e00d38f9
9+
body: none
10+
auth: inherit
11+
}
12+
13+
headers {
14+
Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJCNV9OZHBVMzlfZl9ZX3pJYnF4WWc2SnhiZDlZazFXSkItUHFrWUpuRFowIn0.eyJleHAiOjE3NTI1NTg2NDYsImlhdCI6MTc1MjU1ODM0NiwiYXV0aF90aW1lIjoxNzUyNTU4MDQ1LCJqdGkiOiI2NGY5Y2IzMi01Njk3LTQwZjEtYjBkMC05ZjQ0OTgxMDYxY2QiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgxMDAvYXV0aC9yZWFsbXMvbG9jYWxfcmVhbG0iLCJhdWQiOlsibG9jYWwiLCJhY2NvdW50Il0sInN1YiI6IjIyMjQxMDJmLWFlMDgtNDNhZi04M2FjLTNkMjA3MjhmNWRhOCIsInR5cCI6IkJlYXJlciIsImF6cCI6ImxvY2FsIiwic2lkIjoiZmY3M2NiYWUtMzAwMi00ODhiLWI3NTEtYzgwNGMwMWQ4ZTJmIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLWxvY2FsX3JlYWxtIiwib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfSwibG9jYWwiOnsicm9sZXMiOlsid3JpdGVyIl19fSwic2NvcGUiOiJlbWFpbCBsb2NhbF9hdWRpZW5jZSBwcm9maWxlIG9wZW5pZCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoid3JpdGVyIHdyaXRlciIsInByZWZlcnJlZF91c2VybmFtZSI6IndyaXRlciIsImdpdmVuX25hbWUiOiJ3cml0ZXIiLCJmYW1pbHlfbmFtZSI6IndyaXRlciIsImVtYWlsIjoid3JpdGVyQHdyaXRlci5jb20iLCJhdXRob3JpdGllcyI6WyJST0xFX3dyaXRlciJdfQ.FizcVAGEJhkHTy8LPvUD7DA-E_4lsXovFvkesOBFb-sF1AIHsWAgyiziBuGfCOsxJaB-A_q6N1OF5g4In56o5Q8fMILUrzbxD1nXZVOr6Ro1DX35Utuv2bCp7yJJ5PM5WNH4MX4t4XD_4iTikTs-8l87tnd3vfExPFbvKR9aP3GLmE4wDbIP-ghXgAW5JOaXOSGqcAB2xoBaTFxBTtJ_kkfy7wLwVh4gwE9H7zkpVZm3fZum5kuPuJhBZjqWhbGAkwHiENahp6Rs3amMye_S8XOOAgWH3sOjynrtbXr-bbswmPXj4Q9DsVtBZkXH3XxUEGX4ZmxLxW_eBddh7xJaow
15+
}

bruno/DBS-P13N/Get Checklists.bru

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
meta {
2+
name: Get Checklists
3+
type: http
4+
seq: 6
5+
}
6+
7+
get {
8+
url: http://localhost:39146/checklist
9+
body: none
10+
auth: inherit
11+
}
12+
13+
headers {
14+
Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJCNV9OZHBVMzlfZl9ZX3pJYnF4WWc2SnhiZDlZazFXSkItUHFrWUpuRFowIn0.eyJleHAiOjE3NTI1NTg2NDYsImlhdCI6MTc1MjU1ODM0NiwiYXV0aF90aW1lIjoxNzUyNTU4MDQ1LCJqdGkiOiI2NGY5Y2IzMi01Njk3LTQwZjEtYjBkMC05ZjQ0OTgxMDYxY2QiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgxMDAvYXV0aC9yZWFsbXMvbG9jYWxfcmVhbG0iLCJhdWQiOlsibG9jYWwiLCJhY2NvdW50Il0sInN1YiI6IjIyMjQxMDJmLWFlMDgtNDNhZi04M2FjLTNkMjA3MjhmNWRhOCIsInR5cCI6IkJlYXJlciIsImF6cCI6ImxvY2FsIiwic2lkIjoiZmY3M2NiYWUtMzAwMi00ODhiLWI3NTEtYzgwNGMwMWQ4ZTJmIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLWxvY2FsX3JlYWxtIiwib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfSwibG9jYWwiOnsicm9sZXMiOlsid3JpdGVyIl19fSwic2NvcGUiOiJlbWFpbCBsb2NhbF9hdWRpZW5jZSBwcm9maWxlIG9wZW5pZCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoid3JpdGVyIHdyaXRlciIsInByZWZlcnJlZF91c2VybmFtZSI6IndyaXRlciIsImdpdmVuX25hbWUiOiJ3cml0ZXIiLCJmYW1pbHlfbmFtZSI6IndyaXRlciIsImVtYWlsIjoid3JpdGVyQHdyaXRlci5jb20iLCJhdXRob3JpdGllcyI6WyJST0xFX3dyaXRlciJdfQ.FizcVAGEJhkHTy8LPvUD7DA-E_4lsXovFvkesOBFb-sF1AIHsWAgyiziBuGfCOsxJaB-A_q6N1OF5g4In56o5Q8fMILUrzbxD1nXZVOr6Ro1DX35Utuv2bCp7yJJ5PM5WNH4MX4t4XD_4iTikTs-8l87tnd3vfExPFbvKR9aP3GLmE4wDbIP-ghXgAW5JOaXOSGqcAB2xoBaTFxBTtJ_kkfy7wLwVh4gwE9H7zkpVZm3fZum5kuPuJhBZjqWhbGAkwHiENahp6Rs3amMye_S8XOOAgWH3sOjynrtbXr-bbswmPXj4Q9DsVtBZkXH3XxUEGX4ZmxLxW_eBddh7xJaow
15+
}

bruno/DBS-P13N/bruno.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"version": "1",
3+
"name": "DBS-P13N",
4+
"type": "collection",
5+
"ignore": [
6+
"node_modules",
7+
".git"
8+
]
9+
}

bruno/DBS-P13N/collection.bru

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
auth {
2+
mode: oauth2
3+
}
4+
5+
auth:oauth2 {
6+
grant_type: password
7+
access_token_url: http://localhost:8100/auth/realms/local_realm/protocol/openid-connect/token
8+
refresh_token_url: http://localhost:8100/auth/realms/local_realm/protocol/openid-connect/token
9+
username: writer
10+
password: writer
11+
client_id: local
12+
client_secret:
13+
scope:
14+
credentials_placement: body
15+
credentials_id: credentials
16+
token_placement: header
17+
token_header_prefix: Bearer
18+
auto_fetch_token: true
19+
auto_refresh_token: true
20+
}

bruno/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Bruno API-Collections
2+
3+
For each DBS Module you can find [Bruno](https://github.com/usebruno/bruno)-Collections here.
4+
5+
In Bruno click "Collection" > "Open Collection" > Choose the folder of the module you want to open
6+
7+
If you have the stack running locally you can now test the APIs.

docs/.markdownlint.jsonc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
},
88
"line-length": false,
99
"no-inline-html": false,
10+
"ol-prefix": false,
1011
}

docs/.vitepress/config.mts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const vitepressConfig = defineConfig({
66
title: "DBS",
77
description:
88
"Documentation for the Digital Citizen Service of the City of Munich",
9+
base: "/dbs/",
910
head: [
1011
[
1112
"link",
@@ -28,6 +29,7 @@ const vitepressConfig = defineConfig({
2829
lazyLoading: true,
2930
},
3031
},
32+
ignoreDeadLinks: "localhostLinks",
3133
});
3234

3335
export default withMermaid(vitepressConfig);

docs/deployment-p13n.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Deployment dbs-p13n
2+
3+
## dbs-p13n-service
4+
5+
| Property | Description | Default |
6+
| -------- | ----------- | ------- |
7+
8+
## dbs-p13n-webcomponents
9+
10+
There are multiple webcomponents available which should be integrated to separate pages of your frontend.
11+
12+
1. Add import to your page `<script src="<host>/loader-<component-name>-webcomponent.js" type="module"></script>`
13+
2. Add the element to your page with the appropriate configuration.
14+
15+
### `checklist-overview`
16+
17+
| Property | Type | Description | Default |
18+
| ---------------------- | ------ | -------------------------------- | ------- |
19+
| `checklist-detail-url` | string | URL to the checklist detail page | - |
20+
21+
### `checklist-detail`
22+
23+
| Query-Parameter | Description |
24+
| --------------- | ------------------------------ |
25+
| `cl-id` | ID of the checklist to display |
26+
27+
### `my-checklists`
28+
29+
| Property | Type | Description | Default |
30+
| ---------------------- | ------ | -------------------------------- | ------- |
31+
| `checklist-detail-url` | string | URL to the checklist detail page | - |
32+
| `new-checklist-url` | string | URL to the new checklist page | - |

0 commit comments

Comments
 (0)