diff --git a/.eslintrc.yml b/.eslintrc.yml index a0531ad4..6c8d9f0d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -298,9 +298,6 @@ rules: # ECMAScript 6 - arrow-body-style: - - error - - always arrow-parens: - error - always diff --git a/lib/gui/app/components/flash-another/flash-another.jsx b/lib/gui/app/components/flash-another/flash-another.jsx index ec349e04..15f1b5c1 100644 --- a/lib/gui/app/components/flash-another/flash-another.jsx +++ b/lib/gui/app/components/flash-another/flash-another.jsx @@ -1,5 +1,5 @@ /* - * Copyright 2016 resin.io + * Copyright 2018 resin.io * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,20 +17,27 @@ 'use strict' const React = require('react') -const propTypes = require('prop-types') +const PropTypes = require('prop-types') +const styled = require('styled-components').default +const { position, right } = require('styled-system') + +const Div = styled.div ` + ${position} + ${right} +` const FlashAnother = (props) => { return ( -
+
-
+
) } FlashAnother.propTypes = { - onClick: propTypes.func + onClick: PropTypes.func } module.exports = FlashAnother diff --git a/lib/gui/app/components/flash-results/flash-results.jsx b/lib/gui/app/components/flash-results/flash-results.jsx new file mode 100644 index 00000000..29f6cbbb --- /dev/null +++ b/lib/gui/app/components/flash-results/flash-results.jsx @@ -0,0 +1,66 @@ +/* + * Copyright 2018 resin.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict' + +const React = require('react') +const PropTypes = require('prop-types') +const _ = require('lodash') +const styled = require('styled-components').default +const { position, left, top, space } = require('styled-system') +const { Underline } = require('./../../styled-components') + +const Div = styled.div ` + ${position} + ${top} + ${left} + ${space} +` + +/* eslint-disable no-inline-comments */ + +const FlashResults = (props) => { + return ( +
+
+ +

Flash Complete!

+
+
+ + {_.map(props.results.devices, (quantity, type) => { + return (quantity) ? ( +
+ + { quantity } + { props.message[type](quantity) } +
+ ) : null + })} + +
+
+ ) +} + +FlashResults.propTypes = { + results: PropTypes.object, + message: PropTypes.object, + errors: PropTypes.func +} + +module.exports = FlashResults diff --git a/lib/gui/app/components/flash-results/index.js b/lib/gui/app/components/flash-results/index.js new file mode 100644 index 00000000..325f3eea --- /dev/null +++ b/lib/gui/app/components/flash-results/index.js @@ -0,0 +1,34 @@ +/* + * Copyright 2018 resin.io + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict' + +/** + * @module Etcher.Components.FlashResults + */ + +const angular = require('angular') +const { react2angular } = require('react2angular') + +const MODULE_NAME = 'Etcher.Components.FlashResults' +const FlashResults = angular.module(MODULE_NAME, []) + +FlashResults.component( + 'flashResults', + react2angular(require('./flash-results.jsx')) +) + +module.exports = MODULE_NAME diff --git a/lib/gui/app/components/reduced-flashing-infos/reduced-flashing-infos.jsx b/lib/gui/app/components/reduced-flashing-infos/reduced-flashing-infos.jsx index 0c15a1d5..bbcab727 100644 --- a/lib/gui/app/components/reduced-flashing-infos/reduced-flashing-infos.jsx +++ b/lib/gui/app/components/reduced-flashing-infos/reduced-flashing-infos.jsx @@ -19,6 +19,7 @@ const React = require('react') const propTypes = require('prop-types') const styled = require('styled-components').default +const { color } = require('styled-system') const SvgIcon = require('../svg-icon/svg-icon.jsx') const Div = styled.div ` @@ -48,19 +49,23 @@ const Div = styled.div ` } ` +const Span = styled.span ` + ${color} +` + const ReducedFlashingInfos = (props) => { return (props.shouldShow) ? (
- + - { props.imageName } - { props.imageSize } - + { props.imageName } + { props.imageSize } + - + - { props.driveTitle } - + { props.driveTitle } +
) : null } diff --git a/lib/gui/app/index.html b/lib/gui/app/index.html index b923df45..89ab9b73 100644 --- a/lib/gui/app/index.html +++ b/lib/gui/app/index.html @@ -35,7 +35,7 @@
-