ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-14 17:41:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/next-userspace' into lf/nu-groups-fixes

Browse Source
This commit is contained in:
Liam Fitzgerald 2020-10-07 16:00:37 +10:00
commit 3be77c9d87
16 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/interface/src/views/apps/chat/components/profile-overlay.js
View File

@ -73,7 +73,7 @@ export class ProfileOverlay extends PureComponent {
}
render() {
const { contact, ship, color, topSpace, bottomSpace, group, association, hideNicknames, hideAvatars } = this.props;
const { contact, ship, color, topSpace, bottomSpace, group, association, hideNicknames, hideAvatars, history } = this.props;
let top, bottom;
if (topSpace < OVERLAY_HEIGHT / 2) {
@ -104,6 +104,8 @@ export class ProfileOverlay extends PureComponent {
/*if (!group.hidden) {
}*/
const isHidden = group.hidden;
return (
<div
ref={this.popoverRef}
@ -119,18 +121,20 @@ export class ProfileOverlay extends PureComponent {
)}
<div className="mono gray2">{cite(`~${ship}`)}</div>
{!isOwn && (
<Button mt={2} width="100%" onClick={this.createAndRedirectToDM}>
<Button mt={2} width="100%" style={{ cursor: 'pointer' }} onClick={this.createAndRedirectToDM}>
Send Message
</Button>
)}
{isOwn && !group.hidden (
<Link
to={'/~profile/identity'}
className="b--black b--white-d ba black white-d mt3 tc pa2 pointer db"
{(isOwn) ? (
<Button
mt='2'
width='100%'
style={{ cursor: 'pointer '}}
onClick={() => (isHidden) ? history.push('/~profile/identity') : history.push(`${history.location.pathname}/popover/profile`)}
>
Edit Group Identity
</Link>
)}
Edit Identity
</Button>
) : <div />}
</div>
</div>
);

15
pkg/interface/src/views/apps/launch/components/tiles/tile.js
View File

@ -5,9 +5,9 @@ import defaultApps from '~/logic/lib/default-apps';
import { Box } from "@tlon/indigo-react";
export default class Tile extends React.Component {
render() {
const { to, href, p, ...props } = this.props;
render() {
const { bg, to, href, p, ...props } = this.props;
let childElement = (
<Box p={typeof p === 'undefined' ? 2 : p} width="100%" height="100%">
{props.children}
@ -15,9 +15,12 @@ export default class Tile extends React.Component {
);
if (to) {
childElement= (<Link to={to}>{childElement}</Link>);
} else if (href) {
childElement= (<a href={href}>{childElement}</a>);
if (routeList.indexOf(to) !== -1 || to === '/~landscape/home' || to === '/~profile') {
childElement= (<Link to={to}>{childElement}</Link>);
} else {
childElement= (<a href={to}>{childElement}</a>);
}
}

2
pkg/interface/src/views/apps/profile/components/lib/BucketList.tsx
View File

@ -93,7 +93,7 @@ export function BucketList({
</Box>
))}
<Input mt="2" label="New Bucket" id="newBucket" />
<Button mt="2" borderColor="washedGrey" type="submit">
<Button mt="2" style={{ cursor: 'pointer' }} borderColor="washedGrey" type="submit">
Add
</Button>
</Form>

2
pkg/interface/src/views/apps/profile/components/lib/DisplayForm.tsx
View File

@ -126,7 +126,7 @@ export default function DisplayForm(props: DisplayFormProps) {
id="nicknames"
caption="Do not show user-set nicknames"
/>
<Button border={1} borderColor="washedGray" type="submit">
<Button border={1} style={{ cursor: 'pointer' }} borderColor="washedGray" type="submit">
Save
</Button>
</Box>

2
pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
View File

@ -76,7 +76,7 @@ export default function RemoteContentForm(props: RemoteContentFormProps) {
id="oembedShown"
caption="Embedded content may contain scripts"
/>
<Button border={1} borderColor="washedGray" type="submit">
<Button style={{ cursor: 'pointer' }} border={1} borderColor="washedGray" type="submit">
Save
</Button>
</Box>

2
pkg/interface/src/views/apps/profile/components/lib/S3Form.tsx
View File

@ -78,7 +78,7 @@ export default function S3Form(props: S3FormProps) {
label="Secret Access Key"
id="s3secretAccessKey"
/>
<Button type="submit">Submit</Button>
<Button style={{ cursor: 'pointer' }} type="submit">Submit</Button>
</Form>
</Formik>
</Col>

4
pkg/interface/src/views/apps/profile/components/lib/Security.tsx
View File

@ -19,7 +19,7 @@ export default function SecuritySettings({ api }: SecuritySettingsProps) {
<Box fontSize={0} mt={2} color="gray">
You will be logged out of your Urbit on this browser.
<form method="post" action="/~/logout">
<Button narrow mt='4' border={1}>
<Button mt='4' border={1} style={{ cursor: 'pointer' }}>
Logout
</Button>
</form>
@ -31,7 +31,7 @@ export default function SecuritySettings({ api }: SecuritySettingsProps) {
You will be logged out of all browsers that have currently logged into your Urbit.
<form method="post" action="/~/logout">
<input type="hidden" name="all" />
<Button error narrow mt={4} border={1}>
<Button destructive mt={4} border={1} style={{ cursor: 'pointer' }}>
Logout
</Button>
</form>

3
pkg/interface/src/views/apps/publish/components/Notebook.tsx
View File

@ -108,7 +108,7 @@ export class Notebook extends PureComponent<
<Row justifyContent={["flex-start", "flex-end"]}>
{isWriter && (
<Link to={relativePath("/new")}>
<Button primary border>
<Button primary border style={{ cursor: 'pointer' }}>
New Post
</Button>
</Link>
@ -124,6 +124,7 @@ export class Notebook extends PureComponent<
<Button
ml={isWriter ? 2 : 0}
destructive
style={{ cursor: 'pointer' }}
onClick={() => {
this.setState({ isUnsubscribing: true });
api.publish

2
pkg/interface/src/views/apps/publish/components/Settings.tsx
View File

@ -56,7 +56,7 @@ export function Settings(props: SettingsProps) {
Permanently delete this notebook. (All current members will no longer
see this notebook.)
</Label>
<Button mt="2" onClick={onDelete} destructive>
<Button mt="2" onClick={onDelete} destructive style={{ cursor: 'pointer' }}>
Delete this notebook
</Button>
</Col>

2
pkg/interface/src/views/apps/publish/components/Subscribers.tsx
View File

@ -82,7 +82,7 @@ export class Subscribers extends Component<SubscribersProps> {
return (
<Box mt="3">
{ role === 'admin' && (
<Button mb={3} border onClick={this.addAll}>
<Button mb={3} border onClick={this.addAll} style={{ cursor: 'pointer' }}>
Add all members as writers
</Button>
)}

2
pkg/interface/src/views/components/AsyncButton.tsx
View File

@ -38,7 +38,7 @@ export function AsyncButton({
{isSubmitting ? (
<LoadingSpinner
foreground={rest.primary ? "white" : 'black'}
background="transparent"
background="gray"
awaiting
text={loadingText}
/>

1
pkg/interface/src/views/components/RemoteContent.tsx
View File

@ -151,6 +151,7 @@ export default class RemoteContent extends PureComponent<RemoteContentProps, Rem
style={{ display: 'inline-flex', height: '1.66em' }} // Height is hacked to line-height until Button supports proper size
ml={1}
onClick={this.unfoldEmbed}
style={{ cursor: 'pointer' }}
>
{this.state.unfold ? 'collapse' : 'expand'}
</Button> : null}

2
pkg/interface/src/views/components/StatelessAsyncButton.tsx
View File

@ -31,7 +31,7 @@ export function StatelessAsyncButton({
foreground={
rest.primary ? "white" : rest.destructive ? "red" : "black"
}
background="transparent"
background="gray"
/>
) : state === "success" ? (
"Done"

6
pkg/interface/src/views/landscape/components/GroupSettings.tsx
View File

@ -43,9 +43,9 @@ export function GroupSettings(props: GroupSettingsProps) {
const { metadata } = association;
const currentPrivate = "invite" in props.group.policy;
const initialValues: FormSchema = {
title: metadata.title,
description: metadata.description,
color: metadata.color,
title: metadata?.title,
description: metadata?.description,
color: metadata?.color,
isPrivate: currentPrivate,
};

6
pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
View File

@ -127,7 +127,7 @@ export function GroupSwitcher(props: {
<Icon
mr={2}
color="gray"
icon="Circle"
icon="Node"
/>
<Text> Participants</Text>
</GroupSwitcherItem>
@ -156,10 +156,10 @@ export function GroupSwitcher(props: {
<Row alignItems="center" mr={1} flex='1'>
<Text overflow='hidden' display='inline-block' maxWidth='144px' style={{ textOverflow: 'ellipsis', whiteSpace: 'pre'}}>{title}</Text>
</Row>
<Icon mt="0px" display="block" icon="ChevronSouth" />
<Icon size='12px' ml='1' mt="0px" display="inline-block" icon="ChevronSouth" />
</Row>
</Dropdown>
<Row collapse pr={1} justifyContent="flex-end" alignItems="center">
<Row pr={1} justifyContent="flex-end" alignItems="center">
{workspace.type === "group" && (
<>
<Link to={navTo("/invites")}>

6
pkg/interface/src/views/landscape/components/PopoverRoutes.tsx
View File

@ -25,8 +25,8 @@ const SidebarItem = ({ selected, icon, text, to }) => {
px={3}
py={1}
>
<Icon icon={icon} />
<Text ml="2" color={selected ? "black" : "gray"}>{text}</Text>
<Icon icon={icon} mr='2'/>
<Text color={selected ? "black" : "gray"}>{text}</Text>
</HoverBoxLink>
);
};
@ -90,7 +90,7 @@ export function PopoverRoutes(
borderRightColor="washedGray"
>
<SidebarItem
icon="Circle"
icon="Node"
selected={view === "participants"}
to={relativeUrl("/participants")}
text="Participants"