ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-15 01:52:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3654 from urbit/mp/interface/deps

Browse Source 
interface: update sigils, indigo-react dependencies
This commit is contained in:
matildepark 2020-10-06 17:22:20 -04:00 committed by GitHub
commit 243c2770e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/interface/package-lock.json generated
View File

@ -1709,8 +1709,9 @@
"integrity": "sha512-3OPSdf9cejP/TSzWXuBaYbzLtAfBzQnc75SlPLkoPfwpxnv1Bvy9hiWngLY0WnKRR6lMOldnkYQCCuNWeDibYQ=="
},
"@tlon/indigo-react": {
"version": "github:urbit/indigo-react#30c04b3369076ef8086d4f479a890500a1263510",
"from": "github:urbit/indigo-react#lf/1.2.8",
"version": "1.2.8",
"resolved": "https://registry.npmjs.org/@tlon/indigo-react/-/indigo-react-1.2.8.tgz",
"integrity": "sha512-u8qRWGLsMyB+fVIW+E4TK3EyQJJEPzLRVwPpnhPxPgWoAUe31BWKJ/zJXoP+gqt7KxanTL4lHu1n10MeWKY1Dg==",
"requires": {
"@reach/menu-button": "^0.10.5",
"react": "^16.13.1",
@ -1718,12 +1719,22 @@
},
"dependencies": {
"tslib": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.2.tgz",
"integrity": "sha512-wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg=="
}
}
},
"@tlon/sigil-js": {
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/@tlon/sigil-js/-/sigil-js-1.4.2.tgz",
"integrity": "sha512-meb0q0kf4S34oTKDulRMfVU6Wq/9lSOALeQil4EWttL72Lae9Fznsm+ix3tgT69g1xUpjeZIB+vqGOtAFhZX3g==",
"requires": {
"invariant": "^2.2.4",
"svgson": "^4.0.0",
"transformation-matrix": "2.1.1"
}
},
"@types/anymatch": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
@ -9874,17 +9885,6 @@
"lodash.isequal": "^4.5.0"
}
},
"urbit-sigil-js": {
"version": "1.3.13",
"resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.13.tgz",
"integrity": "sha512-g6tC7K65O/4rMCd9/Cy+BVyVSzC3GNjfd0R4EaXEl4aXnjRIiIkD0xkZl56yzLwNk6W9bniDQJALcGPxY3IROw==",
"requires": {
"invariant": "^2.2.4",
"react": "^16.8.6",
"svgson": "^4.0.0",
"transformation-matrix": "2.1.1"
}
},
"uri-js": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",

8
pkg/interface/package.json
View File

@ -9,7 +9,8 @@
"@reach/menu-button": "^0.10.5",
"@reach/tabs": "^0.10.5",
"@tlon/indigo-light": "^1.0.3",
"@tlon/indigo-react": "urbit/indigo-react#lf/1.2.8",
"@tlon/indigo-react": "^1.2.8",
"@tlon/sigil-js": "^1.4.2",
"aws-sdk": "^2.726.0",
"classnames": "^2.2.6",
"codemirror": "^5.55.0",
@ -20,6 +21,7 @@
"moment": "^2.20.1",
"mousetrap": "^1.6.5",
"mousetrap-global-bind": "^1.1.0",
"normalize-wheel": "1.0.1",
"oembed-parser": "^1.4.1",
"prop-types": "^15.7.2",
"react": "^16.5.2",
@ -39,9 +41,7 @@
"styled-system": "^5.1.5",
"suncalc": "^1.8.0",
"urbit-ob": "^5.0.0",
"urbit-sigil-js": "^1.3.2",
"yup": "^0.29.3",
"normalize-wheel": "1.0.1"
"yup": "^0.29.3"
},
"devDependencies": {
"@babel/core": "^7.9.0",

2
pkg/interface/src/logic/lib/sigil.js
View File

@ -1,5 +1,5 @@
import React, { memo } from 'react';
import { sigil, reactRenderer } from 'urbit-sigil-js';
import { sigil, reactRenderer } from '@tlon/sigil-js';
export const foregroundFromBackground = (background) => {
const rgb = {

2
pkg/interface/src/views/App.js
View File

@ -3,7 +3,7 @@ import 'react-hot-loader';
import * as React from 'react';
import { BrowserRouter as Router, withRouter } from 'react-router-dom';
import styled, { ThemeProvider, createGlobalStyle } from 'styled-components';
import { sigil as sigiljs, stringRenderer } from 'urbit-sigil-js';
import { sigil as sigiljs, stringRenderer } from '@tlon/sigil-js';
import Helmet from 'react-helmet';
import Mousetrap from 'mousetrap';

2
pkg/interface/src/views/apps/launch/app.js
View File

@ -66,7 +66,7 @@ export default class LaunchApp extends React.Component {
>
<Row alignItems="center">
<Icon
stroke="green"
color="green"
fill="rgba(0,0,0,0)"
icon="Circle"
/>

2
pkg/interface/src/views/components/StatusBar.js
View File

@ -22,7 +22,7 @@ const StatusBar = (props) => {
>
<Row collapse>
<StatusBarItem mr={2} onClick={() => props.history.push('/')}>
<Icon icon='Home' color='transparent' stroke='black' />
<Icon icon='Home' color='black'/>
</StatusBarItem>
<StatusBarItem mr={2} onClick={() => props.api.local.setOmnibox()}>
<Icon icon='LeapArrow'/>

5
pkg/interface/src/views/components/leap/OmniboxResult.js
View File

@ -33,9 +33,8 @@ export class OmniboxResult extends Component {
if (defaultApps.includes(icon.toLowerCase()) || icon.toLowerCase() === 'links') {
icon = (icon === 'Dojo') ? 'ChevronEast' : icon;
icon = (icon === 'Link') ? 'Links' : icon;
const color = (icon === 'ChevronEast') ? iconFill : 'transparent';
const stroke = (icon === 'ChevronEast') ? 'transparent' : iconFill;
graphic = <Icon display="inline-block" verticalAlign="middle" icon={icon} mr='2' size='16px' color={color} stroke={stroke} />;
graphic = <Icon display="inline-block" verticalAlign="middle" icon={icon} mr='2' size='16px' color={iconFill} />;
} else if (icon === 'logout') {
graphic = <Icon display="inline-block" verticalAlign="middle" icon='ArrowWest' mr='2' size='16px' color={iconFill} />;
} else if (icon === 'profile') {

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

@ -103,8 +103,7 @@ export function GroupSwitcher(props: {
<GroupSwitcherItem to="">
<Icon
mr={2}
stroke="gray"
color="transparent"
color="gray"
display="block"
icon="Groups"
/>
@ -115,11 +114,11 @@ export function GroupSwitcher(props: {
associations={props.associations}
/>
<GroupSwitcherItem to="/~landscape/new">
<Icon mr="2" color="transparent" stroke="gray" icon="Plus" />
<Icon mr="2" color="gray" icon="Plus" />
<Text> New Group</Text>
</GroupSwitcherItem>
<GroupSwitcherItem to="/~landscape/join">
<Icon mr="2" color="transparent" stroke="gray" icon="Boot" />
<Icon mr="2" color="gray" icon="Boot" />
<Text> Join Group</Text>
</GroupSwitcherItem>
{workspace.type === "group" && (
@ -127,8 +126,7 @@ export function GroupSwitcher(props: {
<GroupSwitcherItem to={navTo("/popover/participants")}>
<Icon
mr={2}
color="transparent"
stroke="gray"
color="gray"
icon="Circle"
/>
<Text> Participants</Text>
@ -136,8 +134,7 @@ export function GroupSwitcher(props: {
<GroupSwitcherItem to={navTo("/popover/settings")}>
<Icon
mr={2}
color="transparent"
stroke="gray"
color="gray"
icon="Gear"
/>
<Text> Settings</Text>

3
pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx
View File

@ -100,8 +100,7 @@ export function SidebarItem(props: {
<Row width='100%' alignItems="center" flex='1 auto' minWidth='0'>
<Icon
display="block"
color="transparent"
stroke={color}
color={color}
icon={getAppIcon(appName, module) as any}
/>
<Box width='100%' flexShrink={2} ml={2} display='flex' overflow='hidden'>

2
pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
View File

@ -70,7 +70,7 @@ export function SidebarListHeader(props: {
</FormikOnBlur>
}
>
<Icon stroke="gray" icon="Menu" />
<Icon color="gray" icon="Menu" />
</Dropdown>
</Row>
);