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.

Sign up for GitHub

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

Jump to bottom

fix: info page card and map error states #412

Merged
merged 1 commit into from
Jun 20, 2022
Merged

fix: info page card and map error states #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 26 additions & 2 deletions src/components/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import mapData from '../assets/data/map-data.json'

interface Props {
style?: CSSProperties
error?: boolean
}

interface MapRecord {
Expand Down Expand Up @@ -47,22 +48,27 @@ function addPins(map: DottedMap, pins: MapRecord[], color: string) {
}

const mapPrecomputed = new DottedMap({ map: JSON.parse(mapData) })
const mapNoPins = new DottedMap({ map: JSON.parse(mapData) })
addPins(mapPrecomputed, deduplicatedRecords, '#303030')

const mapSvgOptions: DottedMapWithoutCountriesLib.SvgSettings = { shape: 'hexagon', radius: 0.21, color: '#dadada' }

export default function Card({ style }: Props): ReactElement {
export default function Card({ style, error }: Props): ReactElement {
const { peers } = useContext(Context)
const [map, setMap] = useState<string>(mapPrecomputed.getSVG(mapSvgOptions))

useEffect(() => {
// Display error map
if (error) setMap(mapNoPins.getSVG({ ...mapSvgOptions, color: '#eaeaea' }))

// Display just the base map without any connections
if (!peers) return

const points = findIntersection(fullMapDb, peers)
const mapNew = Object.create(mapPrecomputed)
addPins(mapNew, points, '#09CA6C')
setMap(mapNew.getSVG(mapSvgOptions))
}, [peers])
}, [peers, error])

return (
<div
Expand All @@ -74,13 +80,31 @@ export default function Card({ style }: Props): ReactElement {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
position: 'relative',
})}
>
<img
alt="world map"
src={`data:image/svg+xml;utf8,${encodeURIComponent(map)}`}
style={{ maxWidth: '100%', maxHeight: '100%', objectFit: 'contain', flex: 1 }}
/>
{error && (
<svg
xmlns="http://www.w3.org/2000/svg"
width="60"
height="60"
viewBox="0 0 24 24"
fill="#f44336"
strokeWidth="0"
strokeLinecap="round"
strokeLinejoin="round"
style={{ position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)', opacity: 0.25 }}
>
<path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path>
<line stroke="#f3f3f3" strokeWidth="2" x1="12" y1="9" x2="12" y2="13"></line>
<line stroke="#f3f3f3" strokeWidth="2" x1="12" y1="17" x2="12.01" y2="17"></line>
</svg>
)}
</div>
)
}
4 changes: 2 additions & 2 deletions src/pages/info/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function Status(): ReactElement {
return (
<div>
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'stretch', alignContent: 'stretch' }}>
{status.all ? (
{status.all === 'OK' ? (
<Card
buttonProps={{ iconType: Search, children: 'Access Content', onClick: () => navigate(ROUTES.DOWNLOAD) }}
icon={<Globe />}
Expand Down Expand Up @@ -105,7 +105,7 @@ export default function Status(): ReactElement {
)}
</div>
<div style={{ height: '16px' }} />
<Map />
<Map error={status.topology.checkState !== 'OK'} />
<div style={{ height: '2px' }} />
<ExpandableListItem label="Connected peers" value={topology?.connected ?? '-'} />
<ExpandableListItem label="Population" value={topology?.population ?? '-'} />
Expand Down