Skip to content

Commit 73675a7

Browse files
author
berdysheva
committed
feat: refactoring components ans sub-blocks
1 parent 8be4e48 commit 73675a7

File tree

41 files changed

+353
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+353
-664
lines changed

‎src/blocks/Media/__stories__/Media.stories.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ const VideoTemplate: Story<MediaBlockModel> = (args) => (
6363
},
6464
{
6565
...args,
66-
title: data.video.youtubeWithPreview.title,
67-
media: data.video.youtubeWithPreview.media as MediaProps,
66+
title: data.video.videoWithPreview.title,
67+
media: data.video.videoWithPreview.media as MediaProps,
6868
},
6969
{
7070
...args,

‎src/blocks/Media/__stories__/data.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@
118118
"youtube": {
119119
"title": "Video from video-hosting",
120120
"media": {
121-
"youtube": "https://youtu.be/bxZRUtMAlFI"
121+
"youtube": "https://youtu.be/0Qd3T6skprA"
122122
}
123123
},
124-
"youtubeWithPreview": {
124+
"videoWithPreview": {
125125
"title": "Video with preview image and play button",
126126
"media": {
127127
"light": {

‎src/blocks/Table/__stories__/data.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
["Lorem 5", "1", "1", "1"]
1414
],
1515
"legend": ["ipsum 1", "ipsum 2"],
16-
"justify": ["start", "center", "center", "center"],
17-
"marker": "disk"
16+
"justify": ["start", "center", "center", "center"]
1817
}
1918
}
2019
}

‎src/components/Author/__stories__/Author.stories.tsx‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Meta, Story} from '@storybook/react/types-6-0';
22
import React from 'react';
33

44
import Author from '../Author';
5-
import {AuthorProps} from '../../../models';
5+
import {AuthorProps, AuthorType} from '../../../models';
66
import {COMPONENTS} from '../../../demo/constants';
77

88
import data from './data.json';
@@ -14,10 +14,21 @@ export default {
1414

1515
const DefaultTemplate: Story<AuthorProps> = (args) => <Author {...args} />;
1616

17+
const TypesTemplate: Story<AuthorProps> = (args) => (
18+
<div>
19+
<div style={{paddingBottom: '32px'}}>
20+
<h3>Type Column</h3>
21+
<Author {...args} />
22+
</div>
23+
<div>
24+
<h3>Type Line</h3>
25+
<Author {...args} type={AuthorType.Line} />
26+
</div>
27+
</div>
28+
);
29+
1730
export const Default = DefaultTemplate.bind({});
18-
export const TextUnderImage = DefaultTemplate.bind({});
19-
export const NoWebpInAvatar = DefaultTemplate.bind({});
31+
export const Types = TypesTemplate.bind({});
2032

2133
Default.args = data.default.content as AuthorProps;
22-
TextUnderImage.args = data.textUnderImage.content as AuthorProps;
23-
NoWebpInAvatar.args = data.noWebpInAvatar.content as AuthorProps;
34+
Types.args = data.default.content as AuthorProps;

‎src/components/Author/__stories__/data.json‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,11 @@
22
"default": {
33
"content": {
44
"author": {
5-
"firstName": "Oval",
6-
"secondName": "Ovalny",
7-
"description": "Geometry Lead",
8-
"avatar": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png"
9-
},
10-
"type": "line"
11-
}
12-
},
13-
"textUnderImage": {
14-
"content": {
15-
"author": {
16-
"firstName": "Oval",
17-
"secondName": "Ovalny",
18-
"description": "Geometry Lead",
19-
"avatar": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png"
20-
},
21-
"type": "column"
22-
}
23-
},
24-
"noWebpInAvatar": {
25-
"content": {
26-
"author": {
27-
"firstName": "Oval",
28-
"secondName": "Ovalny",
29-
"description": "Geometry Lead",
30-
"avatar": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png"
31-
},
32-
"type": "line"
5+
"firstName": "Lorem",
6+
"secondName": "Ipsum",
7+
"description": "Lorem Ipsum",
8+
"avatar": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img_6-12_light.png"
9+
}
3310
}
3411
}
3512
}

‎src/components/BackgroundImage/__stories__/BackgroundImage.stories.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default {
1313
} as Meta;
1414

1515
const DefaultTemplate: Story<BackgroundImageProps> = (args) => (
16-
<div style={{maxWidth: '500px'}}>
16+
<div style={{maxWidth: '1400px'}}>
1717
<BackgroundImage {...args} />
1818
</div>
1919
);

‎src/components/BackgroundImage/__stories__/data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"default": {
33
"content": {
4-
"src": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png",
4+
"src": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-img_light.png",
55
"alt": "string",
66
"disableCompress": true,
77
"style": {

‎src/components/BackgroundMedia/__stories__/BackgroundMedia.stories.tsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ export default {
1717
} as Meta;
1818

1919
const DefaultTemplate: Story<FullProps> = (args) => (
20-
<div style={{maxWidth: '500px', position: 'relative'}}>
20+
<div style={{maxWidth: '1400px', position: 'relative'}}>
2121
<BackgroundMedia {...args} />
2222
</div>
2323
);
2424

2525
export const Image = DefaultTemplate.bind({});
26-
export const ImageSlider = DefaultTemplate.bind({});
2726
export const Video = DefaultTemplate.bind({});
28-
export const DeviceSupport = DefaultTemplate.bind({});
2927

3028
Image.args = data.image.content;
31-
ImageSlider.args = data.imageSlider.content;
3229
Video.args = data.video.content;
33-
DeviceSupport.args = data.deviceSupport.content;

‎src/components/BackgroundMedia/__stories__/data.json‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,24 @@
33
"content": {
44
"video": {
55
"src": [
6-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.mp4",
7-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.ogv",
8-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.webm",
9-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/mobile.png"
6+
"https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-video_light.mp4",
7+
"https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-video_light.webm",
8+
"https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-video_light.png"
109
],
1110
"loop": {
1211
"start": 0
1312
}
1413
},
15-
"image": "https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main.png"
16-
}
17-
},
18-
"imageSlider": {
19-
"content": {
20-
"image": [
21-
{
22-
"desktop": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png",
23-
"mobile": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-black.png",
24-
"alt": "Picture",
25-
"disableCompress": true
26-
},
27-
{
28-
"desktop": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-white.png",
29-
"mobile": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png",
30-
"alt": "Picture",
31-
"disableCompress": true
32-
}
33-
]
14+
"image": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-video_light.png"
3415
}
3516
},
3617
"image": {
3718
"content": {
3819
"image": {
39-
"src": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png",
40-
"alt": "Picture",
41-
"disableCompress": true
42-
}
43-
}
44-
},
45-
"deviceSupport": {
46-
"content": {
47-
"image": {
48-
"desktop": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-gray.png",
49-
"mobile": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-black.png",
20+
"desktop": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/header-bg-img_light.png",
21+
"mobile": "https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img-bg_padding_4-12_light.png",
5022
"alt": "Picture",
5123
"disableCompress": true
52-
},
53-
"video": {
54-
"src": [
55-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.mp4",
56-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.ogv",
57-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/main_video.webm",
58-
"https://storage.yandexcloud.net/cloud-www-assets/constructor/main/main-visual/mobile.png"
59-
],
60-
"loop": {
61-
"start": 0
62-
}
6324
}
6425
}
6526
}

‎src/components/BlockHeader/__stories__/BlockHeader.stories.tsx‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Meta, Story} from '@storybook/react/types-6-0';
2-
import {ClassNameProps} from '../../../models';
2+
import {ClassNameProps, TitleProps} from '../../../models';
33
import React from 'react';
44

55
import BlockHeader, {BlockHeaderProps} from '../BlockHeader';
@@ -16,10 +16,24 @@ const DefaultTemplate: Story<BlockHeaderProps & ClassNameProps> = (args) => (
1616
<BlockHeader {...args} />
1717
);
1818

19+
const SizesTemplate: Story<BlockHeaderProps & ClassNameProps> = (args) => (
20+
<div>
21+
<div style={{paddingBottom: '64px'}}>
22+
<BlockHeader {...args} title={data.sizes.l as TitleProps} />
23+
</div>
24+
<div style={{paddingBottom: '64px'}}>
25+
<BlockHeader {...args} title={data.sizes.m as TitleProps} />
26+
</div>
27+
<div style={{paddingBottom: '64px'}}>
28+
<BlockHeader {...args} title={data.sizes.s as TitleProps} />
29+
</div>
30+
</div>
31+
);
32+
1933
export const Default = DefaultTemplate.bind({});
2034
export const TitleLink = DefaultTemplate.bind({});
21-
export const CustomTitle = DefaultTemplate.bind({});
35+
export const Sizes = SizesTemplate.bind({});
2236

2337
Default.args = data.default.content as BlockHeaderProps;
2438
TitleLink.args = data.titleLink.content as BlockHeaderProps;
25-
CustomTitle.args = data.customTitle.content as BlockHeaderProps;
39+
Sizes.args = data.customTitle.content as BlockHeaderProps;

0 commit comments

Comments
 (0)