Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Map legend embeddings #247

Merged
merged 7 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"@yarnpkg/sdks": "^3.1.0",
"prettier": "^2.7.1",
"sass": "^1.49.0",
"sass-embedded": "^1.79.1",
"stylus": "^0.55.0",
"typescript": "^5.1.6",
"vite-plugin-rewrite-all": "^1.0.1",
Expand Down
25 changes: 19 additions & 6 deletions pages/+Layout.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { DarkModeProvider } from "@macrostrat/ui-components";
import { DarkModeProvider, DevToolsConsole } from "@macrostrat/ui-components";
import { ReactNode } from "react";

import { AuthProvider } from "~/_providers/auth";
import { usePageContext } from "vike-react/usePageContext";
import { enableAdmin } from "@macrostrat-web/settings";

import "~/styles/blueprint-core";
import "~/styles/_theme.styl";
Expand All @@ -12,7 +11,7 @@ import "~/styles/padding.css";
//
import h from "./layout.module.sass";

import { PageAdminConsole } from "~/components";
import { ClientOnly } from "vike-react/ClientOnly";

export default function Layout({ children }: { children: ReactNode }) {
const pageContext = usePageContext();
Expand All @@ -28,14 +27,28 @@ export default function Layout({ children }: { children: ReactNode }) {
{ followSystem: true },
h("div.app-shell", { className: pageStyle + "-page" }, [
children,
h.if(enableAdmin)(PageAdminConsole, {
className: "page-admin-container",
}),
h(
DevToolsConsole,
{ className: "page-admin-container" },
h(DevToolsData)
),
])
)
);
}

function DevToolsData() {
return h(
ClientOnly,
{
load() {
return import("~/components/developer").then((mod) => mod.DevToolsData);
},
},
(DevToolsData) => h(DevToolsData)
);
}

function NoOpDarkModeProvider(props) {
return props.children;
}
7 changes: 7 additions & 0 deletions pages/dev/+Page.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ import { PageHeader, PageBreadcrumbs } from "~/components";
- [CriticalMAAS](/integrations/criticalmaas)
- [Sources](/dev/sources)

## xDD integration

- [Map legend affinity](/dev/legend-affinity)
- [Extractions](/dev/extractions)

## Apps

- [Concept apps](/dev/concepts)
- [Built with Macrostrat](/dev/apps)
- [Test Site](/dev/test-site/main-page)
Expand Down
Loading
Loading