Skip to content
Snippets Groups Projects
Commit 6371457a authored by Tarje Lavik's avatar Tarje Lavik
Browse files

Improve activitystream

parent 4054738f
No related branches found
No related tags found
No related merge requests found
import {Accordion, AccordionButton, AccordionIcon, AccordionItem, AccordionPanel, Box, Flex, Heading, Link, Wrap, WrapItem} from '@chakra-ui/react' import {Accordion, AccordionButton, AccordionIcon, AccordionItem, AccordionPanel, Box, Flex} from '@chakra-ui/react'
import RenderHumanMadeObjectActivityStream from '../RenderHumanMadeObjectActivityStream' import RenderHumanMadeObjectActivityStream from './RenderHumanMadeObjectActivityStream'
import Activity from './Activity'
export default function ActivityStream({stream}) { export default function ActivityStream({stream}) {
if (!stream) { if (!stream) {
...@@ -8,7 +7,7 @@ export default function ActivityStream({stream}) { ...@@ -8,7 +7,7 @@ export default function ActivityStream({stream}) {
} }
return ( return (
<Box> <Box fontFamily="Montserrat">
{/* <Heading as="dt" fontFamily="Montserrat" fontWeight="semibold" fontSize="sm" pb="2">Hendelser</Heading> {/* <Heading as="dt" fontFamily="Montserrat" fontWeight="semibold" fontSize="sm" pb="2">Hendelser</Heading>
<Wrap as="dd" fontFamily="Montserrat" marginBottom={5}> <Wrap as="dd" fontFamily="Montserrat" marginBottom={5}>
{stream.map((activity) => ( {stream.map((activity) => (
......
import { Box, Heading } from '@chakra-ui/react' import { Box, Heading, Wrap, Tag, TagLabel, Avatar } from '@chakra-ui/react'
import { imageBuilder } from '../../../lib/sanity'
import Link from '../../Link' import Link from '../../Link'
import PortableTextBlock from '../../PortableTextBlock' import PortableTextBlock from '../../PortableTextBlock'
import Timespan from '../../Timespan' import Timespan from '../../Timespan'
export default function BeginningOfExistence(props) { export default function BeginningOfExistence(props) {
const {_id, _key, label, timespan, tookplaceAt} = props const {_id, _key, label, timespan, contributionAssignedBy, tookplaceAt} = props
const id = _id ?? _key const id = _id ?? _key
return ( return (
...@@ -15,11 +16,40 @@ export default function BeginningOfExistence(props) { ...@@ -15,11 +16,40 @@ export default function BeginningOfExistence(props) {
pb="1" pb="1"
mb="2" mb="2"
borderBottom="1px solid" borderBottom="1px solid"
borderColor="gray.300" borderColor="gray.300"
fontFamily="Montserrat"
fontWeight="semibold"
fontSize="sm"
> >
{label ? label : "Skapt"} {label ? label : "Skapt"}
</Heading> </Heading>
{timespan && (<Timespan display="inline-block" fontWeight="bolder" timespan={timespan} />)}
{timespan && (
<Timespan display="inline-block" fontWeight="bolder" timespan={timespan} />
)}
{contributionAssignedBy?.length > 0 && (
<Wrap>
{contributionAssignedBy.map((assignment) => (
<Tag key={assignment.assignedActor._id} size="sm" colorScheme="">
<Avatar
size="xs"
ml={-1}
mr={2}
name={assignment.assignedActor.label.no}
src={imageBuilder
.image(assignment.assignedActor.image)
.height(300)
.width(300)
.url()}
/>
<TagLabel>
<Link href={`/id/${assignment.assignedActor._id}`}>{assignment.assignedActor.label.no}</Link>
</TagLabel>
</Tag>
))}
</Wrap>
)}
</Box> </Box>
) )
} }
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import * as ObjectComponents from './HumanMadeObjectActivityStream' import * as ObjectComponents from '.'
import { Alert, AlertIcon, AlertDescription, AlertTitle, Code } from '@chakra-ui/react' import { Alert, AlertIcon, AlertDescription, AlertTitle, Code } from '@chakra-ui/react'
function resolveEvents(event) { function resolveEvents(event) {
......
import React from 'react' import React from 'react'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import * as ObjectComponents from './MergedActivityStreamList' import * as ObjectComponents from '.'
import { Alert, AlertIcon, AlertDescription, AlertTitle, Code } from '@chakra-ui/react' import { Alert, AlertIcon, AlertDescription, AlertTitle, Code } from '@chakra-ui/react'
function resolveEvents(event) { function resolveEvents(event) {
......
...@@ -3,7 +3,7 @@ import {Image, Badge, Box, Container, Flex, Heading, SimpleGrid} from '@chakra-u ...@@ -3,7 +3,7 @@ import {Image, Badge, Box, Container, Flex, Heading, SimpleGrid} from '@chakra-u
import PortableTextBlock from '../PortableTextBlock' import PortableTextBlock from '../PortableTextBlock'
import Cards from '../Cards' import Cards from '../Cards'
import {imageBuilder} from '../../lib/sanity' import {imageBuilder} from '../../lib/sanity'
import RenderMergedActivityStreamList from '../ActivityStream/RenderMergedActivityStreamList' import RenderMergedActivityStreamList from '../ActivityStream/MergedActivityStreamList/RenderMergedActivityStreamList'
export default function Actor(item) { export default function Actor(item) {
if(!item) return null if(!item) return null
......
...@@ -322,6 +322,7 @@ export const routeQuery = groq` ...@@ -322,6 +322,7 @@ export const routeQuery = groq`
} }
` `
/* List query */
export const humanMadeObjectsQuery = groq`{ export const humanMadeObjectsQuery = groq`{
"items": *[_type == "HumanMadeObject"] | order(label){ "items": *[_type == "HumanMadeObject"] | order(label){
_id, _id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment