Add sourcemap and elevate theme provider

Signed-off-by: Lucian <lucian.buzzo@gmail.com>
This commit is contained in:
Lucian 2019-12-04 14:00:54 +00:00 committed by Lorenzo Alberto Maria Ambrosi
parent 177f10f76d
commit fc597abbc9
6 changed files with 53 additions and 52 deletions

View File

@ -26,8 +26,7 @@ const {
ChangeButton, ChangeButton,
DetailsText, DetailsText,
StepButton, StepButton,
StepNameButton, StepNameButton
ThemedProvider
} = require('./../../styled-components') } = require('./../../styled-components')
const { Txt } = require('rendition') const { Txt } = require('rendition')
const middleEllipsis = require('./../../utils/middle-ellipsis') const middleEllipsis = require('./../../utils/middle-ellipsis')
@ -66,7 +65,7 @@ const TargetSelector = (props) => {
if (targets.length === 1) { if (targets.length === 1) {
const target = targets[0] const target = targets[0]
return ( return (
<ThemedProvider> <React.Fragment>
<StepNameButton <StepNameButton
plain plain
tooltip={props.tooltip} tooltip={props.tooltip}
@ -74,7 +73,7 @@ const TargetSelector = (props) => {
{/* eslint-disable no-magic-numbers */} {/* eslint-disable no-magic-numbers */}
{ middleEllipsis(target.description, 20) } { middleEllipsis(target.description, 20) }
</StepNameButton> </StepNameButton>
{ !props.flashing && {!props.flashing &&
<ChangeButton <ChangeButton
plain plain
mb={14} mb={14}
@ -94,7 +93,7 @@ const TargetSelector = (props) => {
} }
{ bytesToClosestUnit(target.size) } { bytesToClosestUnit(target.size) }
</DetailsText> </DetailsText>
</ThemedProvider> </React.Fragment>
) )
} }
@ -118,7 +117,7 @@ const TargetSelector = (props) => {
)) ))
} }
return ( return (
<ThemedProvider> <React.Fragment>
<StepNameButton <StepNameButton
plain plain
tooltip={props.tooltip} tooltip={props.tooltip}
@ -135,12 +134,11 @@ const TargetSelector = (props) => {
</ChangeButton> </ChangeButton>
} }
{targetsTemplate} {targetsTemplate}
</ThemedProvider> </React.Fragment>
) )
} }
return ( return (
<ThemedProvider>
<StepButton <StepButton
tabindex={(targets.length > 0) ? -1 : 2 } tabindex={(targets.length > 0) ? -1 : 2 }
disabled={props.disabled} disabled={props.disabled}
@ -148,7 +146,6 @@ const TargetSelector = (props) => {
> >
Select target Select target
</StepButton> </StepButton>
</ThemedProvider>
) )
} }

View File

@ -120,7 +120,6 @@ class ImageSelector extends React.Component {
} }
reselectImage () { reselectImage () {
console.log('reselecting image')
analytics.logEvent('Reselect image', { analytics.logEvent('Reselect image', {
previousImage: selectionState.getImage(), previousImage: selectionState.getImage(),
applicationSessionUuid: store.getState().toJS().applicationSessionUuid, applicationSessionUuid: store.getState().toJS().applicationSessionUuid,

View File

@ -20,6 +20,9 @@ const _ = require('lodash')
const prettyBytes = require('pretty-bytes') const prettyBytes = require('pretty-bytes')
const propTypes = require('prop-types') const propTypes = require('prop-types')
const React = require('react') const React = require('react')
const {
ThemedProvider
} = require('../../styled-components')
const driveConstraints = require('../../../../shared/drive-constraints') const driveConstraints = require('../../../../shared/drive-constraints')
const utils = require('../../../../shared/utils') const utils = require('../../../../shared/utils')
const TargetSelector = require('../../components/drive-selector/target-selector') const TargetSelector = require('../../components/drive-selector/target-selector')
@ -195,6 +198,7 @@ const DriveSelector = ({
const showStepConnectingLines = !webviewShowing || !flashing const showStepConnectingLines = !webviewShowing || !flashing
return ( return (
<ThemedProvider>
<div className="box text-center relative"> <div className="box text-center relative">
{showStepConnectingLines && ( {showStepConnectingLines && (
@ -230,8 +234,8 @@ const DriveSelector = ({
targets={targets} targets={targets}
/> />
</div> </div>
</div> </div>
</ThemedProvider>
) )
} }

View File

@ -30,7 +30,6 @@ const MainPage = angular.module(MODULE_NAME, [
require('angular-ui-router'), require('angular-ui-router'),
require('../../components/drive-selector/drive-selector'), require('../../components/drive-selector/drive-selector'),
require('../../components/tooltip-modal/tooltip-modal'),
require('../../components/image-selector'), require('../../components/image-selector'),
require('../../components/file-selector'), require('../../components/file-selector'),
require('../../components/featured-project'), require('../../components/featured-project'),

View File

@ -15,6 +15,7 @@
*/ */
'use strict' 'use strict'
exports.colors = { exports.colors = {
dark: { dark: {
foreground: '#fff', foreground: '#fff',

View File

@ -79,7 +79,8 @@ const guiConfig = {
}, },
entry: { entry: {
gui: path.join(__dirname, 'lib', 'gui', 'app', 'app.js') gui: path.join(__dirname, 'lib', 'gui', 'app', 'app.js')
} },
devtool: 'source-map'
} }
const etcherConfig = { const etcherConfig = {