🔀 Rebased from master

2024-12-23 08:52:28 +03:00 · 2022-03-27 20:03:12 +01:00 · 2022-03-27 20:03:12 +01:00 · 3d9c646ad3
commit 3d9c646ad3
parent c3c04723fd b51935f049
12 changed files with 162 additions and 82 deletions
--- a/.github/AUTHORS.txt
+++ b/.github/AUTHORS.txt
@ -1,3 +1,4 @@
+0n1cOn3 <0n1cOn3@gmx.ch> - 1 commits
 Alicia <liss-bot@d0h.co> - 1 commits
 Begin <support@begin.com> - 1 commits
 David <skaarj1989@gmail.com> - 1 commits
@ -12,11 +13,13 @@ Rune <jørnerå> - 1 commits
 Ryan <urne> - 1 commits
 Shreya <o> - 1 commits
 Singebob <jeremy.chauvin@systeme-u.fr> - 1 commits
+Steven <as> - 1 commits
 Xert <xertdev@gmail.com> - 1 commits
 deepsource-io[bot] <deepsource-io[bot]@users.noreply.github.com> - 1 commits
 icy-comet <50461557+icy-comet@users.noreply.github.com> - 1 commits
 jnach <33467747+jnach@users.noreply.github.com> - 1 commits
 tazboyz16 <tazboyz_16@yahoo.com> - 1 commits
+Alessandro <e> - 2 commits
 BOZG <sr@bozg.se> - 2 commits
 Brendan <&#39;Lear> - 2 commits
 Dan <ilber> - 2 commits
@ -24,6 +27,7 @@ Ruben <ilv> - 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 <kenneth@kenneth.church> - 3 commits
 Niklas <abe> - 4 commits
 Alicie <gh@d0h.co> - 5 commits
 UrekD <urek.denis@gmail.com> - 5 commits
@ -37,12 +41,12 @@ snyk-bot <snyk-bot@users.noreply.github.com> - 18 commits
 aterox <church.kennetha@gmail.com> - 19 commits
 EVOTk <45015615+EVOTk@users.noreply.github.com> - 22 commits
 Alicia <yke> - 28 commits
-repo-visualizer <repo-visualizer@users.noreply.github.com> - 28 commits
-snyk-bot <snyk-bot@snyk.io> - 35 commits
-Alicia <o> - 55 commits
-liss-bot <liss-bot@d0h.co> - 71 commits
-Alicia <yke> - 75 commits
+repo-visualizer <repo-visualizer@users.noreply.github.com> - 30 commits
+snyk-bot <snyk-bot@snyk.io> - 37 commits
+Alicia <o> - 61 commits
+liss-bot <liss-bot@d0h.co> - 75 commits
 Lissy93 <gh@d0h.co> - 78 commits
+Alicia <yke> - 87 commits
 Lissy93 <Lissy93@users.noreply.github.com> - 206 commits
 Alicia <yke> - 334 commits
-Alicia <yke> - 1430 commits
+Alicia <yke> - 1439 commits
--- 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!

--- 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
--- a/12
+++ b/12
@ -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
--- 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!
        </a>
    </td></tr>
 <tr>
-    <td align="center">
-        <a href="https://github.com/Famku">
-            <img src="https://avatars.githubusercontent.com/u/27890413?v=4" width="80;" alt="Famku"/>
-            <br />
-            <sub><b>Famku</b></sub>
-        </a>
-    </td>
    <td align="center">
        <a href="https://github.com/hugalafutro">
            <img src="https://avatars.githubusercontent.com/u/30209689?v=4" width="80;" alt="hugalafutro"/>
--- a/docs/assets/CONTRIBUTORS.svg
+++ b/docs/assets/CONTRIBUTORS.svg
--- a/docs/assets/repo-visualization.svg
+++ b/docs/assets/repo-visualization.svg
--- a/docs/credits.md
+++ b/docs/credits.md
@ -47,13 +47,6 @@
        </a>
    </td></tr>
 <tr>
-    <td align="center">
-        <a href="https://github.com/Famku">
-            <img src="https://avatars.githubusercontent.com/u/27890413?v=4" width="80;" alt="Famku"/>
-            <br />
-            <sub><b>Famku</b></sub>
-        </a>
-    </td>
    <td align="center">
        <a href="https://github.com/hugalafutro">
            <img src="https://avatars.githubusercontent.com/u/30209689?v=4" width="80;" alt="hugalafutro"/>
@ -167,21 +160,28 @@
            <sub><b>ᗪєνιη ᗷυнʟ</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/alexdelprete">
+            <img src="https://avatars.githubusercontent.com/u/7027842?v=4" width="80;" alt="alexdelprete"/>
+            <br />
+            <sub><b>Alessandro Del Prete</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/BOZG">
            <img src="https://avatars.githubusercontent.com/u/6022344?v=4" width="80;" alt="BOZG"/>
            <br />
            <sub><b>Stephen Rigney</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/daentech">
            <img src="https://avatars.githubusercontent.com/u/358678?v=4" width="80;" alt="daentech"/>
            <br />
            <sub><b>Dan Gilbert</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/rubenandre">
            <img src="https://avatars.githubusercontent.com/u/9402773?v=4" width="80;" alt="rubenandre"/>
@ -196,6 +196,13 @@
            <sub><b>Jeremy Chauvin</b></sub>
        </a>
    </td>
+    <td align="center">
+        <a href="https://github.com/0n1cOn3">
+            <img src="https://avatars.githubusercontent.com/u/27576311?v=4" width="80;" alt="0n1cOn3"/>
+            <br />
+            <sub><b>0n1cOn3</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/BeginCI">
            <img src="https://avatars.githubusercontent.com/u/57495754?v=4" width="80;" alt="BeginCI"/>
@ -209,7 +216,8 @@
            <br />
            <sub><b>David</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/deepsourcebot">
            <img src="https://avatars.githubusercontent.com/u/60907429?v=4" width="80;" alt="deepsourcebot"/>
@ -223,8 +231,7 @@
            <br />
            <sub><b>FormatToday</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
    <td align="center">
        <a href="https://github.com/Compunctus">
            <img src="https://avatars.githubusercontent.com/u/5058853?v=4" width="80;" alt="Compunctus"/>
@ -252,7 +259,8 @@
            <br />
            <sub><b>Rubjo</b></sub>
        </a>
-    </td>
+    </td></tr>
+<tr>
    <td align="center">
        <a href="https://github.com/turnrye">
            <img src="https://avatars.githubusercontent.com/u/701035?v=4" width="80;" alt="turnrye"/>
@ -266,8 +274,14 @@
            <br />
            <sub><b>Shreya Roy</b></sub>
        </a>
-    </td></tr>
-<tr>
+    </td>
+    <td align="center">
+        <a href="https://github.com/StevKast">
+            <img src="https://avatars.githubusercontent.com/u/17804308?v=4" width="80;" alt="StevKast"/>
+            <br />
+            <sub><b>Steven Kast</b></sub>
+        </a>
+    </td>
    <td align="center">
        <a href="https://github.com/XertDev">
            <img src="https://avatars.githubusercontent.com/u/16572811?v=4" width="80;" alt="XertDev"/>
@ -281,20 +295,6 @@
            <br />
            <sub><b>Aniket Teredesai</b></sub>
        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/jnach">
-            <img src="https://avatars.githubusercontent.com/u/33467747?v=4" width="80;" alt="jnach"/>
-            <br />
-            <sub><b>Jnach</b></sub>
-        </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/tazboyz16">
-            <img src="https://avatars.githubusercontent.com/u/12215340?v=4" width="80;" alt="tazboyz16"/>
-            <br />
-            <sub><b>Tazboyz16</b></sub>
-        </a>
    </td></tr>
 </table>
 <!-- readme: contributors -end -->
--- 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
--- 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",
--- 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]) {
--- 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"