From 940ce359bf288ecf546aa07b92cb6aac0263ac53 Mon Sep 17 00:00:00 2001 From: dimitricappelle Date: Tue, 20 Jun 2023 17:05:07 +0200 Subject: [PATCH 01/47] Adding Kavita --- public/locales/en/common.json | 4 ++ src/widgets/components.js | 3 +- src/widgets/kavita/component.jsx | 33 +++++++++++ src/widgets/kavita/proxy.js | 96 ++++++++++++++++++++++++++++++++ src/widgets/kavita/widget.js | 13 +++++ src/widgets/widgets.js | 4 +- 6 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 src/widgets/kavita/component.jsx create mode 100644 src/widgets/kavita/proxy.js create mode 100644 src/widgets/kavita/widget.js diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 36b5a391..718b913f 100755 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -659,5 +659,9 @@ "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size", "downloadSpeed": "Speed" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } diff --git a/src/widgets/components.js b/src/widgets/components.js index 97760d36..3359dd02 100644 --- a/src/widgets/components.js +++ b/src/widgets/components.js @@ -34,6 +34,7 @@ const components = { jdownloader: dynamic(() => import("./jdownloader/component")), jellyfin: dynamic(() => import("./emby/component")), jellyseerr: dynamic(() => import("./jellyseerr/component")), + kavita: dynamic(() => import("./kavita/component")), komga: dynamic(() => import("./komga/component")), kopia: dynamic(() => import("./kopia/component")), lidarr: dynamic(() => import("./lidarr/component")), @@ -92,4 +93,4 @@ const components = { xteve: dynamic(() => import("./xteve/component")), }; -export default components; \ No newline at end of file +export default components; diff --git a/src/widgets/kavita/component.jsx b/src/widgets/kavita/component.jsx new file mode 100644 index 00000000..f7d91a92 --- /dev/null +++ b/src/widgets/kavita/component.jsx @@ -0,0 +1,33 @@ +import { useTranslation } from "next-i18next"; + +import Container from "components/services/widget/container"; +import Block from "components/services/widget/block"; +import useWidgetAPI from "utils/proxy/use-widget-api"; + +export default function Component({ service }) { + const { t } = useTranslation(); + + const { widget } = service; + + const { data: kavitaData, error: kavitaError } = useWidgetAPI(widget, "info"); + + if (kavitaError) { + return ; + } + + if (!kavitaData) { + return ( + + + + + ); + } + + return ( + + + + + ); +} diff --git a/src/widgets/kavita/proxy.js b/src/widgets/kavita/proxy.js new file mode 100644 index 00000000..786bdf1d --- /dev/null +++ b/src/widgets/kavita/proxy.js @@ -0,0 +1,96 @@ +import cache from "memory-cache"; + +import { httpProxy } from "utils/proxy/http"; +import { formatApiCall } from "utils/proxy/api-helpers"; +import getServiceWidget from "utils/config/service-helpers"; +import createLogger from "utils/logger"; +import widgets from "widgets/widgets"; + +const proxyName = "kavitaProxyHandler"; +const sessionTokenCacheKey = `${proxyName}__sessionToken`; +const logger = createLogger(proxyName); + +async function login(widget, service) { + const endpoint = "Account/login"; + const api = widgets?.[widget.type]?.api + const loginUrl = new URL(formatApiCall(api, { endpoint, ...widget })); + const loginBody = { username: widget.username, password: widget.password }; + const headers = { "Content-Type": "application/json", "accept": "text/plain" }; + + const [, , data,] = await httpProxy(loginUrl, { + method: "POST", + body: JSON.stringify(loginBody), + headers, + }); + + try { + const { token: accessToken } = JSON.parse(data.toString()); + cache.put(`${sessionTokenCacheKey}.${service}`, accessToken); + return { accessToken }; + } catch (e) { + logger.error("Unable to login to Kavita API: %s", e); + } + + return { token: false }; +} + +async function apiCall(widget, endpoint, service) { + const key = `${sessionTokenCacheKey}.${service}`; + const headers = { + "content-type": "application/json", + "Authorization": `Bearer ${cache.get(key)}`, + } + + const url = new URL(formatApiCall(widgets[widget.type].api, { endpoint, ...widget })); + const method = "GET"; + + let [status, contentType, data, responseHeaders] = await httpProxy(url, { + method, + headers, + }); + + if (status === 401 || status === 403) { + logger.debug("Kavita API rejected the request, attempting to obtain new session token"); + const { accessToken } = await login(widget, service); + headers.Authorization = `Bearer ${accessToken}`; + + // retry the request, now with the new session token + [status, contentType, data, responseHeaders] = await httpProxy(url, { + method, + headers, + }); + } + + if (status !== 200) { + logger.error("Error getting data from Kavita: %s status %d. Data: %s", url, status, data); + return { status, contentType, data: null, responseHeaders }; + } + + return { status, contentType, data: JSON.parse(data.toString()), responseHeaders }; +} + +export default async function KavitaProxyHandler(req, res) { + const { group, service } = req.query; + + if (!group || !service) { + logger.debug("Invalid or missing service '%s' or group '%s'", service, group); + return res.status(400).json({ error: "Invalid proxy service type" }); + } + + const widget = await getServiceWidget(group, service); + if (!widget) { + logger.debug("Invalid or missing widget for service '%s' in group '%s'", service, group); + return res.status(400).json({ error: "Invalid proxy service type" }); + } + + if (!cache.get(`${sessionTokenCacheKey}.${service}`)) { + await login(widget, service); + } + + const { data: statsData } = await apiCall(widget, "Stats/server/stats", service); + + return res.status(200).send({ + seriesCount: statsData?.seriesCount, + totalFiles: statsData?.totalFiles + }); +} diff --git a/src/widgets/kavita/widget.js b/src/widgets/kavita/widget.js new file mode 100644 index 00000000..cb35f03c --- /dev/null +++ b/src/widgets/kavita/widget.js @@ -0,0 +1,13 @@ +import kavitaProxyHandler from "./proxy"; + +const widget = { +api: "{url}/api/{endpoint}", + proxyHandler: kavitaProxyHandler, + mappings: { + info: { + endpoint: "/" + } + } +}; + +export default widget; diff --git a/src/widgets/widgets.js b/src/widgets/widgets.js index 86c4266f..fc209414 100644 --- a/src/widgets/widgets.js +++ b/src/widgets/widgets.js @@ -28,6 +28,7 @@ import immich from "./immich/widget"; import jackett from "./jackett/widget"; import jellyseerr from "./jellyseerr/widget"; import jdownloader from "./jdownloader/widget"; +import kavita from "./kavita/widget"; import komga from "./komga/widget"; import kopia from "./kopia/widget"; import lidarr from "./lidarr/widget"; @@ -100,7 +101,7 @@ const widgets = { diskstation, downloadstation, emby, - evcc, + evcc, fileflows, flood, freshrss, @@ -117,6 +118,7 @@ const widgets = { jdownloader, jellyfin: emby, jellyseerr, + kavita, komga, kopia, lidarr, From 3161c459b819cafe137aea8c0dbb12461cda6907 Mon Sep 17 00:00:00 2001 From: Quan Dong <604925267@qq.com> Date: Mon, 19 Jun 2023 15:29:26 +0000 Subject: [PATCH 02/47] Translated using Weblate (Chinese (Simplified)) Currently translated at 94.6% (444 of 469 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hans/ --- public/locales/zh-CN/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index a1f0dfda..ca2774f9 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -632,7 +632,7 @@ "requests_failed": "失败请求" }, "evcc": { - "pv_power": "Production", + "pv_power": "正式环境", "battery_soc": "Battery", "grid_power": "Grid", "home_power": "Consumption", From 3e691ab446e1f4f6210b062cb51b814dda2f7618 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:08 +0000 Subject: [PATCH 03/47] Translated using Weblate (German) Currently translated at 97.0% (457 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/de/ --- public/locales/de/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/de/common.json b/public/locales/de/common.json index 521e2cec..8b5dca93 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From edcd7508c9a0f40bec6a395e252a0f2ed8dc91cd Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:08 +0000 Subject: [PATCH 04/47] Translated using Weblate (Spanish) Currently translated at 99.5% (469 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/es/ --- public/locales/es/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/es/common.json b/public/locales/es/common.json index fcd470cd..eb42b75e 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Velocidad", "downloadBytesRemaining": "Restante", "downloadTotalBytes": "Tamaño" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 2a7ca6590788e9cd40a0b8a61ab6d6fc2f5257b5 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:08 +0000 Subject: [PATCH 05/47] Translated using Weblate (French) Currently translated at 99.5% (469 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/fr/ --- public/locales/fr/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index 7e268e67..b513e6b9 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Vitesse de téléchargement", "downloadBytesRemaining": "Restant", "downloadTotalBytes": "Taille" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 8678c67d97b3148b972a5fa66295cdca1e20fc3b Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:08 +0000 Subject: [PATCH 06/47] Translated using Weblate (Portuguese) Currently translated at 88.1% (415 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pt/ --- public/locales/pt/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/pt/common.json b/public/locales/pt/common.json index 5c84e6c5..3bfb6df8 100644 --- a/public/locales/pt/common.json +++ b/public/locales/pt/common.json @@ -659,5 +659,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 3a8e9ece9b6b259e27c00e7c3ab64b1efa79eff1 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:04 +0000 Subject: [PATCH 07/47] Translated using Weblate (Russian) Currently translated at 87.6% (413 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ru/ --- public/locales/ru/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index d3cd6d48..ded1be07 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 3021190959f893b9c3c7f2a9ad01b81864c4b941 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:04 +0000 Subject: [PATCH 08/47] Translated using Weblate (Chinese (Simplified)) Currently translated at 94.2% (444 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hans/ --- public/locales/zh-CN/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index ca2774f9..2506671c 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 297c253c335600d80a15d6fc41640be414ffdd46 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:03 +0000 Subject: [PATCH 09/47] Translated using Weblate (Italian) Currently translated at 70.7% (333 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/it/ --- public/locales/it/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/it/common.json b/public/locales/it/common.json index 677e1b70..a066c531 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 958428db299cd18c9bd81cd7cc7104b273df6a85 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:03 +0000 Subject: [PATCH 10/47] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 16.7% (79 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/nb_NO/ --- public/locales/nb-NO/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/nb-NO/common.json b/public/locales/nb-NO/common.json index 79124218..a633028c 100644 --- a/public/locales/nb-NO/common.json +++ b/public/locales/nb-NO/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From a25f13662800f8d0fe9ddc92776487adeba4aa2e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:03 +0000 Subject: [PATCH 11/47] Translated using Weblate (Vietnamese) Currently translated at 9.3% (44 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/vi/ --- public/locales/vi/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/vi/common.json b/public/locales/vi/common.json index 069eaff2..1fe186c9 100644 --- a/public/locales/vi/common.json +++ b/public/locales/vi/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From f83dd716822ba8a1b967ef2af779367353829122 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:03 +0000 Subject: [PATCH 12/47] Translated using Weblate (Dutch) Currently translated at 51.1% (241 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/nl/ --- public/locales/nl/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 139e9051..88c809a9 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 0d8f6545dd51942be73b7350edd684e0c47f3fdb Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:06 +0000 Subject: [PATCH 13/47] Translated using Weblate (Chinese (Traditional)) Currently translated at 97.6% (460 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/zh_Hant/ --- public/locales/zh-Hant/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/zh-Hant/common.json b/public/locales/zh-Hant/common.json index 7c0cb9fe..e4f96dd3 100644 --- a/public/locales/zh-Hant/common.json +++ b/public/locales/zh-Hant/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 197d8acbe8596ef9e2537d866fc236c3ebf4ed2a Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:04 +0000 Subject: [PATCH 14/47] Translated using Weblate (Catalan) Currently translated at 55.2% (260 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ca/ --- public/locales/ca/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index 3842feec..5d4082da 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 4fd107ab45bcae71a86473f840404b44906410f9 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:46:59 +0000 Subject: [PATCH 15/47] Translated using Weblate (Polish) Currently translated at 79.4% (374 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pl/ --- public/locales/pl/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/pl/common.json b/public/locales/pl/common.json index 6af51828..5df12a52 100644 --- a/public/locales/pl/common.json +++ b/public/locales/pl/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 112f376aa8d48aff29239966bdd78389fe5f0991 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:04 +0000 Subject: [PATCH 16/47] Translated using Weblate (Swedish) Currently translated at 27.6% (130 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sv/ --- public/locales/sv/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/sv/common.json b/public/locales/sv/common.json index c3325844..0d61d400 100644 --- a/public/locales/sv/common.json +++ b/public/locales/sv/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "totalFiles": "Files", + "seriesCount": "Series" } } From 25f706428626ff3d911902a996fcd413c3204a9d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:05 +0000 Subject: [PATCH 17/47] Translated using Weblate (Croatian) Currently translated at 97.2% (458 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hr/ --- public/locales/hr/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/hr/common.json b/public/locales/hr/common.json index 94dfae26..6fb77826 100644 --- a/public/locales/hr/common.json +++ b/public/locales/hr/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 514d827ff48216d571bacb1d0452c3489c7ffb7e Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:07 +0000 Subject: [PATCH 18/47] Translated using Weblate (Hungarian) Currently translated at 25.4% (120 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hu/ --- public/locales/hu/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index 108ba54d..f4b1509c 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -650,5 +650,9 @@ "downloadCount": "Queue Count", "downloadTotalBytes": "Size", "downloadBytesRemaining": "Remaining" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 58695dbe75f2e133b2add1db7efd1714331ba2f2 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:06 +0000 Subject: [PATCH 19/47] Translated using Weblate (Hebrew) Currently translated at 21.2% (100 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/he/ --- public/locales/he/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/he/common.json b/public/locales/he/common.json index 41e5746b..6fa54751 100644 --- a/public/locales/he/common.json +++ b/public/locales/he/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 794902cbd5aa8d121474313017f18f99d6c90cff Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:05 +0000 Subject: [PATCH 20/47] Translated using Weblate (Romanian) Currently translated at 31.8% (150 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ro/ --- public/locales/ro/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ro/common.json b/public/locales/ro/common.json index e8bf9ac7..3fc07bff 100644 --- a/public/locales/ro/common.json +++ b/public/locales/ro/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From e552524d997a26240c366bfcab7acdf1da9f605c Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:05 +0000 Subject: [PATCH 21/47] Translated using Weblate (Portuguese (Brazil)) Currently translated at 85.7% (404 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/pt_BR/ --- public/locales/pt-BR/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/pt-BR/common.json b/public/locales/pt-BR/common.json index d2146d2c..57e524fe 100644 --- a/public/locales/pt-BR/common.json +++ b/public/locales/pt-BR/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 5f21c20a59582a350f3cd740877b8a73d87b8a78 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:10 +0000 Subject: [PATCH 22/47] Translated using Weblate (Yue (Traditional)) Currently translated at 24.8% (117 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/yue_Hant/ --- public/locales/yue/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/yue/common.json b/public/locales/yue/common.json index 4e360b26..48accfc0 100644 --- a/public/locales/yue/common.json +++ b/public/locales/yue/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 7e01545e143a6a8852dc2dac5898a02ee52eb6b4 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:09 +0000 Subject: [PATCH 23/47] Translated using Weblate (Finnish) Currently translated at 37.5% (177 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/fi/ --- public/locales/fi/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/fi/common.json b/public/locales/fi/common.json index c3875b21..306c5b2b 100644 --- a/public/locales/fi/common.json +++ b/public/locales/fi/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From d9aa1dfdbfdd5a2274938cc7547d1319b4bd7310 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:09 +0000 Subject: [PATCH 24/47] Translated using Weblate (Telugu) Currently translated at 45.6% (215 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/te/ --- public/locales/te/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/te/common.json b/public/locales/te/common.json index b7d11223..9957fc7d 100644 --- a/public/locales/te/common.json +++ b/public/locales/te/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "totalFiles": "Files", + "seriesCount": "Series" } } From 81cf03fa8715dd8cbb861f7090e21539e959a477 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:09 +0000 Subject: [PATCH 25/47] Translated using Weblate (Bulgarian) Currently translated at 9.7% (46 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/bg/ --- public/locales/bg/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/bg/common.json b/public/locales/bg/common.json index 35dd13f4..594d2870 100644 --- a/public/locales/bg/common.json +++ b/public/locales/bg/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From ae060903a01d201fa5c724b9e4b0fb5a54f32f81 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:09 +0000 Subject: [PATCH 26/47] Translated using Weblate (Turkish) Currently translated at 83.4% (393 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/tr/ --- public/locales/tr/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/tr/common.json b/public/locales/tr/common.json index b152e0f7..bb98d412 100644 --- a/public/locales/tr/common.json +++ b/public/locales/tr/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 8f4d64913c533a3bde27a5ad48a8c6d0f61ab580 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:06 +0000 Subject: [PATCH 27/47] Translated using Weblate (Serbian) Currently translated at 1.9% (9 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sr/ --- public/locales/sr/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/sr/common.json b/public/locales/sr/common.json index 9ef56193..f60d3e22 100644 --- a/public/locales/sr/common.json +++ b/public/locales/sr/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 5dde0ae1faea1c500d829ac240b7c3952a61e7fc Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:06 +0000 Subject: [PATCH 28/47] Translated using Weblate (Arabic) Currently translated at 55.6% (262 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ar/ --- public/locales/ar/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ar/common.json b/public/locales/ar/common.json index a1bf5578..2f80f21a 100644 --- a/public/locales/ar/common.json +++ b/public/locales/ar/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 4ba88229aec8add97a3abe411d01eb88bacc550c Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:01 +0000 Subject: [PATCH 29/47] Translated using Weblate (Czech) Currently translated at 94.2% (444 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/cs/ --- public/locales/cs/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/cs/common.json b/public/locales/cs/common.json index 4e16a37a..164cc194 100644 --- a/public/locales/cs/common.json +++ b/public/locales/cs/common.json @@ -650,5 +650,9 @@ "downloadCount": "Queue Count", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 92f5bdf6596ca2ab989f679bc4c86ade77d59531 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:00 +0000 Subject: [PATCH 30/47] Translated using Weblate (Danish) Currently translated at 41.8% (197 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/da/ --- public/locales/da/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/da/common.json b/public/locales/da/common.json index 76ff86dd..3ff03563 100644 --- a/public/locales/da/common.json +++ b/public/locales/da/common.json @@ -650,5 +650,9 @@ "downloadCount": "Queue Count", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From ef1be0bb3f896c8ea3a0c89416362d06b9382c0a Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:00 +0000 Subject: [PATCH 31/47] Translated using Weblate (Malay) Currently translated at 53.2% (251 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ms/ --- public/locales/ms/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ms/common.json b/public/locales/ms/common.json index 70fd66e3..77b3a759 100644 --- a/public/locales/ms/common.json +++ b/public/locales/ms/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From c997b2c87c37f34b549d40016f458c8c8acd3623 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:01 +0000 Subject: [PATCH 32/47] Translated using Weblate (Hindi) Currently translated at 1.9% (9 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/hi/ --- public/locales/hi/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index 155235a9..88a100c3 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 2e34ab9f1e21b2fec5d944973606083f64737374 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:01 +0000 Subject: [PATCH 33/47] Translated using Weblate (Esperanto) Currently translated at 30.7% (145 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/eo/ --- public/locales/eo/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/eo/common.json b/public/locales/eo/common.json index 908169cb..c3c1c87d 100644 --- a/public/locales/eo/common.json +++ b/public/locales/eo/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 03276eced47f3f85f2cb2ee7fe0c7ded4a070fec Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:02 +0000 Subject: [PATCH 34/47] Translated using Weblate (Ukrainian) Currently translated at 99.5% (469 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/uk/ --- public/locales/uk/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/uk/common.json b/public/locales/uk/common.json index 14fc5a04..8f4b180c 100644 --- a/public/locales/uk/common.json +++ b/public/locales/uk/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Швидкість", "downloadBytesRemaining": "Залишилося", "downloadTotalBytes": "Розмір" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 768db388cb034c57a21aeb0d0499844ca86366ea Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:01 +0000 Subject: [PATCH 35/47] Translated using Weblate (Japanese) Currently translated at 81.5% (384 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ja/ --- public/locales/ja/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index 1bc37e96..84f56b12 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From cc92890dcac2a0ab065b605ac39ca07798ae9d0f Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:02 +0000 Subject: [PATCH 36/47] Translated using Weblate (Latvian) Currently translated at 25.0% (118 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/lv/ --- public/locales/lv/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/lv/common.json b/public/locales/lv/common.json index 70361ee2..8022ec13 100644 --- a/public/locales/lv/common.json +++ b/public/locales/lv/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From ebca1050c4f1aa635f36dd2cddb9cd4f46ec371a Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:46:59 +0000 Subject: [PATCH 37/47] Translated using Weblate (Thai) Currently translated at 9.9% (47 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/th/ --- public/locales/th/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/th/common.json b/public/locales/th/common.json index 2afb51f2..6122992f 100644 --- a/public/locales/th/common.json +++ b/public/locales/th/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 0598b8bcf5ca18fdca78431e4ac6d33ec929f2b0 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:07 +0000 Subject: [PATCH 38/47] Translated using Weblate (Slovak) Currently translated at 1.9% (9 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sk/ --- public/locales/sk/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/sk/common.json b/public/locales/sk/common.json index 5f95889c..8d3a80ec 100644 --- a/public/locales/sk/common.json +++ b/public/locales/sk/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 84d12b0b218031fd1d6024c319b78a3a8b6b5713 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:07 +0000 Subject: [PATCH 39/47] Translated using Weblate (Korean) Currently translated at 36.7% (173 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/ko/ --- public/locales/ko/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/ko/common.json b/public/locales/ko/common.json index f9037f52..a3a1d9e6 100644 --- a/public/locales/ko/common.json +++ b/public/locales/ko/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 68f755710e8c315baaed2bd689804daf04f57c05 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:46:59 +0000 Subject: [PATCH 40/47] Translated using Weblate (Greek) Currently translated at 30.3% (143 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/el/ --- public/locales/el/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/el/common.json b/public/locales/el/common.json index b36b43f6..a3be18f2 100644 --- a/public/locales/el/common.json +++ b/public/locales/el/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 60463721b88450dc9ad1add6e2d134044288cd0d Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:47:02 +0000 Subject: [PATCH 41/47] Translated using Weblate (Slovenian) Currently translated at 95.3% (449 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/sl/ --- public/locales/sl/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/sl/common.json b/public/locales/sl/common.json index 24d4b8f7..c4a9e317 100644 --- a/public/locales/sl/common.json +++ b/public/locales/sl/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 1d78881a5f1526ccc4846344627ffd1d4af2ab82 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Tue, 20 Jun 2023 17:46:59 +0000 Subject: [PATCH 42/47] Translated using Weblate (Indonesian) Currently translated at 3.1% (15 of 471 strings) Translation: Homepage/Homepage Translate-URL: https://hosted.weblate.org/projects/homepage/homepage/id/ --- public/locales/id/common.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/locales/id/common.json b/public/locales/id/common.json index 0be279a5..51daa4f1 100644 --- a/public/locales/id/common.json +++ b/public/locales/id/common.json @@ -650,5 +650,9 @@ "downloadSpeed": "Download Speed", "downloadBytesRemaining": "Remaining", "downloadTotalBytes": "Size" + }, + "kavita": { + "seriesCount": "Series", + "totalFiles": "Files" } } From 0936ba2b6befae45a562b6477131252dbdcf22aa Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 22 Jun 2023 09:57:21 -0700 Subject: [PATCH 43/47] Update package-lock.json --- package-lock.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0691562c..2e2a3e13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,6 @@ "minecraft-ping-js": "^1.0.2", "next": "^12.3.1", "next-i18next": "^12.0.1", - "osx-temperature-sensor": "*", "pretty-bytes": "^6.0.0", "raw-body": "^2.5.1", "react": "^18.2.0", From 041fae1fb30a0262ce54d1c5d05dbd6734bc2c32 Mon Sep 17 00:00:00 2001 From: Alex Higgins Date: Wed, 21 Jun 2023 16:46:14 -0400 Subject: [PATCH 44/47] Adds ability to collapse layout sections Reverts pnpm lock file changes Make entire section above list clickable. Implement in headlessui instead of pulling in new library. Remove unecessary packages and clean up ESLint errors --- src/components/services/group.jsx | 26 +++++++++++++++++--------- src/pages/index.jsx | 8 +++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx index 94557064..49a44de4 100644 --- a/src/components/services/group.jsx +++ b/src/components/services/group.jsx @@ -1,9 +1,14 @@ import classNames from "classnames"; +import { Transition } from '@headlessui/react' +import { useState } from 'react' import List from "components/services/list"; import ResolvedIcon from "components/resolvedicon"; -export default function ServicesGroup({ group, services, layout, fiveColumns }) { +export default function ServicesGroup({ group, services, layout, fiveColumns, disableCollapse}) { + + const [isShowing, setIsShowing] = useState(true) + return (
-
- {layout?.icon && -
- -
- } -

{services.name}

+
+ {/* eslint-disable-next-line no-shadow */} +
- +
); } diff --git a/src/pages/index.jsx b/src/pages/index.jsx index d91a8339..5106e07c 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -294,7 +294,13 @@ function Home({ initialSettings }) { {services?.length > 0 && (
{services.map((group) => ( - + ))}
)} From 714e0a4517685dd84c32dfb419e8c208c4e95c8f Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:04:12 -0700 Subject: [PATCH 45/47] Use Disclosure component for collapsible service groups, add transition hide collapse arrow if disabled dont break layout for icons in group title no-shadow --- src/components/services/group.jsx | 37 ++++++++++++++++++++++--------- tailwind.config.js | 5 +++++ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx index 49a44de4..2f94fc77 100644 --- a/src/components/services/group.jsx +++ b/src/components/services/group.jsx @@ -1,14 +1,12 @@ import classNames from "classnames"; -import { Transition } from '@headlessui/react' -import { useState } from 'react' +import { Disclosure, Transition } from '@headlessui/react'; +import { MdKeyboardArrowDown } from "react-icons/md"; import List from "components/services/list"; import ResolvedIcon from "components/resolvedicon"; export default function ServicesGroup({ group, services, layout, fiveColumns, disableCollapse}) { - const [isShowing, setIsShowing] = useState(true) - return (
-
- {/* eslint-disable-next-line no-shadow */} - -
- + + + + + + + + + )} +
); } diff --git a/tailwind.config.js b/tailwind.config.js index b981051b..a075f6e9 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,6 +9,11 @@ module.exports = { "./src/components/**/*.{js,ts,jsx,tsx}", "./src/widgets/**/*.{js,ts,jsx,tsx}", ], + variants: { + extend: { + display: ["group-hover"], + }, + }, theme: { extend: { colors: { From 1b6e5c4a8d55086820402daef64697d77d8a6373 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:51:12 -0700 Subject: [PATCH 46/47] Update group.jsx --- src/components/services/group.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx index 2f94fc77..eb64cc3d 100644 --- a/src/components/services/group.jsx +++ b/src/components/services/group.jsx @@ -5,7 +5,7 @@ import { MdKeyboardArrowDown } from "react-icons/md"; import List from "components/services/list"; import ResolvedIcon from "components/resolvedicon"; -export default function ServicesGroup({ group, services, layout, fiveColumns, disableCollapse}) { +export default function ServicesGroup({ group, services, layout, fiveColumns, disableCollapse }) { return (
Date: Thu, 22 Jun 2023 11:51:38 -0700 Subject: [PATCH 47/47] Adds collapsible feature to bookmarks --- src/components/bookmarks/group.jsx | 38 ++++++++++++++++++++++++++---- src/pages/index.jsx | 5 +++- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/components/bookmarks/group.jsx b/src/components/bookmarks/group.jsx index 2910245c..ef0a5ab8 100644 --- a/src/components/bookmarks/group.jsx +++ b/src/components/bookmarks/group.jsx @@ -1,13 +1,41 @@ +import classNames from "classnames"; +import { Disclosure, Transition } from '@headlessui/react'; +import { MdKeyboardArrowDown } from "react-icons/md"; + import ErrorBoundary from "components/errorboundry"; import List from "components/bookmarks/list"; -export default function BookmarksGroup({ group }) { +export default function BookmarksGroup({ group, disableCollapse }) { return (
-

{group.name}

- - - + + {({ open }) => ( + <> + +

{group.name}

+ + + + + + + + + + + )} +
); } diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 5106e07c..a2993b1a 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -308,7 +308,10 @@ function Home({ initialSettings }) { {bookmarks?.length > 0 && (
{bookmarks.map((group) => ( - + ))}
)}