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

Add reputation to member popover #2118

Merged
merged 19 commits into from
Mar 30, 2020
Merged

Conversation

ceolson01
Copy link
Contributor

@ceolson01 ceolson01 commented Mar 24, 2020

⚠️ This makes use of JoinColony/colonyServer#64

Description

This PR adds a user's reputation to the member popover.

New stuff

  • Client-side resolvers for:
    • UserReputation query
    • UserWithReputation query (may remove - let's discuss)

Changes 🏗

  • Add MemberPopover for use within a colony
  • Add bordered sections to member popover, with safer paddings & margins (no negative margins! 🎉 )
  • Use correct blue version for blue link-esque buttons
  • Improve Numeral appearance flexibility & typings
  • Update UserBadges query to only display badges within the current colony

TODO

  • Add reputation (by adding colonyAddress and skillId) to Assignment instance
  • Open info popover when clicking user avatar in Community tab

Screenshots 📷

Screen Shot 2020-03-24 at 6 53 12 PM

Closes #2026

@ceolson01 ceolson01 self-assigned this Mar 24, 2020
@ceolson01 ceolson01 force-pushed the feature/2026-member-reputation branch from 2c6d625 to 1bb2819 Compare March 25, 2020 21:52
@@ -155,6 +155,26 @@ query User($address: String!) {
}
}

query UserWithReputation($address: String!, $colonyAddress: String!, $skillId: Int) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I initially planned to use this query, but later decided to use the UserReputation query instead, as it was a bit more efficient to handle the data fetching as needed, rather each time a user is fetched. I've left this here, though, as I feel like it might prove useful in the future. Not opposed to removing it, though

Copy link
Member

Choose a reason for hiding this comment

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

Cool! Can you add this as a comment in the code for the future-us?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You bet

@@ -232,7 +232,7 @@ const TaskList = ({
* If the current user hasn't claimed a profile yet, then don't show the
* subscribe to colony call to action
*/
hasJoined: username ? hasJoined : true,
hasJoined: username ? !!hasJoined : true,
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 fixes the weird ICU syntax error that would happen sometimes in the colony home (if there are no tasks and the user is not subscribed to the colony)

@ceolson01 ceolson01 requested a review from chmanie March 25, 2020 22:17
Copy link
Member

@chmanie chmanie left a comment

Choose a reason for hiding this comment

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

Some quirks, all in all fantastic work! I'm happy

src/data/queries.graphql Outdated Show resolved Hide resolved
@@ -155,6 +155,26 @@ query User($address: String!) {
}
}

query UserWithReputation($address: String!, $colonyAddress: String!, $skillId: Int) {
Copy link
Member

Choose a reason for hiding this comment

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

Cool! Can you add this as a comment in the code for the future-us?

src/data/user.ts Outdated Show resolved Hide resolved
src/data/user.ts Outdated Show resolved Hide resolved
@ceolson01 ceolson01 force-pushed the feature/2026-member-reputation branch from 9652345 to faff9ee Compare March 26, 2020 14:26
@ceolson01 ceolson01 force-pushed the feature/2026-member-reputation branch from 9775e00 to 6f68e37 Compare March 30, 2020 18:31
@ceolson01 ceolson01 force-pushed the feature/2026-member-reputation branch from 6f68e37 to 9594b33 Compare March 30, 2020 19:02
@ceolson01 ceolson01 requested a review from chmanie March 30, 2020 19:12
Copy link
Member

@chmanie chmanie left a comment

Choose a reason for hiding this comment

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

What a rename! All seems well

@ceolson01 ceolson01 merged commit ebbddb7 into master Mar 30, 2020
@ceolson01 ceolson01 deleted the feature/2026-member-reputation branch March 30, 2020 22:06
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.

Add reputation to the member pop-over
3 participants