Merge branch 'main' into feature/widget_strelaysrv

src/components/bookmarks/group.jsx

@@ -2,13 +2,8 @@ import List from "components/bookmarks/list";
 
 export default function BookmarksGroup({ group }) {
   return (
-    <div
-      key={group.name}
-      className="basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4 flex-1 p-1"
-    >
-      <h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">
-        {group.name}
-      </h2>
+    <div key={group.name} className="basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4 flex-1 p-1">
+      <h2 className="text-theme-800 dark:text-theme-300 text-xl font-medium">{group.name}</h2>
       <List bookmarks={group.bookmarks} />
     </div>
   );

src/components/bookmarks/item.jsx

@@ -1,12 +1,18 @@
+import { useContext } from "react";
+
+import { SettingsContext } from "utils/settings-context";
+
 export default function Item({ bookmark }) {
   const { hostname } = new URL(bookmark.href);
+  const { settings } = useContext(SettingsContext);
 
   return (
     <li key={bookmark.name}>
-      <button
-        type="button"
-        onClick={() => window.open(bookmark.href, "_blank").focus()}
-        className="w-full text-left mb-3 cursor-pointer rounded-md font-medium text-theme-700 hover:text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-black/10 dark:shadow-black/20 bg-white/50 hover:bg-theme-300/10 dark:bg-white/10 dark:hover:bg-white/20"
+      <a
+        href={bookmark.href}
+        title={bookmark.name}
+        target={settings.target ?? "_blank"}
+        className="block w-full text-left mb-3 cursor-pointer rounded-md font-medium text-theme-700 hover:text-theme-700 dark:text-theme-200 dark:hover:text-theme-300 shadow-md shadow-black/10 dark:shadow-black/20 bg-white/50 hover:bg-theme-300/10 dark:bg-white/10 dark:hover:bg-white/20"
       >
         <div className="flex">
           <div className="flex-shrink-0 flex items-center justify-center w-11 bg-theme-500/10 dark:bg-theme-900/50 text-theme-700 hover:text-theme-700 dark:text-theme-200 text-sm font-medium rounded-l-md">
@@ -17,7 +23,7 @@ export default function Item({ bookmark }) {
             <div className="px-2 py-2 truncate text-theme-500 dark:text-theme-400 opacity-50 text-xs">{hostname}</div>
           </div>
         </div>
-      </button>
+      </a>
     </li>
   );
 }

src/components/services/item.jsx

@@ -1,10 +1,13 @@
 import Image from "next/future/image";
+import { useContext } from "react";
 import { Disclosure } from "@headlessui/react";
 
 import Status from "./status";
 import Widget from "./widget";
 import Docker from "./widgets/service/docker";
 
+import { SettingsContext } from "utils/settings-context";
+
 function resolveIcon(icon) {
   if (icon.startsWith("http")) {
     return `/api/proxy?url=${encodeURIComponent(icon)}`;
@@ -23,6 +26,7 @@ function resolveIcon(icon) {
 
 export default function Item({ service }) {
   const hasLink = service.href && service.href !== "#";
+  const { settings } = useContext(SettingsContext);
 
   return (
     <li key={service.name}>
@@ -37,7 +41,7 @@ export default function Item({ service }) {
               (hasLink ? (
                 <a
                   href={service.href}
-                  target="_blank"
+                  target={settings.target ?? "_blank"}
                   rel="noreferrer"
                   className="flex-shrink-0 flex items-center justify-center w-12 "
                 >
@@ -52,7 +56,7 @@ export default function Item({ service }) {
             {hasLink ? (
               <a
                 href={service.href}
-                target="_blank"
+                target={settings.target ?? "_blank"}
                 rel="noreferrer"
                 className="flex-1 flex items-center justify-between rounded-r-md "
               >

src/components/services/widget.jsx

@@ -28,6 +28,7 @@ import Prowlarr from "./widgets/service/prowlarr";
 import Jackett from "./widgets/service/jackett";
 import AdGuard from "./widgets/service/adguard";
 import StRelaySrv from "./widgets/service/strelaysrv";
+import Mastodon from "./widgets/service/mastodon";
 
 const widgetMappings = {
   docker: Docker,
@@ -58,6 +59,7 @@ const widgetMappings = {
   jackett: Jackett,
   adguard: AdGuard,
   strelaysrv: StRelaySrv,
+  mastodon: Mastodon,
 };
 
 export default function Widget({ service }) {

src/components/services/widgets/service/mastodon.jsx

@@ -0,0 +1,37 @@
+import useSWR from "swr";
+import { useTranslation } from "react-i18next";
+
+import Widget from "../widget";
+import Block from "../block";
+
+import { formatApiUrl } from "utils/api-helpers";
+
+export default function Mastodon({ service }) {
+  const { t } = useTranslation();
+
+  const config = service.widget;
+
+  const { data: statsData, error: statsError } = useSWR(formatApiUrl(config, `instance`));
+
+  if (statsError) {
+    return <Widget error={t("widget.api_error")} />;
+  }
+
+  if (!statsData) {
+    return (
+      <Widget>
+        <Block label={t("mastodon.user_count")} />
+        <Block label={t("mastodon.status_count")} />
+        <Block label={t("mastodon.domain_count")} />
+      </Widget>
+    );
+  }
+
+  return (
+    <Widget>
+      <Block label={t("mastodon.user_count")}   value={t("common.number", { value: statsData.stats.user_count })} />
+      <Block label={t("mastodon.status_count")} value={t("common.number", { value: statsData.stats.status_count })} />
+      <Block label={t("mastodon.domain_count")} value={t("common.number", { value: statsData.stats.domain_count })} />
+    </Widget>
+  );
+}