Skip to content

Fix favicon reset after navigating away from favicon-setting page #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DecDuck merged 2 commits into from
Nov 3, 2026
Merged

Fix favicon reset after navigating away from favicon-setting page #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d7e831
Fix favicon reset after navigating away from favicon-setting page
IC3P3 Nov 2, 2026
b186b1d
Merge remote-tracking branch 'upstream/develop' into fix/favicon-reset
IC3P3 Nov 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions server/app.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ const user = useUser();
const apiDetails = await $dropFetch("/api/v1");
const clientMode = isClientRequest();

const favicon = apiDetails.mLogoObjectId
? useObject(apiDetails.mLogoObjectId)
: "/favicon.ico";
useHead({
link: [{ rel: "icon", href: favicon, key: "favicon" }],
});

const showExternalUrlWarning = ref(false);
function checkExternalUrl() {
if (!import.meta.client || clientMode) return;
Expand Down
5 changes: 1 addition & 4 deletions server/layouts/admin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,9 @@ router.afterEach(() => {
});

const {
generalSettings: { serverName, mLogoObjectId },
generalSettings: { serverName },
} = await $dropFetch<Settings>("/api/v1/settings");

const favicon = mLogoObjectId ? useObject(mLogoObjectId) : "/favicon.ico";
useFavicon(favicon, { rel: "icon" });

const applicationName = serverName || $t("drop.drop");

useHead({
Expand Down
3 changes: 0 additions & 3 deletions server/layouts/default.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,4 @@ useHead({
return title ? t("titleTemplate", [title]) : t("title");
},
});
const { mLogoObjectId } = await $dropFetch("/api/v1");
const favicon = mLogoObjectId ? useObject(mLogoObjectId) : "/favicon.ico";
useFavicon(favicon, { rel: "icon" });
</script>
6 changes: 0 additions & 6 deletions server/nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ export default defineNuxtConfig({
dropVersion: dropVersion,
},

app: {
head: {
link: [{ rel: "icon", href: "/favicon.ico" }],
},
},

routeRules: {
"/api/**": { cors: true },

Expand Down
2 changes: 1 addition & 1 deletion server/pages/store/[id]/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ const ratingArray = Array(5)

useHead({
title: game.mName,
// link: [{ rel: "icon", href: useObject(game.mIconObjectId) }], // Favicon doesn't get reset when we navigate off
link: [{ rel: "icon", href: useObject(game.mIconObjectId), key: "favicon" }],
});
</script>

Expand Down
4 changes: 3 additions & 1 deletion server/pages/store/c/[id]/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ const { company } = await $dropFetch(`/api/v1/companies/${companyId}`);

useHead({
title: company.mName,
link: [{ rel: "icon", href: useObject(company.mLogoObjectId) }],
link: [
{ rel: "icon", href: useObject(company.mLogoObjectId), key: "favicon" },
],
});
</script>
Loading