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

Members list update: contributors vs. watchers #3376

Merged
merged 120 commits into from
Jul 15, 2022
Merged
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
ff1faf0
Feat: change members to contrivutors in `ColonyMembers`
chinins May 10, 2022
a2b2613
Add: New Join this Colony Button
arrenv May 16, 2022
25e2b0c
Refactor: Remove neg margin and update naming
arrenv May 17, 2022
6dfebc8
Feat: reorganise ColonyMembers & add MembersSubsection
chinins May 12, 2022
0a2fd6b
Feat: add tooltip to `MembersSubsection`
chinins May 12, 2022
51b5f6a
Feat: update `MembersSubsection` to fix tooltips & headings
chinins May 13, 2022
31c84dc
Refactor: update the max numer of avatars in `ColonyMembers`
chinins May 14, 2022
2d4af7a
Refactor: fix `ColonyMembers` css syntax
chinins May 16, 2022
e49ce32
Feat: add remaining users link to members aside
chinins May 18, 2022
3838864
Refactor: fix padding for watchers & contributors in aside
chinins May 19, 2022
534d73f
Added invite to colony link button
ArmandoGraterol May 10, 2022
e51ccea
Fixed alignment of InviteLinkButton
ArmandoGraterol May 17, 2022
7a2fed3
Added InviteLinkButton to ColonyMembers aside
ArmandoGraterol May 17, 2022
5afe9fa
Added InviteLinkButton to ColonyMembers section in ColonyHome
ArmandoGraterol May 17, 2022
be5377f
Renamed isContributors prop to isContributorsSubsection
ArmandoGraterol May 19, 2022
f808194
Fixed watchers seciton styles affecting contributors section
ArmandoGraterol May 19, 2022
523a6ff
Updated controls in members page so that the invite link is always av…
ArmandoGraterol May 19, 2022
400c5cd
Feat: split data into watchers & contributors in `ColonyMembers`
chinins May 14, 2022
a36c53f
Feat: add `colonyContributors` query
chinins May 16, 2022
2c03b22
Feat: add additional params to `colonyContributors` query
chinins May 16, 2022
41d82e5
Feat: add `contributorsAndWatchers` query, types & resolver logic
chinins May 17, 2022
53f355a
Refactor: fix types in contributors query
chinins May 17, 2022
9519ab3
Refactor: update `contributorsAndWatchers` query, types & resolver
chinins May 18, 2022
798142e
Refactor: update types in `useAvatarDisplayCounter`
chinins May 18, 2022
8fe9664
Feat: add `contributorsAndWatchers` query to `ColonyMembers` aside
chinins May 18, 2022
e0fbbe0
Feat: add `contributorsAndWatchers` data to `Members` page
chinins May 18, 2022
6765be0
Refactor: update members per page & add title placeholders
chinins May 18, 2022
a30c2fc
Feat: remove watchers if not all teams or root in `Members`
chinins May 18, 2022
e43037a
Refactor: update types in `useAvatarDisplayCounter`
chinins May 26, 2022
39cac4e
Feat: refactor out MembersSection component
dit7ya May 20, 2022
cef2867
Feat: lift extraItemContent up to Members
dit7ya May 20, 2022
4ac33a7
Feat: move message descriptors to MembersSection
dit7ya May 23, 2022
90c4041
Feat: clean up unused stuff in MembersSection
dit7ya May 23, 2022
d9723db
Added basic structure and styles for total team rep in members page
ArmandoGraterol May 12, 2022
a3c5f13
Integrated new total team rep points section with sidebar in ColonyMe…
ArmandoGraterol May 13, 2022
d958ce9
Added missing separation between modules in ColonyMembers
ArmandoGraterol May 13, 2022
4192051
Added Numeral to reputation points display
ArmandoGraterol May 16, 2022
aa1544c
Updated font-size of team rep points container title
ArmandoGraterol May 23, 2022
3da5bcf
Removed leftover code from rebase in Members
ArmandoGraterol May 27, 2022
02a835d
feat:reposition `Select`
danbr May 16, 2022
c07e1d3
feat:reposition UI
danbr May 17, 2022
0b40ef7
feat:add fancy placeholder to search `input`
danbr May 19, 2022
a0cb1e9
feat:separate member filtering
danbr May 21, 2022
4b9b43a
feat:refactor title into separate component
danbr May 22, 2022
3b192e1
feat:incorp `MembersTitle`, `filtermembers` & update logic
danbr May 22, 2022
f9d54a7
fix:clean up the code
danbr May 25, 2022
1c470e4
fix:prevent covering of icons with search text
danbr May 27, 2022
005b264
fix:add types
danbr May 27, 2022
fa221b1
fix:reorder imports, add use of useCallback, add types to `filterMemb…
danbr May 30, 2022
87aacbe
feat:refactor to incorp updates from rebase
danbr May 31, 2022
d91c8ee
fix:remove duplicate css
danbr Jun 1, 2022
4b89033
feat:update behaviour of search icon & input
danbr Jun 1, 2022
8497fff
Fix: match spec for invite link tooltip
dit7ya Jun 1, 2022
b9578ce
Refactor: update `ColonyMembers` based on rebase
chinins Jun 9, 2022
74fd8e5
Feat: add isWhitelisted to `contributors&watchers` query
chinins Jun 9, 2022
48dc16b
Refactor: update `ColonyMembers` based on rebase
chinins Jun 9, 2022
6222b85
Fix: reducing search icon size
willm30 Jun 10, 2022
d68138a
Fix: update `contributorsAndWatchers` query
chinins Jun 17, 2022
ddaf6ba
Refactor: update `colonyMembersWithReputation` resolver
chinins Jun 17, 2022
e8ce86b
Added MemberActionsPopover component
ArmandoGraterol May 12, 2022
62226fc
Added MemberActions component
ArmandoGraterol May 12, 2022
46353cc
Added optional reputation points section to MemberReputation
ArmandoGraterol May 12, 2022
bd82c5a
Updated styles of MemberList and MemberListItems
ArmandoGraterol May 12, 2022
c18c765
Added UI for sorting buttons for Members
ArmandoGraterol May 23, 2022
b492647
Increased width of reputation container in MembersListItem
ArmandoGraterol May 26, 2022
3834fcb
Integrated verified recipients with new MembersListItem and tweaked s…
ArmandoGraterol Jun 13, 2022
121c5b8
Reorganized imports in MemberReputation
ArmandoGraterol Jun 13, 2022
02871d3
Removed empty brackets that are no longer needed in MemberActionsPopover
ArmandoGraterol Jun 13, 2022
50f5d2e
Added max-width to username section in MembersListItem
ArmandoGraterol Jun 15, 2022
ccf770b
Moved blockscout user url to externalUrls files
ArmandoGraterol Jun 15, 2022
b26d2c6
Added dynamic native token decimals to MemberReputation
ArmandoGraterol Jun 15, 2022
6fb3e34
Refactor: update `InviteLinkButton` based on rebase
chinins Jun 22, 2022
77acf78
Updated caret-down-small and caret-up-small icons
ArmandoGraterol Jun 16, 2022
22a6bea
Added useColonyMembersSorting
ArmandoGraterol Jun 16, 2022
c34d88f
Integrated sorting uuser logic with member's list
ArmandoGraterol Jun 16, 2022
105f902
Updated Select component test snapshot
ArmandoGraterol Jun 16, 2022
c94e0a2
Added user reputation to contributors data
ArmandoGraterol Jun 22, 2022
75856bd
Updated useColonyMembersSorting hook
ArmandoGraterol Jun 22, 2022
00274ef
Added toggling color to sorting row icons
ArmandoGraterol Jun 22, 2022
43fd897
Updated caret-up and caret-down icons with lighter versions
ArmandoGraterol Jun 22, 2022
a2e2eec
Added dynamic dropdown size to DomainDropdown
ArmandoGraterol Jun 22, 2022
0decfe5
Updated places where the updated caret icons are used
ArmandoGraterol Jun 22, 2022
acd164f
Updated StepGanache caret icon style
ArmandoGraterol Jun 22, 2022
d4c83d3
Simplified sorting logic
ArmandoGraterol Jun 23, 2022
eacfd94
Made an attempt of a solution to fix caret alignment on some Select
ArmandoGraterol Jun 23, 2022
053320a
Adjusted caret icon size on select and alignment
ArmandoGraterol Jun 24, 2022
f34feb6
Adjusted caret icon size alignment on team selector
ArmandoGraterol Jun 24, 2022
9a48290
Removed unused props from caret SVGs
ArmandoGraterol Jun 24, 2022
844a09f
Fixed misalignment of caret icons in Selects
ArmandoGraterol Jun 27, 2022
beb6b9f
Changed role sorting to be by number of roles
ArmandoGraterol Jun 28, 2022
1476601
Renamed role sorting methods to more appropiate names
ArmandoGraterol Jun 30, 2022
5e54e6d
Refactor: update members page subdomain view
chinins Jun 30, 2022
804e459
Feat: add `MembersFilters` ui & form
chinins Jun 24, 2022
53b596b
Refactor: remove `bannedUsers` from `Members` component
chinins Jun 27, 2022
92e53bf
Feat: add filters as passed props across members page
chinins Jun 27, 2022
beeaed3
Feat: add `isRoot` prop to `MembersFilters`
chinins Jun 28, 2022
5fd32dd
Refactor: update `ColonyMembers` based on rebase
chinins Jun 30, 2022
10c07a3
Feat: add subdomain view for the filters on members page
chinins Jun 30, 2022
00cc51c
Feat: add contributors & watchers filters to `Members`
chinins Jun 30, 2022
18cd19c
Styles: fix the width of the watchers list item on memebers page
chinins Jul 1, 2022
586bade
Feat: add checkbox filters logic to `filterMembers` helper
chinins Jul 1, 2022
e90cd9d
Refactor: extract user controls to separate component
chinins Jul 1, 2022
cc33d5d
Feat: show invite link only in root domain
chinins Jul 4, 2022
bff2442
Refactor: fis the jumping width on members page
chinins Jul 4, 2022
57b44d0
Refactor: fix filters & search combinaiton & no members value
chinins Jul 4, 2022
82dca46
Feat: change filters from checkboxes to select fields
chinins Jul 6, 2022
fd378fc
Feat: make reset button conditional in MembersFilters
chinins Jul 6, 2022
7048e59
Feat: add scrollIntoView to the last member filter select
chinins Jul 7, 2022
240049b
Refactor: fix members filtering logic
chinins Jul 7, 2022
0e2410c
Refactor: update html structure in `MemberFilters
chinins Jul 7, 2022
9204b7b
Refactor: update tooltip posiiton for `MembersListItem`
chinins Jul 7, 2022
65fafeb
Refactor: update `MembersListItem` tooltip css
chinins Jul 7, 2022
9c30750
Refactor: fix min width property on `ColonyMembers`
chinins Jul 8, 2022
d1bfd68
Refactor: update imports based on new rebase
chinins Jul 12, 2022
780e702
Feat: make display name & uniques username inline in members item
chinins Jul 13, 2022
a5fb450
Feat: prepopulate user to ban/unban & fix uthe dialog mixup
chinins Jul 13, 2022
56c2c3a
Feat: make search icon blue when input focused/hovered
chinins Jul 13, 2022
b3e2fa8
Feat: cover all focus/hover cases for blue search icon
chinins Jul 14, 2022
06e69b9
Feat: make all permissions show as icons
chinins Jul 14, 2022
34985ba
Fear: update `search` icon
chinins Jul 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Feat: make search icon blue when input focused/hovered
  • Loading branch information
chinins committed Jul 15, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 56c2c3a7fb4be0695a1106bea2e06cb7b2a0c124
8 changes: 8 additions & 0 deletions src/modules/dashboard/components/Members/MembersTitle.css
Original file line number Diff line number Diff line change
@@ -57,6 +57,14 @@
right: 2px;
z-index: 1;
transform: translateY(-50%);

& svg {
stroke: color-mod(var(--temp-grey-blue-7) alpha(65%));
}
}

.iconFocused svg {
stroke: var(--colony-blue);
}

.input {
Original file line number Diff line number Diff line change
@@ -3,5 +3,6 @@ export const titleLeft: string;
export const titleSelect: string;
export const searchContainer: string;
export const icon: string;
export const iconFocused: string;
export const input: string;
export const clearButton: string;
24 changes: 22 additions & 2 deletions src/modules/dashboard/components/Members/MembersTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import React, { useCallback, Dispatch, useRef, SetStateAction } from 'react';
import React, {
useCallback,
Dispatch,
useRef,
SetStateAction,
useState,
useEffect,
} from 'react';
import { defineMessages, useIntl } from 'react-intl';

import Heading from '~core/Heading';
@@ -49,6 +56,7 @@ const MembersTitle = ({
}: Props) => {
const { formatMessage } = useIntl();
const searchInput = useRef<HTMLInputElement>(null);
const [isSearchFocused, setIsSearchFocused] = useState(false);
const handleFocusRef = useCallback(() => {
searchInput?.current?.focus();
}, [searchInput]);
@@ -70,14 +78,24 @@ const MembersTitle = ({
(e.target as HTMLInputElement).placeholder = formatMessage(
MSG.searchPlaceholder,
);
setIsSearchFocused(true);
},
[formatMessage],
);

const handleMouseLeave = useCallback((e) => {
(e.target as HTMLInputElement).placeholder = '';
setIsSearchFocused(false);
}, []);

useEffect(() => {
if (searchInput.current === document.activeElement) {
setIsSearchFocused(true);
}
/* Needs to be set up lie this for the focus to work */
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchInput.current, document.activeElement]);

return (
<div className={styles.titleContainer}>
<div className={styles.titleLeft}>
@@ -132,7 +150,9 @@ const MembersTitle = ({
)}
<Icon
appearance={{ size: 'normal' }}
className={styles.icon}
className={`${styles.icon} ${
isSearchFocused ? styles.iconFocused : ''
}`}
name="search"
title={MSG.search}
onClick={handleFocusRef}