Skip to content

Simplify template stories #41

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 26, 2023
Merged

Simplify template stories #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df1d5c3
Merge pull request #40 from forumone/1.x-RC
kmonahan Jul 19, 2023
df1346a
Simplify template stories
kmonahan Jul 22, 2023
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
5 changes: 3 additions & 2 deletions services/app/source/04-templates/LandingPage/LandingPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import React from 'react';
import { WYSIWYG } from '../../03-components/Wysiwyg/Wysiwyg.stories';
import LandingPageTemplate from './LandingPage';
import SampleContent from '../../06-utility/storybook/SampleContent';

const meta: Meta<typeof LandingPageTemplate> = {
title: 'Templates/Landing Page',
Expand All @@ -11,11 +11,12 @@ const meta: Meta<typeof LandingPageTemplate> = {
const LandingPage: StoryObj<typeof LandingPageTemplate> = {
render: args => (
<LandingPageTemplate {...args}>
{WYSIWYG.render && <WYSIWYG.render {...WYSIWYG.args} />}
<SampleContent>Main page content</SampleContent>
</LandingPageTemplate>
),
args: {
title: 'Landing Page Title',
hidePageTitle: false,
},
};

Expand Down
9 changes: 3 additions & 6 deletions services/app/source/04-templates/Page/Page.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Meta, StoryObj } from '@storybook/react';
import React from 'react';
import { Breadcrumb } from '../../03-components/Breadcrumb/Breadcrumb.stories';
import { WYSIWYG } from '../../03-components/Wysiwyg/Wysiwyg.stories';
import PageTemplate from './Page';
import SampleContent from '../../06-utility/storybook/SampleContent';

const meta: Meta<typeof PageTemplate> = {
title: 'Templates/Page',
Expand All @@ -12,13 +11,11 @@ const meta: Meta<typeof PageTemplate> = {
const Page: StoryObj<typeof PageTemplate> = {
render: args => (
<PageTemplate {...args}>
{WYSIWYG.render && <WYSIWYG.render {...WYSIWYG.args} />}
<SampleContent>Main page content</SampleContent>
</PageTemplate>
),
args: {
preContent: Breadcrumb.render ? (
<Breadcrumb.render {...Breadcrumb.args} />
) : undefined,
preContent: <SampleContent>Pre-content area</SampleContent>,
title: 'Page Title',
},
};
Expand Down
22 changes: 14 additions & 8 deletions services/app/source/05-pages/Page.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { Meta, StoryObj } from '@storybook/react';
import { PageProps } from '../04-templates/Page/Page';
import { Page as PageStory } from '../04-templates/Page/Page.stories';
import PageTemplate, { PageProps } from '../04-templates/Page/Page';
import PageWrapper from './page-wrappers/default';
import { Breadcrumb } from '../03-components/Breadcrumb/Breadcrumb.stories';
import React from 'react';
import { WYSIWYG } from '../03-components/Wysiwyg/Wysiwyg.stories';

interface PageStoryArgs {
page: PageProps;
Expand All @@ -14,14 +16,18 @@ const settings: Meta<PageStoryArgs> = {
const Page: StoryObj<PageStoryArgs> = {
render: args => (
<PageWrapper>
{PageStory.render && <PageStory.render {...args.page} />}
<PageTemplate {...args.page} />
</PageWrapper>
),
};
Page.args = {
page: {
...PageStory.args,
title: 'Page title',
args: {
page: {
preContent: Breadcrumb.render ? (
<Breadcrumb.render {...Breadcrumb.args} />
) : undefined,
title: 'Page Title',
description: 'Demo basic page in Storybook',
children: WYSIWYG.render && <WYSIWYG.render {...WYSIWYG.args} />,
},
},
};

Expand Down