Skip to content

Commit b1f2a7e

Browse files
jer3m01jer3m01
committed
wip
1 parent 3e6c988 commit b1f2a7e

22 files changed

Lines changed: 272 additions & 158 deletions

‎osmium/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
],
2121
"exports": {
2222
".": {
23-
"solid": "./src/index.tsx",
24-
"import": "./src/index.tsx",
25-
"types": "./src/index.tsx"
23+
"solid": "./src/index.ts",
24+
"import": "./src/index.ts",
25+
"types": "./src/index.ts"
2626
}
2727
},
2828
"license": "MIT",

‎osmium/src/Layout.tsx‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1-
import { RouteSectionProps } from "@solidjs/router";
21
import { ErrorBoundary } from "solid-js";
32

4-
import { Layout } from "~/ui/layout";
5-
import { NotFound } from "~/ui/not-found";
6-
import { useThemeListener } from "@kobalte/solidbase/client";
3+
import { Layout } from "./ui/layout";
4+
import { NotFound } from "./ui/not-found";
5+
import { SidebarProvider, useThemeListener } from "@kobalte/solidbase/client";
76
import { usePace } from "@kobalte/solidbase/default-theme/pace.js";
7+
import { useRouteConfig } from "./utils";
8+
import { OsmiumThemeStateProvider } from "./context";
9+
import { ParentProps } from "solid-js";
810

9-
export default function (props: RouteSectionProps) {
11+
import "./index.css";
12+
13+
export default function (props: ParentProps) {
14+
const config = useRouteConfig();
1015
useThemeListener();
1116
usePace();
1217

1318
return (
14-
<ErrorBoundary fallback={() => <NotFound />}>
15-
<Layout>{props.children}</Layout>
16-
</ErrorBoundary>
19+
<OsmiumThemeStateProvider>
20+
<SidebarProvider config={config().themeConfig?.sidebar}>
21+
<ErrorBoundary fallback={() => <NotFound />}>
22+
<Layout>{props.children}</Layout>
23+
</ErrorBoundary>
24+
</SidebarProvider>
25+
</OsmiumThemeStateProvider>
1726
);
1827
}

‎osmium/src/index.css‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
@import "./styles/expressive-code.css";
44
@import "tailwindcss/components";
55
@import "tailwindcss/utilities";
6-
@import "./styles/fonts.css";
76

87
@layer base {
98
html {

osmium/src/index.tsx renamed to osmium/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineTheme } from "@kobalte/solidbase/config";
2-
import { SidebarConfig } from "@kobalte/solidbase/config/sidebar";
2+
import type { SidebarConfig } from "@kobalte/solidbase/config/sidebar";
33
import { fileURLToPath } from "node:url";
44

55
export interface OsmiumThemeConfig {
@@ -27,13 +27,13 @@ const allFonts = {
2727
geist: {
2828
cssPath: import.meta.resolve("@fontsource-variable/geist"),
2929
preloadFontPath: import.meta
30-
.resolve("@fontsource-variable/inter/files/geist-latin-wght-normal.woff2"),
30+
.resolve("@fontsource-variable/geist/files/geist-latin-wght-normal.woff2"),
3131
fontType: "woff2",
3232
},
3333
geistMono: {
3434
cssPath: import.meta.resolve("@fontsource-variable/geist-mono"),
3535
preloadFontPath: import.meta
36-
.resolve("@fontsource-variable/jetbrains-mono/files/geist-mono-latin-wght-normal.woff2"),
36+
.resolve("@fontsource-variable/geist-mono/files/geist-mono-latin-wght-normal.woff2"),
3737
fontType: "woff2",
3838
},
3939
} satisfies Record<string, Font>;

‎osmium/src/mdx-components.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import {
1010
import { isServer } from "solid-js/web";
1111

1212
import { clientOnly } from "@solidjs/start";
13-
import { Callout } from "~/ui/callout";
14-
import { Tabs, TabList, TabPanel, Tab } from "~/ui/tabs";
13+
import { Callout } from "./ui/callout";
14+
import { Tabs, TabList, TabPanel, Tab } from "./ui/tabs";
1515

16-
export { EditPageLink } from "~/ui/edit-page-link";
17-
export { PageIssueLink } from "~/ui/page-issue-link";
18-
export { Callout } from "~/ui/callout";
19-
export { QuickLinks } from "~/ui/quick-links";
16+
export { EditPageLink } from "./ui/edit-page-link";
17+
export { PageIssueLink } from "./ui/page-issue-link";
18+
export { Callout } from "./ui/callout";
19+
export { QuickLinks } from "./ui/quick-links";
2020

2121
const EraserLinkImpl = clientOnly(() => import("./ui/eraser-link"));
2222

‎osmium/src/ui/button-link.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
import { splitProps } from "solid-js";
2-
import { A, type RouterLinkProps } from "./i18n-anchor";
1+
import { ComponentProps, splitProps } from "solid-js";
32

4-
type ButtonLinkProps = RouterLinkProps & {
3+
type ButtonLinkProps = ComponentProps<"a"> & {
54
variant: "primary" | "secondary";
65
};
76

87
export const ButtonLink = (props: ButtonLinkProps) => {
98
const [localProps, otherProps] = splitProps(props, ["variant"]);
109

1110
return (
12-
<A
13-
addLocale
11+
<a
1412
classList={{
1513
"rounded-full bg-blue-300 py-2 px-4 text-sm font-semibold text-slate-900 hover:bg-blue-200 focus:outline-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-300/50 active:bg-blue-500":
1614
localProps.variant === "primary",

‎osmium/src/ui/docs-layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Show, onMount, JSX } from "solid-js";
22
import { useLocation } from "@solidjs/router";
3-
import { Pagination } from "~/ui/pagination";
3+
import { Pagination } from "./pagination";
44
import { EditPageLink } from "./edit-page-link";
55
import { PageIssueLink } from "./page-issue-link";
6-
import { useOsmiumThemeFrontmatter } from "~/frontmatter";
6+
import { useOsmiumThemeFrontmatter } from "../frontmatter";
77

88
interface DocsLayoutProps {
99
children: JSX.Element;

‎osmium/src/ui/edit-page-link.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ import { Icon } from "solid-heroicons";
33
import { pencilSquare } from "solid-heroicons/outline";
44
import { useCurrentPageData } from "@kobalte/solidbase/client";
55

6-
import { useI18n } from "~/i18n/i18n-context";
7-
86
export const EditPageLink: Component = () => {
9-
const i18n = useI18n();
107
const data = useCurrentPageData();
118

129
return (
@@ -18,7 +15,7 @@ export const EditPageLink: Component = () => {
1815
target="_blank"
1916
>
2017
<Icon aria-hidden="true" class="mr-1 w-[16px]" path={pencilSquare} />
21-
{i18n.t("contribute.edit")}
18+
Edit this page
2219
</a>
2320
)}
2421
</Show>

‎osmium/src/ui/layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { ParentComponent, Show } from "solid-js";
22

3-
import { MainNavigation } from "~/ui/layout/main-navigation";
3+
import { MainNavigation } from "./layout/main-navigation";
44
import { MainHeader } from "./layout/main-header";
55
import { Hero } from "./layout/hero";
66
import { DocsLayout } from "./docs-layout";
77
import { SidePanel } from "./layout/side-panel";
8-
import { useOsmiumThemeFrontmatter } from "~/frontmatter";
8+
import { useOsmiumThemeFrontmatter } from "../frontmatter";
99

1010
export const Layout: ParentComponent<{ isError?: boolean }> = (props) => {
1111
const frontmatter = useOsmiumThemeFrontmatter();

‎osmium/src/ui/layout/language-selector.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Icon } from "solid-heroicons";
33
import { language } from "solid-heroicons/solid";
44
import { ResolvedLocale, useLocale } from "@kobalte/solidbase/client";
55
import { Select } from "@kobalte/core/select";
6-
import { OsmiumThemeConfig } from "~/index";
6+
import { OsmiumThemeConfig } from "../..";
77

88
export const LanguageSelector: Component = () => {
99
const { locales, currentLocale, setLocale } = useLocale();

0 commit comments

Comments
 (0)