From 7021ca75596d3f2cb993fb3d4d28d1953895a46d Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Fri, 30 Mar 2018 22:17:58 -0400 Subject: [PATCH] Playing with dependencies --- package.json | 3 +- src/App.js | 49 ++++++++++++++------------ src/components/Bootstrap/Bootstrap.js | 5 +++ src/components/Bootstrap/Cards.js | 29 +++++++++++++++ src/components/{ => Bootstrap}/Form.js | 0 src/components/{ => Bootstrap}/Grid.js | 0 src/components/Bootstrap/index.js | 4 +++ src/components/index.js | 2 +- yarn.lock | 11 ++++++ 9 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 src/components/Bootstrap/Bootstrap.js create mode 100644 src/components/Bootstrap/Cards.js rename src/components/{ => Bootstrap}/Form.js (100%) rename src/components/{ => Bootstrap}/Grid.js (100%) create mode 100644 src/components/Bootstrap/index.js diff --git a/package.json b/package.json index 6206f70..46a6af2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ "inferno-bootstrap": "^5.0.0", "inferno-router": "^5.0.1", "inferno-scripts": "6.3.0", - "node-exiftool": "^2.3.0" + "node-exiftool": "^2.3.0", + "query-string": "^6.0.0" }, "devDependencies": { "babel-eslint": "^8.2.2", diff --git a/src/App.js b/src/App.js index 68e20f2..c62af96 100644 --- a/src/App.js +++ b/src/App.js @@ -1,31 +1,34 @@ import { BrowserRouter } from 'inferno-router'; -import { Button, Form, FormGroup, Input, Label } from './components/Form'; -import { Container, Row } from './components/Grid'; +import { Jumbotron } from './components/Bootstrap'; +import { Button, Form, FormGroup, Input, Label } from './components/Bootstrap/Form'; +import { Container, Row } from './components/Bootstrap/Grid'; const App = () => ( - - -
-

Welcome to Inferno

-
-
- -

- To get started, edit src/App.js and save to reload. -

-
- -
- - - - - -
-
-
+ + + +
+

Welcome to Inferno

+
+
+ +

+ To get started, edit src/App.js and save to reload. +

+
+ +
+ + + + + +
+
+
+
); diff --git a/src/components/Bootstrap/Bootstrap.js b/src/components/Bootstrap/Bootstrap.js new file mode 100644 index 0000000..71dd3c9 --- /dev/null +++ b/src/components/Bootstrap/Bootstrap.js @@ -0,0 +1,5 @@ +import Jumbotron from 'inferno-bootstrap/dist/Jumbotron'; + +export { + Jumbotron, +} diff --git a/src/components/Bootstrap/Cards.js b/src/components/Bootstrap/Cards.js new file mode 100644 index 0000000..e8d269c --- /dev/null +++ b/src/components/Bootstrap/Cards.js @@ -0,0 +1,29 @@ +import Card from 'inferno-bootstrap/dist/Card/Card'; +import CardBody from 'inferno-bootstrap/dist/Card/CardBody'; +import CardColumns from 'inferno-bootstrap/dist/Card/CardColumns'; +import CardDeck from 'inferno-bootstrap/dist/Card/CardDeck'; +import CardFooter from 'inferno-bootstrap/dist/Card/CardFooter'; +import CardGroup from 'inferno-bootstrap/dist/Card/CardGroup'; +import CardHeader from 'inferno-bootstrap/dist/Card/CardHeader'; +import CardImg from 'inferno-bootstrap/dist/Card/CardImg'; +import CardImgOverlay from 'inferno-bootstrap/dist/Card/CardImgOverlay'; +import CardLink from 'inferno-bootstrap/dist/Card/CardLink'; +import CardSubtitle from 'inferno-bootstrap/dist/Card/CardSubtitle'; +import CardText from 'inferno-bootstrap/dist/Card/CardText'; +import CardTitle from 'inferno-bootstrap/dist/Card/CardTitle'; + +export { + Card, + CardBody, + CardColumns, + CardDeck, + CardFooter, + CardGroup, + CardHeader, + CardImg, + CardImgOverlay, + CardLink, + CardSubtitle, + CardText, + CardTitle, +}; diff --git a/src/components/Form.js b/src/components/Bootstrap/Form.js similarity index 100% rename from src/components/Form.js rename to src/components/Bootstrap/Form.js diff --git a/src/components/Grid.js b/src/components/Bootstrap/Grid.js similarity index 100% rename from src/components/Grid.js rename to src/components/Bootstrap/Grid.js diff --git a/src/components/Bootstrap/index.js b/src/components/Bootstrap/index.js new file mode 100644 index 0000000..00f2cda --- /dev/null +++ b/src/components/Bootstrap/index.js @@ -0,0 +1,4 @@ +export * from './Bootstrap'; +export * from './Cards'; +export * from './Form'; +export * from './Grid'; diff --git a/src/components/index.js b/src/components/index.js index 762542e..448a961 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1 +1 @@ -export * from './Grid'; +export * from './Bootstrap'; diff --git a/yarn.lock b/yarn.lock index a70317e..35347dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6512,6 +6512,13 @@ query-string@^4.1.0: object-assign "^4.1.0" strict-uri-encode "^1.0.0" +query-string@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.0.0.tgz#8b8f39447b73e8290d6f5e3581779218e9171142" + dependencies: + decode-uri-component "^0.2.0" + strict-uri-encode "^2.0.0" + querystring-es3@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -7429,6 +7436,10 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +strict-uri-encode@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" + string-length@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"