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 users list to admin dashboard #2626

Merged
merged 71 commits into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
575e1e8
Commit initial WIP code
davwheat Feb 22, 2021
cce19d5
Fix squashed grid on mobile
davwheat Feb 22, 2021
203eee7
Add pagination support; rename to userList
davwheat Feb 22, 2021
4a2bb25
Improve grid sizing
davwheat Feb 22, 2021
e2067ab
Improve grid row shading
davwheat Feb 22, 2021
72dc83e
Move EditUserModal to common
davwheat Feb 22, 2021
a56112a
Add link to profile page in grid
davwheat Feb 22, 2021
c05210e
Use Less styling vars
davwheat Feb 22, 2021
144d11c
Move EditUserModal translations to lib
davwheat Feb 22, 2021
0568d17
Add edit user button to grid
davwheat Feb 22, 2021
548f047
Fix incorrect profile link priority
davwheat Feb 22, 2021
86bc778
Update profile link translation key
davwheat Feb 22, 2021
295ec51
Add priorities to other columns
davwheat Feb 22, 2021
645a1ac
Add group badges to grid
davwheat Feb 22, 2021
f92e236
Add username to profile link tooltip
davwheat Feb 22, 2021
62a4f3e
Organise imports
davwheat Feb 22, 2021
fe66e07
Use variable for header border bottom color
davwheat Feb 22, 2021
0b23b9a
Fix broken export
davwheat Feb 23, 2021
cae08fc
Add total user count to API payload's metadata
davwheat Feb 23, 2021
a5d523e
Add new metadata to ApiPayload type
davwheat Feb 23, 2021
1e684e3
Implement correct page number
davwheat Feb 23, 2021
c454bb2
Remove debug code
davwheat Feb 23, 2021
f3dfbac
Use function to get the total pages
davwheat Feb 23, 2021
a4fe90e
Center profile link in column
davwheat Feb 23, 2021
1c2f086
Add profile link header
davwheat Feb 23, 2021
b48b5a7
Show total users above table
davwheat Feb 23, 2021
35a5344
Use ItemList's itemName property for column data attributes
davwheat Feb 23, 2021
82e15df
Add user email column, hidden by default
davwheat Feb 23, 2021
60cf820
Fix incorrect tooltip translation keys
davwheat Feb 23, 2021
885b541
Add extra padding between email and visibility toggle button
davwheat Feb 23, 2021
aa24e0b
Prevent selection of blurred email
davwheat Feb 26, 2021
5df848d
Fix incorrect icon state for email toggle
davwheat Feb 26, 2021
14619e4
Update API response type to include metadata (for now)
davwheat Feb 26, 2021
28758bd
Increase number of users per page to 50
davwheat Feb 26, 2021
23682ed
Update compat files with new locations
davwheat Feb 26, 2021
17f1c01
Format
davwheat Feb 26, 2021
0849af5
Add @deprecated notices for forum compat export
davwheat Feb 26, 2021
e7926ad
Use AdminPayload for user count instead of supplying as REST API meta…
davwheat Feb 27, 2021
26ddac5
Make nav look less squashed using bottom margin
davwheat Feb 27, 2021
730636c
Suppress TS warning
davwheat Feb 27, 2021
f819d9f
StyleCI fixes
davwheat Feb 28, 2021
40bc508
Fix TS error
davwheat Mar 2, 2021
f006663
Update based on review comments
davwheat Mar 5, 2021
5e79fb7
Rename user list -> users
davwheat Mar 7, 2021
3c2663b
Rename internal instances of user_list to users
davwheat Mar 7, 2021
69e1c01
Fix formatting
davwheat Mar 16, 2021
269a25e
Use CSS custom properties for the table column count
davwheat Mar 23, 2021
3dd1b9f
Use .Button--icon instead of custom style
davwheat Mar 23, 2021
40ecaf2
Make fake email more realistic length
davwheat Mar 23, 2021
3b4831d
Add a11y attributes
davwheat Mar 23, 2021
013ced9
Use padding bottom instead of margin bottom for page spacing
davwheat Mar 23, 2021
9ff2ce6
Make compatible with new CSS LoadingIndicator
davwheat Apr 16, 2021
2156163
Integrate profile link into username column
davwheat Apr 16, 2021
f6e01e8
Don't force columns to be 300px
davwheat Apr 16, 2021
6bc97d9
Center edit user button in column
davwheat Apr 16, 2021
b421f8f
Increase spacing between email and visibility toggle button
davwheat Apr 16, 2021
16d5e82
Rename `statistics` to `modelStatistics` in Admin payload
davwheat Apr 16, 2021
10116bc
Update comments, fix TS error
davwheat Apr 19, 2021
a44fe5b
Various translation key changes
davwheat Apr 19, 2021
160bc42
Change gmail.com -> example.com
davwheat Apr 19, 2021
faf067d
Stretch 'edit user' button to entire cell size
davwheat Apr 19, 2021
17bd86f
Update translations
davwheat Apr 19, 2021
d17bab2
Is the YAML formatted right this time? :see_no_evil:
davwheat Apr 19, 2021
067ae81
Remove email placeholder
davwheat Apr 19, 2021
8d4f89d
Re-order lib translations
davwheat Apr 19, 2021
a7c6802
Clicking blurred email now unblurs
davwheat Apr 19, 2021
f442ac7
Correct header class
davwheat Apr 19, 2021
77939a6
Improve edit user button centring
davwheat Apr 19, 2021
2a4435f
Improve vertical row item centering
davwheat Apr 19, 2021
e4f412b
Fix incorrect column length in aria attribute
davwheat Apr 19, 2021
abdbcc5
Use .Button--text!
davwheat Apr 22, 2021
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
2 changes: 2 additions & 0 deletions js/src/admin/compat.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import UploadImageButton from './components/UploadImageButton';
import LoadingModal from './components/LoadingModal';
import DashboardPage from './components/DashboardPage';
import BasicsPage from './components/BasicsPage';
import UserListPage from './components/UserListPage';
import EditCustomHeaderModal from './components/EditCustomHeaderModal';
import PermissionsPage from './components/PermissionsPage';
import PermissionDropdown from './components/PermissionDropdown';
Expand Down Expand Up @@ -59,6 +60,7 @@ export default Object.assign(compat, {
'components/LoadingModal': LoadingModal,
'components/DashboardPage': DashboardPage,
'components/BasicsPage': BasicsPage,
'components/UserListPage': UserListPage,
'components/EditCustomHeaderModal': EditCustomHeaderModal,
'components/PermissionsPage': PermissionsPage,
'components/PermissionDropdown': PermissionDropdown,
Expand Down
7 changes: 7 additions & 0 deletions js/src/admin/components/AdminNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,13 @@ export default class AdminNav extends Component {
</LinkButton>
);

items.add(
'userList',
<LinkButton href={app.route('users')} icon="fas fa-users" title={app.translator.trans('core.admin.nav.userlist_title')}>
{app.translator.trans('core.admin.nav.userlist_button')}
</LinkButton>
);

items.add(
'search',
<div className="Search-input">
Expand Down
Loading