Skip to content

Commit e16010c

Browse files
author
Dominik Grenz
committed
Solve merge conflict
2 parents 77208ff + 0ecae43 commit e16010c

22 files changed

+645
-217
lines changed

‎.coderabbit.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
2+
tone_instructions: "Friendly, thankful and supportive."
23
reviews:
3-
profile: "assertive"
4+
profile: "chill"
45
review_status: true
56
auto_review:
6-
enabled: true
7-
auto_incremental_review: true
7+
enabled: false
88
tools:
99
pmd:
1010
enabled: false
@@ -13,3 +13,6 @@ reviews:
1313
finishing_touches:
1414
docstrings:
1515
enabled: false # needs to be disabled as it collides with the PR require checklist functionality (workflow in .github/workflows/pr-checklist.yml)
16+
chat:
17+
auto_reply: true
18+

‎docs/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎personalization-webcomponents/index-checklist-detail.html‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
3+
<head>
44
<meta charset="UTF-8" />
55
<meta
6-
name="robots"
7-
content="noindex"
6+
name="robots"
7+
content="noindex"
88
/>
99
<link
10-
href="/favicon.ico"
11-
rel="icon"
10+
href="/favicon.ico"
11+
rel="icon"
1212
/>
1313
<meta
14-
content="width=device-width, initial-scale=1.0"
15-
name="viewport"
14+
content="width=device-width, initial-scale=1.0"
15+
name="viewport"
1616
/>
1717
<title>personalization-webcomponent</title>
1818

1919
<!-- Muenchen.de Fontfaces -->
2020
<link
21-
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22-
rel="stylesheet"
21+
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22+
rel="stylesheet"
2323
/>
2424

2525
<!-- built files will be auto injected -->
26-
<script src="src/checklist-detail-webcomponent.ts" type="module"></script>
27-
</head>
28-
<body>
29-
<noscript>
30-
<strong>
26+
<script
27+
src="src/checklist-detail-webcomponent.ts"
28+
type="module"
29+
></script>
30+
</head>
31+
<body>
32+
<noscript>
33+
<strong>
3134
In order for the development page to work correctly, JavaScript needs to
3235
be activated.
33-
</strong>
34-
</noscript>
35-
<div>
36-
<checklist-detail first-name="Julia"></checklist-detail>
37-
</div>
38-
</body>
36+
</strong>
37+
</noscript>
38+
<div>
39+
<checklist-detail first-name="Julia"></checklist-detail>
40+
</div>
41+
</body>
3942
</html>

‎personalization-webcomponents/index-checklist-overview.html‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
3+
<head>
44
<meta charset="UTF-8" />
55
<meta
6-
name="robots"
7-
content="noindex"
6+
name="robots"
7+
content="noindex"
88
/>
99
<link
10-
href="/favicon.ico"
11-
rel="icon"
10+
href="/favicon.ico"
11+
rel="icon"
1212
/>
1313
<meta
14-
content="width=device-width, initial-scale=1.0"
15-
name="viewport"
14+
content="width=device-width, initial-scale=1.0"
15+
name="viewport"
1616
/>
1717
<title>personalization-webcomponent</title>
1818

1919
<!-- Muenchen.de Fontfaces -->
2020
<link
21-
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22-
rel="stylesheet"
21+
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22+
rel="stylesheet"
2323
/>
2424

2525
<!-- built files will be auto injected -->
26-
<script src="src/checklist-overview-webcomponent.ts" type="module"></script>
27-
</head>
28-
<body>
29-
<noscript>
30-
<strong>
26+
<script
27+
src="src/checklist-overview-webcomponent.ts"
28+
type="module"
29+
></script>
30+
</head>
31+
<body>
32+
<noscript>
33+
<strong>
3134
In order for the development page to work correctly, JavaScript needs to
3235
be activated.
33-
</strong>
34-
</noscript>
35-
<div>
36-
<checklist-overview first-name="Simon"/>
37-
</div>
38-
</body>
36+
</strong>
37+
</noscript>
38+
<div>
39+
<checklist-overview first-name="Simon" />
40+
</div>
41+
</body>
3942
</html>

‎personalization-webcomponents/index-my-checklists.html‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,42 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
3+
<head>
44
<meta charset="UTF-8" />
55
<meta
6-
name="robots"
7-
content="noindex"
6+
name="robots"
7+
content="noindex"
88
/>
99
<link
10-
href="/favicon.ico"
11-
rel="icon"
10+
href="/favicon.ico"
11+
rel="icon"
1212
/>
1313
<meta
14-
content="width=device-width, initial-scale=1.0"
15-
name="viewport"
14+
content="width=device-width, initial-scale=1.0"
15+
name="viewport"
1616
/>
1717
<title>personalization-webcomponent</title>
1818

1919
<!-- Muenchen.de Fontfaces -->
2020
<link
21-
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22-
rel="stylesheet"
21+
href="https://assets.muenchen.de/mde/1.0.10/css/fonts.css"
22+
rel="stylesheet"
2323
/>
2424

2525
<!-- built files will be auto injected -->
26-
<script src="src/my-checklists-webcomponent.ts" type="module"></script>
27-
</head>
28-
<body>
29-
<noscript>
30-
<strong>
26+
<script
27+
src="src/my-checklists-webcomponent.ts"
28+
type="module"
29+
></script>
30+
</head>
31+
<body>
32+
<noscript>
33+
<strong>
3134
In order for the development page to work correctly, JavaScript needs to
3235
be activated.
33-
</strong>
34-
</noscript>
35-
<div>
36-
<my-checklists first-name="Fabi"/>
37-
</div>
38-
</body>
36+
</strong>
37+
</noscript>
38+
<div>
39+
<my-checklists first-name="Fabi" />
40+
</div>
41+
</body>
3942
</html>

‎personalization-webcomponents/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎personalization-webcomponents/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"fix": "prettier . --write && eslint . --fix"
1818
},
1919
"dependencies": {
20-
"@muenchen/muc-patternlab-vue": "5.2.0",
20+
"@muenchen/muc-patternlab-vue": "5.3.0-beta.1",
2121
"@vueuse/core": "13.3.0",
2222
"vue": "3.5.16"
2323
},

‎personalization-webcomponents/public/assets/img/placeholder_checklist_icon.png‎

2.43 KB
Loading

‎personalization-webcomponents/src/api/dummyservice/DummyChecklist.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type DummyChecklistItem from "@/api/dummyservice/DummyChecklistItem.ts";
22

33
export default interface DummyChecklist {
4-
title: string,
5-
lhmExtId: string,
6-
items: DummyChecklistItem[],
7-
lastUpdated: Date
8-
}
4+
title: string;
5+
lhmExtId: string;
6+
items: DummyChecklistItem[];
7+
lastUpdated: Date;
8+
}

‎personalization-webcomponents/src/api/dummyservice/DummyChecklistItem.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default interface DummyChecklistItem {
2-
serviceID: string,
3-
checked: boolean,
4-
title: string,
5-
note: string,
6-
required: boolean
7-
}
2+
serviceID: string;
3+
checked: Date | null;
4+
title: string;
5+
note: string;
6+
required: boolean;
7+
}

0 commit comments

Comments
 (0)