vh/homepage
1
0
Fork 0
mirror of https://github.com/gethomepage/homepage.git synced 2026-04-10 12:11:23 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch 'gethomepage:dev' into integration

Browse Source
This commit is contained in:
djeinstine
2024-12-29 21:32:22 +01:00
committed by GitHub
parent 49df67ef7a a158866ca1
commit 1e52313a91
11 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/bookmarks/group.jsx
View File

@@ -24,9 +24,9 @@ export default function BookmarksGroup({
<div
key={bookmarks.name}
className={classNames(
"bookmark-group",
"bookmark-group flex-1 overflow-hidden",
layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/4 lg:basis-1/5 xl:basis-1/6",
layout?.header === false ? "flex-1 px-1 -my-1 overflow-hidden" : "flex-1 p-1 overflow-hidden",
layout?.header === false ? "px-1" : "p-1 pb-0",
)}
>
<Disclosure defaultOpen={!(layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) ?? true}>

7
src/components/bookmarks/list.jsx
View File

@@ -5,15 +5,14 @@ import { columnMap } from "../../utils/layout/columns";
import Item from "components/bookmarks/item";
export default function List({ bookmarks, layout, bookmarksStyle }) {
let classes =
layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col mt-3 bookmark-list";
let classes = layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col bookmark-list";
const style = {};
if (layout?.iconsOnly || bookmarksStyle === "icons") {
classes = "grid gap-3 mt-3 bookmark-list";
classes = "grid gap-2 bookmark-list";
style.gridTemplateColumns = "repeat(auto-fill, minmax(60px, 1fr))";
}
return (
<ul className={classNames(classes)} style={style}>
<ul className={classNames(classes, "mb-2", layout?.header === false ? "" : "mt-3")} style={style}>
{bookmarks.map((bookmark) => (
<Item
key={`${bookmark.name}-${bookmark.href}`}

4
src/pages/_document.jsx
View File

@@ -4,10 +4,6 @@ export default function Document() {
return (
<Html>
<Head>
<meta
name="description"
content="A highly customizable homepage (or startpage / application dashboard) with Docker and service API integrations."
/>
<meta name="mobile-web-app-capable" content="yes" />
<link rel="manifest" href="/site.webmanifest?v=4" crossOrigin="use-credentials" />
<link rel="preload" href="/api/config/custom.css" as="style" />

7
src/pages/index.jsx
View File

@@ -359,6 +359,13 @@ function Home({ initialSettings }) {
<>
<Head>
<title>{initialSettings.title || "Homepage"}</title>
<meta
name="description"
content={
initialSettings.description ||
"A highly customizable homepage (or startpage / application dashboard) with Docker and service API integrations."
}
/>
{settings.base && <base href={settings.base} />}
{settings.favicon ? (
<>

2
src/widgets/beszel/component.jsx
View File

@@ -26,7 +26,7 @@ export default function Component({ service }) {
if (systems && !systems.items) {
finalError = { message: "No items returned from beszel API" };
} else if (systems && systems.items && systemId) {
system = systems.items.find((item) => item.id === systemId);
system = systems.items.find((item) => item.id === systemId || item.name === systemId);
if (!system) {
finalError = { message: `System with id ${systemId} not found` };
}

10
src/widgets/glances/metrics/containers.jsx
View File

@@ -38,10 +38,16 @@ export default function Component({ service }) {
}
data.splice(chart ? 5 : 1);
let headerYPosition = "top-4";
let listYPosition = "bottom-4";
if (chart) {
headerYPosition = "-top-6";
listYPosition = "-top-3";
}
return (
<Container chart={chart}>
<Block position="top-4 right-3 left-3">
<Block position={`${headerYPosition} right-3 left-3`}>
<div className="flex items-center text-xs">
<div className="grow" />
<div className="w-14 text-right italic">{t("resources.cpu")}</div>
@@ -49,7 +55,7 @@ export default function Component({ service }) {
</div>
</Block>
<Block position="bottom-4 right-3 left-3">
<Block position={`${listYPosition} right-3 left-3`}>
<div className="pointer-events-none text-theme-900 dark:text-theme-200">
{data.map((item) => (
<div key={item[idKey]} className="text-[0.75rem] h-[0.8rem]">

2
src/widgets/gluetun/widget.js
View File

@@ -7,7 +7,7 @@ const widget = {
mappings: {
ip: {
endpoint: "publicip/ip",
validate: ["public_ip", "region", "country"],
validate: ["public_ip", "country"],
},
},
};