diff --git a/app/components/Sidebar/Settings.js b/app/components/Sidebar/Settings.js index 20d4aed1d..d9863100e 100644 --- a/app/components/Sidebar/Settings.js +++ b/app/components/Sidebar/Settings.js @@ -59,8 +59,8 @@ class SettingsSidebar extends React.Component { Details )} - }> - Members + }> + People }> Share Links diff --git a/app/index.js b/app/index.js index 2dc093536..c4443c7ea 100644 --- a/app/index.js +++ b/app/index.js @@ -22,7 +22,7 @@ import Document from 'scenes/Document'; import Search from 'scenes/Search'; import Settings from 'scenes/Settings'; import Details from 'scenes/Settings/Details'; -import Members from 'scenes/Settings/Members'; +import People from 'scenes/Settings/People'; import Slack from 'scenes/Settings/Slack'; import Shares from 'scenes/Settings/Shares'; import Tokens from 'scenes/Settings/Tokens'; @@ -73,11 +73,7 @@ if (element) { path="/settings/details" component={Details} /> - + {

Details

+ {team.slackConnected && ( + + This team is connected to a Slack team. Your + colleagues can join by signing in with their Slack account details. + + )} + {team.googleConnected && ( + + This team is connected to a Google domain. Your + colleagues can join by signing in with their Google account. + + )} + Logo diff --git a/app/scenes/Settings/Members.js b/app/scenes/Settings/People.js similarity index 70% rename from app/scenes/Settings/Members.js rename to app/scenes/Settings/People.js index 2155b73b1..0f00999f6 100644 --- a/app/scenes/Settings/Members.js +++ b/app/scenes/Settings/People.js @@ -7,6 +7,7 @@ import AuthStore from 'stores/AuthStore'; import UsersStore from 'stores/UsersStore'; import CenteredContent from 'components/CenteredContent'; import PageTitle from 'components/PageTitle'; +import HelpText from 'components/HelpText'; import UserListItem from './components/UserListItem'; import List from 'components/List'; @@ -16,7 +17,7 @@ type Props = { }; @observer -class Members extends React.Component { +class People extends React.Component { componentDidMount() { this.props.users.fetchPage({ limit: 100 }); } @@ -28,8 +29,13 @@ class Members extends React.Component { return ( - -

Members

+ +

People

+ + Everyone that has signed in to your Outline appears here. It's + possible that there are other people who have access but haven't + signed in yet. + {users.data.map(user => ( @@ -45,4 +51,4 @@ class Members extends React.Component { } } -export default inject('auth', 'users')(Members); +export default inject('auth', 'users')(People); diff --git a/app/scenes/Settings/Shares.js b/app/scenes/Settings/Shares.js index 28139353c..cefaaac20 100644 --- a/app/scenes/Settings/Shares.js +++ b/app/scenes/Settings/Shares.js @@ -7,6 +7,7 @@ import ShareListItem from './components/ShareListItem'; import List from 'components/List'; import CenteredContent from 'components/CenteredContent'; import PageTitle from 'components/PageTitle'; +import HelpText from 'components/HelpText'; type Props = { shares: SharesStore, @@ -25,6 +26,12 @@ class Shares extends React.Component {

Share Links

+ + Documents that have been shared appear below. Anyone that has the link + can access a read-only version of the document until the link has been + revoked. + + {shares.orderedData.map(share => ( diff --git a/app/scenes/Settings/Tokens.js b/app/scenes/Settings/Tokens.js index 3379b2cb6..490cfee4d 100644 --- a/app/scenes/Settings/Tokens.js +++ b/app/scenes/Settings/Tokens.js @@ -45,8 +45,9 @@ class Tokens extends React.Component {

API Tokens

- You can create unlimited personal API tokens to hack on your wiki. - Learn more in the API documentation. + You can create an unlimited amount of personal API tokens to hack on + Outline. For more details about the API take a look at the{' '} + developer documentation. {hasApiKeys && ( diff --git a/app/types/index.js b/app/types/index.js index f0824f8d9..8b629d967 100644 --- a/app/types/index.js +++ b/app/types/index.js @@ -28,6 +28,8 @@ export type Team = { id: string, name: string, avatarUrl: string, + slackConnected: boolean, + googleConnected: boolean, }; export type NavigationNode = { diff --git a/server/presenters/team.js b/server/presenters/team.js index d4121b68a..863de4a3f 100644 --- a/server/presenters/team.js +++ b/server/presenters/team.js @@ -9,6 +9,8 @@ function present(ctx: Object, team: Team) { name: team.name, avatarUrl: team.avatarUrl || (team.slackData ? team.slackData.image_88 : null), + slackConnected: !!team.slackId, + googleConnected: !!team.googleId, }; }