Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

fixes map sizing issues and table pagination #392

Merged
merged 1 commit into from Mar 27, 2019

Conversation

designmatty
Copy link
Contributor

Overview

Demo

Screen Shot 2019-03-26 at 9 27 54 AM

Screen Shot 2019-03-26 at 9 28 14 AM

Screen Shot 2019-03-26 at 9 28 22 AM

Testing Instructions

  • view a facility and check it's static map.
    • Should no longer be warped.
  • view a facility contributor list table, resize screen and scroll table.
    • Pagination should not scroll left or right.

@kellyi
Copy link
Contributor

kellyi commented Mar 26, 2019

Heads up that there are some linter errors preventing CI from building this branch:

/usr/local/src/src/components/FacilityListItemsTable.jsx
    9:8  error  'TableRow' is defined but never used                     no-unused-vars
  194:9  error  Expected indentation of 12 space characters but found 8  react/jsx-indent
  213:1  error  Expected indentation of 12 spaces but found 8            indent
  213:9  error  Expected indentation of 12 space characters but found 8  react/jsx-indent

✖ 4 problems (4 errors, 0 warnings)
  3 errors and 0 warnings potentially fixable with the `--fix` option.

@designmatty
Copy link
Contributor Author

Sorry about that, I always forget this project has a linter.

</Table>
</div>
</Paper>
<>
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this empty tag intentional/required?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This shouldnt be required. I'll remove it.

Copy link
Contributor

@jwalgran jwalgran left a comment

Choose a reason for hiding this comment

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

These fixes look good. Thanks.

This has a slightly tricky merge conflict with #378 where we added a status line.

Screen Shot 2019-03-26 at 4 32 03 PM

My idea for reconciling this is to move the status line up out of the FacilityListItemTable component into the FacilityListItem component

Screen Shot 2019-03-26 at 4 23 49 PM

I changed the status style to help draw attention

fontSize: '1rem',
fontWeight: 500,
padding: '0.5rem',

@designmatty
Copy link
Contributor Author

I rebased and updated some styling to that message. I was able to keep the message within the area it was originally placed.

Screen Shot 2019-03-27 at 9 05 24 AM

@jwalgran jwalgran self-assigned this Mar 27, 2019
Copy link
Contributor

@jwalgran jwalgran left a comment

Choose a reason for hiding this comment

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

Thanks for these fixes. Looking good.

@rajadain rajadain merged commit bef0296 into develop Mar 27, 2019
@rajadain rajadain deleted the mw/map-and-pagination-fixes branch March 27, 2019 15:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
6 participants