diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index a4a4d64f..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 @@ -12,11 +13,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 @@ -24,6 +27,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 @@ -37,12 +41,12 @@ snyk-bot - 18 commits aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Alicia - 28 commits -repo-visualizer - 28 commits -snyk-bot - 35 commits -Alicia - 55 commits -liss-bot - 71 commits -Alicia - 75 commits +repo-visualizer - 30 commits +snyk-bot - 37 commits +Alicia - 61 commits +liss-bot - 75 commits Lissy93 - 78 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 diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index f5d63a8a..7166bfff 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -13,6 +13,18 @@ - Adds typecheck on edit item tags, Re: #575 - Fixes item size in config not honored, Re: #576 +## ✨ 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 + ## ✨ 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 46ef15a4..21a81156 100644 --- a/.github/LATEST_CHANGELOG.md +++ b/.github/LATEST_CHANGELOG.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD ## 🐛 Fixes user requested issues [PR #557](https://github.com/Lissy93/dashy/pull/557) - Allows middle click open new tab, Re: #492 - Implements Max redirects for status checks, Re: #494 @@ -10,3 +11,14 @@ - Fixes local image path on sub-page, Re: #570 - Adds typecheck on edit item tags, Re: #575 - Fixes item size in config not honored, Re: #576 +======= +### 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 +>>>>>>> b51935f04976a56a27ecd3cd3124766f7148bfd0 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 diff --git a/README.md b/README.md index a44be843..6e53b34f 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 @@ -529,13 +529,6 @@ Huge thanks to the sponsors helping to support Dashy's development! - - - Famku -
- Famku - - hugalafutro diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index 9e3fa83a..c1119c40 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -1,4 +1,4 @@ - + @@ -27,55 +27,64 @@ + + + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + \ No newline at end of file diff --git a/docs/assets/repo-visualization.svg b/docs/assets/repo-visualization.svg index f579f6d7..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 diff --git a/docs/credits.md b/docs/credits.md index dc2127dc..4198e296 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,6 +196,13 @@ Jeremy Chauvin + + + 0n1cOn3 +
+ 0n1cOn3 + + BeginCI @@ -209,7 +216,8 @@
David - + + deepsourcebot @@ -223,8 +231,7 @@
FormatToday - - + Compunctus @@ -252,7 +259,8 @@
Rubjo - + + turnrye @@ -266,8 +274,14 @@
Shreya Roy - - + + + + StevKast +
+ Steven Kast + + XertDev @@ -281,20 +295,6 @@
Aniket Teredesai - - - - jnach -
- Jnach - - - - - tazboyz16 -
- Tazboyz16 - diff --git a/docs/deployment.md b/docs/deployment.md index 03790efe..df9555bc 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 @@ -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 diff --git a/package.json b/package.json index 5113d9b2..464520b5 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/src/utils/ConfigAccumalator.js b/src/utils/ConfigAccumalator.js index aa4e151b..320673c6 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]) { diff --git a/yarn.lock b/yarn.lock index 38a9a3fb..ca56e278 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"