diff --git a/pkg/interface/chat/src/js/components/member.js b/pkg/interface/chat/src/js/components/member.js index c5bfec9fd..5547cf152 100644 --- a/pkg/interface/chat/src/js/components/member.js +++ b/pkg/interface/chat/src/js/components/member.js @@ -92,11 +92,6 @@ export class MemberScreen extends Component { />
-
-

Members

-

{memberText}

- {members} -

Modify Permissions

{modifyText}

@@ -109,6 +104,11 @@ export class MemberScreen extends Component { /> ) : null}
+
+

Members

+

{memberText}

+ {members} +
); diff --git a/pkg/interface/chat/src/js/components/new.js b/pkg/interface/chat/src/js/components/new.js index 8ac39fa2b..610cb5b7d 100644 --- a/pkg/interface/chat/src/js/components/new.js +++ b/pkg/interface/chat/src/js/components/new.js @@ -19,7 +19,7 @@ export class NewScreen extends Component { idError: false, inviteError: false, allowHistory: true, - createGroup: true + createGroup: false }; this.titleChange = this.titleChange.bind(this); diff --git a/pkg/interface/chat/src/js/components/settings.js b/pkg/interface/chat/src/js/components/settings.js index 848bfbaec..b2ca7737c 100644 --- a/pkg/interface/chat/src/js/components/settings.js +++ b/pkg/interface/chat/src/js/components/settings.js @@ -127,12 +127,7 @@ export class SettingsScreen extends Component { value={this.state.title} disabled={!chatOwner} onChange={this.changeTitle} - /> - { + onBlur={() => { if (chatOwner) { props.api.setSpinner(true); props.api.metadataAdd( @@ -143,13 +138,11 @@ export class SettingsScreen extends Component { association.metadata['date-created'], uxToHex(association.metadata.color) ).then(() => { - this.refs.rename.innerText = "Saved"; props.api.setSpinner(false); }) } - }}> - Save - + }} + />

Change description

Change the description of this chat

@@ -161,12 +154,7 @@ export class SettingsScreen extends Component { value={this.state.description} disabled={!chatOwner} onChange={this.changeDescription} - /> - { + onBlur={() => { if (chatOwner) { props.api.setSpinner(true); props.api.metadataAdd( @@ -177,13 +165,11 @@ export class SettingsScreen extends Component { association.metadata['date-created'], uxToHex(association.metadata.color) ).then(() => { - this.refs.description.innerText = "Saved"; props.api.setSpinner(false); }) } - }}> - Save - + }} + />

Change color

Give this chat a color when viewing group channels

@@ -195,12 +181,7 @@ export class SettingsScreen extends Component { value={this.state.color} disabled={!chatOwner} onChange={this.changeColor} - /> - { + onBlur={() => { if ((chatOwner) && (this.state.color.match(/[0-9A-F]{6}/i))) { props.api.setSpinner(true); props.api.metadataAdd( @@ -211,13 +192,11 @@ export class SettingsScreen extends Component { association.metadata['date-created'], this.state.color ).then(() => { - this.refs.color.innerText = "Saved"; props.api.setSpinner(false); }) } - }}> - Save - + }} + /> diff --git a/pkg/interface/chat/src/js/components/skeleton.js b/pkg/interface/chat/src/js/components/skeleton.js index b3c53cf10..4358609ea 100644 --- a/pkg/interface/chat/src/js/components/skeleton.js +++ b/pkg/interface/chat/src/js/components/skeleton.js @@ -37,10 +37,9 @@ export class Skeleton extends Component {
{/* sidebar skeleton, hidden on mobile when in chat panel */}
{"⟵ Landscape"} -
+
All Chats
diff --git a/pkg/interface/groups/src/js/components/lib/contact-card.js b/pkg/interface/groups/src/js/components/lib/contact-card.js index dcb993f31..40ffe6879 100644 --- a/pkg/interface/groups/src/js/components/lib/contact-card.js +++ b/pkg/interface/groups/src/js/components/lib/contact-card.js @@ -495,8 +495,8 @@ export class ContactCard extends Component { !(props.path.includes('/~/default')) ) ? "dib" : "dn"; - let hiddenonMe = (props.path === "/~/default") - ? "dn" : ""; + let meLink = (props.path === "/~/default") + ? `/~groups` : `/~groups/detail${props.path}`; let card = state.edit ? this.renderEditCard() : this.renderCard(); return ( @@ -507,8 +507,8 @@ export class ContactCard extends Component { "bb b--gray4 b--gray2-d " }>
- - {"⟵ Channels"} + + {"⟵"}
diff --git a/pkg/interface/groups/src/js/components/lib/group-detail.js b/pkg/interface/groups/src/js/components/lib/group-detail.js index 6286cb608..1f1c72cc8 100644 --- a/pkg/interface/groups/src/js/components/lib/group-detail.js +++ b/pkg/interface/groups/src/js/components/lib/group-detail.js @@ -151,7 +151,7 @@ export class GroupDetail extends Component { return (
-
+
{"⟵ Channels"}
@@ -165,26 +165,22 @@ export class GroupDetail extends Component { value={this.state.title} disabled={!groupOwner} onChange={this.changeTitle} + onBlur={() => { + if (groupOwner) { + props.api.setSpinner(true); + props.api.metadataAdd( + association['app-path'], + association['group-path'], + this.state.title, + association.metadata.description, + association.metadata['date-created'], + uxToHex(association.metadata.color) + ).then(() => { + props.api.setSpinner(false); + }) + } + }} /> - { - if (groupOwner) { - props.api.setSpinner(true); - props.api.metadataAdd( - association['app-path'], - association['group-path'], - this.state.title, - association.metadata.description, - association.metadata['date-created'], - uxToHex(association.metadata.color) - ).then(() => { - this.refs.rename.innerText = "Saved"; - props.api.setSpinner(false); - }) - } - }}>Save

Change description

Change the description of this group

@@ -196,11 +192,7 @@ export class GroupDetail extends Component { value={this.state.description} disabled={!groupOwner} onChange={this.changeDescription} - /> - { + onBlur={() => { if (groupOwner) { props.api.setSpinner(true); props.api.metadataAdd( @@ -211,11 +203,11 @@ export class GroupDetail extends Component { association.metadata['date-created'], uxToHex(association.metadata.color) ).then(() => { - this.refs.description.innerText = "Saved"; props.api.setSpinner(false); }) } - }}>Save + }} + />
diff --git a/pkg/interface/link/src/js/components/links-list.js b/pkg/interface/link/src/js/components/links-list.js index 0846f1309..7ac33a4f1 100644 --- a/pkg/interface/link/src/js/components/links-list.js +++ b/pkg/interface/link/src/js/components/links-list.js @@ -115,7 +115,7 @@ export class Links extends Component { page={props.page} resourcePath={props.resourcePath}/>
-
+
diff --git a/pkg/interface/link/src/js/components/member.js b/pkg/interface/link/src/js/components/member.js index 3b8fcd430..b8ba957b1 100644 --- a/pkg/interface/link/src/js/components/member.js +++ b/pkg/interface/link/src/js/components/member.js @@ -70,22 +70,11 @@ export class MemberScreen extends Component { />
-
-

Members

-

- { 'Everyone with permission to use this collection.' + - ((isManaged && props.amOwner) - ? ' Removing someone removes them from the group.' - : '') - } -

- {members} -
- { !props.amOwner ? null : ( + {!props.amOwner ? null : (

Modify Permissions

- { 'Invite someone to this collection.' + + {'Invite someone to this collection.' + (isManaged ? ' Adding someone adds them to the group.' : '') @@ -99,6 +88,17 @@ export class MemberScreen extends Component { />

)} +
+

Members

+

+ { 'Everyone with permission to use this collection.' + + ((isManaged && props.amOwner) + ? ' Removing someone removes them from the group.' + : '') + } +

+ {members} +
); diff --git a/pkg/interface/link/src/js/components/new.js b/pkg/interface/link/src/js/components/new.js index 2d7d1bf75..a19c3590c 100644 --- a/pkg/interface/link/src/js/components/new.js +++ b/pkg/interface/link/src/js/components/new.js @@ -16,7 +16,7 @@ export class NewScreen extends Component { ships: [], idError: false, inviteError: false, - createGroup: true + createGroup: false }; this.titleChange = this.titleChange.bind(this); diff --git a/pkg/interface/link/src/js/components/root.js b/pkg/interface/link/src/js/components/root.js index 42e461e42..0fc94e555 100644 --- a/pkg/interface/link/src/js/components/root.js +++ b/pkg/interface/link/src/js/components/root.js @@ -55,7 +55,7 @@ export class Root extends Component { rightPanelHide={true} sidebarShown={state.sidebarShown} links={links}> -
+

Select or create a collection to begin. diff --git a/pkg/interface/link/src/js/components/settings.js b/pkg/interface/link/src/js/components/settings.js index d651ffca8..63ec55360 100644 --- a/pkg/interface/link/src/js/components/settings.js +++ b/pkg/interface/link/src/js/components/settings.js @@ -125,12 +125,7 @@ export class SettingsScreen extends Component { value={this.state.title} disabled={!props.amOwner} onChange={this.changeTitle} - /> - { + onBlur={() => { if (props.amOwner) { api.setSpinner(true); api.metadataAdd( @@ -142,12 +137,10 @@ export class SettingsScreen extends Component { uxToHex(resource.metadata.color) ).then(() => { api.setSpinner(false); - this.refs.rename.innerText = "Saved"; }); } - }}> - Save - + }} + />

Change description

@@ -161,12 +154,7 @@ export class SettingsScreen extends Component { value={this.state.description} disabled={!props.amOwner} onChange={this.changeDescription} - /> - { + onBlur={() => { if (props.amOwner) { api.setSpinner(true); api.metadataAdd( @@ -178,12 +166,10 @@ export class SettingsScreen extends Component { uxToHex(resource.color) ).then(() => { api.setSpinner(false); - this.refs.description.innerText = "Saved"; }); } - }}> - Save - + }} + />

Change color

Give this collection a color when viewing group channels

@@ -195,12 +181,7 @@ export class SettingsScreen extends Component { value={this.state.color} disabled={!props.amOwner} onChange={this.changeColor} - /> - { + onBlur={() => { if (props.amOwner && state.color.match(/[0-9A-F]{6}/i)) { api.setSpinner(true); api.metadataAdd( @@ -212,12 +193,10 @@ export class SettingsScreen extends Component { state.color ).then(() => { api.setSpinner(false); - this.refs.color.innerText = "Saved"; }); } - }}> - Save - + }} + />
diff --git a/pkg/interface/publish/src/js/components/lib/edit-post.js b/pkg/interface/publish/src/js/components/lib/edit-post.js index f6e3b8cf5..b9f7f1a15 100644 --- a/pkg/interface/publish/src/js/components/lib/edit-post.js +++ b/pkg/interface/publish/src/js/components/lib/edit-post.js @@ -114,7 +114,7 @@ export class EditPost extends Component { />
-
+
{date}
diff --git a/pkg/interface/publish/src/js/components/lib/new-post.js b/pkg/interface/publish/src/js/components/lib/new-post.js index af7d77909..6feefcda4 100644 --- a/pkg/interface/publish/src/js/components/lib/new-post.js +++ b/pkg/interface/publish/src/js/components/lib/new-post.js @@ -99,8 +99,13 @@ export class NewPost extends Component { let hiddenOnPopout = (props.popout) ? "" : "dib-m dib-l dib-xl"; + let newIndex = props.location.pathname.indexOf("/new"); + let backHref = props.location.pathname.slice(0, newIndex); return (
+
+ {"<- Back"} +
-
+
-
+
{title}
diff --git a/pkg/interface/publish/src/js/components/lib/notebook.js b/pkg/interface/publish/src/js/components/lib/notebook.js index cbe785c1f..5709ab9f5 100644 --- a/pkg/interface/publish/src/js/components/lib/notebook.js +++ b/pkg/interface/publish/src/js/components/lib/notebook.js @@ -192,7 +192,7 @@ export class Notebook extends Component { />
{ this.scrollElement = el; diff --git a/pkg/interface/publish/src/js/components/lib/settings.js b/pkg/interface/publish/src/js/components/lib/settings.js index b5827530a..f960ef255 100644 --- a/pkg/interface/publish/src/js/components/lib/settings.js +++ b/pkg/interface/publish/src/js/components/lib/settings.js @@ -130,32 +130,25 @@ export class Settings extends Component { value={this.state.title} onChange={this.changeTitle} disabled={this.state.disabled} + onBlur={() => { + this.setState({ disabled: true }); + window.api.setSpinner(true); + window.api + .action("publish", "publish-action", { + "edit-book": { + book: this.props.book, + title: this.state.title, + about: this.props.notebook.about, + coms: this.props.notebook.comments, + group: null + } + }) + .then(() => { + this.setState({ disabled: false }) + window.api.setSpinner(false); + }); + }} /> - { - this.setState({disabled: true}); - window.api.setSpinner(true); - window.api - .action("publish", "publish-action", { - "edit-book": { - book: this.props.book, - title: this.state.title, - about: this.props.notebook.about, - coms: this.props.notebook.comments, - group: null - } - }) - .then(() => { - this.setState({disabled: false}) - this.refs.rename.innerText = "Saved"; - window.api.setSpinner(false); - }); - }}> - Save -

Change description

Change the description of this notebook

@@ -167,32 +160,25 @@ export class Settings extends Component { } value={this.state.description} onChange={this.changeDescription} - /> - { + onBlur={() => { this.setState({ disabled: true }); - window.api.setSpinner(true); - window.api - .action("publish", "publish-action", { - "edit-book": { - book: this.props.book, - title: this.props.notebook.title, - about: this.state.description, - coms: this.props.notebook.comments, - group: null - } - }) - .then(() => { - this.setState({ disabled: false }); - this.refs.description.innerText = "Saved"; - window.api.setSpinner(false); - }); - }}> - Save - + window.api.setSpinner(true); + window.api + .action("publish", "publish-action", { + "edit-book": { + book: this.props.book, + title: this.props.notebook.title, + about: this.state.description, + coms: this.props.notebook.comments, + group: null + } + }) + .then(() => { + this.setState({ disabled: false }); + window.api.setSpinner(false); + }); + }} + />
-
{props.children}