From c9cd395313a2734de815798045fd9528ac5c30f6 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Sat, 6 Aug 2022 18:53:48 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=80=20Rebase=20from=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/AUTHORS.txt | 11 ++++++----- README.md | 25 ++++++++++++++++--------- docs/assets/CONTRIBUTORS.svg | 29 ++++++++++++++++------------- docs/assets/repo-visualization.svg | 2 +- docs/authentication.md | 2 +- docs/credits.md | 27 +++++++++++++++++---------- docs/troubleshooting.md | 12 ++++++++++++ src/components/LinkItems/Item.vue | 10 ++++++---- 8 files changed, 75 insertions(+), 43 deletions(-) diff --git a/.github/AUTHORS.txt b/.github/AUTHORS.txt index 6351e20d..a2df5d75 100644 --- a/.github/AUTHORS.txt +++ b/.github/AUTHORS.txt @@ -17,6 +17,7 @@ Leonardo - 1 commits M - 1 commits Markus - 1 commits PlusaN <61884717+PlusaN@users.noreply.github.com> - 1 commits +Prince - 1 commits Rune - 1 commits Ryan - 1 commits Shreya - 1 commits @@ -68,12 +69,12 @@ aterox - 19 commits EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits Marcell <ülö> - 24 commits Alicia - 28 commits -repo-visualizer - 46 commits -snyk-bot - 47 commits +repo-visualizer - 47 commits +snyk-bot - 48 commits Lissy93 - 78 commits -Alicia - 90 commits -liss-bot - 101 commits -Alicia - 187 commits +Alicia - 92 commits +liss-bot - 103 commits +Alicia - 188 commits Lissy93 - 208 commits Alicia - 440 commits Alicia - 1488 commits \ No newline at end of file diff --git a/README.md b/README.md index b2318617..51376526 100644 --- a/README.md +++ b/README.md @@ -521,6 +521,13 @@ Huge thanks to the sponsors helping to support Dashy's development! + + + - + + + - + + + - +
+ + Keloran +
+ Max Hooton + + 		peng1can @@ -555,15 +562,15 @@ Huge thanks to the sponsors helping to support Dashy's development!
Stephen Rigney -
AdamXweb
Adam Kostarelas -
bmcgonag @@ -598,15 +605,15 @@ Huge thanks to the sponsors helping to support Dashy's development!
Byolock -
PAPAMICA
Mickael Asseline -
hugalafutro @@ -641,15 +648,15 @@ Huge thanks to the sponsors helping to support Dashy's development!
Undefined -
jtfinley72
Jtfinley72 -
CynegeticIO diff --git a/docs/assets/CONTRIBUTORS.svg b/docs/assets/CONTRIBUTORS.svg index f7626bbc..0c6fc4dc 100644 --- a/docs/assets/CONTRIBUTORS.svg +++ b/docs/assets/CONTRIBUTORS.svg @@ -117,43 +117,46 @@ + + + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/docs/assets/repo-visualization.svg b/docs/assets/repo-visualization.svg index e03393c4..51a33159 100644 --- a/docs/assets/repo-visualization.svg +++ b/docs/assets/repo-visualization.svg @@ -1 +1 @@ -viewsviewsutilsutilsstylesstylesmixinsmixinsdirectivesdirectivescomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSch...ConfigSch...ConfigSch...color-the...color-the...color-the...store.jsstore.jsstore.jsAnonAddy...AnonAddy...AnonAddy...CustomTh...CustomTh...CustomTh...Section.vueSection.vueSection.vueItem.vueItem.vueItem.vueEditItem...EditItem...EditItem...ConfigCo...ConfigCo...ConfigCo...en.jsonen.jsonen.jsonde.jsonde.jsonde.jsonbg.jsonbg.jsonbg.jsonhi.jsonhi.jsonhi.jsonko.jsonko.jsonko.jsonpt.jsonpt.jsonpt.jsonit.jsonit.jsonit.jsonfr.jsonfr.jsonfr.jsonsv.jsonsv.jsonsv.jsonzh-CN.jsonzh-CN.jsonzh-CN.jsonru.jsonru.jsonru.jsonsl.jsonsl.jsonsl.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file +viewsviewsutilsutilsstylesstylesmixinsmixinsdirectivesdirectivescomponentscomponentsassetsassetsWorkspaceWorkspaceWidgetsWidgetsSettingsSettingsPageStrcturePageStrctureMinimalViewMinimalViewLinkItemsLinkItemsInteractiveEditorInteractiveEditorFormElementsFormElementsConfigurationConfigurationChartsChartslocaleslocalesinterface-iconsinterface-iconsemojis.jsonemojis.jsonemojis.jsonConfigSch...ConfigSch...ConfigSch...color-the...color-the...color-the...store.jsstore.jsstore.jsAnonAddy...AnonAddy...AnonAddy...CustomTh...CustomTh...CustomTh...Section.vueSection.vueSection.vueItem.vueItem.vueItem.vueEditItem...EditItem...EditItem...ConfigCo...ConfigCo...ConfigCo...en.jsonen.jsonen.jsonde.jsonde.jsonde.jsonbg.jsonbg.jsonbg.jsonhi.jsonhi.jsonhi.jsonko.jsonko.jsonko.jsonpt.jsonpt.jsonpt.jsonit.jsonit.jsonit.jsonfr.jsonfr.jsonfr.jsonsv.jsonsv.jsonsv.jsonzh-CN.jsonzh-CN.jsonzh-CN.jsonru.jsonru.jsonru.jsonsl.jsonsl.jsonsl.json.js.json.scss.svg.vueeach dot sized by file size \ No newline at end of file diff --git a/docs/authentication.md b/docs/authentication.md index 5a0e2677..080d9b7d 100644 --- a/docs/authentication.md +++ b/docs/authentication.md @@ -94,7 +94,7 @@ With basic auth, all logic is happening on the client-side, which could mean a s Dashy also supports using a [Keycloack](https://www.keycloak.org/) authentication server. The setup for this is a bit more involved, but it gives you greater security overall, useful for if your instance is exposed to the internet. -[Keycloak](https://www.keycloak.org/about.html) is a Java-based [open source](https://github.com/keycloak/keycloak), high-performance, secure authentication system, supported by [RedHad](https://www.redhat.com/en). It is easy to setup ([with Docker](https://quay.io/repository/keycloak/keycloak)), and enables you to secure multiple self-hosted applications with single-sign on using standard protocols (OpenID Connect, OAuth 2.0, SAML 2.0 and social login). It's also very customizable, you can write or use custom [themes](https://wjw465150.gitbooks.io/keycloak-documentation/content/server_development/topics/themes.html), [plugins](https://www.keycloak.org/extensions.html), [password policies](https://wjw465150.gitbooks.io/keycloak-documentation/content/server_admin/topics/authentication/password-policies.html) and more. +[Keycloak](https://www.keycloak.org/about.html) is a Java-based [open source](https://github.com/keycloak/keycloak), high-performance, secure authentication system, supported by [RedHat](https://www.redhat.com/en). It is easy to setup ([with Docker](https://quay.io/repository/keycloak/keycloak)), and enables you to secure multiple self-hosted applications with single-sign on using standard protocols (OpenID Connect, OAuth 2.0, SAML 2.0 and social login). It's also very customizable, you can write or use custom [themes](https://wjw465150.gitbooks.io/keycloak-documentation/content/server_development/topics/themes.html), [plugins](https://www.keycloak.org/extensions.html), [password policies](https://wjw465150.gitbooks.io/keycloak-documentation/content/server_admin/topics/authentication/password-policies.html) and more. The following guide will walk you through setting up Keycloak with Dashy. If you already have a Keycloak instance configured, then skip to Step 3. ### 1. Deploy Keycloak diff --git a/docs/credits.md b/docs/credits.md index 689fa29d..3134b777 100644 --- a/docs/credits.md +++ b/docs/credits.md @@ -4,6 +4,13 @@ + + + - + + + - + + + - +
+ + Keloran +
+ Max Hooton + + 		peng1can @@ -38,15 +45,15 @@
Stephen Rigney -
AdamXweb
Adam Kostarelas -
bmcgonag @@ -81,15 +88,15 @@
Byolock -
PAPAMICA
Mickael Asseline -
hugalafutro @@ -124,15 +131,15 @@
Undefined -
jtfinley72
Jtfinley72 -
CynegeticIO @@ -222,7 +229,7 @@ jammo2k5
- jammo2k5 + Jammo2k5 		diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 2f863133..c7906aa5 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -23,6 +23,7 @@ - [DockerHub toomanyrequests](#dockerhub-toomanyrequests) - [Config Validation Errors](#config-validation-errors) - [Node Sass unsupported environment](#node-sass-does-not-yet-support-your-current-environment) +- [Unreachable Code Error](#unreachable-code-error) - [Cannot find module './_baseValues'](#error-cannot-find-module-_basevalues) - [Ngrok Invalid Host Headers](#invalid-host-header-while-running-through-ngrok) - [Warnings in the Console during deploy](#warnings-in-the-console-during-deploy) @@ -315,6 +316,17 @@ If the issue still persists, you should raise an issue. Caused by node-sass's binaries being built for a for a different architecture To fix this, just run: `yarn rebuild node-sass` +--- + +## Unreachable Code Error + +An error similar to: `Fatal error in , line 0. Unreachable code, FailureMessage Object: 0xffe6c8ac. Illegal instruction (core dumped)` +Is related to a bug in a downstream package, see [nodejs/docker-node#1477](https://github.com/nodejs/docker-node/issues/1477). +Usually, updating your system and packages will resolve the issue. + +See also: [#776](https://github.com/Lissy93/dashy/issues/776) + + --- ## Error: Cannot find module './_baseValues' diff --git a/src/components/LinkItems/Item.vue b/src/components/LinkItems/Item.vue index 24df237e..581d4a7a 100644 --- a/src/components/LinkItems/Item.vue +++ b/src/components/LinkItems/Item.vue @@ -172,10 +172,12 @@ export default { }, mounted() { // If ststus checking is enabled, then check service status - if (this.enableStatusCheck) this.checkWebsiteStatus(); - // If continious status checking is enabled, then start ever-lasting loop - if (this.statusCheckInterval > 0) { - this.intervalId = setInterval(this.checkWebsiteStatus, this.statusCheckInterval * 1000); + if (this.enableStatusCheck) { + this.checkWebsiteStatus(); + // If continious status checking is enabled, then start ever-lasting loop + if (this.statusCheckInterval > 0) { + this.intervalId = setInterval(this.checkWebsiteStatus, this.statusCheckInterval * 1000); + } } }, beforeDestroy() {