Skip to content

Commit 059a4b2

Browse files
author
Joanna Szczęch
authored
#53149 - Update banner commpoonent (#247)
1 parent cc1354f commit 059a4b2

File tree

7 files changed

+37
-25
lines changed

7 files changed

+37
-25
lines changed

src/04-views/home/Home.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<script>
44
import AHeading from '../../atoms/heading/Heading.vue'
55
import AImage from '../../atoms/image/Image.vue'
6-
import ABanner from '../../atoms/banner/Banner.vue'
6+
import ABanner from '../../molecules/banner/Banner.vue'
77
import AList from '../../atoms/list/List.vue'
88
import AListItem from '../../atoms/list-item/ListItem.vue'
99

src/atoms/banner/Banner.html renamed to src/molecules/banner/Banner.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
:media="item.media"
1111
>
1212
<a-image
13-
:src="image.src"
14-
:alt="image.alt"
13+
:src="imageSrc"
14+
:alt="imageAlt"
1515
/>
1616
</picture>
1717
<div

src/atoms/banner/Banner.js renamed to src/molecules/banner/Banner.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,17 @@ export default {
99
default: 'a'
1010
},
1111
/**
12-
* Props for image should have keys: src, alt
12+
* Image alt
1313
*/
14-
image: {
15-
type: Object,
14+
imageAlt: {
15+
type: String,
16+
required: true
17+
},
18+
/**
19+
* Image src
20+
*/
21+
imageSrc: {
22+
type: String,
1623
required: true
1724
},
1825
/**

src/atoms/banner/Banner.scss renamed to src/molecules/banner/Banner.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '../../../assets/styles/_globals.scss';
1+
@import '../../../assets/styles/globals';
22

33
$banner-width : 100% !default;
44
$banner-text-decoration: none !default;

src/atoms/banner/Banner.spec.js renamed to src/molecules/banner/Banner.spec.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ describe('Banner', () => {
55
it('has default structure', () => {
66
const wrapper = mount(ABanner, {
77
propsData: {
8-
image: { key: 'key', src: 'src' }
8+
imageAlt: 'alt',
9+
imageSrc: 'src'
910
}
1011
})
1112

@@ -17,7 +18,8 @@ describe('Banner', () => {
1718
it('renders named slot text when passed', () => {
1819
const wrapper = mount(ABanner, {
1920
propsData: {
20-
image: { key: 'key', src: 'src' },
21+
imageAlt: 'alt',
22+
imageSrc: 'src',
2123
text: 'Title'
2224
},
2325
slots: {
@@ -32,13 +34,15 @@ describe('Banner', () => {
3234
it('should be generated with correct props', () => {
3335
const wrapper = mount(ABanner, {
3436
propsData: {
35-
image: { key: 'key', src: 'src' },
37+
imageAlt: 'alt',
38+
imageSrc: 'src',
3639
sources: [{ srcset: 'srcset', media: 'media' }],
3740
text: 'Text'
3841
}
3942
})
4043

41-
expect(wrapper.props().image.key).toBe('key')
44+
expect(wrapper.props().imageSrc).toBe('src')
45+
expect(wrapper.props().imageAlt).toBe('alt')
4246
expect(wrapper.props().sources[0].media).toBe('media')
4347
expect(wrapper.props().text).toBe('Text')
4448
})

src/atoms/banner/Banner.stories.js renamed to src/molecules/banner/Banner.stories.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ import { object, text } from '@storybook/addon-knobs'
33

44
import ABanner from './Banner.vue'
55

6-
const info = `
7-
<p>Check <b>Knobs</b> tab to edit component properties dynamically.</p>
8-
`
6+
const info = `<p>Check <b>Knobs</b> tab to edit component properties dynamically.</p>`
97

108
const sources = [
119
{
@@ -30,18 +28,16 @@ const sources = [
3028
}
3129
]
3230

33-
const image = {
34-
src: '/images/banner/banner-320_176.jpg',
35-
alt: 'Banner image'
36-
}
37-
38-
storiesOf('Atoms/Banner', module)
31+
storiesOf('Molecules/Banner', module)
3932
.addParameters({ info })
4033
.add('Default', () => ({
4134
components: { ABanner },
4235
props: {
4336
imageKnobs: {
44-
default: object('Image', image)
37+
default: object('Image', '/images/banner/banner-320_176.jpg')
38+
},
39+
altKnobs: {
40+
default: object('Alt', 'Banner image')
4541
},
4642
sourcesKnobs: {
4743
default: object('Sources', sources)
@@ -57,7 +53,8 @@ storiesOf('Atoms/Banner', module)
5753
<a-banner
5854
:href="hrefKnobs"
5955
:aria-label="ariaLabelKnobs"
60-
:image="imageKnobs"
56+
:image-src="imageKnobs"
57+
:image-alt="altKnobs"
6158
:sources="sourcesKnobs"
6259
/>
6360
`
@@ -66,7 +63,10 @@ storiesOf('Atoms/Banner', module)
6663
components: { ABanner },
6764
props: {
6865
imageKnobs: {
69-
default: object('Image', { src: '/images/image/banner.jpg', alt: 'Banner' })
66+
default: object('Image', '/images/image/banner.jpg')
67+
},
68+
altKnobs: {
69+
default: object('Alt', 'Banner image')
7070
},
7171
textKnobs: {
7272
default: text('Text', 'Banner')
@@ -82,7 +82,8 @@ storiesOf('Atoms/Banner', module)
8282
<a-banner
8383
:href="hrefKnobs"
8484
:aria-label="ariaLabelKnobs"
85-
:image="imageKnobs"
85+
:image-src="imageKnobs"
86+
:image-alt="altKnobs"
8687
tag="div"
8788
>
8889
<span style="color: white; font-size: 48px; font-weight: bold;">

src/atoms/banner/Banner.vue renamed to src/molecules/banner/Banner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template src="./Banner.html" />
22

33
<script>
4-
import AImage from '../image/Image.vue'
4+
import AImage from '../../atoms/image/Image.vue'
55
66
import ABanner from './Banner.js'
77

0 commit comments

Comments
 (0)