Update Dashboard UI #1002
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
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,43 @@ | ||
|
|
||
| import React, { useRef, useState } from 'react'; | ||
| import { array, string, bool } from 'prop-types'; | ||
| import { angularize } from '../angular-react-helper'; | ||
| import { View } from 'react-native'; | ||
| import { useTheme, Card } from 'react-native-paper'; | ||
|
|
||
| const MetricsDetails = ({ chartData}) => { | ||
|
|
||
| const { colors } = useTheme(); | ||
| const [ numVisibleDatasets, setNumVisibleDatasets ] = useState(1); | ||
|
|
||
| const defaultPalette = [ | ||
|
There was a problem hiding this comment. I'm guessing this was copied over from There was a problem hiding this comment. If you want to copy the contents of a file as a starting point for a new file, that's ok -- just make sure you remove the bits that aren't relevant. |
||
| '#c95465', // red oklch(60% 0.15 14) | ||
| '#4a71b1', // blue oklch(55% 0.11 260) | ||
| '#d2824e', // orange oklch(68% 0.12 52) | ||
| '#856b5d', // brown oklch(55% 0.04 50) | ||
| '#59894f', // green oklch(58% 0.1 140) | ||
| '#e0cc55', // yellow oklch(84% 0.14 100) | ||
| '#b273ac', // purple oklch(64% 0.11 330) | ||
| '#f09da6', // pink oklch(78% 0.1 12) | ||
| '#b3aca8', // grey oklch(75% 0.01 55) | ||
| '#80afad', // teal oklch(72% 0.05 192) | ||
| ] | ||
|
|
||
|
|
||
|
|
||
| return ( | ||
| <View> | ||
| <div> | ||
| 25 | ||
| miles | ||
| </div> | ||
| </View> | ||
| ) | ||
| } | ||
|
|
||
| MetricsDetails.propTypes = { | ||
| chartData: array, | ||
| }; | ||
|
|
||
| angularize(MetricsDetails, 'MetricsDetails', 'emission.main.metricsdetails'); | ||
| export default MetricsDetails; | ||
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,55 @@ | ||
|
|
||
| import React, { useState } from 'react'; | ||
| import { array, } from 'prop-types'; | ||
| import { angularize } from '../angular-react-helper'; | ||
| import { Card, IconButton, Surface} from 'react-native-paper'; | ||
| import BarChart from './BarChart'; | ||
| import MetricsDetails from './MetricDetails'; | ||
| import { StyleSheet } from 'react-native'; | ||
|
|
||
|
|
||
| const MetricsCard = ({chartData, axisTitle}) => { | ||
|
|
||
| const [state, setState] = useState({detailsView : false}) | ||
| return ( | ||
| <Card style={{width:"90%", alignSelf:"center", height:"280px" }}> | ||
| <Surface style={{backgroundColor: 'rgba(0, 136, 206, 1)', height: "60px"}}> | ||
| <Card.Title | ||
| titleStyle={{textAlign:"center", color:"white", fontSize:"20px"}} | ||
| title="My Distance" | ||
| right={state.detailsView ? | ||
| (()=><IconButton icon="chart-bar" mode="contained" onPress={()=> setState({detailsView : false})}/> | ||
| ): | ||
| ( | ||
| ()=> <IconButton icon="abacus" mode="contained" onPress={()=> setState({detailsView : true})}/> | ||
| )} | ||
| /> | ||
| </Surface> | ||
|
|
||
| {state.detailsView ? ( | ||
| <> | ||
| <Card.Content> | ||
| <MetricsDetails chartData={chartData}/> | ||
| </Card.Content> | ||
| </> | ||
|
|
||
| ) : ( | ||
| <> | ||
| <Card.Content> | ||
| <BarChart chartData={chartData} axisTitle={axisTitle} isHorizontal={true}/> | ||
| </Card.Content> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
|
|
||
| </Card> | ||
| ) | ||
| } | ||
|
|
||
| MetricsCard.propTypes = { | ||
| chartData: array, | ||
| }; | ||
|
|
||
| angularize(MetricsCard, 'MetricsCard', 'emission.main.metricscard'); | ||
| export default MetricsCard; |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try to avoid committing needless changes like this, where you add a space or adjust indentation
I know this was probably on accident - just make sure you check over the diff of what you're committing before you do so