-
Notifications
You must be signed in to change notification settings - Fork 114
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.
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
Reorganize In-App Dashboard & Use New Energy Footprint Calculations #1176
Merged
+1,814
−2,363
Merged
Changes from all commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
4b8264d
refactor MetricsTab into sections
JGreenlee 7e99a32
split metrics tab into sections; add MetricsScreen component
JGreenlee 11bef71
revise dashboard tab sections; 'Travel' tab
JGreenlee afe5973
refresh styles: palette, navbar, navigation tabs
JGreenlee 2eab6c5
update react-native-paper-dates
JGreenlee 6bad3dd
move formatForDisplay to js/util.ts
JGreenlee 6e671b2
DateSelect + NavBarButton style tweak
JGreenlee 66a854d
allow surveys to be skipped on DEV builds
JGreenlee 462ed94
use <Portal> instead of <Modal> for Alerts
JGreenlee a3940ea
rename dash_key to uncertainty_prefix
JGreenlee eae8ab0
TimelineContext: only load the last week even if pipeline is behind
JGreenlee adf7b1e
unify date & time formatting functions, move to common place
JGreenlee db160bc
fix segmentDaysByWeeks with blank weeks
JGreenlee 5f131ae
update "Movement" section
JGreenlee e000b15
MetricsTab: only force >= 14 days on initialization
JGreenlee 612e674
adjust metrics cards styles
JGreenlee de524ca
change SummaryCard, 'guidelines' -> 'goals'
JGreenlee c9831b3
use e-mission-common 0.6.1, update types
JGreenlee 7e109e2
extract getColorForModeLabel to metricsHelper
JGreenlee 42eefd9
add WeeklyFootprintCard
JGreenlee 24c0eb4
use SummaryCard and WeeklyFootprintCard; remove old cards
JGreenlee b3c132e
add ChartRecord type
JGreenlee f481608
add missing import in MetricsScreen
JGreenlee 19881d8
TimelineContext: set initial value for dateRange
JGreenlee acd40b1
consolidate "metrics" translations
JGreenlee 7fc842c
fix LabelOption type
JGreenlee aa01f1f
update styles of metrics cards, navbar
JGreenlee 54f73d1
add more metrics translations
JGreenlee 616b6b0
use the new label options and rich modes pattern throughout the UI
JGreenlee bacc745
use all days for DailyActiveMinutesCard
JGreenlee 5cfad8d
fix display of week date ranges on WeeklyActiveMinutesCard
JGreenlee 8d1965c
fix missing return of getColorForModeLabel
JGreenlee e49bf0c
fix types in metrics
JGreenlee b46a255
export colors from appTheme
JGreenlee 6e1d719
adjust formatForDisplay
JGreenlee 6743b8c
add FootprintComparisonCard
JGreenlee fd5010a
fix lineAnnotations on WeeklyFootprintCard
JGreenlee 6e7153f
keep total of nUsers when aggregating MetricEntries
JGreenlee a7fcd0d
remove old footprint metrics files
JGreenlee a623405
update translations
JGreenlee b13524f
update tests to reflect changes
JGreenlee 59dbd72
make the StatusBar color match the appbar background color
JGreenlee 95dc523
Merge branch 'master' of https://github.com/e-mission/e-mission-phone…
JGreenlee 314af14
fix error with adding nUsers
JGreenlee 61f873e
remove LoadMoreButton test
JGreenlee 8740062
updated EXPECTED_COUNT of plugins
JGreenlee f671e04
fix prettier
JGreenlee 33a38c9
handle statusbar style on welcome page vs rest of app
JGreenlee dabeb7c
remove more unused functions from metricsHelper
JGreenlee cd0b488
add more tests to metricsHelper
JGreenlee 9c2186b
fix typo DailyActiveMinutesCard
JGreenlee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 was deleted.
Oops, something went wrong.
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 was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
I should really review the e-mission-common changes at some point too. Maybe I can do that while generating the results for the paper.
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.
Maybe the easiest way to do that would be looking at the releases on e-mission-common and the "Full changelog"s that are generated there
https://github.com/JGreenlee/e-mission-common/releases