urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-19 16:51:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

interface: fix merge errors

Browse Source
This commit is contained in:
Liam Fitzgerald 2021-05-06 10:45:15 +10:00
parent 93de5a312b
commit 6c653e7ab9
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1966,7 +1966,7 @@
"bundled": true "bundled": true
}, },
"onchange": { "onchange": {
"version": "https://registry.npmjs.org/onchange/-/onchange-7.1.0.tgz", "version": "7.1.0",
"bundled": true, "bundled": true,
"requires": { "requires": {
"@blakeembrey/deque": "^1.0.5", "@blakeembrey/deque": "^1.0.5",
@ -2144,7 +2144,7 @@
"bundled": true "bundled": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz", "version": "4.22.1",
"bundled": true, "bundled": true,
"requires": { "requires": {
"@typescript-eslint/experimental-utils": "4.22.1", "@typescript-eslint/experimental-utils": "4.22.1",
@ -2170,7 +2170,7 @@
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.1.tgz", "version": "4.22.1",
"bundled": true, "bundled": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "4.22.1", "@typescript-eslint/scope-manager": "4.22.1",
@ -2245,7 +2245,7 @@
} }
}, },
"babel-eslint": { "babel-eslint": {
"version": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz", "version": "10.1.0",
"bundled": true, "bundled": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -2377,7 +2377,7 @@
"bundled": true "bundled": true
}, },
"eslint-plugin-react": { "eslint-plugin-react": {
"version": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz", "version": "7.23.2",
"bundled": true, "bundled": true,
"requires": { "requires": {
"array-includes": "^3.1.3", "array-includes": "^3.1.3",
@ -2868,7 +2868,7 @@
} }
}, },
"typescript": { "typescript": {
"version": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", "version": "4.2.4",
"bundled": true "bundled": true
}, },
"unbox-primitive": { "unbox-primitive": {

1
pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
View File

@ -22,7 +22,6 @@ import useLocalState from '~/logic/state/local';
import useSettingsState, { selectCalmState } from '~/logic/state/settings'; import useSettingsState, { selectCalmState } from '~/logic/state/settings';
import { Dropdown } from '~/views/components/Dropdown'; import { Dropdown } from '~/views/components/Dropdown';
import ProfileOverlay from '~/views/components/ProfileOverlay'; import ProfileOverlay from '~/views/components/ProfileOverlay';
import {useCopy} from '~/logic/lib/useCopy';
import { GraphContent} from '~/views/landscape/components/Graph/GraphContent'; import { GraphContent} from '~/views/landscape/components/Graph/GraphContent';

4
pkg/interface/src/views/apps/notifications/graph.tsx
View File

@ -19,7 +19,7 @@ import {
GraphNotificationContents, GraphNotifIndex GraphNotificationContents, GraphNotifIndex
} from '~/types'; } from '~/types';
import Author from '~/views/components/Author'; import Author from '~/views/components/Author';
import { GraphContentWide } from '~/views/landscape/components/Graph/GraphContentWide'; import { GraphContent } from '~/views/landscape/components/Graph/GraphContent';
import { PermalinkEmbed } from '../permalinks/embed'; import { PermalinkEmbed } from '../permalinks/embed';
import { Header } from './header'; import { Header } from './header';
@ -150,7 +150,7 @@ export const GraphNodeContent = ({ post, mod, index, hidden, association }) => {
} }
return ( return (
<TruncBox truncate={8}> <TruncBox truncate={8}>
<GraphContentWide api={{} as any} post={post} showOurContact /> <GraphContent api={{} as any} contents={post.contents} showOurContact />
</TruncBox> </TruncBox>
); );
}; };

6
pkg/interface/src/views/apps/permalinks/TranscludedNode.tsx
View File

@ -8,7 +8,7 @@ import { getSnippet } from '~/logic/lib/publish';
import { useGroupForAssoc } from '~/logic/state/group'; import { useGroupForAssoc } from '~/logic/state/group';
import Author from '~/views/components/Author'; import Author from '~/views/components/Author';
import { MentionText } from '~/views/components/MentionText'; import { MentionText } from '~/views/components/MentionText';
import { GraphContentWide } from '~/views/landscape/components/Graph/GraphContentWide'; import { GraphContent } from '~/views/landscape/components/Graph/GraphContent';
import ChatMessage from '../chat/components/ChatMessage'; import ChatMessage from '../chat/components/ChatMessage';
import { NotePreviewContent } from '../publish/components/NotePreview'; import { NotePreviewContent } from '../publish/components/NotePreview';
import { PermalinkEmbed } from './embed'; import { PermalinkEmbed } from './embed';
@ -72,10 +72,10 @@ function TranscludedComment(props: {
group={group} group={group}
/> />
<Box p="2"> <Box p="2">
<GraphContentWide <GraphContent
api={api} api={api}
transcluded={transcluded} transcluded={transcluded}
post={comment.post} contents={comment.post.contents}
showOurContact={false} showOurContact={false}
/> />
</Box> </Box>

1
pkg/interface/src/views/apps/publish/components/Note.tsx
View File

@ -6,7 +6,6 @@ import GlobalApi from '~/logic/api/global';
import { roleForShip } from '~/logic/lib/group'; import { roleForShip } from '~/logic/lib/group';
import { Contacts, GraphNode, Graph, Association, Unreads, Group, Post } from '@urbit/api'; import { Contacts, GraphNode, Graph, Association, Unreads, Group, Post } from '@urbit/api';
import { getPermalinkForGraph } from '~/logic/lib/permalinks'; import { getPermalinkForGraph } from '~/logic/lib/permalinks';
import {useQuery} from '~/logic/lib/useQuery';
import { GraphContent } from '~/views/landscape/components/Graph/GraphContent'; import { GraphContent } from '~/views/landscape/components/Graph/GraphContent';
import { getComments, getLatestRevision } from '~/logic/lib/publish'; import { getComments, getLatestRevision } from '~/logic/lib/publish';
import { useCopy } from '~/logic/lib/useCopy'; import { useCopy } from '~/logic/lib/useCopy';

6
pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostContent.tsx
View File

@ -3,7 +3,7 @@ import { Post } from '@urbit/api';
import React, { ReactElement } from 'react'; import React, { ReactElement } from 'react';
import styled from 'styled-components'; import styled from 'styled-components';
import GlobalApi from '~/logic/api/global'; import GlobalApi from '~/logic/api/global';
import { GraphContentWide } from '~/views/landscape/components/Graph/GraphContentWide'; import { GraphContent } from '~/views/landscape/components/Graph/GraphContent';
const TruncatedBox = styled(Col)` const TruncatedBox = styled(Col)`
display: -webkit-box; display: -webkit-box;
@ -31,9 +31,9 @@ const PostContent = (props: PostContentProps): ReactElement => {
textOverflow="ellipsis" textOverflow="ellipsis"
overflow="hidden" overflow="hidden"
> >
<GraphContentWide <GraphContent
transcluded={0} transcluded={0}
post={post} contents={post.contents}
api={api} api={api}
showOurContact showOurContact
/> />