diff --git a/hyperglass/configuration/__init__.py b/hyperglass/configuration/__init__.py index 6ca6833..28e134a 100644 --- a/hyperglass/configuration/__init__.py +++ b/hyperglass/configuration/__init__.py @@ -439,6 +439,7 @@ _frontend_fields = { "request_timeout": ..., "org_name": ..., "google_analytics": ..., + "site_title": ..., "site_description": ..., "site_keywords": ..., "web": ..., diff --git a/hyperglass/ui/components/Meta.js b/hyperglass/ui/components/Meta.js index 0ec2c2a..fd0a345 100644 --- a/hyperglass/ui/components/Meta.js +++ b/hyperglass/ui/components/Meta.js @@ -8,7 +8,7 @@ const Meta = () => { const config = useConfig(); const theme = useTheme(); const [location, setLocation] = useState({}); - const title = config?.org_name || "hyperglass"; + const title = config?.site_title || "hyperglass"; const description = config?.site_description || "The modern looking glass."; const siteName = `${title} - ${description}`; const keywords = config?.site_keywords || [ @@ -27,15 +27,10 @@ const Meta = () => { "network", "isp" ]; - const author = config?.org_name || "Matt Love, matt@hyperglass.io"; - const language = config?.language || "en"; - const currentYear = new Date().getFullYear(); - const copyright = config - ? `${currentYear} ${config.org_name}` - : `${currentYear} hyperglass`; - const ogImage = config?.web.opengraph.image || null; - const ogImageHeight = config?.web.opengraph.height || null; - const ogImageWidth = config?.web.opengraph.width || null; + const language = config?.language ?? "en"; + const ogImage = config?.web.opengraph.image ?? null; + const ogImageHeight = config?.web.opengraph.height ?? null; + const ogImageWidth = config?.web.opengraph.width ?? null; const primaryFont = googleFontUrl(theme.fonts.body); const monoFont = googleFontUrl(theme.fonts.mono); useEffect(() => { @@ -46,18 +41,12 @@ const Meta = () => { return ( {title} - - - - - - @@ -70,6 +59,4 @@ const Meta = () => { ); }; -Meta.displayName = "Meta"; - export default Meta;