-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/hurumap_select_component
- Loading branch information
Showing
13 changed files
with
307 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| FROM codeforafrica/codeforafrica-ui:0.1.7 | ||
| FROM codeforafrica/codeforafrica-ui:0.1.8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "civicsignalblog", | ||
| "version": "0.1.7", | ||
| "version": "0.1.8", | ||
| "private": true, | ||
| "author": "Code for Africa <[email protected]>", | ||
| "description": "This is the (temporary) CivicSignal blog", | ||
|
|
@@ -47,6 +47,7 @@ | |
| "@next/env": "^14.2.5", | ||
| "@payloadcms/bundler-webpack": "^1.0.7", | ||
| "@payloadcms/db-mongodb": "^1.7.1", | ||
| "@payloadcms/live-preview": "^0.2.2", | ||
| "@payloadcms/live-preview-react": "^0.2.0", | ||
| "@payloadcms/plugin-cloud-storage": "^1.1.3", | ||
| "@payloadcms/plugin-nested-docs": "^1.0.12", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import { subscribe, unsubscribe, ready } from "@payloadcms/live-preview"; | ||
| import { useCallback, useEffect, useState, useRef } from "react"; | ||
|
|
||
| export const useLivePreview = (props) => { | ||
| const { depth = 0, initialData, serverURL } = props; | ||
| const [data, setData] = useState(initialData); | ||
| const [isLoading, setIsLoading] = useState(true); | ||
| const hasSentReadyMessage = useRef(false); | ||
|
|
||
| const onChange = useCallback((mergedData) => { | ||
| // When a change is made, the `onChange` callback will be called with the merged data | ||
| // Set this merged data into state so that React will re-render the UI | ||
| setData(mergedData); | ||
| setIsLoading(false); | ||
| }, []); | ||
|
|
||
| useEffect(() => { | ||
| // Listen for `window.postMessage` events from the Admin panel | ||
| // When a change is made, the `onChange` callback will be called with the merged data | ||
| const subscription = subscribe({ | ||
| callback: onChange, | ||
| depth, | ||
| initialData, | ||
| serverURL, | ||
| }); | ||
|
|
||
| // Once subscribed, send a `ready` message back up to the Admin panel | ||
| // This will indicate that the front-end is ready to receive messages | ||
| if (!hasSentReadyMessage.current) { | ||
| hasSentReadyMessage.current = true; | ||
|
|
||
| ready({ | ||
| serverURL, | ||
| }); | ||
| } | ||
|
|
||
| // When the component unmounts, unsubscribe from the `window.postMessage` events | ||
| return () => { | ||
| unsubscribe(subscription); | ||
| }; | ||
| }, [serverURL, onChange, depth, initialData, hasSentReadyMessage]); | ||
|
|
||
| useEffect(() => { | ||
| setData(initialData); | ||
| }, [initialData]); | ||
|
|
||
| return { | ||
| data, | ||
| isLoading, | ||
| }; | ||
| }; | ||
|
|
||
| export default useLivePreview; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| import merge from "deepmerge"; | ||
|
|
||
| import Scope from "./Scope"; | ||
|
|
||
| export default function HeatMapScope(props) { | ||
| const { | ||
| primaryData, | ||
| metadata, | ||
| config, | ||
| secondaryData, | ||
| primaryParentData, | ||
| secondaryParentData, | ||
| isCompare, | ||
| isMobile, | ||
| theme, | ||
| args, | ||
| } = props; | ||
|
|
||
| const { primary_group: primaryGroup } = metadata; | ||
|
|
||
| return merge( | ||
| Scope({ | ||
| primaryData, | ||
| metadata, | ||
| config, | ||
| secondaryData, | ||
| primaryParentData, | ||
| secondaryParentData, | ||
| chartType: "heatmap", | ||
| theme, | ||
| args, | ||
| }), | ||
| { | ||
| height: isMobile && isCompare && secondaryData?.length > 1 ? 620 : 310, | ||
| signals: [ | ||
| { | ||
| name: "height", | ||
| value: isMobile && isCompare && secondaryData?.length > 1 ? 620 : 310, | ||
| }, | ||
| { | ||
| name: "isMobile", | ||
| value: isMobile, | ||
| }, | ||
| { | ||
| name: "isCompare", | ||
| value: isCompare, | ||
| }, | ||
| { name: "stripeWidth", update: "width/length(data('primary'))" }, | ||
| ], | ||
| scales: [ | ||
| { | ||
| name: "scaleX", | ||
| type: "linear", | ||
| domain: { | ||
| data: "primary", | ||
| field: primaryGroup, | ||
| }, | ||
| range: [0, { signal: "width" }], | ||
| zero: false, | ||
| }, | ||
| { | ||
| name: "color", | ||
| type: "linear", | ||
| domain: { | ||
| data: "primary", | ||
| field: { | ||
| signal: "datatype[Units]", | ||
| }, | ||
| }, | ||
| range: [theme.palette.secondary.main, theme.palette.primary.main], | ||
| reverse: true, | ||
| }, | ||
| ], | ||
| marks: [ | ||
| { | ||
| name: "stripe", | ||
| type: "rect", | ||
| interactive: true, | ||
| from: { | ||
| data: "primary", | ||
| }, | ||
| encode: { | ||
| enter: { | ||
| xc: { | ||
| scale: "scaleX", | ||
| field: primaryGroup, | ||
| }, | ||
| fill: { | ||
| scale: "color", | ||
| field: { | ||
| signal: "datatype[Units]", | ||
| }, | ||
| }, | ||
| }, | ||
| update: { | ||
| y: { | ||
| signal: 0, | ||
| }, | ||
| height: { | ||
| signal: "height", | ||
| }, | ||
| width: { | ||
| signal: "stripeWidth", | ||
| }, | ||
| tooltip: { | ||
| signal: "{'group': datum[mainGroup], 'count': datum.count}", | ||
| }, | ||
| }, | ||
| hover: { | ||
| y: { | ||
| value: -4, | ||
| }, | ||
| height: { | ||
| signal: "height + 8", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| ], | ||
| axes: [ | ||
| { | ||
| scale: "scaleX", | ||
| orient: "bottom", | ||
| domain: false, | ||
| format: ".4", | ||
| labelColor: "black", | ||
| }, | ||
| ], | ||
| legends: [ | ||
| { | ||
| fill: "color", | ||
| type: "gradient", | ||
| titleFontSize: 12, | ||
| titlePadding: 4, | ||
| gradientLength: { signal: "height" }, | ||
| }, | ||
| ], | ||
| }, | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.