Chore: change MySpeed blocks layout order (#5984)

Co-authored-by: MountainGod2 <admin@reid.ca>

.github/workflows/docker-publish.yml

@@ -35,6 +35,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
+          version: 10
           run_install: false
 
       - name: Setup Node.js
@@ -93,6 +94,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
+          version: 10
           run_install: false
 
       - name: Setup Node.js
@@ -127,7 +129,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v3.6.0
+        uses: docker/setup-qemu-action@v3.7.0
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3

Dockerfile

@@ -51,6 +51,8 @@ COPY --link --from=builder --chown=1000:1000 /app/.next/static/ ./.next/static
 
 RUN apk add --no-cache su-exec iputils-ping shadow
 
+USER root
+
 ENV NODE_ENV=production
 ENV HOSTNAME=0.0.0.0
 ENV PORT=3000

docker-entrypoint.sh

@@ -57,8 +57,8 @@ if [ -d /app/.next ]; then
 fi
 
 # Drop privileges (when asked to) if root, otherwise run as current user
-if [ "$(id -u)" == "0" ] && [ "${PUID}" != "0" ]; then
-  su-exec ${PUID}:${PGID} "$@"
+if [ "$(id -u)" = "0" ] && [ "${PUID}" != "0" ]; then
+  exec su-exec ${PUID}:${PGID} "$@"
 else
   exec "$@"
 fi

docs/configs/settings.md

@@ -571,3 +571,18 @@ or per service widget (`services.yaml`) with:
 ```
 
 If either value is set to true, the error message will be hidden.
+
+## Disable Search Engine Indexing
+
+You can request that search engines not to index your Homepage instance by enabling the `disableIndexing` setting.
+
+```yaml
+disableIndexing: true
+```
+
+When enabled, this will:
+
+- Disallow all crawlers in `robots.txt`
+- Add `<meta name="robots" content="noindex, nofollow">` tags to prevent indexing
+
+By default this feature is disabled.

docs/widgets/services/crowdsec.md

@@ -8,6 +8,9 @@ Learn more about [Crowdsec](https://crowdsec.net).
 See the [crowdsec docs](https://docs.crowdsec.net/docs/local_api/intro/#machines) for information about registering a machine,
 in most instances you can use the default credentials (`/etc/crowdsec/local_api_credentials.yaml`).
 
+!!! note
+Without the `limit24h` option, the widget will fetch all alerts which is limited to 100 by the API to avoid performance issues.
+
 Allowed fields: `["alerts", "bans"]`.
 
 ```yaml
@@ -16,4 +19,5 @@ widget:
   url: http://crowdsechostorip:port
   username: localhost # machine_id in crowdsec
   password: password
+  limit24h: true # optional, limits alerts to last 24h. Default: false
 ```

docs/widgets/services/ghostfolio.md

@@ -15,7 +15,7 @@ See the [official docs](https://github.com/ghostfolio/ghostfolio#authorization-b
 
 _Note that the Bearer token is valid for 6 months, after which a new one must be generated._
 
-Allowed fields: `["gross_percent_today", "gross_percent_1y", "gross_percent_max"]`
+Allowed fields: `["gross_percent_today", "gross_percent_1y", "gross_percent_max", "net_worth"]`
 
 ```yaml
 widget:

docs/widgets/services/komodo.md

@@ -17,6 +17,6 @@ widget:
   url: http://komodo.hostname.or.ip:port
   key: K-xxxxxx...
   secret: S-xxxxxx...
-  showSummary: true # optional, default: false
+  showSummary: true # optional, default: false. Takes precedence over showStacks
   showStacks: true # optional, default: false
 ```

docs/widgets/services/omada.md

@@ -3,7 +3,7 @@ title: Omada
 description: Omada Widget Configuration
 ---
 
-The widget supports controller versions 3, 4 and 5.
+The widget supports controller versions 3, 4, 5 and 6.
 
 Allowed fields: `["connectedAp", "activeUser", "alerts", "connectedGateways", "connectedSwitches"]`.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "homepage",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "private": true,
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -63,13 +63,6 @@
   "optionalDependencies": {
     "osx-temperature-sensor": "^1.0.8"
   },
-  "packageManager": "pnpm@10.8.1",
-  "devEngines": {
-    "packageManager": {
-      "name": "pnpm",
-      "version": "10.8.1"
-    }
-  },
   "pnpm": {
     "onlyBuiltDependencies": [
       "osx-temperature-sensor",

public/locales/en/common.json

@@ -759,7 +759,8 @@
     "ghostfolio": {
         "gross_percent_today": "Today",
         "gross_percent_1y": "One year",
-        "gross_percent_max": "All time"
+        "gross_percent_max": "All time",
+        "net_worth": "Net Worth"
     },
     "audiobookshelf": {
         "podcasts": "Podcasts",

public/locales/zh-Hans/common.json

@@ -200,10 +200,10 @@
     "rutorrent": {
         "active": "活动中",
         "upload": "Upload",
-        "download": "Download"
+        "download": "下载"
     },
     "transmission": {
-        "download": "Download",
+        "download": "下载",
         "upload": "",
         "leech": "Leech",
         "seed": "Seed"
@@ -223,8 +223,8 @@
         "invalid": "Invalid"
     },
     "deluge": {
-        "download": "Download",
-        "upload": "Upload",
+        "download": "下载",
+        "upload": "上传",
         "leech": "Leech",
         "seed": "Seed"
     },

src/pages/index.jsx

@@ -400,6 +400,7 @@ function Home({ initialSettings }) {
             "A highly customizable homepage (or startpage / application dashboard) with Docker and service API integrations."
           }
         />
+        {settings.disableIndexing && <meta name="robots" content="noindex, nofollow" />}
         {settings.base && <base href={settings.base} />}
         {settings.favicon ? (
           <>

src/pages/robots.txt.js

@@ -0,0 +1,19 @@
+import { getSettings } from "utils/config/config";
+
+export async function getServerSideProps({ res }) {
+  const settings = getSettings();
+  const content = ["User-agent: *", !!settings.disableIndexing ? "Disallow: /" : "Allow: /"].join("\n");
+
+  res.setHeader("Content-Type", "text/plain");
+  res.write(content);
+  res.end();
+
+  return {
+    props: {},
+  };
+}
+
+export default function RobotsTxt() {
+  // placeholder component
+  return null;
+}

src/utils/config/service-helpers.js

@@ -279,6 +279,9 @@ export function cleanServiceGroups(groups) {
           slugs,
           symbols,
 
+          // crowdsec
+          limit24h,
+
           // customapi
           mappings,
           display,
@@ -473,6 +476,10 @@ export function cleanServiceGroups(groups) {
           if (defaultinterval) widget.defaultinterval = defaultinterval;
         }
 
+        if (limit24h !== undefined) {
+          widget.limit24h = !!limit24h;
+        }
+
         if (type === "docker") {
           if (server) widget.server = server;
           if (container) widget.container = container;

src/widgets/calendar/integrations/ical.jsx

@@ -106,13 +106,19 @@ export default function Integration({ config, params, setEvents, hideErrors, tim
     };
 
     const eventsToAdd = [];
-    events.forEach((event, index) => {
+    events.forEach((event) => {
       const occurrences = getOcurrencesFromRange(event);
 
       occurrences.forEach((icalDate) => {
         const date = icalDate.toJSDate();
 
-        const hash = simpleHash(`${event.id}-${event.title}-${index}-${date.toString()}`);
+        const occurrenceTimestamp = date.getTime();
+        const eventIdentifier =
+          event.id ??
+          simpleHash(
+            `${event.title ?? ""}-${event.type ?? ""}-${event.status ?? ""}-${event.url ?? ""}-${event.location ?? ""}`,
+          );
+        const hash = simpleHash(`${eventIdentifier}-${occurrenceTimestamp}`);
 
         let title = event.title;
         if (showName) {

src/widgets/crowdsec/component.jsx

@@ -9,7 +9,7 @@ export default function Component({ service }) {
 
   const { widget } = service;
 
-  const { data: alerts, error: alertsError } = useWidgetAPI(widget, "alerts");
+  const { data: alerts, error: alertsError } = useWidgetAPI(widget, !!widget.limit24h ? "alerts24h" : "alerts");
   const { data: bans, error: bansError } = useWidgetAPI(widget, "bans");
 
   if (alertsError || bansError) {

src/widgets/crowdsec/widget.js

@@ -9,6 +9,9 @@ const widget = {
     alerts: {
       endpoint: "alerts",
     },
+    alerts24h: {
+      endpoint: "alerts?limit=0&since=24h",
+    },
     bans: {
       endpoint: "alerts?decision_type=ban&origin=crowdsec&has_active_decision=1",
     },

src/widgets/esphome/component.jsx

@@ -14,6 +14,12 @@ export default function Component({ service }) {
     return <Container service={service} error={resultError} />;
   }
 
+  if (!widget.fields || widget.fields.length === 0) {
+    widget.fields = ["online", "offline", "offline_alt", "total"];
+  } else if (widget.fields.length > 4) {
+    widget.fields = widget.fields.slice(0, 4);
+  }
+
   if (!resultData) {
     return (
       <Container service={service}>

src/widgets/ghostfolio/component.jsx

@@ -20,13 +20,15 @@ function getPerformancePercent(t, performanceRange) {
 export default function Component({ service }) {
   const { t } = useTranslation();
   const { widget } = service;
+  const includeNetWorth = widget.fields?.includes("net_worth");
 
   const { data: performanceToday, error: ghostfolioErrorToday } = useWidgetAPI(widget, "today");
   const { data: performanceYear, error: ghostfolioErrorYear } = useWidgetAPI(widget, "year");
   const { data: performanceMax, error: ghostfolioErrorMax } = useWidgetAPI(widget, "max");
+  const { data: userInfo, error: ghostfolioErrorUserInfo } = useWidgetAPI(widget, includeNetWorth ? "userInfo" : "");
 
-  if (ghostfolioErrorToday || ghostfolioErrorYear || ghostfolioErrorMax) {
-    const finalError = ghostfolioErrorToday ?? ghostfolioErrorYear ?? ghostfolioErrorMax;
+  if (ghostfolioErrorToday || ghostfolioErrorYear || ghostfolioErrorMax || ghostfolioErrorUserInfo) {
+    const finalError = ghostfolioErrorToday ?? ghostfolioErrorYear ?? ghostfolioErrorMax ?? ghostfolioErrorUserInfo;
     return <Container service={service} error={finalError} />;
   }
 
@@ -34,12 +36,13 @@ export default function Component({ service }) {
     return <Container service={service} error={performanceToday} />;
   }
 
-  if (!performanceToday || !performanceYear || !performanceMax) {
+  if (!performanceToday || !performanceYear || !performanceMax || (includeNetWorth && !userInfo)) {
     return (
       <Container service={service}>
         <Block label="ghostfolio.gross_percent_today" />
         <Block label="ghostfolio.gross_percent_1y" />
         <Block label="ghostfolio.gross_percent_max" />
+        {includeNetWorth && <Block label="ghostfolio.net_worth" />}
       </Container>
     );
   }
@@ -49,6 +52,12 @@ export default function Component({ service }) {
       <Block label="ghostfolio.gross_percent_today" value={getPerformancePercent(t, performanceToday)} />
       <Block label="ghostfolio.gross_percent_1y" value={getPerformancePercent(t, performanceYear)} />
       <Block label="ghostfolio.gross_percent_max" value={getPerformancePercent(t, performanceMax)} />
+      {includeNetWorth && (
+        <Block
+          label="ghostfolio.net_worth"
+          value={`${performanceToday.performance.currentNetWorth.toFixed(2)} ${userInfo?.settings?.currency ?? ""}`}
+        />
+      )}
     </Container>
   );
 }

src/widgets/ghostfolio/widget.js

@@ -1,18 +1,21 @@
 import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
 
 const widget = {
-  api: "{url}/api/v2/portfolio/performance?range={endpoint}",
+  api: "{url}/api/{endpoint}",
   proxyHandler: credentialedProxyHandler,
 
   mappings: {
     today: {
-      endpoint: "1d",
+      endpoint: "v2/portfolio/performance?range=1d",
     },
     year: {
-      endpoint: "1y",
+      endpoint: "v2/portfolio/performance?range=1y",
     },
     max: {
-      endpoint: "max",
+      endpoint: "v2/portfolio/performance?range=max",
+    },
+    userInfo: {
+      endpoint: "v1/user",
     },
   },
 };

src/widgets/komodo/component.jsx

@@ -32,7 +32,7 @@ export default function Component({ service }) {
 
   if (
     (!widget.showStacks && !containersData) ||
-    (widget.showSummary && (!stacksData || !serversData)) ||
+    (widget.showSummary && (!containersData || !stacksData || !serversData)) ||
     (widget.showStacks && !stacksData)
   ) {
     return widget.showSummary ? (

src/widgets/myspeed/component.jsx

@@ -24,9 +24,9 @@ export default function Component({ service }) {
   if (!data || (data && data.length === 0)) {
     return (
       <Container service={service}>
-        <Block label="myspeed.ping" />
         <Block label="myspeed.download" />
         <Block label="myspeed.upload" />
+        <Block label="myspeed.ping" />
       </Container>
     );
   }