mirror of
https://github.com/urbit/shrub.git
synced 2024-12-01 22:55:03 +03:00
spa: resolve conflicts from rebasing on master
This commit is contained in:
Matilde Park
Logan Allen
parent
f9865bdd2c
commit
28f82e0a4d
@ -45,6 +45,7 @@ export default class GroupsApp extends Component {
|
||||
state.invites['/contacts'] : {};
|
||||
const associations = state.associations ? state.associations : {};
|
||||
const selectedGroups = state.selectedGroups ? state.selectedGroups : [];
|
||||
const s3 = state.s3 ? state.s3 : {};
|
||||
|
||||
return (
|
||||
<div>
|
||||
@ -223,6 +224,7 @@ export default class GroupsApp extends Component {
|
||||
ship={window.ship}
|
||||
share={true}
|
||||
rootIdentity={rootIdentity}
|
||||
s3={s3}
|
||||
/>
|
||||
</Skeleton>
|
||||
);
|
||||
@ -273,6 +275,7 @@ export default class GroupsApp extends Component {
|
||||
path={groupPath}
|
||||
ship={props.match.params.contact}
|
||||
rootIdentity={rootIdentity}
|
||||
s3={s3}
|
||||
/>
|
||||
</Skeleton>
|
||||
);
|
||||
@ -298,6 +301,7 @@ export default class GroupsApp extends Component {
|
||||
history={props.history}
|
||||
path="/~/default"
|
||||
contact={me}
|
||||
s3={s3}
|
||||
ship={window.ship}
|
||||
/>
|
||||
</Skeleton>
|
||||
|
||||
@ -90,203 +90,248 @@ export class ContactCard extends Component {
|
||||
|
||||
shipParser(ship) {
|
||||
switch (ship.length) {
|
||||
case 3: return 'Galaxy';
|
||||
case 6: return 'Star';
|
||||
case 13: return 'Planet';
|
||||
case 56: return 'Comet';
|
||||
default: return 'Unknown';
|
||||
case 3:
|
||||
return 'Galaxy';
|
||||
case 6:
|
||||
return 'Star';
|
||||
case 13:
|
||||
return 'Planet';
|
||||
case 56:
|
||||
return 'Comet';
|
||||
default:
|
||||
return 'Unknown';
|
||||
}
|
||||
}
|
||||
|
||||
setField(field) {
|
||||
const { props, state } = this;
|
||||
const ship = '~' + props.ship;
|
||||
const emailTest = new RegExp(String(/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*/.source)
|
||||
+ /@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/.source
|
||||
const emailTest = new RegExp(
|
||||
String(
|
||||
/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*/.source
|
||||
) +
|
||||
/@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/
|
||||
.source
|
||||
);
|
||||
|
||||
const phoneTest = new RegExp(String(/^\s*(?:\+?(\d{1,3}))?/.source)
|
||||
+ /([-. (]*(\d{3})[-. )]*)?((\d{3})[-. ]*(\d{2,4})(?:[-.x ]*(\d+))?)\s*$/.source
|
||||
const phoneTest = new RegExp(
|
||||
String(/^\s*(?:\+?(\d{1,3}))?/.source) +
|
||||
/([-. (]*(\d{3})[-. )]*)?((\d{3})[-. ]*(\d{2,4})(?:[-.x ]*(\d+))?)\s*$/
|
||||
.source
|
||||
);
|
||||
|
||||
const websiteTest = new RegExp(String(/[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}/.source)
|
||||
+ /\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/.source
|
||||
const websiteTest = new RegExp(
|
||||
String(/[(http(s)?):\/\/(www\.)?a-zA-Z0-9@:%._\+~#=]{2,256}/.source) +
|
||||
/\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/.source
|
||||
);
|
||||
|
||||
switch (field) {
|
||||
case 'avatar': {
|
||||
if (
|
||||
(state.avatarToSet === '') ||
|
||||
(
|
||||
Boolean(props.contact.avatar) &&
|
||||
'url' in props.contact.avatar &&
|
||||
state.avatarToSet === props.contact.avatar.url
|
||||
)
|
||||
state.avatarToSet === '' ||
|
||||
(Boolean(props.contact.avatar) &&
|
||||
state.avatarToSet === props.contact.avatar)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
const avatarTestResult = websiteTest.exec(state.avatarToSet);
|
||||
if (avatarTestResult) {
|
||||
this.setState({
|
||||
this.setState(
|
||||
{
|
||||
awaiting: true,
|
||||
type: 'Saving to group'
|
||||
}, (() => {
|
||||
api.contactEdit(props.path, ship, {
|
||||
},
|
||||
() => {
|
||||
console.log(state.avatarToSet);
|
||||
api
|
||||
.contactEdit(props.path, ship, {
|
||||
avatar: {
|
||||
url: state.avatarToSet
|
||||
}
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'color': {
|
||||
let currentColor = (props.contact.color) ? props.contact.color : '000000';
|
||||
let currentColor = props.contact.color ? props.contact.color : '000000';
|
||||
currentColor = uxToHex(currentColor);
|
||||
const hexExp = /([0-9A-Fa-f]{6})/;
|
||||
const hexTest = hexExp.exec(this.state.colorToSet);
|
||||
|
||||
if (hexTest && (hexTest[1] !== currentColor) && !props.share) {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, `~${props.ship}`, { color: hexTest[1] }).then(() => {
|
||||
if (hexTest && hexTest[1] !== currentColor && !props.share) {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, `~${props.ship}`, { color: hexTest[1] })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'email': {
|
||||
if (
|
||||
(state.emailToSet === '') ||
|
||||
(state.emailToSet === props.contact.email)
|
||||
state.emailToSet === '' ||
|
||||
state.emailToSet === props.contact.email
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
const emailTestResult = emailTest.exec(state.emailToSet);
|
||||
if (emailTestResult) {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, ship, { email: state.emailToSet }).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, ship, { email: state.emailToSet })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'nickname': {
|
||||
if (
|
||||
(state.nickNameToSet === '') ||
|
||||
(state.nickNameToSet === props.contact.nickname)
|
||||
state.nickNameToSet === '' ||
|
||||
state.nickNameToSet === props.contact.nickname
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, ship, { nickname: state.nickNameToSet }).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, ship, { nickname: state.nickNameToSet })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
|
||||
break;
|
||||
}
|
||||
case 'notes': {
|
||||
if (
|
||||
(state.notesToSet === '') ||
|
||||
(state.notesToSet === props.contact.notes)
|
||||
state.notesToSet === '' ||
|
||||
state.notesToSet === props.contact.notes
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, ship, { notes: state.notesToSet }).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, ship, { notes: state.notesToSet })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
break;
|
||||
}
|
||||
case 'phone': {
|
||||
if (
|
||||
(state.phoneToSet === '') ||
|
||||
(state.phoneToSet === props.contact.phone)
|
||||
state.phoneToSet === '' ||
|
||||
state.phoneToSet === props.contact.phone
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
const phoneTestResult = phoneTest.exec(state.phoneToSet);
|
||||
if (phoneTestResult) {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, ship, { phone: state.phoneToSet }).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, ship, { phone: state.phoneToSet })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'website': {
|
||||
if (
|
||||
(state.websiteToSet === '') ||
|
||||
(state.websiteToSet === props.contact.website)
|
||||
state.websiteToSet === '' ||
|
||||
state.websiteToSet === props.contact.website
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
const websiteTestResult = websiteTest.exec(state.websiteToSet);
|
||||
if (websiteTestResult) {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, (() => {
|
||||
api.contactEdit(props.path, ship, { website: state.websiteToSet }).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Saving to group' }, () => {
|
||||
api
|
||||
.contactEdit(props.path, ship, { website: state.websiteToSet })
|
||||
.then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 'removeEmail': {
|
||||
this.setState({ emailToSet: '', awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState(
|
||||
{ emailToSet: '', awaiting: true, type: 'Removing from group' },
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { email: '' }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
case 'removeNickname': {
|
||||
this.setState({ nicknameToSet: '', awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState(
|
||||
{ nicknameToSet: '', awaiting: true, type: 'Removing from group' },
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { nickname: '' }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
case 'removePhone': {
|
||||
this.setState({ phoneToSet: '', awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState(
|
||||
{ phoneToSet: '', awaiting: true, type: 'Removing from group' },
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { phone: '' }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
case 'removeWebsite': {
|
||||
this.setState({ websiteToSet: '', awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState(
|
||||
{ websiteToSet: '', awaiting: true, type: 'Removing from group' },
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { website: '' }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
case 'removeAvatar': {
|
||||
this.setState({
|
||||
this.setState(
|
||||
{
|
||||
avatarToSet: null,
|
||||
awaiting: true,
|
||||
type: 'Removing from group'
|
||||
}, (() => {
|
||||
},
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { avatar: null }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
case 'removeNotes': {
|
||||
this.setState({ notesToSet: '', awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState(
|
||||
{ notesToSet: '', awaiting: true, type: 'Removing from group' },
|
||||
() => {
|
||||
api.contactEdit(props.path, ship, { notes: '' }).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
});
|
||||
}));
|
||||
}
|
||||
);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -301,20 +346,24 @@ export class ContactCard extends Component {
|
||||
|
||||
shareWithGroup() {
|
||||
const { props, state } = this;
|
||||
const defaultVal = props.share ? {
|
||||
const defaultVal = props.share
|
||||
? {
|
||||
nickname: props.rootIdentity.nickname,
|
||||
email: props.rootIdentity.email,
|
||||
phone: props.rootIdentity.phone,
|
||||
website: props.rootIdentity.website,
|
||||
avatar: { url: props.rootIdentity.avatar },
|
||||
avatar: props.rootIdentity.avatar
|
||||
? { url: props.rootIdentity.avatar }
|
||||
: null,
|
||||
notes: props.rootIdentity.notes,
|
||||
color: uxToHex(props.rootIdentity.color)
|
||||
} : {
|
||||
}
|
||||
: {
|
||||
nickname: props.contact.nickname,
|
||||
email: props.contact.email,
|
||||
phone: props.contact.phone,
|
||||
website: props.contact.website,
|
||||
avatar: { url: props.contact.avatar },
|
||||
avatar: props.contact.avatar ? { url: props.contact.avatar } : null,
|
||||
notes: props.contact.notes,
|
||||
color: props.contact.color
|
||||
};
|
||||
@ -332,13 +381,13 @@ export class ContactCard extends Component {
|
||||
)
|
||||
};
|
||||
|
||||
this.setState({ awaiting: true, type: 'Sharing with group' }, (() => {
|
||||
api.contactView.share(
|
||||
`~${props.ship}`, props.path, `~${window.ship}`, contact
|
||||
).then(() => {
|
||||
this.setState({ awaiting: true, type: 'Sharing with group' }, () => {
|
||||
api.contactView
|
||||
.share(`~${props.ship}`, props.path, `~${window.ship}`, contact)
|
||||
.then(() => {
|
||||
props.history.push(`/~groups/view${props.path}/${window.ship}`);
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
removeSelfFromGroup() {
|
||||
@ -356,10 +405,13 @@ export class ContactCard extends Component {
|
||||
};
|
||||
|
||||
api.contactView.share(
|
||||
`~${props.ship}`, props.path, `~${window.ship}`, contact
|
||||
`~${props.ship}`,
|
||||
props.path,
|
||||
`~${window.ship}`,
|
||||
contact
|
||||
);
|
||||
|
||||
this.setState({ awaiting: true, type: 'Removing from group' }, (() => {
|
||||
this.setState({ awaiting: true, type: 'Removing from group' }, () => {
|
||||
api.contactView.delete(props.path).then(() => {
|
||||
this.setState({ awaiting: false });
|
||||
props.history.push(`/~groups`);
|
||||
@ -375,15 +427,18 @@ export class ContactCard extends Component {
|
||||
this.setState({ awaiting: false });
|
||||
props.history.push(`/~groups${props.path}`);
|
||||
});
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
uploadSuccess(url) {
|
||||
this.setState({
|
||||
this.setState(
|
||||
{
|
||||
avatarToSet: url
|
||||
}, () => {
|
||||
},
|
||||
() => {
|
||||
this.setField('avatar');
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
uploadError(error) {
|
||||
@ -393,7 +448,8 @@ export class ContactCard extends Component {
|
||||
renderEditCard() {
|
||||
const { props, state } = this;
|
||||
// if this is our first edit in a new group, propagate from root identity
|
||||
const defaultValue = props.share ? {
|
||||
const defaultValue = props.share
|
||||
? {
|
||||
nickname: props.rootIdentity.nickname,
|
||||
email: props.rootIdentity.email,
|
||||
phone: props.rootIdentity.phone,
|
||||
@ -401,7 +457,8 @@ export class ContactCard extends Component {
|
||||
avatar: props.rootIdentity.avatar,
|
||||
notes: props.rootIdentity.notes,
|
||||
color: props.rootIdentity.color
|
||||
} : {
|
||||
}
|
||||
: {
|
||||
nickname: props.contact.nickname,
|
||||
email: props.contact.email,
|
||||
phone: props.contact.phone,
|
||||
@ -418,14 +475,14 @@ export class ContactCard extends Component {
|
||||
let currentColor = state.colorToSet ? state.colorToSet : defaultColor;
|
||||
currentColor = uxToHex(currentColor);
|
||||
|
||||
const avatar = ('avatar' in props.contact && props.contact.avatar !== null)
|
||||
? <img className="dib h-auto"
|
||||
width={128}
|
||||
src={props.contact.avatar}
|
||||
/>
|
||||
: <span className="dn"></span>;
|
||||
const avatar =
|
||||
'avatar' in props.contact && props.contact.avatar !== null ? (
|
||||
<img className="dib h-auto" width={128} src={props.contact.avatar} />
|
||||
) : (
|
||||
<span className="dn"></span>
|
||||
);
|
||||
|
||||
const imageSetter = (!props.share) ? (
|
||||
const imageSetter = !props.share ? (
|
||||
<span className="db">
|
||||
<p className="f9 gray2 db pb1">Avatar image url</p>
|
||||
<span className="cf db">
|
||||
@ -448,7 +505,9 @@ export class ContactCard extends Component {
|
||||
/>
|
||||
</span>
|
||||
</span>
|
||||
) : (<span className="dn"></span>);
|
||||
) : (
|
||||
<span className="dn"></span>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="w-100 mt8 flex justify-center pa4 pt8 pt0-l pa0-xl pt4-xl pb8">
|
||||
@ -461,18 +520,23 @@ export class ContactCard extends Component {
|
||||
color={'#' + currentColor}
|
||||
key={'avatar' + currentColor}
|
||||
/>
|
||||
<div className="tl mt4 mb4 w-auto ml-auto mr-auto"
|
||||
<div
|
||||
className="tl mt4 mb4 w-auto ml-auto mr-auto"
|
||||
style={{ width: 'fit-content' }}
|
||||
>
|
||||
<p className="f9 gray2 lh-copy">Sigil Color</p>
|
||||
<textarea
|
||||
className={'b--gray4 b--gray2-d black white-d bg-gray0-d f7 ba db pl2 ' +
|
||||
'focus-b--black focus-b--white-d'}
|
||||
className={
|
||||
'b--gray4 b--gray2-d black white-d bg-gray0-d f7 ba db pl2 ' +
|
||||
'focus-b--black focus-b--white-d'
|
||||
}
|
||||
onChange={this.sigilColorSet}
|
||||
defaultValue={defaultColor}
|
||||
key={'default' + defaultColor}
|
||||
onKeyPress={ e => !e.key.match(/[0-9a-f]/i) ? e.preventDefault() : null}
|
||||
onBlur={(() => this.setField('color'))}
|
||||
onKeyPress={e =>
|
||||
!e.key.match(/[0-9a-f]/i) ? e.preventDefault() : null
|
||||
}
|
||||
onBlur={() => this.setField('color')}
|
||||
maxLength={6}
|
||||
style={{
|
||||
resize: 'none',
|
||||
@ -480,8 +544,7 @@ export class ContactCard extends Component {
|
||||
paddingTop: 10,
|
||||
width: 114
|
||||
}}
|
||||
>
|
||||
</textarea>
|
||||
></textarea>
|
||||
</div>
|
||||
<div className="w-100 pt8 pb8 lh-copy tl">
|
||||
<p className="f9 gray2">Ship Name</p>
|
||||
@ -543,18 +606,21 @@ export class ContactCard extends Component {
|
||||
const hexColor = uxToHex(currentColor);
|
||||
|
||||
const avatar =
|
||||
('avatar' in props.contact && props.contact.avatar !== null) ?
|
||||
<img className="dib h-auto" width={128} src={props.contact.avatar} /> :
|
||||
'avatar' in props.contact && props.contact.avatar !== null ? (
|
||||
<img className="dib h-auto" width={128} src={props.contact.avatar} />
|
||||
) : (
|
||||
<Sigil
|
||||
ship={props.ship}
|
||||
size={128}
|
||||
color={'#' + hexColor}
|
||||
key={hexColor}
|
||||
/>;
|
||||
/>
|
||||
);
|
||||
|
||||
const websiteHref =
|
||||
(props.contact.website && props.contact.website.includes('://')) ?
|
||||
props.contact.website : 'http://' + props.contact.website;
|
||||
props.contact.website && props.contact.website.includes('://')
|
||||
? props.contact.website
|
||||
: 'http://' + props.contact.website;
|
||||
|
||||
return (
|
||||
<div className="w-100 mt8 flex justify-center pa4 pt8 pt0-l pa0-xl pt4-xl">
|
||||
@ -572,26 +638,24 @@ export class ContactCard extends Component {
|
||||
<p className="f9 gray2">Nickname</p>
|
||||
<p className="f8">{props.contact.nickname}</p>
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
) : null}
|
||||
{props.contact.email ? (
|
||||
<div>
|
||||
<p className="f9 mt6 gray2">Email</p>
|
||||
<p className="f8">{props.contact.email}</p>
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
) : null}
|
||||
{props.contact.phone ? (
|
||||
<div>
|
||||
<p className="f9 mt6 gray2">Phone</p>
|
||||
<p className="f8">{props.contact.phone}</p>
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
) : null}
|
||||
{props.contact.website ? (
|
||||
<div>
|
||||
<p className="f9 mt6 gray2">website</p>
|
||||
<a target="_blank"
|
||||
<a
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="bb b--black f8"
|
||||
href={websiteHref}
|
||||
@ -599,15 +663,13 @@ export class ContactCard extends Component {
|
||||
{props.contact.website}
|
||||
</a>
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
) : null}
|
||||
{props.contact.notes ? (
|
||||
<div>
|
||||
<p className="f9 mt6 gray2">notes</p>
|
||||
<p className="f8">{props.contact.notes}</p>
|
||||
</div>
|
||||
) : null
|
||||
}
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -618,21 +680,21 @@ export class ContactCard extends Component {
|
||||
render() {
|
||||
const { props, state } = this;
|
||||
|
||||
let editInfoText =
|
||||
state.edit ? 'Finish' : 'Edit';
|
||||
let editInfoText = state.edit ? 'Finish' : 'Edit';
|
||||
if (props.share && state.edit) {
|
||||
editInfoText = 'Share';
|
||||
}
|
||||
|
||||
const ourOpt = (props.ship === window.ship) ? 'dib' : 'dn';
|
||||
const ourOpt = props.ship === window.ship ? 'dib' : 'dn';
|
||||
|
||||
const adminOpt =
|
||||
((props.path.includes(`~${window.ship}/`)) || ((props.ship === window.ship) &&
|
||||
!(props.path.includes('/~/default'))))
|
||||
? 'dib' : 'dn';
|
||||
props.path.includes(`~${window.ship}/`) ||
|
||||
(props.ship === window.ship && !props.path.includes('/~/default'))
|
||||
? 'dib'
|
||||
: 'dn';
|
||||
|
||||
const meLink = (props.path === '/~/default')
|
||||
? '/~groups' : `/~groups/detail${props.path}`;
|
||||
const meLink =
|
||||
props.path === '/~/default' ? '/~groups' : `/~groups/detail${props.path}`;
|
||||
|
||||
const card = state.edit ? this.renderEditCard() : this.renderCard();
|
||||
return (
|
||||
@ -644,9 +706,7 @@ export class ContactCard extends Component {
|
||||
}
|
||||
>
|
||||
<div className="f9 mv4 mh3 pt1 dib w-100">
|
||||
<Link to={meLink}>
|
||||
{'⟵'}
|
||||
</Link>
|
||||
<Link to={meLink}>{'⟵'}</Link>
|
||||
</div>
|
||||
<div className="flex">
|
||||
<button
|
||||
@ -671,13 +731,15 @@ export class ContactCard extends Component {
|
||||
}
|
||||
onClick={props.ship === window.ship ? this.removeSelfFromGroup : this.removeOtherFromGroup}
|
||||
>
|
||||
{props.ship === window.ship
|
||||
? 'Leave Group'
|
||||
: 'Remove from Group'}
|
||||
{props.ship === window.ship ? 'Leave Group' : 'Remove from Group'}
|
||||
</button>
|
||||
</div>
|
||||
<div className="h-100 w-100 overflow-x-hidden pb8 white-d">{card}</div>
|
||||
<Spinner awaiting={this.state.awaiting} text={`${this.state.type}...`} classes="absolute right-1 bottom-1 ba pa2 b--gray1-d" />
|
||||
<Spinner
|
||||
awaiting={this.state.awaiting}
|
||||
text={`${this.state.type}...`}
|
||||
classes="absolute right-1 bottom-1 ba pa2 b--gray1-d"
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import React, { Component } from 'react'
|
||||
import S3Client from '/lib/s3';
|
||||
import S3Client from '../../../../lib/s3';
|
||||
|
||||
export class S3Upload extends Component {
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@ import InviteUpdateReducer from '../../reducers/invite-update';
|
||||
import PermissionUpdateReducer from '../../reducers/permission-update';
|
||||
import { MetadataReducer } from './reducers/metadata-update';
|
||||
import LocalReducer from '../../reducers/local';
|
||||
import { S3Reducer } from '../../reducers/s3.js';
|
||||
import S3Reducer from '../../reducers/s3.js';
|
||||
|
||||
class Store {
|
||||
constructor() {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import _ from 'lodash';
|
||||
|
||||
export class S3Reducer {
|
||||
export default class S3Reducer {
|
||||
reduce(json, state) {
|
||||
const data = _.get(json, 's3-update', false);
|
||||
if (data) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user