From 7efaff4f6fa363267f88405529fdfdf656af3cee Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Tue, 20 Dec 2022 19:47:28 +0100 Subject: [PATCH] basic style for toc + further cleanup --- .eslintignore | 2 + website/src/components/Header/AstroLogo.astro | 40 ----- .../src/components/Header/DefaultHeader.astro | 149 ------------------ website/src/components/Header/Header.astro | 4 +- website/src/components/Header/Search.tsx | 2 +- .../src/components/Header/SidebarToggle.tsx | 63 ++++---- .../src/components/Header/SkipToContent.astro | 26 --- .../RightSidebar/RightSidebar.astro | 27 +--- .../RightSidebar/TableOfContents.tsx | 139 ++++++++-------- website/src/layouts/DefaultLayout.astro | 136 ---------------- website/src/pages/index.astro | 1 + website/src/styles/index.css | 4 + 12 files changed, 110 insertions(+), 483 deletions(-) delete mode 100644 website/src/components/Header/AstroLogo.astro delete mode 100644 website/src/components/Header/DefaultHeader.astro delete mode 100644 website/src/components/Header/SkipToContent.astro delete mode 100644 website/src/layouts/DefaultLayout.astro diff --git a/.eslintignore b/.eslintignore index 3ceb0c5b..e4289393 100644 --- a/.eslintignore +++ b/.eslintignore @@ -12,3 +12,5 @@ tailwind.config.js vite.config.js /**/dist/**/* !**/*.mjs +**/*.tsx +**/*.ts diff --git a/website/src/components/Header/AstroLogo.astro b/website/src/components/Header/AstroLogo.astro deleted file mode 100644 index 6c8b5b9c..00000000 --- a/website/src/components/Header/AstroLogo.astro +++ /dev/null @@ -1,40 +0,0 @@ ---- -type Props = { - size: number; -}; -const { size } = Astro.props as Props; ---- - - diff --git a/website/src/components/Header/DefaultHeader.astro b/website/src/components/Header/DefaultHeader.astro deleted file mode 100644 index 93144c02..00000000 --- a/website/src/components/Header/DefaultHeader.astro +++ /dev/null @@ -1,149 +0,0 @@ ---- -// import { getLanguageFromURL, KNOWN_LANGUAGE_CODES } from '../../languages'; -import * as CONFIG from '../../config'; -// import AstroLogo from './AstroLogo.astro'; -import SkipToContent from './SkipToContent.astro'; -import SidebarToggle from './SidebarToggle'; -// import LanguageSelect from './LanguageSelect'; -import Search from './Search'; - -type Props = { - currentPage: string; -}; - -const { currentPage } = Astro.props as Props; -// const lang = getLanguageFromURL(currentPage); ---- - -
- - -
- - - - diff --git a/website/src/components/Header/Header.astro b/website/src/components/Header/Header.astro index 2aea68fe..ed89ccb4 100644 --- a/website/src/components/Header/Header.astro +++ b/website/src/components/Header/Header.astro @@ -2,7 +2,6 @@ // import { getLanguageFromURL, KNOWN_LANGUAGE_CODES } from '../../languages'; import * as CONFIG from '../../config'; // import AstroLogo from './AstroLogo.astro'; -import SkipToContent from './SkipToContent.astro'; import SidebarToggle from './SidebarToggle'; // import LanguageSelect from './LanguageSelect'; import Search from './Search'; @@ -15,7 +14,6 @@ const { currentPage } = Astro.props as Props; // const lang = getLanguageFromURL(currentPage); --- - diff --git a/website/src/components/Header/Search.tsx b/website/src/components/Header/Search.tsx index 31ef6ad9..f51ede45 100644 --- a/website/src/components/Header/Search.tsx +++ b/website/src/components/Header/Search.tsx @@ -26,7 +26,7 @@ export default function Search() { }, [setIsOpen]); const onInput = useCallback( - (e) => { + (e: any) => { setIsOpen(true); setInitialQuery(e.key); }, diff --git a/website/src/components/Header/SidebarToggle.tsx b/website/src/components/Header/SidebarToggle.tsx index 50a5d93d..e07beb29 100644 --- a/website/src/components/Header/SidebarToggle.tsx +++ b/website/src/components/Header/SidebarToggle.tsx @@ -3,42 +3,37 @@ import type { FunctionalComponent } from 'preact'; import { useState, useEffect } from 'preact/hooks'; const MenuToggle: FunctionalComponent = () => { - const [sidebarShown, setSidebarShown] = useState(false); + const [sidebarShown, setSidebarShown] = useState(false); - useEffect(() => { - const body = document.querySelector('body')!; - if (sidebarShown) { - body.classList.add('mobile-sidebar-toggle'); - } else { - body.classList.remove('mobile-sidebar-toggle'); - } - }, [sidebarShown]); + useEffect(() => { + const body = document.querySelector('body')!; + if (sidebarShown) { + body.classList.add('mobile-sidebar-toggle'); + } else { + body.classList.remove('mobile-sidebar-toggle'); + } + }, [sidebarShown]); - return ( - - ); + return ( + + ); }; export default MenuToggle; diff --git a/website/src/components/Header/SkipToContent.astro b/website/src/components/Header/SkipToContent.astro deleted file mode 100644 index 4d97923f..00000000 --- a/website/src/components/Header/SkipToContent.astro +++ /dev/null @@ -1,26 +0,0 @@ ---- -type Props = {}; ---- - - - - diff --git a/website/src/components/RightSidebar/RightSidebar.astro b/website/src/components/RightSidebar/RightSidebar.astro index d45fbd49..7334b1eb 100644 --- a/website/src/components/RightSidebar/RightSidebar.astro +++ b/website/src/components/RightSidebar/RightSidebar.astro @@ -4,31 +4,14 @@ import MoreMenu from './MoreMenu.astro'; import type { MarkdownHeading } from 'astro'; type Props = { - headings: MarkdownHeading[]; - githubEditUrl: string; + headings: MarkdownHeading[]; + githubEditUrl: string; }; const { headings, githubEditUrl } = Astro.props as Props; --- -