fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 06:36:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing custom favicons. Fixes #220

Browse source
This commit is contained in:
Dessalines 2021-03-25 11:58:29 -04:00
parent ffc218f268
commit 159e3a0035
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/index.tsx
View file

@ -133,10 +133,6 @@ server.get("/*", async (req, res) => {
<!-- Web app manifest --> <!-- Web app manifest -->
<link rel="manifest" href="/static/assets/manifest.webmanifest"> <link rel="manifest" href="/static/assets/manifest.webmanifest">
<!-- Icons -->
<link rel="shortcut icon" type="image/svg+xml" href="/static/assets/icons/favicon.svg" />
<link rel="apple-touch-icon" href="/static/assets/icons/apple-touch-icon.png" />
<!-- Styles --> <!-- Styles -->
<link rel="stylesheet" type="text/css" href="/static/styles/styles.css" /> <link rel="stylesheet" type="text/css" href="/static/styles/styles.css" />

11
src/shared/components/app.tsx
View file

@ -11,6 +11,7 @@ import { Theme } from "./theme";
import { Symbols } from "./symbols"; import { Symbols } from "./symbols";
import { GetSiteResponse } from "lemmy-js-client"; import { GetSiteResponse } from "lemmy-js-client";
import "./styles.scss"; import "./styles.scss";
import { favIconPngUrl, favIconUrl } from "shared/utils";
export interface AppProps { export interface AppProps {
siteRes: GetSiteResponse; siteRes: GetSiteResponse;
@ -33,9 +34,15 @@ export class App extends Component<AppProps, any> {
<Helmet> <Helmet>
<link <link
id="favicon" id="favicon"
rel="icon" rel="shortcut icon"
type="image/x-icon" type="image/x-icon"
href={this.props.siteRes.site_view.site.icon} href={this.props.siteRes.site_view.site.icon || favIconUrl}
/>
<link
rel="apple-touch-icon"
href={
this.props.siteRes.site_view.site.icon || favIconPngUrl
}
/> />
</Helmet> </Helmet>
)} )}

4
src/shared/utils.ts
View file

@ -72,8 +72,8 @@ import { i18n } from "./i18next";
export const wsClient = new LemmyWebsocket(); export const wsClient = new LemmyWebsocket();
export const favIconUrl = "/static/assets/favicon.svg"; export const favIconUrl = "/static/assets/icons/favicon.svg";
export const favIconPngUrl = "/static/assets/apple-touch-icon.png"; export const favIconPngUrl = "/static/assets/icons/apple-touch-icon.png";
// TODO // TODO
// export const defaultFavIcon = `${window.location.protocol}//${window.location.host}${favIconPngUrl}`; // export const defaultFavIcon = `${window.location.protocol}//${window.location.host}${favIconPngUrl}`;
export const repoUrl = "https://github.com/LemmyNet"; export const repoUrl = "https://github.com/LemmyNet";