Settings members UI
This commit is contained in:
@ -56,6 +56,9 @@ class Sidebar extends Component {
|
|||||||
</Section>
|
</Section>
|
||||||
<Section>
|
<Section>
|
||||||
<Header>Team</Header>
|
<Header>Team</Header>
|
||||||
|
<SidebarLink to="/settings/members" icon={<CodeIcon />}>
|
||||||
|
Members
|
||||||
|
</SidebarLink>
|
||||||
<SidebarLink
|
<SidebarLink
|
||||||
to="/settings/integrations/slack"
|
to="/settings/integrations/slack"
|
||||||
icon={<SettingsIcon />}
|
icon={<SettingsIcon />}
|
||||||
|
@ -20,6 +20,7 @@ import Collection from 'scenes/Collection';
|
|||||||
import Document from 'scenes/Document';
|
import Document from 'scenes/Document';
|
||||||
import Search from 'scenes/Search';
|
import Search from 'scenes/Search';
|
||||||
import Settings from 'scenes/Settings';
|
import Settings from 'scenes/Settings';
|
||||||
|
import Members from 'scenes/Settings/Members';
|
||||||
import Slack from 'scenes/Settings/Slack';
|
import Slack from 'scenes/Settings/Slack';
|
||||||
import Tokens from 'scenes/Settings/Tokens';
|
import Tokens from 'scenes/Settings/Tokens';
|
||||||
import SlackAuth from 'scenes/SlackAuth';
|
import SlackAuth from 'scenes/SlackAuth';
|
||||||
@ -65,6 +66,7 @@ render(
|
|||||||
<Route exact path="/dashboard" component={Dashboard} />
|
<Route exact path="/dashboard" component={Dashboard} />
|
||||||
<Route exact path="/starred" component={Starred} />
|
<Route exact path="/starred" component={Starred} />
|
||||||
<Route exact path="/settings" component={Settings} />
|
<Route exact path="/settings" component={Settings} />
|
||||||
|
<Route exact path="/settings/members" component={Members} />
|
||||||
<Route exact path="/settings/tokens" component={Tokens} />
|
<Route exact path="/settings/tokens" component={Tokens} />
|
||||||
<Route
|
<Route
|
||||||
exact
|
exact
|
||||||
|
@ -1,75 +1,83 @@
|
|||||||
// @flow
|
// @flow
|
||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import { observable, runInAction } from 'mobx';
|
import { observable } from 'mobx';
|
||||||
import { observer } from 'mobx-react';
|
import { observer, inject } from 'mobx-react';
|
||||||
import invariant from 'invariant';
|
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
import Flex from 'shared/components/Flex';
|
import Flex from 'shared/components/Flex';
|
||||||
import Avatar from 'components/Avatar';
|
import Avatar from 'components/Avatar';
|
||||||
import { color, layout } from 'shared/styles/constants';
|
import { color } from 'shared/styles/constants';
|
||||||
|
|
||||||
import { client } from 'utils/ApiClient';
|
import ErrorsStore from 'stores/ErrorsStore';
|
||||||
|
import SettingsStore from 'stores/SettingsStore';
|
||||||
import CenteredContent from 'components/CenteredContent';
|
import CenteredContent from 'components/CenteredContent';
|
||||||
|
import LoadingPlaceholder from 'components/LoadingPlaceholder';
|
||||||
import PageTitle from 'components/PageTitle';
|
import PageTitle from 'components/PageTitle';
|
||||||
import HelpText from 'components/HelpText';
|
|
||||||
|
|
||||||
@observer
|
@observer
|
||||||
class Members extends Component {
|
class Members extends Component {
|
||||||
|
props: {
|
||||||
|
errors: ErrorsStore,
|
||||||
|
settings: SettingsStore,
|
||||||
|
};
|
||||||
|
|
||||||
@observable members;
|
@observable members;
|
||||||
@observable isLoaded: boolean = false;
|
@observable isLoaded: boolean = false;
|
||||||
|
|
||||||
|
@observable inviteEmails: string = '';
|
||||||
|
@observable isInviting: boolean = false;
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
this.fetchMembers();
|
this.props.settings.fetchMembers();
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchMembers() {
|
handleUserInvite = async () => {};
|
||||||
try {
|
|
||||||
const res = await client.post(`/team.users`);
|
handleInviteEmailChange = e => {
|
||||||
invariant(res && res.data, 'Unable ');
|
this.inviteEmails = e.target.value;
|
||||||
const { data } = res;
|
};
|
||||||
runInAction('Members#fetchMembers', () => {
|
|
||||||
this.members = data;
|
|
||||||
});
|
|
||||||
} catch (e) {
|
|
||||||
// show error
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<CenteredContent>
|
<CenteredContent>
|
||||||
<PageTitle title="Members" />
|
<PageTitle title="Members" />
|
||||||
<h1>Members</h1>
|
<h1>Members</h1>
|
||||||
{this.members && (
|
|
||||||
<MemberList>
|
{!this.props.settings.isFetching ? (
|
||||||
{this.members.map(member => (
|
<Flex column>
|
||||||
<Member auto justify="space-between">
|
{this.props.settings.members && (
|
||||||
<Flex>
|
<MemberList>
|
||||||
<Avatar src={member.avatarUrl} />
|
{this.props.settings.members.map(member => (
|
||||||
<UserName>
|
<Member auto justify="space-between">
|
||||||
{member.name} · {member.email}
|
<Flex>
|
||||||
{member.isAdmin && <AdminBadge>Admin</AdminBadge>}
|
<Avatar src={member.avatarUrl} />
|
||||||
</UserName>
|
<UserName>
|
||||||
</Flex>
|
{member.name} {member.email && `(${member.email})`}
|
||||||
<Flex>
|
{member.isAdmin && <AdminBadge>Admin</AdminBadge>}
|
||||||
<Action onClick={() => { }}>Make admin</Action>
|
</UserName>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Member>
|
</Member>
|
||||||
))}
|
))}
|
||||||
</MemberList>
|
</MemberList>
|
||||||
|
)}
|
||||||
|
</Flex>
|
||||||
|
) : (
|
||||||
|
<LoadingPlaceholder />
|
||||||
)}
|
)}
|
||||||
</CenteredContent>
|
</CenteredContent>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const MemberList = styled(Flex) `
|
const MemberList = styled(Flex)`
|
||||||
border: 1px solid ${color.smoke};
|
border: 1px solid ${color.smoke};
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
|
|
||||||
|
margin-top: 20px;
|
||||||
|
margin-bottom: 40px;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Member = styled(Flex) `
|
const Member = styled(Flex)`
|
||||||
padding: 4px 10px;
|
padding: 10px;
|
||||||
border-bottom: 1px solid ${color.smoke};
|
border-bottom: 1px solid ${color.smoke};
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
|
|
||||||
@ -90,6 +98,4 @@ const AdminBadge = styled.span`
|
|||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const Action = styled.span``;
|
export default inject('errors', 'settings')(Members);
|
||||||
|
|
||||||
export default Members;
|
|
||||||
|
@ -2,10 +2,11 @@
|
|||||||
import { observable, action, runInAction } from 'mobx';
|
import { observable, action, runInAction } from 'mobx';
|
||||||
import invariant from 'invariant';
|
import invariant from 'invariant';
|
||||||
import { client } from 'utils/ApiClient';
|
import { client } from 'utils/ApiClient';
|
||||||
import type { ApiKey } from 'types';
|
import type { ApiKey, User } from 'types';
|
||||||
|
|
||||||
class SettingsStore {
|
class SettingsStore {
|
||||||
@observable apiKeys: ApiKey[] = [];
|
@observable apiKeys: ApiKey[] = [];
|
||||||
|
@observable members: User[] = [];
|
||||||
@observable isFetching: boolean = false;
|
@observable isFetching: boolean = false;
|
||||||
@observable isSaving: boolean = false;
|
@observable isSaving: boolean = false;
|
||||||
|
|
||||||
@ -55,6 +56,24 @@ class SettingsStore {
|
|||||||
console.error('Something went wrong');
|
console.error('Something went wrong');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@action
|
||||||
|
fetchMembers = async () => {
|
||||||
|
this.isFetching = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await client.post('/team.users');
|
||||||
|
invariant(res && res.data, 'Data should be available');
|
||||||
|
const { data } = res;
|
||||||
|
|
||||||
|
runInAction('fetchMembers', () => {
|
||||||
|
this.members = data;
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Something went wrong');
|
||||||
|
}
|
||||||
|
this.isFetching = false;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export default SettingsStore;
|
export default SettingsStore;
|
||||||
|
Reference in New Issue
Block a user