From c162f518e5124cd6e06a422a3ec0df33c358787a Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:05:21 +0100 Subject: [PATCH 1/2] Optimize Jellyfin / Jellyfin-Server update (#215) --- ct/jellyfin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/jellyfin.sh b/ct/jellyfin.sh index ae6e09f12c..41c073a325 100644 --- a/ct/jellyfin.sh +++ b/ct/jellyfin.sh @@ -59,6 +59,7 @@ if [[ ! -d /usr/lib/jellyfin ]]; then msg_error "No ${APP} Installation Found!"; msg_info "Updating ${APP} LXC" apt-get update &>/dev/null apt-get -y upgrade &>/dev/null +apt-get --with-new-pkgs upgrade jellyfin jellyfin-server &>/dev/null msg_ok "Updated ${APP} LXC" exit } From dac521c6a36d7f940cb44e2434e1e6779c2ba987 Mon Sep 17 00:00:00 2001 From: Bram Suurd <78373894+BramSuurdje@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:45:39 +0100 Subject: [PATCH 2/2] Fixing Front end issues related to image loading and SEO (#219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update mariadb.json * Update vaultwarden.json * Update vaultwarden.json * Update keycloak.json * Update json/keycloak.json Co-authored-by: Håvard Gjøby Thom <34199185+havardthom@users.noreply.github.com> * Update mariadb.json Co-authored-by: Håvard Gjøby Thom <34199185+havardthom@users.noreply.github.com> * Add canonical link to layout for improved SEO and page indexing * Fix image source fallback for script logos to use a consistent relative path * Fix image source for script logos across components to consistently use the "/ProxmoxVE/logo.png" path * Update image source for script logos to use basePath for consistent paths across all components * Fix image source for script logos to ensure leading slash is consistent for all components' paths --------- Co-authored-by: CanbiZ <47820557+MickLesk@users.noreply.github.com> Co-authored-by: Håvard Gjøby Thom <34199185+havardthom@users.noreply.github.com> --- frontend/src/app/layout.tsx | 1 + .../app/scripts/_components/ScriptAccordion.tsx | 5 +++-- .../app/scripts/_components/ScriptInfoBlocks.tsx | 14 +++++++++++--- .../src/app/scripts/_components/ScriptItem.tsx | 6 ++++-- frontend/src/components/CommandMenu.tsx | 5 +++-- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx index b5422c8615..423c7ad1ef 100644 --- a/frontend/src/app/layout.tsx +++ b/frontend/src/app/layout.tsx @@ -64,6 +64,7 @@ export default function RootLayout({ src={`https://${analytics.url}/script.js`} data-website-id={analytics.token} > + diff --git a/frontend/src/app/scripts/_components/ScriptAccordion.tsx b/frontend/src/app/scripts/_components/ScriptAccordion.tsx index 4a39c40e94..96be28da21 100644 --- a/frontend/src/app/scripts/_components/ScriptAccordion.tsx +++ b/frontend/src/app/scripts/_components/ScriptAccordion.tsx @@ -12,6 +12,7 @@ import { cn } from "@/lib/utils"; import Image from "next/image"; import Link from "next/link"; import { useState } from "react"; +import { basePath } from "@/config/siteConfig"; export default function ScriptAccordion({ items, @@ -104,13 +105,13 @@ export default function ScriptAccordion({ >
((e.currentTarget as HTMLImageElement).src = - "/logo.png") + `/${basePath}/logo.png`) } alt={script.name} className="mr-1 w-4 h-4 rounded-full" diff --git a/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx b/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx index 962e516f8b..1c418c94cd 100644 --- a/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx +++ b/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx @@ -7,7 +7,7 @@ import { CardHeader, CardTitle, } from "@/components/ui/card"; -import { mostPopularScripts } from "@/config/siteConfig"; +import { basePath, mostPopularScripts } from "@/config/siteConfig"; import { extractDate } from "@/lib/time"; import { Category, Script } from "@/lib/types"; import { CalendarPlus } from "lucide-react"; @@ -92,11 +92,15 @@ export function LatestScripts({ items }: { items: Category[] }) {
+ ((e.currentTarget as HTMLImageElement).src = + `/${basePath}/logo.png`) + } className="h-11 w-11 object-contain" />
@@ -161,10 +165,14 @@ export function MostViewedScripts({ items }: { items: Category[] }) {
+ ((e.currentTarget as HTMLImageElement).src = + `/${basePath}/logo.png`) + } className="h-11 w-11 object-contain" />
diff --git a/frontend/src/app/scripts/_components/ScriptItem.tsx b/frontend/src/app/scripts/_components/ScriptItem.tsx index 2d9848dbdc..835fce5769 100644 --- a/frontend/src/app/scripts/_components/ScriptItem.tsx +++ b/frontend/src/app/scripts/_components/ScriptItem.tsx @@ -14,6 +14,7 @@ import Description from "./ScriptItems/Description"; import InstallCommand from "./ScriptItems/InstallCommand"; import InterFaces from "./ScriptItems/InterFaces"; import Tooltips from "./ScriptItems/Tooltips"; +import { basePath } from "@/config/siteConfig"; function ScriptItem({ item, @@ -40,10 +41,11 @@ function ScriptItem({
- ((e.currentTarget as HTMLImageElement).src = "/logo.png") + ((e.currentTarget as HTMLImageElement).src = + `/${basePath}/logo.png`) } height={400} alt={item.name} diff --git a/frontend/src/components/CommandMenu.tsx b/frontend/src/components/CommandMenu.tsx index 140897e5a3..b1c8e1267e 100644 --- a/frontend/src/components/CommandMenu.tsx +++ b/frontend/src/components/CommandMenu.tsx @@ -15,6 +15,7 @@ import React from "react"; import { Badge } from "./ui/badge"; import { Button } from "./ui/button"; import { DialogTitle } from "./ui/dialog"; +import { basePath } from "@/config/siteConfig"; export const formattedBadge = (type: string) => { switch (type) { @@ -102,10 +103,10 @@ export default function CommandMenu() { >
setOpen(false)}> ((e.currentTarget as HTMLImageElement).src = - "/logo.png") + `/${basePath}/logo.png`) } unoptimized width={16}