From 1d69fc86177d4c2d4eda82082a211a712036f130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GRANDIN?= Date: Sat, 23 Apr 2022 02:43:38 +0200 Subject: [PATCH 01/10] :sparkles: Add extra option to hide legend in percentageChart --- src/components/Charts/PercentageChart.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Charts/PercentageChart.vue b/src/components/Charts/PercentageChart.vue index d4b4b539..0a2ba53c 100644 --- a/src/components/Charts/PercentageChart.vue +++ b/src/components/Charts/PercentageChart.vue @@ -13,7 +13,7 @@ > -
+
@@ -31,6 +31,10 @@ export default { type: Boolean, default: true, }, + showLegend: { + type: Boolean, + default: true, + }, height: { number: Boolean, default: 1, From 6e7b0e4dd52b4f212221ee8dc0e9dc9e06f11dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GRANDIN?= Date: Sat, 23 Apr 2022 02:44:49 +0200 Subject: [PATCH 02/10] :sparkles: Add Synology Download Widget --- src/assets/locales/en.json | 9 + src/components/Widgets/SynologyDownload.vue | 174 ++++++++++++++++++++ src/components/Widgets/WidgetBase.vue | 8 + 3 files changed, 191 insertions(+) create mode 100644 src/components/Widgets/SynologyDownload.vue diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json index 741fcbc9..d70594ca 100644 --- a/src/assets/locales/en.json +++ b/src/assets/locales/en.json @@ -290,6 +290,15 @@ "tfl-status": { "good-service-all": "Good Service on all Lines", "good-service-rest": "Good Service on all other Lines" + }, + "synology-download": { + "download": "Download", + "upload": "Upload", + "downloaded": "Downloaded", + "uploaded": "Uploaded", + "remaining": "Remaining", + "up": "Up", + "down": "Down" } } } \ No newline at end of file diff --git a/src/components/Widgets/SynologyDownload.vue b/src/components/Widgets/SynologyDownload.vue new file mode 100644 index 00000000..15c2af3b --- /dev/null +++ b/src/components/Widgets/SynologyDownload.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue index ac288d4f..089fc226 100644 --- a/src/components/Widgets/WidgetBase.vue +++ b/src/components/Widgets/WidgetBase.vue @@ -349,6 +349,13 @@ @error="handleError" :ref="widgetRef" /> + import('@/components/Widgets/SportsScores.vue'), StatPing: () => import('@/components/Widgets/StatPing.vue'), StockPriceChart: () => import('@/components/Widgets/StockPriceChart.vue'), + SynologyDownload: () => import('@/components/Widgets/SynologyDownload.vue'), SystemInfo: () => import('@/components/Widgets/SystemInfo.vue'), TflStatus: () => import('@/components/Widgets/TflStatus.vue'), WalletBalance: () => import('@/components/Widgets/WalletBalance.vue'), From 044b7ed94dfdf08c94644ee33f116d2727521611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GRANDIN?= Date: Sat, 23 Apr 2022 02:45:46 +0200 Subject: [PATCH 03/10] :memo: Add Synology Download widget documentation --- docs/widgets.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/docs/widgets.md b/docs/widgets.md index bbfff1d8..85d74ef9 100644 --- a/docs/widgets.md +++ b/docs/widgets.md @@ -46,6 +46,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a - [Pi Hole Queries](#pi-hole-queries) - [Recent Traffic](#recent-traffic) - [Stat Ping Statuses](#stat-ping-statuses) + - [Synology Download Station](#stat-ping-statuses) - **[System Resource Monitoring](#system-resource-monitoring)** - [CPU Usage Current](#current-cpu-usage) - [CPU Usage Per Core](#cpu-usage-per-core) @@ -1325,6 +1326,41 @@ Displays the current and recent uptime of your running services, via a self-host --- +### Synology Download Station + +Displays the current downloads/torrents tasks of your Synology NAS + +

+ +##### Options + +**Field** | **Type** | **Required** | **Description** +--- | --- | --- | --- +**`hostname`** | `string` | Required | The URL to your Synology NAS, without a trailing slash +**`username`** | `string` | Required | The username of a user on your synology NAS. You will see only this user download station tasks if he is not part of the administrator group. Currently don't support OTP protected accounts. +**`password`** | `string` | Required | The password of the account specified above. + +##### Example + +```yaml +- type: synology-download + options: + hostname: http://192.168.1.1:8080 + username: dashy + password: totally-secure-password + + +``` + +##### Info +- **CORS**: 🟠 Proxied +- **Auth**: 🟢 Required +- **Price**: 🟢 Free +- **Host**: Self-Hosted (see [Synology](https://www.synology.com/en-us)) +- **Privacy**: _See [Synology Privacy Statement](https://www.synology.com/en-us/company/legal/privacy)_ + +--- + ## System Resource Monitoring The easiest method for displaying system info and resource usage in Dashy is with [Glances](https://nicolargo.github.io/glances/). From 5aab049a43f0a92b7c80d0dd51419ac2f27c81fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GRANDIN?= Date: Sat, 23 Apr 2022 14:05:57 +0200 Subject: [PATCH 04/10] :rotating_light: Fix b =>strong as recommendedn by sonarcloud --- src/components/Widgets/SynologyDownload.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/Widgets/SynologyDownload.vue b/src/components/Widgets/SynologyDownload.vue index 15c2af3b..aa82089e 100644 --- a/src/components/Widgets/SynologyDownload.vue +++ b/src/components/Widgets/SynologyDownload.vue @@ -11,10 +11,12 @@ size: 100 - task.Progress, color: '#6092d1' }, ]" />

- {{ $t('widgets.synology-download.downloaded') }}: {{ task.Downloaded | formatSize }} + {{ $t('widgets.synology-download.downloaded') }}: + {{ task.Downloaded | formatSize }} / {{ task.TotalSize | formatSize }} ({{ task.Progress }}%) ({{ task.DownSpeed | formatSize }}/s)
- {{ $t('widgets.synology-download.uploaded') }}: {{ task.Uploaded | formatSize }} + {{ $t('widgets.synology-download.uploaded') }}: + {{ task.Uploaded | formatSize }} ({{ task.UpSpeed | formatSize }}/s) (ratio : {{ Math.floor( task.Uploaded / task.Downloaded * 100 ) / 100 }})

From 9d627b1c86a36d98b020eabbefe6f314dbe14ddf Mon Sep 17 00:00:00 2001 From: CHAIYEON CHO Date: Sun, 24 Apr 2022 01:51:47 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=F0=9F=90=9BPrevent=20line=20breaks=20in?= =?UTF-8?q?=20search-label.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Settings/SearchBar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Settings/SearchBar.vue b/src/components/Settings/SearchBar.vue index f65447fd..22654b2a 100644 --- a/src/components/Settings/SearchBar.vue +++ b/src/components/Settings/SearchBar.vue @@ -172,6 +172,7 @@ export default { color: var(--search-label-color); margin: 0.5rem; display: inline; + word-break: keep-all; } input { display: inline-block; From 558690ad989d9ffa06341e64dd5844fb0043eb99 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 23 Apr 2022 22:53:35 +0100 Subject: [PATCH 06/10] =?UTF-8?q?=F0=9F=93=9D=20Fixes=20docs=20link=20to?= =?UTF-8?q?=20Synology=20Download=20Station?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/widgets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/widgets.md b/docs/widgets.md index 85d74ef9..562f1fd8 100644 --- a/docs/widgets.md +++ b/docs/widgets.md @@ -46,7 +46,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a - [Pi Hole Queries](#pi-hole-queries) - [Recent Traffic](#recent-traffic) - [Stat Ping Statuses](#stat-ping-statuses) - - [Synology Download Station](#stat-ping-statuses) + - [Synology Download Station](#synology-download-station) - **[System Resource Monitoring](#system-resource-monitoring)** - [CPU Usage Current](#current-cpu-usage) - [CPU Usage Per Core](#cpu-usage-per-core) From c54efa4fd35672510ff5321922ff2aae6f086d84 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 24 Apr 2022 02:29:01 +0100 Subject: [PATCH 07/10] :purple_heart: Updates contributors list --- docs/credits.md | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/credits.md b/docs/credits.md index 85b4c867..9f7aa641 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -146,6 +146,13 @@ UrekD + + + remygrandin +
+ remygrandin + + walkxcode @@ -166,15 +173,15 @@
Alessandro Del Prete - + + BOZG
Stephen Rigney - - + daentech @@ -209,6 +216,14 @@
Begin + + + + + moemoeq +
+ CHAIYEON CHO + @@ -216,8 +231,7 @@
David - - + deepsourcebot @@ -245,7 +259,8 @@
Ishan Jain - + + KierenConnell @@ -259,8 +274,7 @@
Rubjo - - + turnrye @@ -281,20 +295,6 @@
Steven Kast - - - - XertDev -
- Xert - - - - - icy-comet -
- Aniket Teredesai - From b08c37137622821cc2ceb67596207bd635841ddd Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 24 Apr 2022 02:29:04 +0100 Subject: [PATCH 08/10] :blue_heart: Updates contributor SVG --- docs/assets/CONTRIBUTORS.svg | 50 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index c1119c40..a3c5791c 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -21,70 +21,76 @@ + + + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file From 24cf5bc606658ebffa36e5550de6ade1e620ac73 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 24 Apr 2022 02:29:12 +0100 Subject: [PATCH 09/10] :blue_heart: Makes author list --- .github/AUTHORS.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index 90874719..547d7dd2 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -1,6 +1,7 @@ 0n1cOn3 <0n1cOn3@gmx.ch> - 1 commits Alicia - 1 commits Begin - 1 commits +CHAIYEON - 1 commits David - 1 commits DeepSource - 1 commits Devin - 1 commits @@ -29,7 +30,9 @@ liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits Walkx <71191962+walkxcode@users.noreply.github.com> - 3 commits aterox - 3 commits Niklas - 4 commits +Rémy - 4 commits Alicie - 5 commits +Benjamin - 5 commits UrekD - 5 commits Erik - 6 commits Leonardo - 6 commits @@ -41,12 +44,12 @@ snyk-bot - 18 commits aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Alicia - 28 commits -repo-visualizer - 32 commits +repo-visualizer - 33 commits snyk-bot - 38 commits -Alicia - 65 commits +Alicia - 66 commits Lissy93 - 78 commits liss-bot - 80 commits -Alicia - 97 commits +Alicia - 99 commits Lissy93 - 206 commits -Alicia - 334 commits -Alicia - 1482 commits \ No newline at end of file +Alicia - 336 commits +Alicia - 1487 commits \ No newline at end of file From 7766c0a48c6a77f6993b92303d07bea9f4954723 Mon Sep 17 00:00:00 2001 From: repo-visualizer Date: Sun, 24 Apr 2022 01:32:40 +0000 Subject: [PATCH 10/10] :yellow_heart: Updates repo diagram --- docs/assets/repo-visualization.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/repo-visualization.svg b/docs/assets/repo-visualization.svg index 2caf1e41..0e36fbe2 100644 --- a/docs/assets/repo-visualization.svg +++ b/docs/assets/repo-visualization.svg @@ -1 +1 @@ -viewsviewsutilsutilsstylesstylesmixinsmixinsdirectivesdirectivescomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsLogin.vueLogin.vueLogin.vueHome.vueHome.vueHome.vueemojis.jsonemojis.jsonemojis.jsonConfigSch...ConfigSch...ConfigSch...defaults.jsdefaults.jsdefaults.jscolor-the...color-the...color-the...store.jsstore.jsstore.jsWidgetBas...WidgetBas...WidgetBas...AnonAddy.vueAnonAddy.vueAnonAddy.vueSportsSc...SportsSc...SportsSc...CustomThe...CustomThe...CustomThe...Section.vueSection.vueSection.vueItem.vueItem.vueItem.vueItemIcon.vueItemIcon.vueItemIcon.vueEditItem.vueEditItem.vueEditItem.vueEditMode...EditMode...EditMode...JsonEdito...JsonEdito...JsonEdito...ConfigCon...ConfigCon...ConfigCon...CloudBac...CloudBac...CloudBac...Gauge.vueGauge.vueGauge.vuehi.jsonhi.jsonhi.jsonit.jsonit.jsonit.jsonfr.jsonfr.jsonfr.jsonsv.jsonsv.jsonsv.jsonen.jsonen.jsonen.jsonru.jsonru.jsonru.jsonsl.jsonsl.jsonsl.jsonar.jsonar.jsonar.jsonja.jsonja.jsonja.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file +viewsviewsutilsutilsstylesstylesmixinsmixinsdirectivesdirectivescomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsLogin.vueLogin.vueLogin.vueHome.vueHome.vueHome.vueemojis.jsonemojis.jsonemojis.jsonConfigSch...ConfigSch...ConfigSch...defaults.jsdefaults.jsdefaults.jscolor-the...color-the...color-the...store.jsstore.jsstore.jsWidgetBas...WidgetBas...WidgetBas...AnonAddy.vueAnonAddy.vueAnonAddy.vueSportsSc...SportsSc...SportsSc...CustomThe...CustomThe...CustomThe...Section.vueSection.vueSection.vueItem.vueItem.vueItem.vueItemIcon.vueItemIcon.vueItemIcon.vueEditItem.vueEditItem.vueEditItem.vueEditMode...EditMode...EditMode...JsonEdito...JsonEdito...JsonEdito...ConfigCon...ConfigCon...ConfigCon...CloudBac...CloudBac...CloudBac...Gauge.vueGauge.vueGauge.vuehi.jsonhi.jsonhi.jsonit.jsonit.jsonit.jsonfr.jsonfr.jsonfr.jsonsv.jsonsv.jsonsv.jsonen.jsonen.jsonen.jsonru.jsonru.jsonru.jsonsl.jsonsl.jsonsl.jsonar.jsonar.jsonar.jsonja.jsonja.jsonja.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file