Skip to content

Commit a12e2f5

Browse files
authored
Merge pull request #48 from ma4nn/dependabot/npm_and_yarn/alpine-8a52b6a08d
Bump the alpine group with 2 updates
2 parents 819a8c5 + 17bc3d3 commit a12e2f5

File tree

7 files changed

+41
-28
lines changed

7 files changed

+41
-28
lines changed

bundlesize.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"path": "./dist/SankeyChart.lua",
55
"compression": "none",
6-
"maxSize": "950 kB"
6+
"maxSize": "1 MB"
77
}
88
]
99
}

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"description": "An extension for the great MoneyMoney app to export an interactive HTML Sankey Chart based on the transaction categories",
44
"private": true,
55
"dependencies": {
6-
"@alpinejs/csp": "^3.14.9",
7-
"@alpinejs/persist": "^3.14.9",
6+
"@alpinejs/csp": "^3.15.0",
7+
"@alpinejs/persist": "^3.15.0",
88
"bootstrap": "^5.3.8",
99
"highcharts": "^12.4.0",
1010
"lz-string": "^1.5.0"

playwright.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export default defineConfig({
2121
workers: process.env.CI ? 1 : undefined,
2222
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
2323
reporter: 'html',
24+
timeout: 10_000,
2425
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
2526
use: {
2627
baseURL: 'http://127.0.0.1:8080',

src/app.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ export function initApp(transactions: Array<Transaction>, currency: string = 'EU
7272
Alpine.store('error').setMessage('Konfiguration kann nicht geladen werden.');
7373
}
7474

75-
Alpine.data('alert-component', alertComponent);
76-
Alpine.data('sankey-chart-component', () => sankeyChartComponent(categories.tree));
77-
Alpine.data('transaction-meta', () => {
75+
Alpine.data('alert', alertComponent);
76+
Alpine.data('sankeychart', () => sankeyChartComponent(categories.tree));
77+
Alpine.data('transactionmeta', () => {
7878
return {
7979
accounts: data.accounts.join(', '),
8080
start_date: data.startDate.toLocaleDateString(),
8181
end_date: data.endDate.toLocaleDateString(),
8282
transaction_count: data.transactions.length,
8383
}
8484
});
85-
Alpine.data('scaler-component', () => scalerComponent(data.calculateNumberOfMonths()));
86-
Alpine.data('threshold-slider-component', () => thresholdSliderComponent(categories.getOutgoingWeights()));
87-
Alpine.data('categories-table-component', categoriesTableComponent);
88-
Alpine.data('more-actions-component', moreActionsComponent);
89-
Alpine.data('sorter-component', sorterComponent);
85+
Alpine.data('scaler', () => scalerComponent(data.calculateNumberOfMonths()));
86+
Alpine.data('thresholdslider', () => thresholdSliderComponent(categories.getOutgoingWeights()));
87+
Alpine.data('categoriestable', categoriesTableComponent);
88+
Alpine.data('moreactions', moreActionsComponent);
89+
Alpine.data('sorter', sorterComponent);
9090

9191
window.Alpine = Alpine;
9292
Alpine.start();

src/template.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<header class="container-fluid text-center" aria-label="primary">
2525
<h1 class="my-4">Cashflows</h1>
2626

27-
<p class="lead" x-data="transaction-meta"><span x-text="accounts"></span> &dash; <span x-text="start_date"></span> bis <span x-text="end_date"></span></p>
27+
<p class="lead" x-data="transactionmeta"><span x-text="accounts"></span> &dash; <span x-text="start_date"></span> bis <span x-text="end_date"></span></p>
2828
</header>
2929

3030
<nav class="navbar navbar-expand-lg bg-body-tertiary sticky-top">
@@ -38,11 +38,11 @@ <h1 class="my-4">Cashflows</h1>
3838
</svg>
3939
Kategorien anpassen
4040
</button>
41-
<div class="form-check form-switch form-check-inline" x-data="scaler-component">
41+
<div class="form-check form-switch form-check-inline" x-data="scaler">
4242
<input class="form-check-input" type="checkbox" role="switch" id="is-show-monthly" :checked="isScaled" @change="toggle" :disabled="isDisabled" :title="tooltip">
4343
<label class="form-check-label" for="is-show-monthly" :title="tooltip">pro Monat</label>
4444
</div>
45-
<div class="nav-item dropdown me-3" x-data="sorter-component">
45+
<div class="nav-item dropdown me-3" x-data="sorter">
4646
<button class="nav-link dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
4747
Sortieren nach: <span x-text="label"></span>
4848
</button>
@@ -55,10 +55,10 @@ <h1 class="my-4">Cashflows</h1>
5555
</div>
5656
<div class="d-flex align-items-center ms-md-auto mt-2 mt-md-0">
5757
<label for="threshold" class="me-2">Detailgrad:</label>
58-
<input x-data="threshold-slider-component" type="range" class="form-range me-5" id="threshold" :min="minValue" :max="maxValue" :value="currentValue" @change="zoom" title="Detailgrad">
58+
<input x-data="thresholdslider" type="range" class="form-range me-5" id="threshold" :min="minValue" :max="maxValue" :value="currentValue" @change="zoom" title="Detailgrad">
5959
<div class="nav-item dropdown me-3">
6060
<button class="nav-link dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">Aktionen</button>
61-
<ul class="dropdown-menu dropdown-menu-end" x-data="more-actions-component">
61+
<ul class="dropdown-menu dropdown-menu-end" x-data="moreactions">
6262
<li><a class="dropdown-item icon-link" href="#" :href="sankeymaticUrl" target="_blank" rel="external noopener" title="Öffnet das aktuelle Sankey-Diagram in SankeyMATIC.com. Die Daten werden dabei in das entsprechende Format konvertiert und an den externen Anbieter übertragen.">in SankeyMATIC öffnen<svg class="bi" aria-hidden="true"><use xlink:href="#arrow-up-right"></use></svg></a></li>
6363
<li><hr class="dropdown-divider"></li>
6464
<li><button class="dropdown-item" type="button" @click="reset">Chart zurücksetzen</button></li>
@@ -70,7 +70,7 @@ <h1 class="my-4">Cashflows</h1>
7070
</nav>
7171

7272
<main class="container-fluid my-3">
73-
<div x-data="alert-component">
73+
<div x-data="alert">
7474
<div x-show="message" class="alert alert-danger" role="alert" x-transition x-cloak>
7575
<h4 class="alert-heading">Schwerer Fehler</h4>
7676
<span x-text="message"></span>
@@ -81,7 +81,7 @@ <h4 class="alert-heading">Schwerer Fehler</h4>
8181

8282
<section id="sankey" class="row">
8383
<h2 class="visually-hidden">Sankey Chart</h2>
84-
<div id="chart-container" x-data="sankey-chart-component"></div>
84+
<div id="chart-container" x-data="sankeychart"></div>
8585
</section>
8686
</main>
8787

@@ -105,14 +105,14 @@ <h5 class="offcanvas-title" id="offcanvasConfigLabel">Kategorien konfigurieren</
105105
</div>
106106
<div class="offcanvas-body pt-0">
107107
<p>
108-
<small x-data="transaction-meta">
108+
<small x-data="transactionmeta">
109109
Das <a class="icon-link" href="https://de.wikipedia.org/wiki/Sankey-Diagramm" target="_blank" rel="external noopener">Sankey Chart<svg class="bi" aria-hidden="true"><use xlink:href="#arrow-up-right"></use></svg></a>
110110
zeigt die aus <a class="icon-link" href="https://moneymoney-app.com/" target="_blank" rel="external noopener">MoneyMoney<svg class="bi" aria-hidden="true"><use xlink:href="#arrow-up-right"></use></svg></a> exportierten Cashflows der
111111
Konten <strong x-text="accounts"></strong> für den Zeitraum <strong><span x-text="start_date"></span> bis <span x-text="end_date"></span></strong>.
112112
Es wurde aus insgesamt <strong id="transaction-count"><span x-text="transaction_count"></span> Transaktionen</strong> generiert.
113113
</small>
114114
</p>
115-
<form x-data="categories-table-component">
115+
<form x-data="categoriestable">
116116
<div class="row sticky-top bg-white">
117117
<div class="col-12 pb-4">
118118
<button id="apply-settings-btn" type="submit" class="btn btn-primary" data-bs-dismiss="offcanvas">Anwenden</button>

tests/chart.spec.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,18 @@ test.beforeEach(async ({ page }) => {
5858
await page.goto('/');
5959
});
6060

61+
test('no console errors during page load', async ({ page }) => {
62+
const errors = [];
63+
64+
page.on('pageerror', error => {
65+
errors.push(error.message);
66+
});
67+
68+
await page.goto('/');
69+
70+
expect(errors).toEqual([]);
71+
});
72+
6173
test('take screenshot', async ({ page }) => {
6274
await page.evaluate(() => document.querySelectorAll('header').forEach(header => header.remove()));
6375
await page.locator('#chart-container').screenshot({ path: 'tmp/sample.png' }); // take a screenshot for README file

0 commit comments

Comments
 (0)