From ce5ea35d46d7bd56095093f150251acb48f89006 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 1 Mar 2022 00:50:59 +0000 Subject: [PATCH 01/19] fix: upgrade @sentry/tracing from 6.17.4 to 6.17.5 Snyk has created this PR to upgrade @sentry/tracing from 6.17.4 to 6.17.5. See this package in npm: See this project in Snyk: https://app.snyk.io/org/lissy93/project/564ca11b-8665-48b8-befa-ccd607c3e09a?utm_source=github&utm_medium=referral&page=upgrade-pr --- package.json | 2 +- yarn.lock | 47 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index adbdd615..1b887e6b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@formschema/native": "^2.0.0-beta.6", - "@sentry/tracing": "^6.17.4", + "@sentry/tracing": "^6.17.5", "@sentry/vue": "^6.17.4", "ajv": "^8.10.0", "axios": "^0.25.0", diff --git a/yarn.lock b/yarn.lock index 6fb27f1d..18130937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1169,6 +1169,15 @@ "@sentry/utils" "6.17.4" tslib "^1.9.3" +"@sentry/hub@6.18.1": + version "6.18.1" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.18.1.tgz#fcfb8cb84515efefaf4e48472305ea5a71455abb" + integrity sha512-+zGzgc/xX3an/nKA3ELMn9YD9VmqbNaNwWZ5/SjNUvzsYHh2UNZ7YzT8WawQsRVOXLljyCKxkWpFB4EchiYGbw== + dependencies: + "@sentry/types" "6.18.1" + "@sentry/utils" "6.18.1" + tslib "^1.9.3" + "@sentry/minimal@6.17.4": version "6.17.4" resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.17.4.tgz#6a35dbdb22a1c532d1eb7b4c0d9223618cb67ccd" @@ -1178,15 +1187,24 @@ "@sentry/types" "6.17.4" tslib "^1.9.3" -"@sentry/tracing@^6.17.4": - version "6.17.4" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.17.4.tgz#17c2ab50d9e4cdf727b9b25e7f91ae3a9ea19437" - integrity sha512-UV6wWH/fqndts0k0cptsNtzD0h8KXqHInJSCGqlWDlygFRO16jwMKv0wfXgqsgc3cBGDlsl8C4l6COSwz9ROdg== +"@sentry/minimal@6.18.1": + version "6.18.1" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.18.1.tgz#eac73d2262589930aa0bb33e0e12380ac5b766a9" + integrity sha512-dm+0MuasWNi/LASvHX+09oCo8IBZY5WpMK8qXvQMnwQ9FVfklrjcfEI3666WORDCmeUhDCSeL2MbjPDm+AmPLg== dependencies: - "@sentry/hub" "6.17.4" - "@sentry/minimal" "6.17.4" - "@sentry/types" "6.17.4" - "@sentry/utils" "6.17.4" + "@sentry/hub" "6.18.1" + "@sentry/types" "6.18.1" + tslib "^1.9.3" + +"@sentry/tracing@^6.17.5": + version "6.18.1" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.18.1.tgz#7cc54b328dd051102900ade53e907e7441426f83" + integrity sha512-OxozmSfxGx246Ae1XhO01I7ZWxO3briwMBh55E5KyjQb8fuS9gVE7Uy8ZRs5hhNjDutFAU7nMtC0zipfVxP6fg== + dependencies: + "@sentry/hub" "6.18.1" + "@sentry/minimal" "6.18.1" + "@sentry/types" "6.18.1" + "@sentry/utils" "6.18.1" tslib "^1.9.3" "@sentry/types@6.17.4": @@ -1194,6 +1212,11 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.17.4.tgz#36b78d7c4a6de19b2bbc631bb34893bcad30c0ba" integrity sha512-RUyiXCKf61k2GIMP7FQX0naoSew4zLxe+UrtbjwVcWU4AFPZfH7tLNtTpVE85zAKbxsaiq3OD2FPtTZarHcwxQ== +"@sentry/types@6.18.1": + version "6.18.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.18.1.tgz#e2de38dd0da8096a5d22f8effc6756c919266ede" + integrity sha512-wp741NoBKnXE/4T9L723sWJ8EcNMxeTIT1smgNJOfbPwrsDICoYmGEt6JFa05XHpWBGI66WuNvnDjoHVeh6zhA== + "@sentry/utils@6.17.4": version "6.17.4" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.17.4.tgz#4f109629d2e7f16c5595b4367445ef47bfe96b61" @@ -1202,6 +1225,14 @@ "@sentry/types" "6.17.4" tslib "^1.9.3" +"@sentry/utils@6.18.1": + version "6.18.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.18.1.tgz#1aa819502b042540612f4db7bcb86c7b176f5a6b" + integrity sha512-IFZmuvA+c5lDGlZEri13JSyUP0BHelzY0S4dcKxAzskPW+BtBdQDgYGV90iED1y+IRMLawWb34GF7HyJSouN1Q== + dependencies: + "@sentry/types" "6.18.1" + tslib "^1.9.3" + "@sentry/vue@^6.17.4": version "6.17.4" resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-6.17.4.tgz#f77ad22fcc6b9d2efa5967d133dccc24d49163a8" From 8626b3d0682be8b02cb94eed887a34bcec4383f8 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 13 Mar 2022 22:44:58 +0000 Subject: [PATCH 02/19] :purple_heart: Updates contributors list --- docs/credits.md | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/credits.md b/docs/credits.md index dc2127dc..10925592 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -196,6 +196,13 @@ Jeremy Chauvin + + + alexdelprete +
+ Alessandro Del Prete + + BeginCI @@ -216,15 +223,15 @@
DeepSource Bot - + + FormatToday
FormatToday - - + Compunctus @@ -259,15 +266,15 @@
Ryan Turner - + + royshreyaaa
Shreya Roy - - + XertDev From 76e76a05586641210ac33979d1a23d6294b43a8c Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 13 Mar 2022 22:45:00 +0000 Subject: [PATCH 03/19] :blue_heart: Updates contributor SVG --- docs/assets/CONTRIBUTORS.svg | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index 9e3fa83a..5935deb6 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -39,43 +39,46 @@ + + + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file From f87e2fcd7893a815f2ab24f6b4b9a51b667aaea4 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 13 Mar 2022 22:45:07 +0000 Subject: [PATCH 04/19] :blue_heart: Makes author list --- .github/AUTHORS.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index a4a4d64f..8c31712f 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -1,3 +1,4 @@ +Alessandro - 1 commits Alicia - 1 commits Begin - 1 commits David - 1 commits @@ -37,12 +38,12 @@ snyk-bot - 18 commits aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Alicia - 28 commits -repo-visualizer - 28 commits +repo-visualizer - 29 commits snyk-bot - 35 commits -Alicia - 55 commits -liss-bot - 71 commits -Alicia - 75 commits +Alicia - 57 commits +liss-bot - 72 commits Lissy93 - 78 commits +Alicia - 80 commits Lissy93 - 206 commits Alicia - 334 commits Alicia - 1430 commits \ No newline at end of file From ad0c9f13497b3cece8a62a52bee8798e5e5ab63b Mon Sep 17 00:00:00 2001 From: Alessandro Del Prete Date: Mon, 14 Mar 2022 00:01:04 +0100 Subject: [PATCH 05/19] Updated Language Section (Italian) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a44be843..4d61e170 100644 --- a/README.md +++ b/README.md @@ -410,7 +410,7 @@ Dashy supports multiple languages and locales. When available, your language sho - 🇪🇸 **Spanish**: `es` - Contributed by **[@lu4t](https://github.com/lu4t)** - 🇸🇮 **Slovenian**: `sl` - Contributed by **[@UrekD](https://github.com/UrekD)** - 🇸🇪 **Swedish**: `sv` - Contributed by **[@BOZG](https://github.com/BOZG)** -- 🇮🇹 **Italian**: `it` - Machine Translated *(awaiting human review)* +- 🇮🇹 **Italian**: `it` - Contributed by **[@alexdelprete](https://github.com/alexdelprete)** - 🇵🇹 **Portuguese**: `pt` - Machine Translated *(awaiting human review)* - 🇷🇺 **Russian**: `ru` - Contributed by Anon - 🇦🇪 **Arabic**: `ar` - Contributed by Anon From 38337ed69305931ac3991fa817d6c06c58b25a2e Mon Sep 17 00:00:00 2001 From: aterox Date: Sun, 13 Mar 2022 19:28:18 -0400 Subject: [PATCH 06/19] Import conf at build time --- src/utils/ConfigAccumalator.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/utils/ConfigAccumalator.js b/src/utils/ConfigAccumalator.js index 6ab294e3..aa5a19ad 100644 --- a/src/utils/ConfigAccumalator.js +++ b/src/utils/ConfigAccumalator.js @@ -16,6 +16,8 @@ import ErrorHandler from '@/utils/ErrorHandler'; import { applyItemId } from '@/utils/SectionHelpers'; import $store from '@/store'; +import buildConf from '../../public/conf.yml'; + export default class ConfigAccumulator { constructor() { this.conf = $store.state.remoteConfig; @@ -25,7 +27,7 @@ export default class ConfigAccumulator { appConfig() { let appConfigFile = {}; // Set app config from file - if (this.conf) appConfigFile = this.conf.appConfig || {}; + if (this.conf) appConfigFile = this.conf.appConfig || buildConf.appConfig || {}; // Fill in defaults if anything missing let usersAppConfig = defaultAppConfig; if (localStorage[localStorageKeys.APP_CONFIG]) { From 79754dc1e9a345c331ceaa2b1523f1eeaf6f9c3f Mon Sep 17 00:00:00 2001 From: aterox Date: Sun, 13 Mar 2022 19:35:19 -0400 Subject: [PATCH 07/19] Revert Dockerfile, but ensure only one conf.yml --- Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2b0029f..8d7b15ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,18 +39,16 @@ WORKDIR ${DIRECTORY} RUN apk add --no-cache tzdata tini # Copy built application from build phase -COPY --from=BUILD_IMAGE /app/dist/ public/ -COPY --from=BUILD_IMAGE /app/node_modules/ node_modules/ -COPY services/ services/ -COPY src/utils/ src/utils/ -COPY package.json yarn.lock server.js ./ +COPY --from=BUILD_IMAGE /app ./ +# Ensure only one version of conf.yml exists +RUN rm dist/conf.yml # Finally, run start command to serve up the built application ENTRYPOINT [ "/sbin/tini", "--" ] -CMD [ "yarn", "start" ] +CMD [ "yarn", "build-and-start" ] # Expose the port EXPOSE ${PORT} # Run simple healthchecks every 5 mins, to check that everythings still great -HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check +HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check \ No newline at end of file From b05c6ea069c89ab769f6e49eead780d05117de7b Mon Sep 17 00:00:00 2001 From: aterox Date: Sun, 13 Mar 2022 20:30:00 -0400 Subject: [PATCH 08/19] Bump version --- .github/CHANGELOG.md | 12 ++++++++++++ .github/LATEST_CHANGELOG.md | 11 +++++++++-- package.json | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index e28eba36..bfb29f68 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## 2.0.5 - Bug Fixes and a few New Features + +### Partially revert 2.0.4, fixing several issues caused by `conf.yml` not being loaded at startup. +This change requires a rebuild of the application when several options under `appConfig` are changed. +Fixes #544 #555 + +### Several other changes since 2.0.4, including: +The `Add New Section` button on the UI editor now displays if no sections are present. #536 +When using SSL, the server can now redirect from HTTP to HTTPS. This is enabled by default when using SSL. #538 +Section context menus are now accessible on mobile, and will no longer clip off the screen. #541 +Italian translations have been added. #556 + ## :sparkles: 2.0.4 - Dynamic Config Loading [PR #528](https://github.com/Lissy93/dashy/pull/528) - `conf.yml` is now loaded dynamically and the app now only needs a browser refresh on config change, not a full rebuild! diff --git a/.github/LATEST_CHANGELOG.md b/.github/LATEST_CHANGELOG.md index 7a2367cb..905abe72 100644 --- a/.github/LATEST_CHANGELOG.md +++ b/.github/LATEST_CHANGELOG.md @@ -1,2 +1,9 @@ -## :sparkles: Dynamic Config Loading [PR #528](https://github.com/Lissy93/dashy/pull/528) -- `conf.yml` is now loaded dynamically and the app now only needs a browser refresh on config change, not a full rebuild! \ No newline at end of file +### Partially revert 2.0.4, fixing several issues caused by `conf.yml` not being loaded at startup. +This change requires a rebuild of the application when several options under `appConfig` are changed. +Fixes #544 #555 + +### Several other changes since 2.0.4, including: +The `Add New Section` button on the UI editor now displays if no sections are present. #536 +When using SSL, the server can now redirect from HTTP to HTTPS. This is enabled by default when using SSL. #538 +Section context menus are now accessible on mobile, and will no longer clip off the screen. #541 +Italian translations have been added. #556 \ No newline at end of file diff --git a/package.json b/package.json index ee320b40..e656b3b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Dashy", - "version": "2.0.4", + "version": "2.0.5", "license": "MIT", "main": "server", "author": "Alicia Sykes (https://aliciasykes.com)", From 40a56ceb583712418c541e3ef838f0de2de99882 Mon Sep 17 00:00:00 2001 From: Steven Kast Date: Sat, 19 Mar 2022 16:06:38 -0400 Subject: [PATCH 09/19] Fixing docker-compose example volume path The container root folder is not needed and causes directory unknown errors. --- docs/deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment.md b/docs/deployment.md index 03790efe..ceac3a31 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -89,7 +89,7 @@ services: container_name: Dashy # Pass in your config file below, by specifying the path on your host machine # volumes: - # - /root/my-config.yml:/app/public/conf.yml + # - /root/my-config.yml:/public/conf.yml ports: - 4000:80 # Set any environmental variables From 9ee7e85b0d0782c18061af3a8e4336958b51c370 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 20 Mar 2022 01:28:17 +0000 Subject: [PATCH 10/19] :purple_heart: Updates contributors list --- docs/credits.md | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/docs/credits.md b/docs/credits.md index 10925592..7d55ab7f 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -47,13 +47,6 @@ - - - Famku -
- Famku - - hugalafutro @@ -167,21 +160,28 @@ ᗪєνιη ᗷυнʟ + + + alexdelprete +
+ Alessandro Del Prete + + BOZG
Stephen Rigney - + + daentech
Dan Gilbert - - + rubenandre @@ -196,13 +196,6 @@ Jeremy Chauvin - - - alexdelprete -
- Alessandro Del Prete - - BeginCI @@ -275,6 +268,13 @@ Shreya Roy + + + StevKast +
+ Steven Kast + + XertDev @@ -295,13 +295,6 @@
Jnach - - - - tazboyz16 -
- Tazboyz16 - From ad08c6d58fc1f74d312f2d8dfa36e604f9a390d2 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 20 Mar 2022 01:28:18 +0000 Subject: [PATCH 11/19] :yellow_heart: Updates sponsors table --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 4d61e170..6e53b34f 100644 --- a/README.md +++ b/README.md @@ -529,13 +529,6 @@ Huge thanks to the sponsors helping to support Dashy's development! - - - Famku -
- Famku - - hugalafutro From 925bf8c53bb785721cbb7d077a6b90da40d560e6 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 20 Mar 2022 01:28:21 +0000 Subject: [PATCH 12/19] :blue_heart: Updates contributor SVG --- docs/assets/CONTRIBUTORS.svg | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index 5935deb6..c5f6572e 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -27,20 +27,20 @@ + + + - + - + - + - - - - + @@ -69,16 +69,19 @@ + + + - + - + - + - + \ No newline at end of file From fc36cca2cc46a27a5776163e30ac1af9ac71d473 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 20 Mar 2022 01:28:30 +0000 Subject: [PATCH 13/19] :blue_heart: Makes author list --- .github/AUTHORS.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index 8c31712f..60ac0850 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -1,4 +1,3 @@ -Alessandro - 1 commits Alicia - 1 commits Begin - 1 commits David - 1 commits @@ -13,11 +12,13 @@ Rune - 1 commits Ryan - 1 commits Shreya - 1 commits Singebob - 1 commits +Steven - 1 commits Xert - 1 commits deepsource-io[bot] - 1 commits icy-comet <50461557+icy-comet@users.noreply.github.com> - 1 commits jnach <33467747+jnach@users.noreply.github.com> - 1 commits tazboyz16 - 1 commits +Alessandro - 2 commits BOZG - 2 commits Brendan <'Lear> - 2 commits Dan - 2 commits @@ -25,6 +26,7 @@ Ruben - 2 commits liss-bot <87835202+liss-bot@users.noreply.github.com> - 2 commits ᗪєνιη <υн> - 2 commits Walkx <71191962+walkxcode@users.noreply.github.com> - 3 commits +aterox - 3 commits Niklas - 4 commits Alicie - 5 commits UrekD - 5 commits @@ -39,11 +41,11 @@ aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Alicia - 28 commits repo-visualizer - 29 commits -snyk-bot - 35 commits -Alicia - 57 commits -liss-bot - 72 commits +snyk-bot - 36 commits +Alicia - 59 commits +liss-bot - 73 commits Lissy93 - 78 commits -Alicia - 80 commits +Alicia - 84 commits Lissy93 - 206 commits Alicia - 334 commits Alicia - 1430 commits \ No newline at end of file From 7814b595025a58c4077ab7da539378611dca7ef6 Mon Sep 17 00:00:00 2001 From: repo-visualizer Date: Sun, 20 Mar 2022 01:29:47 +0000 Subject: [PATCH 14/19] :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 f579f6d7..7856a809 100644 --- a/docs/assets/repo-visualization.svg +++ b/docs/assets/repo-visualization.svg @@ -1 +1 @@ -viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file +viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file From 84b6e9146b3ed8e76010e36e14fa35ab1c4d8ed0 Mon Sep 17 00:00:00 2001 From: 0n1cOn3 <0n1cOn3@gmx.ch> Date: Sun, 20 Mar 2022 03:19:36 +0100 Subject: [PATCH 15/19] added Synology NAS Steps Added a way howto install dashy with Synologys GUI + Docker Environemnt --- docs/deployment.md | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/deployment.md b/docs/deployment.md index ceac3a31..df9555bc 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -122,8 +122,27 @@ If you are building from source, and would like to use one of the [other Dockerf ## Synology NAS -// TODO +Installing dashy is really simply and fast: +1. Install Docker via Synology ```Package Center```. +2. Go to ```File Station``` and open the ```docker``` folder. Inside the docker folder, create one new folder and name it ```dashy```. + > Note: Be careful to enter only lowercase, not uppercase letters. +3. Go to Control Panel / Task Scheduler / Create / Scheduled Task / User-defined script. +4. Once you click on ```User-defined``` script a new window will open. +5. Follow the instructions below: +6. General: In the Task field type in Install dashy. Uncheck “Enabled” option. Select root User. +7. Schedule: Select Run on the following date then select “Do not repeat“. +8. Task Settings: Check “Send run details by email“, add your email then copy paste the code below in the Run command area. After that click OK. + +``` +docker run -d \ + -p 4000:80 \ + -v /volume1/docker/dashy/my-local-conf.yml:/app/public/conf.yml \ + --name dashy \ + --restart=always \ + lissy93/dashy:latest +``` +dashy should be up within 1-2min after you've started the install task procedure --- ## Build from Source From 772e19dc2fc647837c08478c9ddf84662458ace0 Mon Sep 17 00:00:00 2001 From: liss-bot Date: Sun, 27 Mar 2022 02:28:29 +0100 Subject: [PATCH 16/19] :purple_heart: Updates contributors list --- docs/credits.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/credits.md b/docs/credits.md index 7d55ab7f..4198e296 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -196,6 +196,13 @@ Jeremy Chauvin + + + 0n1cOn3 +
+ 0n1cOn3 + + BeginCI @@ -209,15 +216,15 @@
David - + + deepsourcebot
DeepSource Bot - - + FormatToday @@ -252,15 +259,15 @@
Rubjo - + + turnrye
Ryan Turner - - + royshreyaaa @@ -288,13 +295,6 @@
Aniket Teredesai - - - - jnach -
- Jnach - From 3a4007004a1a2d6a5dde649f964c72d810a0c5df Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 27 Mar 2022 02:28:39 +0100 Subject: [PATCH 17/19] :blue_heart: Makes author list --- .github/AUTHORS.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index 60ac0850..dce2f6b4 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -1,3 +1,4 @@ +0n1cOn3 <0n1cOn3@gmx.ch> - 1 commits Alicia - 1 commits Begin - 1 commits David - 1 commits @@ -40,12 +41,12 @@ snyk-bot - 18 commits aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Alicia - 28 commits -repo-visualizer - 29 commits -snyk-bot - 36 commits -Alicia - 59 commits -liss-bot - 73 commits +repo-visualizer - 30 commits +snyk-bot - 37 commits +Alicia - 61 commits +liss-bot - 75 commits Lissy93 - 78 commits -Alicia - 84 commits +Alicia - 87 commits Lissy93 - 206 commits Alicia - 334 commits -Alicia - 1430 commits \ No newline at end of file +Alicia - 1439 commits \ No newline at end of file From b353a88927585fad3623fa763a1faab9911e2f93 Mon Sep 17 00:00:00 2001 From: Alicia Bot <87835202+liss-bot@users.noreply.github.com> Date: Sun, 27 Mar 2022 02:28:39 +0100 Subject: [PATCH 18/19] :blue_heart: Updates contributor SVG --- docs/assets/CONTRIBUTORS.svg | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index c5f6572e..c1119c40 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -1,4 +1,4 @@ - + @@ -42,46 +42,49 @@ + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file From b51935f04976a56a27ecd3cd3124766f7148bfd0 Mon Sep 17 00:00:00 2001 From: repo-visualizer Date: Sun, 27 Mar 2022 01:29:32 +0000 Subject: [PATCH 19/19] :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 7856a809..b3f8a74d 100644 --- a/docs/assets/repo-visualization.svg +++ b/docs/assets/repo-visualization.svg @@ -1 +1 @@ -viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file +viewsviewsutilsutilsstylesstylesmixinsmixinscomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSc...ConfigSc...ConfigSc...color-th...color-th...color-th...WidgetBa...WidgetBa...WidgetBa...Item.vueItem.vueItem.vuehi.jsonhi.jsonhi.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file