diff --git a/.gitignore b/.gitignore
index dff8f8c..1357ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
# Project
-hyperglass/hyperglass/static
+static/
TODO*
.env
diff --git a/hyperglass/configuration/validate.py b/hyperglass/configuration/validate.py
index 3accb7e..f5868eb 100644
--- a/hyperglass/configuration/validate.py
+++ b/hyperglass/configuration/validate.py
@@ -125,6 +125,7 @@ def init_ui_params(*, params: "Params", devices: "Devices") -> "UIParameters":
_ui_params = params.frontend()
_ui_params["web"]["logo"]["light_format"] = params.web.logo.light.suffix
_ui_params["web"]["logo"]["dark_format"] = params.web.logo.dark.suffix
+ _ui_params["web"]["logo"]["footer_format"] = params.web.logo.footer.suffix
return UIParameters(
**_ui_params,
diff --git a/hyperglass/frontend/__init__.py b/hyperglass/frontend/__init__.py
index bbd7ace..c2a24e3 100644
--- a/hyperglass/frontend/__init__.py
+++ b/hyperglass/frontend/__init__.py
@@ -203,7 +203,7 @@ def migrate_images(app_path: Path, params: "UIParameters"):
src_files = ()
dst_files = ()
- for image in ("light", "dark", "favicon"):
+ for image in ("light", "dark", "favicon", "footer"):
src: Path = getattr(params.web.logo, image)
dst = images_dir / f"{image + src.suffix}"
src_files += (src,)
diff --git a/hyperglass/models/config/params.py b/hyperglass/models/config/params.py
index 1e35ba2..1ced6f3 100644
--- a/hyperglass/models/config/params.py
+++ b/hyperglass/models/config/params.py
@@ -47,12 +47,12 @@ class ParamsPublic(HyperglassModel):
description="Your network's primary ASN. This field is used to set some useful defaults such as the subtitle and PeeringDB URL.",
)
org_name: str = Field(
- "Beloved Hyperglass User",
+ "Beloved Looking Glass User",
title="Organization Name",
description="Your organization's name. This field is used in the UI & API documentation to set fields such as `` HTML tags for SEO and the terms & conditions footer component.",
)
site_title: str = Field(
- "hyperglass",
+ "Looking Glass",
title="Site Title",
description="The name of your hyperglass site. This field is used in the UI & API documentation to set fields such as the `` HTML tag, and the terms & conditions footer component.",
)
@@ -131,8 +131,8 @@ class Params(ParamsPublic, HyperglassModel):
for menu in web.menus:
menu.content = menu.content.format(
- site_title=info.data.get("site_title", "hyperglass"),
- org_name=info.data.get("org_name", "hyperglass"),
+ site_title=info.data.get("site_title", "Looking Glass"),
+ org_name=info.data.get("org_name", "Looking Glass"),
version=__version__,
)
return web
diff --git a/hyperglass/models/config/web.py b/hyperglass/models/config/web.py
index 7916d9e..62b24d2 100644
--- a/hyperglass/models/config/web.py
+++ b/hyperglass/models/config/web.py
@@ -86,6 +86,7 @@ class Logo(HyperglassModel):
light: FilePath = DEFAULT_IMAGES / "hyperglass-light.svg"
dark: FilePath = DEFAULT_IMAGES / "hyperglass-dark.svg"
favicon: FilePath = DEFAULT_IMAGES / "hyperglass-icon.svg"
+ footer: FilePath = DEFAULT_IMAGES / "hyperglass-icon.svg"
width: str = Field(default="50%", pattern=PERCENTAGE_PATTERN)
height: t.Optional[str] = Field(default=None, pattern=PERCENTAGE_PATTERN)
@@ -95,13 +96,13 @@ class LogoPublic(Logo):
light_format: str
dark_format: str
-
+ footer_format: str
class Text(HyperglassModel):
"""Validation model for params.branding.text."""
title_mode: TitleMode = "logo_only"
- title: str = Field(default="hyperglass", max_length=32)
+ title: str = Field(default="Looking Glass", max_length=32)
subtitle: str = Field(default="Network Looking Glass", max_length=32)
query_location: str = "Location"
query_type: str = "Query Type"
@@ -132,7 +133,7 @@ class Text(HyperglassModel):
class ThemeColors(HyperglassModel):
"""Validation model for theme colors."""
- black: Color = "#000000"
+ black: Color = "#2d3635"
white: Color = "#ffffff"
dark: Color = "#010101"
light: Color = "#f5f6f7"
@@ -169,7 +170,7 @@ class ThemeColors(HyperglassModel):
class ThemeFonts(HyperglassModel):
"""Validation model for theme fonts."""
- body: str = "Nunito"
+ body: str = "Inter"
mono: str = "Fira Code"
@@ -226,6 +227,7 @@ class HighlightPattern(HyperglassModel):
class Web(HyperglassModel):
"""Validation model for all web/browser-related configuration."""
+ copyright: t.Optional[str] = "All rights reserved"
credit: Credit = Credit()
dns_provider: DnsOverHttps = DnsOverHttps()
links: t.Sequence[Link] = [
diff --git a/hyperglass/ui/components/footer/button.tsx b/hyperglass/ui/components/footer/button.tsx
index 3546849..ec59765 100644
--- a/hyperglass/ui/components/footer/button.tsx
+++ b/hyperglass/ui/components/footer/button.tsx
@@ -2,13 +2,12 @@ import { useMemo } from 'react';
import { Button, Menu, MenuButton, MenuList } from '@chakra-ui/react';
import { useConfig } from '~/context';
import { Markdown } from '~/elements';
-import { useColorValue, useBreakpointValue, useOpposingColor, useStrf } from '~/hooks';
+import { useStrf } from '~/hooks';
import type { MenuListProps } from '@chakra-ui/react';
import type { Config } from '~/types';
interface FooterButtonProps extends Omit {
- side: 'left' | 'right';
title?: MenuListProps['children'];
content: string;
}
@@ -27,26 +26,26 @@ function getConfigFmt(config: Config): Record {
}
export const FooterButton = (props: FooterButtonProps): JSX.Element => {
- const { content, title, side, ...rest } = props;
+ const { content, title, ...rest } = props;
const config = useConfig();
const strF = useStrf();
const fmt = useMemo(() => getConfigFmt(config), [config]);
const fmtContent = useMemo(() => strF(content, fmt), [fmt, content, strF]);
- const placement = side === 'left' ? 'top' : side === 'right' ? 'top-end' : undefined;
- const bg = useColorValue('white', 'gray.900');
- const color = useOpposingColor(bg);
- const size = useBreakpointValue({ base: 'xs', lg: 'sm' });
-
return (
-