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

Observation chart - A good place #31

Merged
merged 57 commits into from
May 8, 2024
Merged

Observation chart - A good place #31

merged 57 commits into from
May 8, 2024

Commits on May 3, 2024

  1. generalizing its usage better by passing the data key and state data/… 

    …setter references
    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    4058b8c View commit details
    Browse the repository at this point in the history

  2. now calling an object to render the graph and the generalized params … 

    …for the floating dialog
    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6d5dfeb View commit details
    Browse the repository at this point in the history

  3. adding an id to the feature props to remove it from the selected list… 

    … in BaseFloatingDialog
    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    8ad109e View commit details
    Browse the repository at this point in the history

  4. adjusting the params sent to BaseFloatingDialog

    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    e1daa6d View commit details
    Browse the repository at this point in the history

  5. generalizing the id used for removing data list items from state

    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    f2a5ce9 View commit details
    Browse the repository at this point in the history

  6. new component to render the observation data as a chart

    @PhillipsOwen
    PhillipsOwen committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a317555 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. checkpointing current state of branch

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    d96611e View commit details
    Browse the repository at this point in the history

  2. removing TODO as it is done

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    6760c13 View commit details
    Browse the repository at this point in the history

  3. checkpointing current state of code

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    294a3b3 View commit details
    Browse the repository at this point in the history

  4. tidying up

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    89fa591 View commit details
    Browse the repository at this point in the history

  5. tidying up

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    e561cb9 View commit details
    Browse the repository at this point in the history

  6. definition for the remove all observations sidebar

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    ae04250 View commit details
    Browse the repository at this point in the history

  7. adding a component that will be rendered on the sidebar to remove all… 

    … observation selection dialogs
    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    109e730 View commit details
    Browse the repository at this point in the history

  8. adding a component to the sibebar

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    8a572f5 View commit details
    Browse the repository at this point in the history

  9. tidying up, adding comments

    @PhillipsOwen
    PhillipsOwen committed May 6, 2024
    Configuration menu
    Copy the full SHA
    fb03178 View commit details
    Browse the repository at this point in the history

  10. updates for addition and removal of target icon for observations sele… 

    …cted
    @lstillwe
    lstillwe committed May 6, 2024
    Configuration menu
    Copy the full SHA
    02b2ccf View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. moving files around, working on line chart

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    88583f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'observation-chart' of https://github.com/RENCI/APSViz-U… 

    …I-V3 into use-reducer

# Conflicts:
#	src/app.js
#	src/components/dialog/base-floating-dialog.js
#	src/components/dialog/observation-dialog.js
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    9e82a77 View commit details
    Browse the repository at this point in the history

  3. changing imports to reference a new location for dialog components

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d784a2d View commit details
    Browse the repository at this point in the history

  4. fixing linting issue

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    2b68fd1 View commit details
    Browse the repository at this point in the history

  5. fixing linting issue

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f1c3c5b View commit details
    Browse the repository at this point in the history

  6. adding new map bullseye references

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ce61067 View commit details
    Browse the repository at this point in the history

  7. correcting merge mishap

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    2ed09ec View commit details
    Browse the repository at this point in the history

  8. adjusting sizing

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d8bc7be View commit details
    Browse the repository at this point in the history

  9. adjusting sizing

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    1b195b2 View commit details
    Browse the repository at this point in the history

  10. trying to resync with main

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    bd53023 View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'origin/observation-chart' into observat… 

    …ion-chart
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    4da51cc View commit details
    Browse the repository at this point in the history

  12. generalizing its usage better by passing the data key and state data/… 

    …setter references
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    c2a03ec View commit details
    Browse the repository at this point in the history

  13. now calling an object to render the graph and the generalized params … 

    …for the floating dialog
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    efc3f2e View commit details
    Browse the repository at this point in the history

  14. adding an id to the feature props to remove it from the selected list… 

    … in BaseFloatingDialog
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    54c50ce View commit details
    Browse the repository at this point in the history

  15. adjusting the params sent to BaseFloatingDialog

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    29d5434 View commit details
    Browse the repository at this point in the history

  16. generalizing the id used for removing data list items from state

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    45010dd View commit details
    Browse the repository at this point in the history

  17. new component to render the observation data as a chart

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    78457f4 View commit details
    Browse the repository at this point in the history

  18. checkpointing current state of branch

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    7bf94d0 View commit details
    Browse the repository at this point in the history

  19. removing TODO as it is done

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    c9f2f4b View commit details
    Browse the repository at this point in the history

  20. checkpointing current state of code

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    387e3d4 View commit details
    Browse the repository at this point in the history

  21. updates for addition and removal of target icon for observations sele… 

    …cted
    @lstillwe @PhillipsOwen
    lstillwe authored and PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    7379c41 View commit details
    Browse the repository at this point in the history

  22. tidying up

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f777c41 View commit details
    Browse the repository at this point in the history

  23. tidying up

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d2d6e15 View commit details
    Browse the repository at this point in the history

  24. definition for the remove all observations sidebar

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ca1016d View commit details
    Browse the repository at this point in the history

  25. adding a component that will be rendered on the sidebar to remove all… 

    … observation selection dialogs
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    1183561 View commit details
    Browse the repository at this point in the history

  26. adding a component to the sibebar

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    5243175 View commit details
    Browse the repository at this point in the history

  27. tidying up, adding comments

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    7157d31 View commit details
    Browse the repository at this point in the history

  28. moving files around, working on line chart

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    ca4524b View commit details
    Browse the repository at this point in the history

  29. changing imports to reference a new location for dialog components

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    c0f7282 View commit details
    Browse the repository at this point in the history

  30. fixing linting issue

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    3b4c8b3 View commit details
    Browse the repository at this point in the history

  31. fixing linting issue

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f27466f View commit details
    Browse the repository at this point in the history

  32. adding new map bullseye references

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    043c3b0 View commit details
    Browse the repository at this point in the history

  33. correcting merge mishap

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    17bebb0 View commit details
    Browse the repository at this point in the history

  34. trying to resync with main

    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    94f193d View commit details
    Browse the repository at this point in the history

  35. Merge remote-tracking branch 'origin/observation-chart' into observat… 

    …ion-chart

# Conflicts:
#	src/components/dialog/base-floating-dialog.js
    @PhillipsOwen
    PhillipsOwen committed May 7, 2024
    Configuration menu
    Copy the full SHA
    b12b534 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Merge remote-tracking branch 'origin/main' into observation-chart

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    fce2723 View commit details
    Browse the repository at this point in the history

  2. tidying up

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f04c47c View commit details
    Browse the repository at this point in the history

  3. commenting out console log

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    57a741f View commit details
    Browse the repository at this point in the history

  4. correcting the prop name for the map reference

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f79a860 View commit details
    Browse the repository at this point in the history

  5. correcting the look of the graph

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    859f81e View commit details
    Browse the repository at this point in the history

  6. correcting the look of the graph

    @PhillipsOwen
    PhillipsOwen committed May 8, 2024
    Configuration menu
    Copy the full SHA
    ecfcd31 View commit details
    Browse the repository at this point in the history