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

Manual Input Wizard #52

Merged
merged 74 commits into from
Sep 7, 2023
Merged

Manual Input Wizard #52

merged 74 commits into from
Sep 7, 2023

Conversation

lemilonkh
Copy link
Contributor

@lemilonkh lemilonkh commented Aug 25, 2023 •
edited
Loading

  • Adds /data and /data/[step] pages with lots of forms and UI
  • Links to /data and /data/[step] from the dashboard
  • Creates custom components RadioButton and TagSelect, as well as page specific ones in the [step] folder

@lemilonkh
feat(ui): add showNav property to NavigationBar and reformat layouts
8acd484 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add borderOverlay color to theme and reformat providers.tsx
c4c360f 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): implement add data screen (landing page for data)
ef663a4 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): show nav on data pages
70e5335 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): spacing in NavigationBar nav section and width of language p…
51fe09b 
…icker

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add translation string for dashboard
9781d87 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): define default Tag theme and colors
e66e40d 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): create CircleIcon from Figma SVG
c349cd7 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(i18n): add translation strings for data step page
ab5be12 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): implement top UI for data step page
3859d8c 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add second section to data steps page
7cdc0a8 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add manual data entry section to data entry page
54faeb0 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): determine initial step from URL param
b5ac022 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): change step param in URL without reloading
2a54378 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): wrong icon for residential buildings data source
15b298f 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add bottom bar to DataSteps page
93cd0bb 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): make data source cards clickable and add green outline to c…
80a7c4d 
…onnected sources

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add subsectors for other sectors and extract to JSON file
79abc21 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add GHG protocol link to learn more on Data page
eaaaae5 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add SourceDrawer to page to show data source info
4956abd 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): sentence with wrong grammar in add data details on DataSteps…
dab0660 
… page

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): implement SourceDrawer content
f9326c8 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): create custom theme for icon buttons
7135d5a 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): create SubsectorDrawer and RadioButton components
3eb063f 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add German translation for go-back
ae3ea67 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): add custom tooltips to SubsectorDrawer and create theme
db72728 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): customize line variant of Tabs component
fdb0637 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): manually define tooltip placement as defaultProps in theme n…
63f3c45 
…ot supported

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add "add-data" i18n string
9986b8a 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): redirect to dashboard when saving last step
034110a 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add white background to RadioButton
73031fc 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): customize Accordion styling
6ca31dc 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): refactor ActivityDataTab and EmissionsForm to use nested data
e467243 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): store all data in nested format and define more types
9f95e14 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): fix colors on data landing page
d55be9e
@lemilonkh
feat(ui): make data source grid responsive
821bc3b 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): make subsector grid responsive
a26fc71 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add missing prefix to methodology switch (so subcategory for…
fdc3072 
…ms have their own value)

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): breakpoints for WizardSteps
7c2b309 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): button layout with all form elements opened on SubsectorDrawer
a05f535 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
refactor(ui): move types from SubsectorDrawer into types.d.ts
2fc30e1 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): enable submit button in values for each subcategory mode
6f8f8c2 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): remove hidden form parts from DOM to fix validation
be98d36 
Form data is persisted by react-hook-form
Also remove allowMultiple from the Accordion so only one subcategory is open at the same time

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add missing translation strings for complete and incomplete …
8c16a93 
…tags

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
feat(ui): link to data pages from dashboard
9bac5f9 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): reset top padding in action cards on dashboard
75ec207 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh lemilonkh changed the title WIP: Manual Input Wizard Manual Input Wizard Aug 29, 2023
cephaschapa
cephaschapa approved these changes Aug 29, 2023
View reviewed changes
Copy link
Contributor

@cephaschapa cephaschapa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work!
Please let me know if there are some components on the dash that you created that match the ones that are currently there. And we can reuse or change.

@lemilonkh
fix(ui): use prefix for determining errors in EmissionsForm tabs
c4cb8da 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): add separate GWP values for CO2 and CH4 to ActivityDataTab i…
e11b965 
…nfo text

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): define background for form elements on ActivityDataTab
1c337ce 
So they look correct on the grey background on the "values for each subcategory" view

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): form validation in nested objects using "resolve" helper fun…
3ad841e 
…ction

Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): let SubsectorDrawer close itself when it's done saving
97ecc30 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): make link for data source cards open drawer instead of new tab
afb8d9c 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): colors on SourceDrawer
5819675 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
fix(ui): define background colors for inputs on DirectMeasureForm
940b5d9 
Signed-off-by: Milan Gruner <milangruner@gmail.com>
@lemilonkh
Merge branch 'develop' of github.com:Open-Earth-Foundation/CityCataly…
3051f38 
…st into feature/manual-input
@lemilonkh lemilonkh merged commit a761d65 into develop Sep 7, 2023
@lemilonkh lemilonkh deleted the feature/manual-input branch September 7, 2023 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cephaschapa cephaschapa cephaschapa approved these changes

@evanp evanp Awaiting requested review from evanp

Assignees

@lemilonkh lemilonkh

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lemilonkh @cephaschapa