OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/add-azure-pr

Browse Source 
# Conflicts:
#	public/locales/en/common.json
#	src/utils/proxy/handlers/credentialed.js
#	src/widgets/components.js
#	src/widgets/widgets.js
This commit is contained in:
Nitzan Miranda 2023-07-21 01:47:29 +03:00
commit f5bcf95e2c
58 changed files with 560 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/locales/ar/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/bg/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/ca/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/cs/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/da/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/de/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/el/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/en/common.json
View File

@ -665,6 +665,16 @@
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
},
"azurePullrequests": {
"totalPrs": "Total PRs",
"myPrs": "My PRs",

10
public/locales/eo/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/es/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Serie",
"totalFiles": "Archivos"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/eu/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/fi/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/fr/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Séries",
"totalFiles": "Fichiers"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/he/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/hi/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

12
public/locales/hr/common.json
View File

@ -105,7 +105,7 @@
"transcoding": "Prekodiranje",
"bitrate": "Stopa bitova",
"no_active": "Nema aktivnih prijenosa",
"plex_connection_error": "Check Plex Connection"
"plex_connection_error": "Provjeri Plex vezu"
},
"nzbget": {
"rate": "Stopa",
@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Serije",
"totalFiles": "Datoteke"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/hu/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/id/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/it/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Serie",
"totalFiles": "File"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/ja/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/ko/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/lv/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"result": "Result",
"inProgress": "In Progress"
}
}

10
public/locales/ms/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/nb-NO/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Filer"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/nl/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/pl/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/pt-BR/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/pt/common.json
View File

@ -664,5 +664,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/ro/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/ru/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"inProgress": "In Progress",
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled"
}
}

10
public/locales/sk/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/sl/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Serije",
"totalFiles": "Datoteke"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/sr/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/sv/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"totalFiles": "Files",
"seriesCount": "Series"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/te/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"totalFiles": "Files",
"seriesCount": "Series"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/th/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/tr/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/uk/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Серій",
"totalFiles": "Файлів"
},
"azurePipelines": {
"failed": "Failed",
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/vi/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/yue/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/zh-CN/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

10
public/locales/zh-Hant/common.json
View File

@ -655,5 +655,15 @@
"kavita": {
"seriesCount": "Series",
"totalFiles": "Files"
},
"azurePipelines": {
"result": "Result",
"status": "Status",
"buildId": "Build ID",
"succeeded": "Succeeded",
"notStarted": "Not Started",
"failed": "Failed",
"canceled": "Canceled",
"inProgress": "In Progress"
}
}

6
src/components/widgets/glances/glances.jsx
View File

@ -37,7 +37,7 @@ export default function Widget({ options }) {
<Resource icon={FaMemory} label={t("glances.wait")} percentage="0" />
{ options.cputemp && <Resource icon={FaThermometerHalf} label={t("glances.wait")} percentage="0" /> }
{ options.disk && !Array.isArray(options.disk) && <Resource key={options.disk} icon={FiHardDrive} label={t("glances.wait")} percentage="0" /> }
{ options.disk && Array.isArray(options.disk) && options.disk.map((disk) => <Resource key={disk.mnt_point} icon={FiHardDrive} label={t("glances.wait")} percentage="0" /> )}
{ options.disk && Array.isArray(options.disk) && options.disk.map((disk) => <Resource key={`disk_${disk.mnt_point}`} icon={FiHardDrive} label={t("glances.wait")} percentage="0" /> ) }
{ options.uptime && <Resource icon={FaRegClock} label={t("glances.wait")} percentage="0" /> }
{ options.label && <WidgetLabel label={options.label} /> }
</Resources>;
@ -50,7 +50,7 @@ export default function Widget({ options }) {
if (options.cputemp && cpuSensors) {
try {
mainTemp = cpuSensors.reduce((acc, s) => acc + s.value, 0) / cpuSensors.length;
maxTemp = Math.max(cpuSensors.reduce((acc, s) => acc + s.warning, 0) / cpuSensors.length, maxTemp);
maxTemp = Math.max(cpuSensors.reduce((acc, s) => acc + (s.warning > 0 ? s.warning : 0), 0) / cpuSensors.length, maxTemp);
if (unit === "fahrenheit") {
mainTemp = convertToFahrenheit(mainTemp);
maxTemp = convertToFahrenheit(maxTemp);
@ -108,7 +108,7 @@ export default function Widget({ options }) {
expanded={options.expanded}
/>
{disks.map((disk) => (
<Resource key={disk.mnt_point}
<Resource key={`disk_${disk.mnt_point}`}
icon={FiHardDrive}
value={t("common.bytes", { value: disk.free })}
label={t("glances.free")}

90
src/components/widgets/logo/logo.jsx
View File

@ -10,56 +10,58 @@ export default function Logo({ options }) {
{options.icon ?
<ResolvedIcon icon={options.icon} width={48} height={48} /> :
// fallback to homepage logo
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1024 1024"
style={{
enableBackground: "new 0 0 1024 1024",
}}
xmlSpace="preserve"
className="w-full h-full"
>
<style>
{
".st0{display:none}.st3{stroke-linecap:square}.st3,.st4{fill:none;stroke:#fff;stroke-miterlimit:10}.st6{display:inline;fill:#333}.st7{fill:#fff}"
}
</style>
<g id="Icon">
<path
d="M771.9 191c27.7 0 50.1 26.5 50.1 59.3v186.4l-100.2.3V250.3c0-32.8 22.4-59.3 50.1-59.3z"
style={{
fill: "rgba(var(--color-logo-start))",
}}
/>
<linearGradient
id="homepage_logo_gradient"
gradientUnits="userSpaceOnUse"
x1={200.746}
y1={225.015}
x2={764.986}
y2={789.255}
>
<stop
offset={0}
<div className="w-12 h-12">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1024 1024"
style={{
enableBackground: "new 0 0 1024 1024",
}}
xmlSpace="preserve"
className="w-full h-full"
>
<style>
{
".st0{display:none}.st3{stroke-linecap:square}.st3,.st4{fill:none;stroke:#fff;stroke-miterlimit:10}.st6{display:inline;fill:#333}.st7{fill:#fff}"
}
</style>
<g id="Icon">
<path
d="M771.9 191c27.7 0 50.1 26.5 50.1 59.3v186.4l-100.2.3V250.3c0-32.8 22.4-59.3 50.1-59.3z"
style={{
stopColor: "rgba(var(--color-logo-start))",
fill: "rgba(var(--color-logo-start))",
}}
/>
<stop
offset={1}
<linearGradient
id="homepage_logo_gradient"
gradientUnits="userSpaceOnUse"
x1={200.746}
y1={225.015}
x2={764.986}
y2={789.255}
>
<stop
offset={0}
style={{
stopColor: "rgba(var(--color-logo-start))",
}}
/>
<stop
offset={1}
style={{
stopColor: "rgba(var(--color-logo-stop))",
}}
/>
</linearGradient>
<path
d="M721.8 250.3c0-32.7 22.4-59.3 50.1-59.3H253.1c-27.7 0-50.1 26.5-50.1 59.3v582.2l90.2-75.7-.1-130.3H375v61.8l88-73.8 258.8 217.9V250.6"
style={{
stopColor: "rgba(var(--color-logo-stop))",
fill: "url(#homepage_logo_gradient)",
}}
/>
</linearGradient>
<path
d="M721.8 250.3c0-32.7 22.4-59.3 50.1-59.3H253.1c-27.7 0-50.1 26.5-50.1 59.3v582.2l90.2-75.7-.1-130.3H375v61.8l88-73.8 258.8 217.9V250.6"
style={{
fill: "url(#homepage_logo_gradient)",
}}
/>
</g>
</svg>
</g>
</svg>
</div>
}
</Raw>
</Container>

7
src/components/widgets/openmeteo/icon.jsx
View File

@ -1,7 +0,0 @@
import mapIcon from "utils/weather/openmeteo-condition-map";
export default function Icon({ condition, timeOfDay }) {
const IconComponent = mapIcon(condition, timeOfDay);
return <IconComponent className="w-10 h-10 text-theme-800 dark:text-theme-200" />;
}

13
src/components/widgets/openmeteo/openmeteo.jsx
View File

@ -10,8 +10,7 @@ import ContainerButton from "../widget/container_button";
import WidgetIcon from "../widget/widget_icon";
import PrimaryText from "../widget/primary_text";
import SecondaryText from "../widget/secondary_text";
import Icon from "./icon";
import mapIcon from "../../../utils/weather/openmeteo-condition-map";
function Widget({ options }) {
const { t } = useTranslation();
@ -33,10 +32,8 @@ function Widget({ options }) {
}
const unit = options.units === "metric" ? "celsius" : "fahrenheit";
const weatherInfo = {
condition: data.current_weather.weathercode,
timeOfDay: data.current_weather.time > data.daily.sunrise[0] && data.current_weather.time < data.daily.sunset[0] ? "day" : "night"
};
const condition = data.current_weather.weathercode;
const timeOfDay = data.current_weather.time > data.daily.sunrise[0] && data.current_weather.time < data.daily.sunset[0] ? "day" : "night";
return <Container options={options}>
<PrimaryText>
@ -47,8 +44,8 @@ function Widget({ options }) {
unit,
})}
</PrimaryText>
<SecondaryText>{t(`wmo.${data.current_weather.weathercode}-${weatherInfo.timeOfDay}`)}</SecondaryText>
<WidgetIcon icon={Icon} size="xl" weatherInfo={weatherInfo} />
<SecondaryText>{t(`wmo.${data.current_weather.weathercode}-${timeOfDay}`)}</SecondaryText>
<WidgetIcon icon={mapIcon(condition, timeOfDay)} size="xl" />
</Container>;
}

7
src/components/widgets/openweathermap/icon.jsx
View File

@ -1,7 +0,0 @@
import mapIcon from "utils/weather/owm-condition-map";
export default function Icon({ condition, timeOfDay }) {
const IconComponent = mapIcon(condition, timeOfDay);
return <IconComponent className="w-10 h-10 text-theme-800 dark:text-theme-200" />;
}

12
src/components/widgets/openweathermap/weather.jsx
View File

@ -10,9 +10,7 @@ import ContainerButton from "../widget/container_button";
import PrimaryText from "../widget/primary_text";
import SecondaryText from "../widget/secondary_text";
import WidgetIcon from "../widget/widget_icon";
import Icon from "./icon";
import mapIcon from "../../../utils/weather/owm-condition-map";
function Widget({ options }) {
const { t, i18n } = useTranslation();
@ -35,15 +33,13 @@ function Widget({ options }) {
const unit = options.units === "metric" ? "celsius" : "fahrenheit";
const weatherInfo = {
condition: data.weather[0].id,
timeOfDay: data.dt > data.sys.sunrise && data.dt < data.sys.sunset ? "day" : "night"
};
const condition = data.weather[0].id;
const timeOfDay = data.dt > data.sys.sunrise && data.dt < data.sys.sunset ? "day" : "night";
return <Container options={options}>
<PrimaryText>{options.label && `${options.label}, ` }{t("common.number", { value: data.main.temp, style: "unit", unit })}</PrimaryText>
<SecondaryText>{data.weather[0].description}</SecondaryText>
<WidgetIcon icon={Icon} size="xl" weatherInfo={weatherInfo} />
<WidgetIcon icon={mapIcon(condition, timeOfDay)} size="xl" />
</Container>;
}

7
src/components/widgets/weather/icon.jsx
View File

@ -1,7 +0,0 @@
import mapIcon from "utils/weather/condition-map";
export default function Icon({ condition, timeOfDay }) {
const IconComponent = mapIcon(condition, timeOfDay);
return <IconComponent className="w-10 h-10 text-theme-800 dark:text-theme-200" />;
}

11
src/components/widgets/weather/weather.jsx
View File

@ -10,8 +10,7 @@ import PrimaryText from "../widget/primary_text";
import SecondaryText from "../widget/secondary_text";
import WidgetIcon from "../widget/widget_icon";
import ContainerButton from "../widget/container_button";
import Icon from "./icon";
import mapIcon from "../../../utils/weather/condition-map";
function Widget({ options }) {
const { t, i18n } = useTranslation();
@ -33,10 +32,8 @@ function Widget({ options }) {
}
const unit = options.units === "metric" ? "celsius" : "fahrenheit";
const weatherInfo = {
condition: data.current.condition.code,
timeOfDay: data.current.is_day ? "day" : "night",
};
const condition = data.current.condition.code;
const timeOfDay = data.current.is_day ? "day" : "night";
return <Container options={options}>
<PrimaryText>
@ -48,7 +45,7 @@ function Widget({ options }) {
})}
</PrimaryText>
<SecondaryText>{data.current.condition.text}</SecondaryText>
<WidgetIcon icon={Icon} size="xl" weatherInfo={weatherInfo} />
<WidgetIcon icon={mapIcon(condition, timeOfDay)} size="xl" />
</Container>;
}

5
src/components/widgets/widget/widget_icon.jsx
View File

@ -1,6 +1,5 @@
export default function WidgetIcon({ icon, size = "s", pulse = false, weatherInfo = {} }) {
export default function WidgetIcon({ icon, size = "s", pulse = false }) {
const Icon = icon;
const { condition, timeOfDay } = weatherInfo;
let additionalClasses = "text-theme-800 dark:text-theme-200 ";
switch (size) {
@ -14,5 +13,5 @@ export default function WidgetIcon({ icon, size = "s", pulse = false, weatherInf
additionalClasses += "animate-pulse ";
}
return <Icon className={additionalClasses} condition={condition} timeOfDay={timeOfDay} />;
return <Icon className={additionalClasses} />;
}

4
src/utils/config/service-helpers.js
View File

@ -290,6 +290,7 @@ export function cleanServiceGroups(groups) {
enableNowPlaying,
volume, // diskstation widget,
enableQueue, // sonarr/radarr
node, // Proxmox
} = cleanedService.widget;
let fieldsList = fields;
@ -323,6 +324,9 @@ export function cleanServiceGroups(groups) {
if (type === "unifi") {
if (site) cleanedService.widget.site = site;
}
if (type === "proxmox") {
if (node) cleanedService.widget.node = node;
}
if (type === "kubernetes") {
if (namespace) cleanedService.widget.namespace = namespace;
if (app) cleanedService.widget.app = app;

2
src/utils/proxy/handlers/credentialed.js
View File

@ -62,7 +62,7 @@ export default async function credentialedProxyHandler(req, res, map) {
headers.Authorization = `Basic ${Buffer.from(`${widget.username}:${widget.password}`).toString("base64")}`;
}
}
else if (widget.type === "azurePullrequests") {
else if (widget.type === "azurePipelines" || widget.type === "azurePullrequests") {
headers.Authorization = `Basic ${Buffer.from(`$:${widget.key}`).toString("base64")}`;
} else {
headers["X-API-Key"] = `${widget.key}`;

36
src/widgets/azurePipelines/component.jsx Normal file
View File

@ -0,0 +1,36 @@
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: pipelineData, error: pipelineError } = useWidgetAPI(widget);
if (pipelineError) {
return <Container service={service} error={pipelineError} />;
}
if (!pipelineData || !Array.isArray(pipelineData.value)) {
return (
<Container service={service}>
<Block label="azurePipelines.result" />
<Block label="azurePipelines.buildId" />
</Container>
);
}
return (
<Container service={service}>
{pipelineData.value[0].result ?
<Block label="azurePipelines.result" value={t(`azurePipelines.${pipelineData.value[0].result.toString()}`)} /> :
<Block label="azurePipelines.status" value={t(`azurePipelines.${pipelineData.value[0].status.toString()}`)} />
}
<Block label="azurePipelines.buildId" value= { pipelineData.value[0].id } />
</Container>
);
}

8
src/widgets/azurePipelines/widget.js Normal file
View File

@ -0,0 +1,8 @@
import credentialedProxyHandler from "utils/proxy/handlers/credentialed";
const widget = {
api: "https://dev.azure.com/{organization}/{project}/_apis/build/Builds?branchName={branchName}&definitions={definitionId}",
proxyHandler: credentialedProxyHandler,
};
export default widget;

1
src/widgets/components.js
View File

@ -5,6 +5,7 @@ const components = {
audiobookshelf: dynamic(() => import("./audiobookshelf/component")),
authentik: dynamic(() => import("./authentik/component")),
autobrr: dynamic(() => import("./autobrr/component")),
azurePipelines: dynamic(() => import("./azurePipelines/component")),
azurePullrequests: dynamic(() => import("./azurePullrequests/component")),
bazarr: dynamic(() => import("./bazarr/component")),
caddy: dynamic(() => import("./caddy/component")),

32
src/widgets/proxmox/component.jsx
View File

@ -4,6 +4,7 @@ import Container from "components/services/widget/container";
import Block from "components/services/widget/block";
import useWidgetAPI from "utils/proxy/use-widget-api";
function calcRunning(total, current) {
return current.status === "running" ? total + 1 : total;
}
@ -25,29 +26,40 @@ export default function Component({ service }) {
<Block label="proxmox.vms" />
<Block label="proxmox.lxc" />
<Block label="resources.cpu" />
<Block label="resources.ram" />
<Block label="resources.mem" />
</Container>
);
}
const { data } = clusterData ;
const vms = data.filter(item => item.type === "qemu" && item.template === 0) || [];
const lxc = data.filter(item => item.type === "lxc" && item.template === 0) || [];
const nodes = data.filter(item => item.type === "node") || [];
const vms = data.filter(item => item.type === "qemu" && item.template === 0 && (widget.node === undefined || widget.node === item.node)) || [];
const lxc = data.filter(item => item.type === "lxc" && item.template === 0 && (widget.node === undefined || widget.node === item.node)) || [];
const nodes = data.filter(item => item.type === "node" && (widget.node === undefined || widget.node === item.node)) || [];
const runningVMs = vms.reduce(calcRunning, 0);
const runningLXC = lxc.reduce(calcRunning, 0);
// TODO: support more than one node
// TODO: better handling of cluster with zero nodes
const node = nodes.length > 0 ? nodes[0] : { cpu: 0.0, mem: 0, maxmem: 0 };
if (nodes.length === 0) {
return (
<Container service={service}>
<Block label="proxmox.vms" value={`${runningVMs} / ${vms.length}`} />
<Block label="proxmox.lxc" value={`${runningLXC} / ${lxc.length}`} />
<Block label="resources.cpu" />
<Block label="resources.mem" />
</Container>
);
}
const maxMemory = nodes.reduce((sum, n) => n.maxmem + sum, 0);
const usedMemory = nodes.reduce((sum, n) => n.mem + sum, 0);
const maxCpu = nodes.reduce((sum, n) => n.maxcpu + sum, 0);
const usedCpu = nodes.reduce((sum, n) => (n.cpu * n.maxcpu) + sum, 0);
return (
<Container service={service}>
<Block label="proxmox.vms" value={`${runningVMs} / ${vms.length}`} />
<Block label="proxmox.lxc" value={`${runningLXC} / ${lxc.length}`} />
<Block label="resources.cpu" value={t("common.percent", { value: (node.cpu * 100) })} />
<Block label="resources.mem" value={t("common.percent", { value: ((node.mem / node.maxmem) * 100) })} />
<Block label="resources.cpu" value={t("common.percent", { value: ((usedCpu / maxCpu) * 100) })} />
<Block label="resources.mem" value={t("common.percent", { value: ((usedMemory / maxMemory) * 100) })} />
</Container>
);
}

2
src/widgets/widgets.js
View File

@ -2,6 +2,7 @@ import adguard from "./adguard/widget";
import audiobookshelf from "./audiobookshelf/widget";
import authentik from "./authentik/widget";
import autobrr from "./autobrr/widget";
import azurePipelines from "./azurePipelines/widget";
import azurePullrequests from "./azurePullrequests/widget";
import bazarr from "./bazarr/widget";
import caddy from "./caddy/widget";
@ -92,6 +93,7 @@ const widgets = {
audiobookshelf,
authentik,
autobrr,
azurePipelines,
azurePullrequests,
bazarr,
caddy,