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.

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

Point group/select lead points#256 #277

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

Akotawa
Copy link
Contributor

@Akotawa Akotawa commented Jan 20, 2025

issue 256 changes have been done. please review it.

@ddfridley ddfridley linked an issue Jan 21, 2025 that may be closed by this pull request
@ddfridley
Copy link
Contributor

onClick the card should be green-filled as well

Means that if the user clicks on the a card, like the Point 1 card, that it should be selected just as if they clicked on the select as lead button.

@Akotawa
Copy link
Contributor Author

Akotawa commented Jan 26, 2025

Onclick card changes made.

Copy link
Contributor

@ddfridley ddfridley left a comment

Choose a reason for hiding this comment

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

I see that there were several changes that were requested that haven't been addressed. Is there some problem?

Also, I see that clicking on the card works for this case: http://localhost:6006/?path=/story/point-group--select-lead-points

But in these cases, clicking on the card doesn't trigger the select as lead action. -- though the card isn't expected turn green. Please make clicking on the card trigger the select action in these cases too:

http://localhost:6006/?path=/story/point-group--edit-multiple-points
http://localhost:6006/?path=/story/point-group--selected-edit-multiple-points

@@ -1,4 +1,5 @@
// https://github.com/EnCiv/civil-pursuit/issues/43
//https://github.com/EnCiv/civil-pursuit/issues/257
Copy link
Contributor

Choose a reason for hiding this comment

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

there weren't really changes to this file, so please revert it back to what's in master.

@@ -1,4 +1,5 @@
// https://github.com/EnCiv/civil-pursuit/issues/150
//https://github.com/EnCiv/civil-pursuit/issues/257
Copy link
Contributor

Choose a reason for hiding this comment

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

this file seems to be from a different branch for a different issue. Please revert this to what's in master

@@ -85,7 +86,7 @@ const Point = forwardRef((props, ref) => {

const useStylesFromThemeFunction = createUseStyles(theme => ({
contentContainer: {
padding: '2.1875rem 1.875rem',
padding: '1rem 1.875rem 2.1875rem 1.875rem',
Copy link
Contributor

Choose a reason for hiding this comment

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

There are changes to this padding from another issue being worked on - https://github.com/EnCiv/civil-pursuit/pull/276/files

And they are different. For now, lets say don't make changes to point.jsx and we'll let the other issue deal with it.

@Akotawa
Copy link
Contributor Author

Akotawa commented Feb 9, 2025

on click card changes made.

Copy link
Contributor

@ddfridley ddfridley left a comment

Choose a reason for hiding this comment

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

Clicking on the card looks good and just a little more to go:

First, there are changes to point.jsx that have been merged into master. please go
git fetch
git merge origin/master
to pull in the changes, and if there are conflicts with the point component, prioritize the changes from master.

Then here are the issues i see, but they should be evaluated again after you merge in the other point component.
image

  1. The select as lead button doesn't appear to quite line up with the text.
  2. the space between cards is still small, though the space between the card and the done button looks good.
  3. the shadow around the cards doesn't look like it does in figma. there is shadow above and left of the card, and maybe more than expected below and to the right.

Thanks!

@Akotawa
Copy link
Contributor Author

Akotawa commented Feb 19, 2025

Changes made accordingly. please review it.

Copy link
Contributor

@ddfridley ddfridley left a comment

Choose a reason for hiding this comment

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

1, The horizontal space between point components has gotten bigger than it should be.
2. The button is not centered any more. Is there something about the width, margin, padding or something of the point component that is causing 1 and 2?
3. The vertical gap between the point components and the last row and the done button are not the same.

image

@@ -2,6 +2,7 @@
// https://github.com/EnCiv/civil-pursuit/issues/76
Copy link
Contributor

Choose a reason for hiding this comment

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

since there are no changes to this file, please revert it to origin/master:
git checkout origin/master app/components/point.jsx
git add app/components/point.jsx

@Akotawa
Copy link
Contributor Author

Akotawa commented Mar 17, 2025

select lead points button css changed

Copy link
Contributor

@ddfridley ddfridley left a comment

Choose a reason for hiding this comment

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

  • please restore app/components/point.jsx to whats in origin/master. See comment about that file.
  • I missed this one before, but if you shrink the window width the button width gets messed up:
    image

@Akotawa
Copy link
Contributor Author

Akotawa commented Mar 23, 2025

Made changes according to comments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

point-group/Select Lead Points
2 participants