Revert "feat: refine mobile dashboard experience"

This reverts commit 315520beca.
This commit is contained in:
ajnart committed 2026-07-29 20:07:17 +02:00
1 parent bbc560706a
commit 5c4cc81b05
114 files changed
+535 -2349

No files matched your search

@@ -13,10 +13,9 @@ interface ApplicationsSectionProps {
applications: CoolifyApplicationWithContext[];
baseUrl: string;
isTiny: boolean;
isMobileDetail: boolean;
}
export function ApplicationsSection({ applications, baseUrl, isTiny, isMobileDetail }: ApplicationsSectionProps) {
export function ApplicationsSection({ applications, baseUrl, isTiny }: ApplicationsSectionProps) {
const t = useScopedI18n("widget.coolify");
const tCommon = useScopedI18n("common");
const runningApps = applications.filter((app) => parseStatus(app.status ?? "") === "running").length;
@@ -35,14 +34,7 @@ export function ApplicationsSection({ applications, baseUrl, isTiny, isMobileDet
{applications.length > 0 ? (
<Stack gap={4}>
{applications.map((app) => (
<ResourceRow
key={app.uuid}
item={app}
baseUrl={baseUrl}
isTiny={isTiny}
resourceType="application"
isMobileDetail={isMobileDetail}
/>
<ResourceRow key={app.uuid} item={app} baseUrl={baseUrl} isTiny={isTiny} resourceType="application" />
))}
</Stack>
) : (
+4 -26
View File
@@ -10,12 +10,7 @@ import { createWidgetKey } from "./coolify-utils";
import { InstanceCard } from "./instance-card";
import { SingleInstanceLayout } from "./single-instance-layout";
export default function CoolifyWidget({
options,
integrationIds,
width,
displayMode,
}: WidgetComponentProps<"coolify">) {
export default function CoolifyWidget({ options, integrationIds, width }: WidgetComponentProps<"coolify">) {
const t = useScopedI18n("widget.coolify");
if (integrationIds.length === 0) {
@@ -26,24 +21,16 @@ export default function CoolifyWidget({
);
}
return (
<CoolifyContent
integrationIds={integrationIds}
options={options}
width={width}
isMobileDetail={displayMode === "mobileDetail"}
/>
);
return <CoolifyContent integrationIds={integrationIds} options={options} width={width} />;
}
interface CoolifyContentProps {
integrationIds: string[];
options: WidgetComponentProps<"coolify">["options"];
width: number;
isMobileDetail: boolean;
}
function CoolifyContent({ integrationIds, options, width, isMobileDetail }: CoolifyContentProps) {
function CoolifyContent({ integrationIds, options, width }: CoolifyContentProps) {
const { data: instancesData = [] } = clientApi.widget.coolify.getInstancesInfo.useQuery({ integrationIds });
const isTiny = width < 256;
@@ -51,15 +38,7 @@ function CoolifyContent({ integrationIds, options, width, isMobileDetail }: Cool
const widgetKey = createWidgetKey(integrationIds);
if (instancesData.length === 1 && firstInstance) {
return (
<SingleInstanceLayout
instance={firstInstance}
options={options}
isTiny={isTiny}
widgetKey={widgetKey}
isMobileDetail={isMobileDetail}
/>
);
return <SingleInstanceLayout instance={firstInstance} options={options} isTiny={isTiny} widgetKey={widgetKey} />;
}
return (
@@ -72,7 +51,6 @@ function CoolifyContent({ integrationIds, options, width, isMobileDetail }: Cool
options={options}
isTiny={isTiny}
widgetKey={widgetKey}
isMobileDetail={isMobileDetail}
/>
))}
</Stack>
-2
View File
@@ -5,8 +5,6 @@ import { optionsBuilder } from "../options";
export const { definition, componentLoader } = createWidgetDefinition("coolify", {
icon: IconCloud,
mobile: { supportsDetailView: true },
queryKey: [["widget", "coolify"]],
createOptions() {
return optionsBuilder.from((factory) => ({
showServers: factory.switch({
+3 -15
View File
@@ -18,10 +18,9 @@ interface InstanceCardProps {
options: CoolifyOptions;
isTiny: boolean;
widgetKey: string;
isMobileDetail: boolean;
}
export function InstanceCard({ instance, options, isTiny, widgetKey, isMobileDetail }: InstanceCardProps) {
export function InstanceCard({ instance, options, isTiny, widgetKey }: InstanceCardProps) {
const t = useScopedI18n("widget.coolify");
const cardKey = `${widgetKey}-${instance.integrationId}`;
const [showIp, setShowIp] = useLocalStorage({
@@ -100,24 +99,13 @@ export function InstanceCard({ instance, options, isTiny, widgetKey, isMobileDet
isTiny={isTiny}
showIp={showIp}
onToggleIp={() => setShowIp((prev) => !prev)}
isMobileDetail={isMobileDetail}
/>
)}
{options.showApplications && (
<ApplicationsSection
applications={instance.instanceInfo.applications}
baseUrl={baseUrl}
isTiny={isTiny}
isMobileDetail={isMobileDetail}
/>
<ApplicationsSection applications={instance.instanceInfo.applications} baseUrl={baseUrl} isTiny={isTiny} />
)}
{options.showServices && (
<ServicesSection
services={instance.instanceInfo.services}
baseUrl={baseUrl}
isTiny={isTiny}
isMobileDetail={isMobileDetail}
/>
<ServicesSection services={instance.instanceInfo.services} baseUrl={baseUrl} isTiny={isTiny} />
)}
</Accordion>
+5 -38
View File
@@ -3,8 +3,6 @@
import { ActionIcon, Anchor, Group, Indicator, Stack, Text } from "@mantine/core";
import { IconExternalLink, IconFileText, IconLink } from "@tabler/icons-react";
import { useScopedI18n } from "@homarr/translation/client";
import { cleanFqdn, getResourceTimestamp, getStatusColor, parseStatus } from "./coolify-utils";
interface ResourceRowProps {
@@ -23,18 +21,11 @@ interface ResourceRowProps {
baseUrl: string;
isTiny: boolean;
resourceType: "application" | "service";
isMobileDetail: boolean;
}
export function ResourceRow({ item, baseUrl, isTiny, resourceType, isMobileDetail }: ResourceRowProps) {
const tCommon = useScopedI18n("common");
const tApp = useScopedI18n("widget.app");
export function ResourceRow({ item, baseUrl, isTiny, resourceType }: ResourceRowProps) {
const status = parseStatus(item.status ?? "");
const statusColor = getStatusColor(status);
const fqdn = cleanFqdn(item.fqdn);
const actionIconSize = isMobileDetail ? 44 : "xs";
const resourceLabel = resourceType === "application" ? tCommon("applications") : tCommon("services");
const openInNewTabLabel = tApp("option.openInNewTab.label");
const resourceUrl =
item.projectUuid && item.environmentUuid
@@ -58,42 +49,18 @@ export function ResourceRow({ item, baseUrl, isTiny, resourceType, isMobileDetai
)}
</Group>
<Group wrap="nowrap" gap={4} ml={16}>
{fqdn && (
<ActionIcon
component="a"
href={fqdn}
target="_blank"
size={actionIconSize}
variant="subtle"
c="dimmed"
aria-label={`${openInNewTabLabel}: ${fqdn}`}
>
{cleanFqdn(item.fqdn) && (
<ActionIcon component="a" href={cleanFqdn(item.fqdn)} target="_blank" size="xs" variant="subtle" c="dimmed">
<IconLink size={12} />
</ActionIcon>
)}
{resourceUrl && (
<ActionIcon
component="a"
href={resourceUrl}
target="_blank"
size={actionIconSize}
variant="subtle"
c="dimmed"
aria-label={`${openInNewTabLabel}: ${resourceLabel} ${item.name}`}
>
<ActionIcon component="a" href={resourceUrl} target="_blank" size="xs" variant="subtle" c="dimmed">
<IconExternalLink size={12} />
</ActionIcon>
)}
{logsUrl && (
<ActionIcon
component="a"
href={logsUrl}
target="_blank"
size={actionIconSize}
variant="subtle"
c="dimmed"
aria-label={`${tCommon("action.checkLogs")}: ${item.name}`}
>
<ActionIcon component="a" href={logsUrl} target="_blank" size="xs" variant="subtle" c="dimmed">
<IconFileText size={12} />
</ActionIcon>
)}
@@ -15,7 +15,6 @@ interface ServersSectionProps {
isTiny: boolean;
showIp: boolean;
onToggleIp: () => void;
isMobileDetail: boolean;
}
export function ServersSection({
@@ -25,7 +24,6 @@ export function ServersSection({
isTiny,
showIp,
onToggleIp,
isMobileDetail,
}: ServersSectionProps) {
const t = useScopedI18n("widget.coolify");
const tCommon = useScopedI18n("common");
@@ -42,11 +40,9 @@ export function ServersSection({
</Badge>
</Group>
<ActionIcon
size={isMobileDetail ? 44 : "xs"}
size="xs"
variant="subtle"
c="dimmed"
aria-label={`${showIp ? tCommon("action.hide") : tCommon("action.show")} IP`}
aria-pressed={showIp}
onClick={(event) => {
event.stopPropagation();
onToggleIp();
@@ -69,7 +65,6 @@ export function ServersSection({
baseUrl={baseUrl}
isTiny={isTiny}
showIp={showIp}
isMobileDetail={isMobileDetail}
/>
))}
</Stack>
@@ -89,12 +84,10 @@ interface ServerRowProps {
baseUrl: string;
isTiny: boolean;
showIp: boolean;
isMobileDetail: boolean;
}
function ServerRow({ server, counts, baseUrl, isTiny, showIp, isMobileDetail }: ServerRowProps) {
function ServerRow({ server, counts, baseUrl, isTiny, showIp }: ServerRowProps) {
const t = useScopedI18n("widget.coolify");
const tApp = useScopedI18n("widget.app");
const isBuildServer = server.settings?.is_build_server === true;
const isOnline = server.is_reachable !== false;
const serverUrl = `${baseUrl}/server/${server.uuid}`;
@@ -117,15 +110,7 @@ function ServerRow({ server, counts, baseUrl, isTiny, showIp, isMobileDetail }:
)}
</Group>
<Group wrap="nowrap" gap={4} ml={16}>
<ActionIcon
component="a"
href={serverUrl}
target="_blank"
size={isMobileDetail ? 44 : "xs"}
variant="subtle"
c="dimmed"
aria-label={`${tApp("option.openInNewTab.label")}: ${server.name}`}
>
<ActionIcon component="a" href={serverUrl} target="_blank" size="xs" variant="subtle" c="dimmed">
<IconExternalLink size={12} />
</ActionIcon>
<Text fz="10px" c="dimmed">
@@ -13,10 +13,9 @@ interface ServicesSectionProps {
services: CoolifyServiceWithContext[];
baseUrl: string;
isTiny: boolean;
isMobileDetail: boolean;
}
export function ServicesSection({ services, baseUrl, isTiny, isMobileDetail }: ServicesSectionProps) {
export function ServicesSection({ services, baseUrl, isTiny }: ServicesSectionProps) {
const t = useScopedI18n("widget.coolify");
const tCommon = useScopedI18n("common");
const runningServices = services.filter((svc) => parseStatus(svc.status ?? "") === "running").length;
@@ -35,14 +34,7 @@ export function ServicesSection({ services, baseUrl, isTiny, isMobileDetail }: S
{services.length > 0 ? (
<Stack gap={4}>
{services.map((service) => (
<ResourceRow
key={service.uuid}
item={service}
baseUrl={baseUrl}
isTiny={isTiny}
resourceType="service"
isMobileDetail={isMobileDetail}
/>
<ResourceRow key={service.uuid} item={service} baseUrl={baseUrl} isTiny={isTiny} resourceType="service" />
))}
</Stack>
) : (
@@ -18,16 +18,9 @@ interface SingleInstanceLayoutProps {
options: CoolifyOptions;
isTiny: boolean;
widgetKey: string;
isMobileDetail: boolean;
}
export function SingleInstanceLayout({
instance,
options,
isTiny,
widgetKey,
isMobileDetail,
}: SingleInstanceLayoutProps) {
export function SingleInstanceLayout({ instance, options, isTiny, widgetKey }: SingleInstanceLayoutProps) {
const t = useScopedI18n("widget.coolify");
const [showIp, setShowIp] = useLocalStorage({
key: `coolify-show-ip-${widgetKey}`,
@@ -72,24 +65,13 @@ export function SingleInstanceLayout({
isTiny={isTiny}
showIp={showIp}
onToggleIp={() => setShowIp((prev) => !prev)}
isMobileDetail={isMobileDetail}
/>
)}
{options.showApplications && (
<ApplicationsSection
applications={instance.instanceInfo.applications}
baseUrl={baseUrl}
isTiny={isTiny}
isMobileDetail={isMobileDetail}
/>
<ApplicationsSection applications={instance.instanceInfo.applications} baseUrl={baseUrl} isTiny={isTiny} />
)}
{options.showServices && (
<ServicesSection
services={instance.instanceInfo.services}
baseUrl={baseUrl}
isTiny={isTiny}
isMobileDetail={isMobileDetail}
/>
<ServicesSection services={instance.instanceInfo.services} baseUrl={baseUrl} isTiny={isTiny} />
)}
</Accordion>