scott/crabfit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into refactor/rust-api

Browse source
This commit is contained in:
Ben Grant 2023-05-16 15:36:57 +10:00
commit 862ea1148b
9 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/components/AvailabilityViewer/AvailabilityViewer.jsx
View file

@ -4,7 +4,7 @@ import dayjs from 'dayjs'
import localeData from 'dayjs/plugin/localeData'
import customParseFormat from 'dayjs/plugin/customParseFormat'
import relativeTime from 'dayjs/plugin/relativeTime'
import createPalette from 'hue-map'
import { createPalette } from 'hue-map'
import { useSettingsStore, useLocaleUpdateStore } from '/src/stores'
@ -72,7 +72,7 @@ const AvailabilityViewer = ({
useEffect(() => setPalette(createPalette({
map: colormap === 'crabfit' ? [[0, [247,158,0,0]], [1, [247,158,0,255]]] : colormap,
steps: tempFocus !== null ? 2 : Math.min(max, filteredPeople.length)+1,
})), [tempFocus, filteredPeople, max, colormap])
}).format()), [tempFocus, filteredPeople, max, colormap])
const heatmap = useMemo(() => (
<Container>

4
frontend/src/components/Legend/Legend.jsx
View file

@ -1,6 +1,6 @@
import { useState, useEffect } from 'react'
import { useTranslation } from 'react-i18next'
import createPalette from 'hue-map'
import { createPalette } from 'hue-map'
import { useSettingsStore } from '/src/stores'
@ -27,7 +27,7 @@ const Legend = ({
useEffect(() => setPalette(createPalette({
map: colormap === 'crabfit' ? [[0, [247,158,0,0]], [1, [247,158,0,255]]] : colormap,
steps: max+1-min,
})), [min, max, colormap])
}).format()), [min, max, colormap])
return (
<Wrapper>