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.

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

Simple card #12

Merged
merged 12 commits into from
Aug 29, 2019
Merged

Simple card #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d5eaff6
First pass: adds unstyled SimpleCard component
allishultes Aug 20, 2019
164cfe3
Re-adds LinkContainers
allishultes Aug 21, 2019
7e090fc
Adds storybook-react-router as a decorator to get links working
allishultes Aug 21, 2019
2d3c4f9
Adds an error handle that allows showlinkPath to not throw an error i…
allishultes Aug 21, 2019
de3836d
Small tweaks
allishultes Aug 21, 2019
da3b506
Refactors actions in SimpleCard story and code in SimpleCard index
allishultes Aug 28, 2019
ec4f4a7
Tidying console.logs in stories.js
allishultes Aug 28, 2019
0e6a7cb
Adds SimpleCard component to webpack.config
allishultes Aug 28, 2019
d30b446
Update packages/components/SimpleCard/index.js
allishultes Aug 28, 2019
0921ef4
Update packages/components/SimpleCard/index.js
allishultes Aug 28, 2019
ccdc36a
Adds default props and proptypes
allishultes Aug 28, 2019
f0eae03
Merge branch 'SimpleCard' of github.com:bbc/digital-paper-edit-storyb…
allishultes Aug 28, 2019
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
11 changes: 1 addition & 10 deletions .storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
// import { configure } from '@storybook/react';

// // automatically import all files ending in *.stories.js
// const req = require.context('../stories', true, /\.stories\.js$/);
// function loadStories() {
// req.keys().forEach(filename => req(filename));
// }

// configure(loadStories, module);

import { configure, addDecorator, addParameters } from '@storybook/react';
import { withA11y } from '@storybook/addon-a11y';
Expand All @@ -32,4 +23,4 @@ addParameters({
},
});

configure(loadStories, module);
configure(loadStories, module);
166 changes: 146 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
"@bbc/react-transcript-editor": "^1.0.4",
"@fortawesome/fontawesome-svg-core": "^1.2.19",
"@fortawesome/free-brands-svg-icons": "^5.8.2",
"@fortawesome/free-solid-svg-icons": "^5.9.0",
"@fortawesome/free-solid-svg-icons": "^5.10.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"bootstrap": "^4.3.1",
"bootstrap-css-only": "^4.3.1",
"chroma-js": "^2.0.3",
"css-color-names": "^1.0.1",
"css-loader": "^3.0.0",
Expand All @@ -33,8 +34,10 @@
"node-sass": "^4.12.0",
"randomcolor": "^0.5.4",
"react": "^16.8.3",
"react-bootstrap": "^1.0.0-beta.8",
"react-bootstrap": "^1.0.0-beta.11",
"react-color": "^2.17.1",
"react-router-bootstrap": "^0.25.0",
"react-router-dom": "^5.0.1",
"react-select": "^2.4.3",
"sass-loader": "^7.1.0",
"save": "^2.4.0",
Expand All @@ -51,6 +54,7 @@
"@storybook/addons": "^5.1.9",
"@storybook/react": "^5.1.9",
"babel-loader": "^8.0.6",
"gh-pages": "^2.0.1"
"gh-pages": "^2.0.1",
"storybook-react-router": "^1.0.5"
}
}
Loading