Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added series styling to more parts of the app #166

Merged
merged 2 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function HeroListFeature(props = {}) {
if (item.action === 'OPEN_URL') {
analytics.track('OpenUrl', {
url: item?.relatedNode?.url,
});
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good linter

return window.open(getURLFromType(item.relatedNode), '_blank');
}

Expand Down Expand Up @@ -71,6 +71,7 @@ function HeroListFeature(props = {}) {

const actions = props.feature?.actions;


return (
<Box mb="base" minWidth="180px" {...props}>
{/* Content */}
Expand Down Expand Up @@ -121,6 +122,11 @@ function HeroListFeature(props = {}) {
flexDirection="column"
paddingTop={{ md: 'xl', lg: 'xxxl' }}
>
{props?.feature?.heroCard?.relatedNode?.parentItem?.title ? (
<Styled.ChannelLabel color="text.secondary">
{props?.feature?.heroCard?.relatedNode?.parentItem?.title}
</Styled.ChannelLabel>
) : null}
<Styled.Title>{props?.feature?.heroCard?.title}</Styled.Title>
<Styled.Summary color="text.secondary">
{props?.feature?.heroCard?.summary}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ const Summary = withTheme(styled.div`
${system}
`);

const ChannelLabel = withTheme(styled.h3`
${TypeStyles.SmallBodyText}
${system}
`);

const Container = styled.div`
display: grid;

Expand Down Expand Up @@ -83,4 +88,5 @@ export default {
Summary,
Container,
Item,
ChannelLabel,
};
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function FeatureFeedListGrid(props = {}) {
summary={item.summary}
onClick={() => handleActionPress(item)}
videoMedia={item.relatedNode?.videos[0]}
channelLabel={item.relatedNode?.parentItem?.title}
/>
))}
</Box>
Expand Down
21 changes: 1 addition & 20 deletions packages/web-shared/hooks/useFeatureFeed.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,30 +176,11 @@ export const FEED_FEATURES = gql`
title
subtitle
heroCard {
id
title
labelText
summary
coverImage {
name
sources {
uri
}
}
hasAction
action
actionIcon
...ContentCard
relatedNode {
id
__typename

... on ContentItem {
title
originId
originType
videos {
...VideoMediaFields
}
}
}
}
Expand Down
11 changes: 3 additions & 8 deletions web-embeds/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,9 @@
style="max-width: 1180px; padding: 40px; margin: auto; margin-top: 20px"
></div> -->

<!-- <div
data-type="FeatureFeed"
data-church="liquid_church"
data-feature-feed="FeatureFeed:d292fd8c-5b9f-4cd7-a2fe-9d7d0914c34f"
data-placeholder="Life Is Hard. How Can We Help?"
data-modal="true"
class="apollos-widget"
></div> -->
<div data-type="FeatureFeed" data-church="liquid_church"
data-feature-feed="FeatureFeed:04160599-4edf-4824-98c5-02c1a8854c48"
data-placeholder="Life Is Hard. How Can We Help?" data-modal="true" class="apollos-widget"></div>
<!--
<div
data-church="cedar_creek"
Expand Down
Loading