A little housecleaning

This commit is contained in:
Timothy Warren 2018-04-04 11:21:38 -04:00
parent 6a659aa273
commit c0ee4f06d4
4 changed files with 15 additions and 43 deletions

View File

@ -8,13 +8,10 @@
"inferno-bootstrap": "^5.0.0", "inferno-bootstrap": "^5.0.0",
"inferno-router": "^5.0.1", "inferno-router": "^5.0.1",
"inferno-scripts": "6.3.0", "inferno-scripts": "6.3.0",
"lodash": "^4.17.5", "node-exiftool": "^2.3.0"
"node-exiftool": "^2.3.0",
"query-string": "^6.0.0"
}, },
"devDependencies": { "devDependencies": {
"babel-eslint": "^8.2.2", "babel-eslint": "^8.2.2",
"bootstrap": "4",
"electron": "^1.8.4", "electron": "^1.8.4",
"electron-builder": "^20.8.1", "electron-builder": "^20.8.1",
"eslint": "^4.19.1", "eslint": "^4.19.1",
@ -25,8 +22,7 @@
"eslint-plugin-promise": "^3.7.0", "eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1", "eslint-plugin-standard": "^3.0.1",
"foreman": "^2.0.0", "foreman": "^2.0.0",
"husky": "^0.14.3", "husky": "^0.14.3"
"jquery": "^3.3.1"
}, },
"scripts": { "scripts": {
"build": "inferno-scripts build", "build": "inferno-scripts build",
@ -37,7 +33,8 @@
"fix": "eslint --fix src/**/*.js", "fix": "eslint --fix src/**/*.js",
"lint": "eslint src/**/*.js", "lint": "eslint src/**/*.js",
"pack": "build --dir", "pack": "build --dir",
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"precommit": "yarn lint",
"react-start": "inferno-scripts start", "react-start": "inferno-scripts start",
"start": "nf start -p 3000", "start": "nf start -p 3000",
"test": "inferno-scripts test --env=jsdom" "test": "inferno-scripts test --env=jsdom"

View File

@ -1,5 +0,0 @@
/* class BSContainer extends HTMLElement {}
class FilmExifElement extends HTMLElement {}
customElements.define('bs-container', BSContainer);
customElements.define('film-exif', FilmExifElement); */

View File

@ -8,18 +8,17 @@ import {
export const FormBlock = ({ export const FormBlock = ({
children, children,
label, label,
name, type = 'text',
type='text',
...props ...props
}) => { }) => {
const formElement = (children !== undefined) const formElement = (children !== undefined)
? children ? children
: <Input id={name} name={name} type={type} {...props} /> : <Input id={props.name} name={props.name} type={type} {...props} />;
return ( return (
<Col xs={12} sm={6} md={3}> <Col xs={12} sm={6} md={3}>
<FormGroup> <FormGroup>
<Label for={name}>{label}</Label> <Label for={props.name}>{label}</Label>
{formElement} {formElement}
</FormGroup> </FormGroup>
</Col> </Col>

View File

@ -1240,10 +1240,6 @@ boom@5.x.x:
dependencies: dependencies:
hoek "4.x.x" hoek "4.x.x"
bootstrap@4:
version "4.0.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
boxen@^1.2.1: boxen@^1.2.1:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@ -1785,7 +1781,7 @@ commander@2.15.x, commander@^2.11.0, commander@~2.15.0:
commander@~2.9.0: commander@~2.9.0:
version "2.9.0" version "2.9.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" resolved "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
dependencies: dependencies:
graceful-readlink ">= 1.0.0" graceful-readlink ">= 1.0.0"
@ -3385,7 +3381,7 @@ foreach@^2.0.5:
foreman@^2.0.0: foreman@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/foreman/-/foreman-2.0.0.tgz#00acd20f9dbbe2f79d04697bcca2a77ee00ee031" resolved "https://registry.npmjs.org/foreman/-/foreman-2.0.0.tgz#00acd20f9dbbe2f79d04697bcca2a77ee00ee031"
dependencies: dependencies:
commander "~2.9.0" commander "~2.9.0"
http-proxy "~1.11.1" http-proxy "~1.11.1"
@ -3636,7 +3632,7 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
"graceful-readlink@>= 1.0.0": "graceful-readlink@>= 1.0.0":
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" resolved "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
growly@^1.3.0: growly@^1.3.0:
version "1.3.0" version "1.3.0"
@ -3934,7 +3930,7 @@ http-proxy@^1.16.2:
http-proxy@~1.11.1: http-proxy@~1.11.1:
version "1.11.3" version "1.11.3"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.11.3.tgz#1915dc888751e2a6bf3c2abfcb1808fa86c72353" resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.11.3.tgz#1915dc888751e2a6bf3c2abfcb1808fa86c72353"
dependencies: dependencies:
eventemitter3 "1.x.x" eventemitter3 "1.x.x"
requires-port "0.x.x" requires-port "0.x.x"
@ -4895,10 +4891,6 @@ jest@22.4.2:
import-local "^1.0.0" import-local "^1.0.0"
jest-cli "^22.4.2" jest-cli "^22.4.2"
jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
js-base64@^2.1.9: js-base64@^2.1.9:
version "2.4.3" version "2.4.3"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
@ -5201,7 +5193,7 @@ lodash.uniq@^4.5.0:
version "4.5.0" version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: "lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.5" version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
@ -5467,7 +5459,7 @@ multicast-dns@^6.0.1:
mustache@^2.2.1: mustache@^2.2.1:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0" resolved "https://registry.npmjs.org/mustache/-/mustache-2.3.0.tgz#4028f7778b17708a489930a6e52ac3bca0da41d0"
mute-stream@0.0.7: mute-stream@0.0.7:
version "0.0.7" version "0.0.7"
@ -6524,13 +6516,6 @@ query-string@^4.1.0:
object-assign "^4.1.0" object-assign "^4.1.0"
strict-uri-encode "^1.0.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: querystring-es3@^0.2.0:
version "0.2.1" version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@ -6908,7 +6893,7 @@ require-uncached@^1.0.3:
requires-port@0.x.x: requires-port@0.x.x:
version "0.0.1" version "0.0.1"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-0.0.1.tgz#4b4414411d9df7c855995dd899a8c78a2951c16d" resolved "https://registry.npmjs.org/requires-port/-/requires-port-0.0.1.tgz#4b4414411d9df7c855995dd899a8c78a2951c16d"
requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0: requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0:
version "1.0.0" version "1.0.0"
@ -7189,7 +7174,7 @@ shell-quote@1.6.1:
shell-quote@~1.4.2: shell-quote@~1.4.2:
version "1.4.3" version "1.4.3"
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.4.3.tgz#952c44e0b1ed9013ef53958179cc643e8777466b" resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz#952c44e0b1ed9013ef53958179cc643e8777466b"
dependencies: dependencies:
array-filter "~0.0.0" array-filter "~0.0.0"
array-map "~0.0.0" array-map "~0.0.0"
@ -7448,10 +7433,6 @@ strict-uri-encode@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" 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: string-length@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"