From 2ada424ff4a683e18cf704687e6cb0bb91172ced Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Mon, 16 Dec 2024 17:26:48 +1100 Subject: [PATCH 01/19] Update page layout, add page header --- src/App.jsx | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 9a04316..656c3e9 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,32 +1,41 @@ -import { Box, Grid } from "@chakra-ui/react"; +import { Box, Grid, Text } from "@chakra-ui/react"; import Providers from "./Providers"; import { ChatInput, ChatOutput, Map } from "./components"; function App() { return ( - - - - - - - - - + + + Land Carbon Lab - Zeno + + + + + + + + + + + + + ); From fdc99399117c166bca87b6206bcbdb0586437e24 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Mon, 16 Dec 2024 17:53:59 +1100 Subject: [PATCH 02/19] Add message border styling --- src/components/MessageAssistant.jsx | 4 ++-- src/components/MessageDefault.jsx | 2 +- src/components/MessageIn.jsx | 2 +- src/components/MessageTool.jsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/MessageAssistant.jsx b/src/components/MessageAssistant.jsx index ec603e4..4d6ce80 100644 --- a/src/components/MessageAssistant.jsx +++ b/src/components/MessageAssistant.jsx @@ -10,13 +10,13 @@ function MessageAssistant({ message }) { if (typeof message === "string" || message instanceof String) { return ( - + {message} ); } else { return ( - + {message.map((messagePart) => { const { index, type } = messagePart; if (type === "text") { diff --git a/src/components/MessageDefault.jsx b/src/components/MessageDefault.jsx index 9aecd9c..a5e308f 100644 --- a/src/components/MessageDefault.jsx +++ b/src/components/MessageDefault.jsx @@ -4,7 +4,7 @@ import { Alert } from "./ui/alert"; function MessageDefault({message, type}) { return ( - + {message} diff --git a/src/components/MessageIn.jsx b/src/components/MessageIn.jsx index 5c64b3d..de64a02 100644 --- a/src/components/MessageIn.jsx +++ b/src/components/MessageIn.jsx @@ -3,7 +3,7 @@ import { Box } from "@chakra-ui/react"; function MessageIn({ message }) { return ( - + {message} ); diff --git a/src/components/MessageTool.jsx b/src/components/MessageTool.jsx index 3c637e5..c706a95 100644 --- a/src/components/MessageTool.jsx +++ b/src/components/MessageTool.jsx @@ -93,7 +93,7 @@ function MessageTool({message, toolName, artifact}) { } return ( - + {render} ); From 85ef6e28aa8838479ed8e649c8b9b6ae9bd62a8f Mon Sep 17 00:00:00 2001 From: Marc Farra Date: Mon, 16 Dec 2024 21:24:23 +0000 Subject: [PATCH 03/19] set font in app to IBM plex sans --- package.json | 1 + src/main.jsx | 1 + src/theme/index.jsx | 13 ++++++++++++- yarn.lock | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f58a9ea..2ea3d8a 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "dependencies": { "@chakra-ui/react": "^3.2.1", "@emotion/react": "^11.13.5", + "@fontsource/ibm-plex-sans": "^5.1.0", "@turf/bbox": "^7.1.0", "d3": "^7.9.0", "jotai": "^2.10.3", diff --git a/src/main.jsx b/src/main.jsx index b48d3a0..c0577bb 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,6 +1,7 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import App from "./App"; +import "@fontsource/ibm-plex-sans/index.css"; createRoot(document.getElementById("root")).render( diff --git a/src/theme/index.jsx b/src/theme/index.jsx index b6722c6..1672f93 100644 --- a/src/theme/index.jsx +++ b/src/theme/index.jsx @@ -1,5 +1,16 @@ +"use client"; + import { createSystem, defaultConfig } from "@chakra-ui/react"; -const config = {}; +const config = { + theme: { + tokens: { + fonts: { + body: { value: "IBM Plex Sans" }, + heading: { value: "IBM Plex Sans" }, + } + } + } +}; export default createSystem(defaultConfig, config); diff --git a/yarn.lock b/yarn.lock index 83aa58e..d9d65e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -550,6 +550,11 @@ resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz" integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig== +"@fontsource/ibm-plex-sans@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@fontsource/ibm-plex-sans/-/ibm-plex-sans-5.1.0.tgz#9cd6bcce9817c55565ae2cf92629ce9a9f617a6b" + integrity sha512-v2aFHGh33ogG+At6dVNUCX6vWlNAhQ6STWj5WrBKPxVWX1SsAnHNq8sXQBa7WHEt29Irmozuk7GTp6GzFlpwdQ== + "@humanfs/core@^0.19.1": version "0.19.1" resolved "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz" From ae4bbc536008a88e488240b20bba144c3eb2e544 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 11:04:06 +1100 Subject: [PATCH 04/19] Set font size to sm --- src/components/ChatInput.jsx | 1 + src/components/ChatOutput.jsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/ChatInput.jsx b/src/components/ChatInput.jsx index 901b256..26ced70 100644 --- a/src/components/ChatInput.jsx +++ b/src/components/ChatInput.jsx @@ -21,6 +21,7 @@ function ChatInput() { aria-label="Ask a question" placeholder="Ask a question" bgColor="white" + fontSize="sm" value={inputValue} onChange={(e) => setInputValue(e.target.value)} onKeyUp={handleKeyUp} diff --git a/src/components/ChatOutput.jsx b/src/components/ChatOutput.jsx index f096463..eae1943 100644 --- a/src/components/ChatOutput.jsx +++ b/src/components/ChatOutput.jsx @@ -31,7 +31,7 @@ function ChatOutput() { }, []); return ( - + {chatHistory.map((msg) => { switch (msg.type) { case "in": From 4a384722fe50b719df4d42e1a398f26ac7721250 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 12:07:55 +1100 Subject: [PATCH 05/19] Add prompt-submit button --- src/components/ChatInput.jsx | 37 ++++++++++++++++++++++++++---------- yarn.lock | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/components/ChatInput.jsx b/src/components/ChatInput.jsx index 26ced70..257b3dc 100644 --- a/src/components/ChatInput.jsx +++ b/src/components/ChatInput.jsx @@ -1,5 +1,6 @@ import { useState } from "react"; -import { Input } from "@chakra-ui/react"; +import { Box, Button, Input } from "@chakra-ui/react"; +import { MdChevronRight } from "react-icons/md"; import { useSetAtom } from "jotai"; import { addPrompt } from "../atoms"; @@ -17,15 +18,31 @@ function ChatInput() { }; return ( - setInputValue(e.target.value)} - onKeyUp={handleKeyUp} - /> + + setInputValue(e.target.value)} + onKeyUp={handleKeyUp} + /> + + ); } diff --git a/yarn.lock b/yarn.lock index d9d65e1..8795593 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3947,7 +3947,7 @@ react-dom@^18.3.1: react-icons@^5.4.0: version "5.4.0" - resolved "https://registry.npmjs.org/react-icons/-/react-icons-5.4.0.tgz" + resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-5.4.0.tgz#443000f6e5123ee1b21ea8c0a716f6e7797f7416" integrity sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ== react-is@^16.13.1, react-is@^16.7.0: From dccada47f00a693d1e4758b97bfa885641be42b1 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 12:36:34 +1100 Subject: [PATCH 06/19] Fix shadows --- src/App.jsx | 10 +++------- src/components/ChatInput.jsx | 2 ++ src/components/MessageAssistant.jsx | 4 ++-- src/components/MessageTool.jsx | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 656c3e9..a092b5c 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -6,17 +6,15 @@ function App() { return ( - + Land Carbon Lab - Zeno @@ -27,10 +25,8 @@ function App() { diff --git a/src/components/ChatInput.jsx b/src/components/ChatInput.jsx index 257b3dc..aeff784 100644 --- a/src/components/ChatInput.jsx +++ b/src/components/ChatInput.jsx @@ -24,6 +24,8 @@ function ChatInput() { placeholder="Ask a question" fontSize="sm" pr="12" + shadow="md" + border="0" value={inputValue} onChange={(e) => setInputValue(e.target.value)} onKeyUp={handleKeyUp} diff --git a/src/components/MessageAssistant.jsx b/src/components/MessageAssistant.jsx index 4d6ce80..ba7f7ce 100644 --- a/src/components/MessageAssistant.jsx +++ b/src/components/MessageAssistant.jsx @@ -10,13 +10,13 @@ function MessageAssistant({ message }) { if (typeof message === "string" || message instanceof String) { return ( - + {message} ); } else { return ( - + {message.map((messagePart) => { const { index, type } = messagePart; if (type === "text") { diff --git a/src/components/MessageTool.jsx b/src/components/MessageTool.jsx index c706a95..bc0998a 100644 --- a/src/components/MessageTool.jsx +++ b/src/components/MessageTool.jsx @@ -93,7 +93,7 @@ function MessageTool({message, toolName, artifact}) { } return ( - + {render} ); From ef89d659ebaf16bec9b75994c370a9e05af63564 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 12:42:14 +1100 Subject: [PATCH 07/19] Fix shadow clip --- src/App.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.jsx b/src/App.jsx index a092b5c..e1f52ce 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -17,7 +17,7 @@ function App() { shadow="md" p="4" > - + From 40c9a6939783d670a731339a830d212d4a558ca5 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 15:58:49 +1100 Subject: [PATCH 08/19] Fix grid layout --- src/App.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index e1f52ce..9ab85ec 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,7 +5,7 @@ import { ChatInput, ChatOutput, Map } from "./components"; function App() { return ( - + Land Carbon Lab - Zeno @@ -16,19 +16,17 @@ function App() { borderRadius="lg" shadow="md" p="4" + height="0" + minH="100%" > - + - + From bff9b6552450b9f3354a8bbfebe34bd0e9e856d1 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 16:48:18 +1100 Subject: [PATCH 09/19] Add logo to LLM message output --- src/components/LclLogo.jsx | 15 +++++++++++++ .../{ => MessageOut}/MessageAssistant.jsx | 13 ++++++----- .../{ => MessageOut}/MessageDefault.jsx | 8 +++---- .../{ => MessageOut}/MessageTool.jsx | 11 +++++----- src/components/MessageOut/wrapper.jsx | 22 +++++++++++++++++++ src/components/index.js | 8 ++++--- 6 files changed, 59 insertions(+), 18 deletions(-) create mode 100644 src/components/LclLogo.jsx rename src/components/{ => MessageOut}/MessageAssistant.jsx (83%) rename src/components/{ => MessageOut}/MessageDefault.jsx (59%) rename src/components/{ => MessageOut}/MessageTool.jsx (92%) create mode 100644 src/components/MessageOut/wrapper.jsx diff --git a/src/components/LclLogo.jsx b/src/components/LclLogo.jsx new file mode 100644 index 0000000..5604bb3 --- /dev/null +++ b/src/components/LclLogo.jsx @@ -0,0 +1,15 @@ +function LclLogo() { + return ( + + + + + + + + + + ); +} + +export default LclLogo; diff --git a/src/components/MessageAssistant.jsx b/src/components/MessageOut/MessageAssistant.jsx similarity index 83% rename from src/components/MessageAssistant.jsx rename to src/components/MessageOut/MessageAssistant.jsx index ba7f7ce..9fcf228 100644 --- a/src/components/MessageAssistant.jsx +++ b/src/components/MessageOut/MessageAssistant.jsx @@ -1,22 +1,23 @@ import T from "prop-types"; -import { Box, Button } from "@chakra-ui/react"; +import { Button } from "@chakra-ui/react"; import Markdown from "react-markdown"; import { useSetAtom } from "jotai"; -import { addPrompt } from "../atoms"; +import { addPrompt } from "../../atoms"; +import MessageOutWrapper from "./wrapper"; function MessageAssistant({ message }) { const submit = useSetAtom(addPrompt); if (typeof message === "string" || message instanceof String) { return ( - + {message} - + ); } else { return ( - + {message.map((messagePart) => { const { index, type } = messagePart; if (type === "text") { @@ -26,7 +27,7 @@ function MessageAssistant({ message }) { return ; } })} - + ); } } diff --git a/src/components/MessageDefault.jsx b/src/components/MessageOut/MessageDefault.jsx similarity index 59% rename from src/components/MessageDefault.jsx rename to src/components/MessageOut/MessageDefault.jsx index a5e308f..8934ed6 100644 --- a/src/components/MessageDefault.jsx +++ b/src/components/MessageOut/MessageDefault.jsx @@ -1,13 +1,13 @@ import T from "prop-types"; -import { Box } from "@chakra-ui/react"; -import { Alert } from "./ui/alert"; +import { Alert } from "../ui/alert"; +import MessageOutWrapper from "./wrapper"; function MessageDefault({message, type}) { return ( - + {message} - + ); } diff --git a/src/components/MessageTool.jsx b/src/components/MessageOut/MessageTool.jsx similarity index 92% rename from src/components/MessageTool.jsx rename to src/components/MessageOut/MessageTool.jsx index bc0998a..9d9de5b 100644 --- a/src/components/MessageTool.jsx +++ b/src/components/MessageOut/MessageTool.jsx @@ -1,10 +1,11 @@ import T from "prop-types"; import { Box, Button } from "@chakra-ui/react"; -import MiniMap from "./MiniMap"; -import BarChart from "./BarChart"; +import MiniMap from "../MiniMap"; +import BarChart from "../BarChart"; import { useSetAtom } from "jotai"; -import { mapLayersAtom } from "../atoms"; +import { mapLayersAtom } from "../../atoms"; +import MessageOutWrapper from "./wrapper"; function ContextLayer({message}) { return ( @@ -93,9 +94,9 @@ function MessageTool({message, toolName, artifact}) { } return ( - + {render} - + ); } diff --git a/src/components/MessageOut/wrapper.jsx b/src/components/MessageOut/wrapper.jsx new file mode 100644 index 0000000..e86b70c --- /dev/null +++ b/src/components/MessageOut/wrapper.jsx @@ -0,0 +1,22 @@ +import T from "prop-types"; +import { Box } from "@chakra-ui/react"; +import { LclLogo } from ".."; + +function MessageOutWrapper({ children }) { + return ( + + + + + + {children} + + + ); +} + +MessageOutWrapper.propTypes = { + children: T.node.isRequired +}; + +export default MessageOutWrapper; diff --git a/src/components/index.js b/src/components/index.js index 458c59f..c31e52a 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,14 +1,16 @@ import ChatInput from "./ChatInput"; import ChatOutput from "./ChatOutput"; +import LclLogo from "./LclLogo"; import Map from "./Map"; import MessageIn from "./MessageIn"; -import MessageTool from "./MessageTool"; -import MessageAssistant from "./MessageAssistant"; -import MessageDefault from "./MessageDefault"; +import MessageTool from "./MessageOut/MessageTool"; +import MessageAssistant from "./MessageOut/MessageAssistant"; +import MessageDefault from "./MessageOut/MessageDefault"; export { ChatInput, ChatOutput, + LclLogo, Map, MessageIn, MessageTool, From b56795a7a7596e4b703b59f2ce5563af76f75d2e Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 17:12:41 +1100 Subject: [PATCH 10/19] Expand messages over full width --- src/App.jsx | 2 +- src/components/MessageOut/MessageTool.jsx | 2 +- src/components/MessageOut/wrapper.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 9ab85ec..9135545 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -9,7 +9,7 @@ function App() { Land Carbon Lab - Zeno - + - + {children} From b0784e531e1b39a9673859ddf64308f060617ac9 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Tue, 17 Dec 2024 17:42:33 +1100 Subject: [PATCH 11/19] Add global styling --- src/theme/globalCss.jsx | 21 +++++++++++++++++++++ src/theme/index.jsx | 10 +++++----- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 src/theme/globalCss.jsx diff --git a/src/theme/globalCss.jsx b/src/theme/globalCss.jsx new file mode 100644 index 0000000..e2c98e7 --- /dev/null +++ b/src/theme/globalCss.jsx @@ -0,0 +1,21 @@ +export default { + h2: { + marginBottom: 4, + fontSize: "lg", + fontWeight: "bold" + }, + h3: { + marginBottom: 4, + fontWeight: "bold" + }, + ul: { + marginTop: 4, + marginBottom: 4, + listStyleType: "disc", + paddingLeft: 4 + }, + p: { + marginTop: 4, + marginBottom: 4, + } +}; diff --git a/src/theme/index.jsx b/src/theme/index.jsx index 1672f93..31ae1f9 100644 --- a/src/theme/index.jsx +++ b/src/theme/index.jsx @@ -1,8 +1,8 @@ -"use client"; +import { createSystem, defaultConfig, defineConfig } from "@chakra-ui/react"; +import globalCss from "./globalCss"; -import { createSystem, defaultConfig } from "@chakra-ui/react"; - -const config = { +const config = defineConfig({ + globalCss, theme: { tokens: { fonts: { @@ -11,6 +11,6 @@ const config = { } } } -}; +}); export default createSystem(defaultConfig, config); From f5cb447ab28eb2f9959aff0b07dc2c27527632d1 Mon Sep 17 00:00:00 2001 From: LanesGood Date: Tue, 17 Dec 2024 10:48:18 -0500 Subject: [PATCH 12/19] Add new mapbox style, update geojson color --- src/components/Map.jsx | 66 ++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 22 deletions(-) diff --git a/src/components/Map.jsx b/src/components/Map.jsx index 71f5a01..59bcf0c 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -1,5 +1,9 @@ import "maplibre-gl/dist/maplibre-gl.css"; -import MapGl, { Layer, Source, AttributionControl } from "react-map-gl/maplibre"; +import MapGl, { + Layer, + Source, + AttributionControl, +} from "react-map-gl/maplibre"; import { useEffect } from "react"; import bbox from "@turf/bbox"; import { mapLayersAtom } from "../atoms"; @@ -19,19 +23,28 @@ function Map() { // each layer is a feature collection, so we need to calculate the bounds of all features useEffect(() => { if (mapLayers.length > 0) { - const bounds = mapLayers.reduce((acc, layer) => { - const layerBounds = bbox(layer); - return [ - Math.min(acc[0], layerBounds[0]), - Math.min(acc[1], layerBounds[1]), - Math.max(acc[2], layerBounds[2]), - Math.max(acc[3], layerBounds[3]) - ]; - }, [Infinity, Infinity, -Infinity, -Infinity]); + const bounds = mapLayers.reduce( + (acc, layer) => { + const layerBounds = bbox(layer); + return [ + Math.min(acc[0], layerBounds[0]), + Math.min(acc[1], layerBounds[1]), + Math.max(acc[2], layerBounds[2]), + Math.max(acc[3], layerBounds[3]), + ]; + }, + [Infinity, Infinity, -Infinity, -Infinity] + ); - mapRef.current.fitBounds([[bounds[0], bounds[1]], [bounds[2], bounds[3]]], { - padding: {top: 100, bottom: 100, left: 450, right: 100} - }); + mapRef.current.fitBounds( + [ + [bounds[0], bounds[1]], + [bounds[2], bounds[3]], + ], + { + padding: { top: 100, bottom: 100, left: 450, right: 100 }, + } + ); } }, [mapLayers]); @@ -48,19 +61,28 @@ function Map() { - {mapLayers.map((layer, idx) => { - const layerId = layer?.features[0]?.id || idx; - return ( - - - - ); - })} + {mapLayers.map((layer, idx) => { + const layerId = layer?.features[0]?.id || idx; + return ( + + + + + ); + })} ); From d8907ce3e7cd235e476bd888b2ab88fb79af0467 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Wed, 18 Dec 2024 11:08:29 +1100 Subject: [PATCH 13/19] Change button style --- src/components/MessageOut/MessageAssistant.jsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/MessageOut/MessageAssistant.jsx b/src/components/MessageOut/MessageAssistant.jsx index 9fcf228..180c37c 100644 --- a/src/components/MessageOut/MessageAssistant.jsx +++ b/src/components/MessageOut/MessageAssistant.jsx @@ -24,7 +24,18 @@ function MessageAssistant({ message }) { return {messagePart.text}; } else { const { query } = JSON.parse(messagePart.partial_json); - return ; + return ( + ); } })} From d41ef502f62c0e856b8fc4bba68c67b9a08ec027 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Wed, 18 Dec 2024 11:17:20 +1100 Subject: [PATCH 14/19] Add background gradient --- src/App.jsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/App.jsx b/src/App.jsx index 9135545..a63848c 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,7 +5,14 @@ import { ChatInput, ChatOutput, Map } from "./components"; function App() { return ( - + Land Carbon Lab - Zeno @@ -18,6 +25,7 @@ function App() { p="4" height="0" minH="100%" + bgColor="white" > From c85dc9da7b0815973f5c0b41e9aa9b29d38cd0d2 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Wed, 18 Dec 2024 11:38:34 +1100 Subject: [PATCH 15/19] Set padding to 100 all around --- src/components/Map.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Map.jsx b/src/components/Map.jsx index 59bcf0c..f92e58b 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -42,7 +42,7 @@ function Map() { [bounds[2], bounds[3]], ], { - padding: { top: 100, bottom: 100, left: 450, right: 100 }, + padding: 100, } ); } From 3ca5345b9a41d05aa4856d9287f66e394b24c6c5 Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Wed, 18 Dec 2024 11:45:32 +1100 Subject: [PATCH 16/19] Make layer IDs unique --- src/components/Map.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Map.jsx b/src/components/Map.jsx index f92e58b..e551cf7 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -71,12 +71,12 @@ function Map() { return ( From 8397b9c47937f4d1ac9346bdc345daf4a681149d Mon Sep 17 00:00:00 2001 From: Oliver Roick Date: Wed, 18 Dec 2024 11:45:47 +1100 Subject: [PATCH 17/19] Apply map styles to minimap --- src/components/MiniMap.jsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/MiniMap.jsx b/src/components/MiniMap.jsx index 4d6fa5e..394c13f 100644 --- a/src/components/MiniMap.jsx +++ b/src/components/MiniMap.jsx @@ -4,7 +4,7 @@ import "maplibre-gl/dist/maplibre-gl.css"; import bbox from "@turf/bbox"; /** - * MiniMap is a static map for the sidebar + * MiniMap is a static map for the sidebar */ function MiniMap({ artifact }){ let viewState = { @@ -34,7 +34,7 @@ function MiniMap({ artifact }){ @@ -45,7 +45,16 @@ function MiniMap({ artifact }){ type="geojson" data={artifact} > - + + )} From b54a9de882d034d51fb463fc2ade5334ff6b2f14 Mon Sep 17 00:00:00 2001 From: LanesGood Date: Thu, 19 Dec 2024 11:33:43 -0500 Subject: [PATCH 18/19] Add colors to theme, update app bg --- src/App.jsx | 5 ++--- src/theme/index.jsx | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index a63848c..86fe715 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -9,9 +9,8 @@ function App() { maxH="vh" h="vh" templateRows="min-content minmax(0, 1fr)" - bgGradient="to-b" - gradientFrom="teal.50" - gradientTo="blue.50" + bg="blue.900/15" + bgImage="linear-gradient({colors.lime.50}, transparent)" > Land Carbon Lab - Zeno diff --git a/src/theme/index.jsx b/src/theme/index.jsx index 31ae1f9..4cda912 100644 --- a/src/theme/index.jsx +++ b/src/theme/index.jsx @@ -8,9 +8,38 @@ const config = defineConfig({ fonts: { body: { value: "IBM Plex Sans" }, heading: { value: "IBM Plex Sans" }, - } - } - } + }, + colors: { + blue: { + 50: "#ebf9ff", + 100: "#d1f1ff", + 200: "#aee7ff", + 300: "#76dbff", + 400: "#35c4ff", + 500: "#07a0ff", + 600: "#007bff", + 700: "#0062ff", + 800: "#0051d7", + 900: "#0049a8", //primary + 950: "#062d65", + }, + + lime: { + 50: "#fcfee7", + 100: "#f7fbcc", + 200: "#eef89e", + 300: "#def066", + 400: "#cbe437", + 500: "#adca18", //primary + 600: "#87a10f", + 700: "#667b10", + 800: "#516113", + 900: "#445215", + 950: "#242e05", + }, + }, + }, + }, }); export default createSystem(defaultConfig, config); From da95bcdeece043663250645090ba4f34e88b7179 Mon Sep 17 00:00:00 2001 From: LanesGood Date: Thu, 19 Dec 2024 11:46:32 -0500 Subject: [PATCH 19/19] Update secondary theme colors according to LCL brand guidelines --- src/theme/index.jsx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/theme/index.jsx b/src/theme/index.jsx index 4cda912..51b8c4a 100644 --- a/src/theme/index.jsx +++ b/src/theme/index.jsx @@ -37,6 +37,15 @@ const config = defineConfig({ 900: "#445215", 950: "#242e05", }, + cyan: { 500: "#01B9F3" }, + indigo: { 500: "#6F6FDF" }, + purple: { 500: "#BA4AFF" }, + pink: { 500: "#F26798" }, + red: { 500: "#FF452C" }, + orange: { 500: "#FF9916" }, + yellow: { 500: "#FFD80B" }, + mint: { 500: "#00DCA7" }, + green: { 500: "#00A651" }, }, }, },