Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit 62840e7

Browse files
author
Hoberg, Kyle
committed
Fix svg loading in visual-stack-redux and added propTypes
1 parent 3d3dae4 commit 62840e7

5 files changed

Lines changed: 127 additions & 5 deletions

File tree

packages/visual-stack-redux/package-lock.json

Lines changed: 115 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/visual-stack-redux/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
"rimraf": "^2.5.2",
8282
"sinon": "^1.17.3",
8383
"sinon-chai": "^2.8.0",
84+
"url-loader": "^4.1.1",
8485
"webpack": "^3.6.0"
8586
}
8687
}

packages/visual-stack-redux/webpack.config.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ var config = {
1010
exclude: /node_modules/,
1111
use: 'babel-loader',
1212
},
13-
{ test: /\.css$/,
13+
{
14+
test: /\.css$/,
1415
use: 'ignore-loader',
16+
},
17+
{
18+
test: /\.((woff2?|svg)(\?v=[0-9]\.[0-9]\.[0-9]))|(woff2?|svg|jpe?g|png|gif|ico)$/,
19+
use: [{ loader: 'url-loader', options: { limit: 10000 } }],
1520
}
1621
]
1722
},

packages/visual-stack/src/components/CJLogo.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import PropTypes from 'prop-types';
33
import SVG from 'react-inlinesvg';
44
import classNames from 'classnames';
5-
import logoSvg from '../images/ui-kit/cj-logo-2021.svg';
5+
import logoSvg from '../../src/images/ui-kit/cj-logo-2021.svg';
66
import './CJLogo.css';
77

88
const CJLogo = ({ className, useStandardPadding = true, ...restProps }) => (
@@ -12,14 +12,15 @@ const CJLogo = ({ className, useStandardPadding = true, ...restProps }) => (
1212
className={classNames(
1313
'vs-cj-logo',
1414
'vs-cj-logo-svg',
15-
className,
16-
useStandardPadding && 'vs-cj-logo-padded'
15+
useStandardPadding && 'vs-cj-logo-padded',
16+
className
1717
)}
1818
/>
1919
);
2020

2121
CJLogo.propTypes = {
2222
className: PropTypes.string,
23+
useStandardPadding: PropTypes.bool,
2324
};
2425

2526
export default CJLogo;

packages/visual-stack/src/components/Icons/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Account from 'mdi-react/AccountCircleIcon';
66
import Logout from 'mdi-react/LogoutIcon';
77
import Settings from 'mdi-react/SettingsIcon';
88
import Product from 'mdi-react/PackageVariantClosedIcon';
9-
import CJLogo from '../CJLogo';
9+
import CJLogo from '../../components/CJLogo';
1010
import classNames from 'classnames';
1111

1212
export const AccountIcon = Account;

0 commit comments

Comments
 (0)