diff --git a/smart-hut/package-lock.json b/smart-hut/package-lock.json index 5a1ee14..188d272 100644 --- a/smart-hut/package-lock.json +++ b/smart-hut/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@ant-design/css-animation": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@ant-design/css-animation/-/css-animation-1.7.2.tgz", + "integrity": "sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw==" + }, "@babel/code-frame": { "version": "7.8.3", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", @@ -1999,6 +2004,14 @@ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==" }, + "add-dom-event-listener": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz", + "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==", + "requires": { + "object-assign": "4.x" + } + }, "address": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", @@ -4600,6 +4613,11 @@ "esutils": "^2.0.2" } }, + "dom-align": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.11.1.tgz", + "integrity": "sha512-hN42DmUgtweBx0iBjDLO4WtKOMcK8yBmPx/fgdsgQadLuzPu/8co3oLdK5yMmeM/vnUd3yDyV6qV8/NzxBexQg==" + }, "dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -11427,6 +11445,73 @@ } } }, + "rc-align": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-3.0.0.tgz", + "integrity": "sha512-/T/4LOlKJLFe8EwsORuc3pFWOJ8caUpj2vtKIHWea4PhakoleM7KDQsx0n1WDQENIeSfrP9P1FowVxAdvhjsvw==", + "requires": { + "classnames": "2.x", + "dom-align": "^1.7.0", + "rc-util": "^4.12.0", + "resize-observer-polyfill": "^1.5.1" + } + }, + "rc-animate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0.tgz", + "integrity": "sha512-+ANeyCei4lWSJHWTcocywdYAy6lpRdBva/7Fs3nBBiAngW/W+Gmx+gQEcsmcgQBqziWUYnR91Bk12ltR3GBHPA==", + "requires": { + "@ant-design/css-animation": "^1.7.2", + "classnames": "^2.2.6", + "raf": "^3.4.0", + "rc-util": "^4.15.3" + } + }, + "rc-slider": { + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.2.4.tgz", + "integrity": "sha512-wSr7vz+WtzzGqsGU2rTQ4mmLz9fkuIDMPYMYm8ygYFvxQ2Rh4uRhOWHYI0R8krNK5k1bGycckYxmQqUIvLAh3w==", + "requires": { + "babel-runtime": "6.x", + "classnames": "^2.2.5", + "rc-tooltip": "^4.0.0", + "rc-util": "^4.0.4", + "shallowequal": "^1.1.0", + "warning": "^4.0.3" + } + }, + "rc-tooltip": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.0.3.tgz", + "integrity": "sha512-HNyBh9/fPdds0DXja8JQX0XTIHmZapB3lLzbdn74aNSxXG1KUkt+GK4X1aOTRY5X9mqm4uUKdeFrn7j273H8gw==", + "requires": { + "rc-trigger": "^4.0.0" + } + }, + "rc-trigger": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.1.0.tgz", + "integrity": "sha512-EyQjO6aHDAPRvJeyPmg/yVL/8Bp7oA6Lf+4Ay2OyOwhZLzHHN8m+F2XrVWKpjg04eBXbuGBNiucIqv1d/ddE3w==", + "requires": { + "classnames": "^2.2.6", + "raf": "^3.4.1", + "rc-align": "^3.0.0-rc.0", + "rc-animate": "^3.0.0", + "rc-util": "^4.20.0" + } + }, + "rc-util": { + "version": "4.20.5", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.20.5.tgz", + "integrity": "sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg==", + "requires": { + "add-dom-event-listener": "^1.1.0", + "prop-types": "^15.5.10", + "react-is": "^16.12.0", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.1.0" + } + }, "react": { "version": "16.12.0", "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz", @@ -11654,6 +11739,11 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" }, + "react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, "react-modal": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-2.2.2.tgz", diff --git a/smart-hut/package.json b/smart-hut/package.json index b57dade..d6010d7 100644 --- a/smart-hut/package.json +++ b/smart-hut/package.json @@ -13,6 +13,7 @@ "classnames": "^2.2.6", "immutability-helper": "^3.0.2", "material-ui-image": "^3.2.3", + "rc-slider": "^9.2.4", "react": "^16.12.0", "react-axios": "^2.0.3", "react-circular-input": "^0.1.6", diff --git a/smart-hut/public/img/camera-icon-simulation.png b/smart-hut/public/img/camera-icon-simulation.png new file mode 100644 index 0000000..ebc169c Binary files /dev/null and b/smart-hut/public/img/camera-icon-simulation.png differ diff --git a/smart-hut/public/img/humidity-simulation.png b/smart-hut/public/img/humidity-simulation.png new file mode 100644 index 0000000..fc2e758 Binary files /dev/null and b/smart-hut/public/img/humidity-simulation.png differ diff --git a/smart-hut/public/img/insensity-light-simulation.png b/smart-hut/public/img/insensity-light-simulation.png new file mode 100644 index 0000000..b252bc7 Binary files /dev/null and b/smart-hut/public/img/insensity-light-simulation.png differ diff --git a/smart-hut/public/img/intensity-icon-simulation-2.png b/smart-hut/public/img/intensity-icon-simulation-2.png new file mode 100644 index 0000000..347fd79 Binary files /dev/null and b/smart-hut/public/img/intensity-icon-simulation-2.png differ diff --git a/smart-hut/public/img/light-simulation.png b/smart-hut/public/img/light-simulation.png new file mode 100644 index 0000000..744aeb0 Binary files /dev/null and b/smart-hut/public/img/light-simulation.png differ diff --git a/smart-hut/public/img/motion-simulation.png b/smart-hut/public/img/motion-simulation.png new file mode 100644 index 0000000..5f0dcb3 Binary files /dev/null and b/smart-hut/public/img/motion-simulation.png differ diff --git a/smart-hut/public/img/thermo-simulation.png b/smart-hut/public/img/thermo-simulation.png new file mode 100644 index 0000000..08d9bb6 Binary files /dev/null and b/smart-hut/public/img/thermo-simulation.png differ diff --git a/smart-hut/src/components/DropdownSimulation.js b/smart-hut/src/components/DropdownSimulation.js new file mode 100644 index 0000000..853f441 --- /dev/null +++ b/smart-hut/src/components/DropdownSimulation.js @@ -0,0 +1,15 @@ +import React from 'react'; +import { Dropdown } from 'semantic-ui-react'; + +const options = [ + { key: 'Living Room', text: 'Living Room', value: 'Living Room' }, + { key: 'Kitchen', text: 'Kitchen', value: 'Kitchen' }, + { key: 'Garden', text: 'Garden', value: 'Garden' }, + { key: 'Bedroom 1', text: 'Bedroom 1', value: 'Bedroom 1' }, +]; + +const DropdownSimulation = () => ( + +); + +export default DropdownSimulation; diff --git a/smart-hut/src/components/HeaderController.js b/smart-hut/src/components/HeaderController.js index 6b214ba..f09e11c 100644 --- a/smart-hut/src/components/HeaderController.js +++ b/smart-hut/src/components/HeaderController.js @@ -8,10 +8,10 @@ import { Checkbox, Segment, Image, } from 'semantic-ui-react'; - import { withRouter } from 'react-router-dom'; import { connect } from 'react-redux'; import { RemoteService } from '../remote'; +import SimulationPanel from './SimulationPanel'; const IconHomeImage = () => ( ( const TitleImage = () => ; -export class MyHeader extends React.Component { +class MyHeader extends React.Component { constructor(props) { super(props); - + this.state = { simulationPanel: undefined }; this.getInfo(); this.logout = this.logout.bind(this); } @@ -53,16 +53,37 @@ export class MyHeader extends React.Component { .catch((err) => console.error('Camera enabled', err)); } + openSimulationPanel = () => { + this.setState((state) => ({ simulationPanel: true })); + }; + + closeSimulationPanel = () => { + this.setState((state) => ({ simulationPanel: undefined })); + }; + + render() { return (
+ - - - + + + + + + + +
+ +
+ @@ -78,6 +99,7 @@ export class MyHeader extends React.Component { + Share cameras} checked={this.props.cameraEnabled} - toggle onChange={(e, val) => this.setCameraEnabled(val.checked)} /> @@ -106,30 +127,43 @@ export class MyHeader extends React.Component { - - - - + + + - - +
+ +
+ + + + + + + + + + - Share cameras} - checked={this.props.cameraEnabled} - toggle - onChange={(e, val) => this.setCameraEnabled(val.checked)} - /> - + > + Share cameras} + checked={this.props.cameraEnabled} + onChange={(e, val) => this.setCameraEnabled(val.checked)} + /> + + diff --git a/smart-hut/src/components/SimulationPanel.js b/smart-hut/src/components/SimulationPanel.js new file mode 100644 index 0000000..3031388 --- /dev/null +++ b/smart-hut/src/components/SimulationPanel.js @@ -0,0 +1,428 @@ +import React, { Component } from 'react'; +import { + Grid, + Divider, + Image, + Modal, + Button, + } from 'semantic-ui-react'; +import { connect } from 'react-redux'; +import { RemoteService } from '../remote'; +import SimulationPanelSlider from './SimulationPanelSlider.js'; + +/* +const SimulationPanel = (props) => ( + + {props.simulationPanel} + + + {/* TITLE } + +

+ Welcome in the Simulation Panel +

+ + + {/* TEMPERATURE SENSOR } + + + + +

+ Temperature Sensor +

+ + + + + + +
+ +
+ +
+ +
+ + + + {/* HUMIDTY SENSOR } + + + + +

+ Humidity Sensor +

+ + + + + + +
+ +
+ +
+ +
+ + + + {/* LIGHT SENSOR } + + + + +

+ Light Sensor +

+ + + + + + +
+ +
+ +
+ +
+ + + + {/* MOTION SENSOR } + + + + +

+ Motion Sensor +

+ + + + + + +
+ +
+ +
+ +
+ + + + + + +); +*/ +class SimulationPanel extends Component { + constructor(props) { + super(props); + console.log(this.props.devices); + this.state = { + value: null, + error: null, + }; + this.updateSliderValues = this.updateSliderValues.bind(this); + this.saveChanges = this.saveChanges.bind(this); + } + + updateSliderValues(type, data, motion) { + console.log(data, motion); + this.setState({ + [type ? 'error' : 'value']: data, + }); + } + + saveChanges(device) { + console.log(this.state); + const { value } = this.state; + const { error } = this.state; + if (device.kind === 'sensor') { + this.props + .updateSimulation( + { ...device, typical: value, err: error }, + ) + .catch((err) => console.error('Simulation panel update error', err)); + } else { + const val = device.kind === 'motionSensor' ? 'detected' : 'typical'; + this.props + .saveDevice( + { ...device, [val]: value, err: error }, + null, + ) + .catch((err) => console.error('Simulation panel update error', err)); + } + } + + renderImage(device) { + let image = './../img/'; + switch (device.kind) { + case 'thermostat': + image += 'thermo-simulation.png'; + break; + case 'motionSensor': + image += 'motion-simulation.png'; + break; + case 'sensor': + if (device.sensorType === 'TEMPERATURE') { + image += 'thermo-simulation.png'; + } else if (device.sensorType === 'HUMIDITY') { + image += 'humidity-simulation.png'; + } else { + image += 'light-simulation.png'; + } + break; + default: + break; + } + + return ( + +); + } + + render() { + return ( + + + +

+ Welcome in the Simulation Panel +

+ + { + this.props.devices + ? this.props.devices.map((d, i) => ( + + + {this.renderImage(d)} +

+ {d.name} +

+ + + + + + + +
+ +
+ { + d.kind === 'motionSensor' + ? null + : ( + <> + +
+ +
+ +) + } + + + )) + : null + } + + + + ); + } +} + +const mapStateToProps = (state, _) => ({ + get devices() { + const deviceInternalSensor = { + thermostat: 'Thermostat', + sensor: 'Sensor', + motionSensor: 'Sensor', + }; + const deviceArray = [ + ...Object.values(state.devices), + ].filter((e) => e.kind in deviceInternalSensor); + return deviceArray; + }, +}); +const SimulationPanelContainer = connect( +mapStateToProps, +RemoteService, +)(SimulationPanel); +export default SimulationPanelContainer; diff --git a/smart-hut/src/components/SimulationPanelSlider.js b/smart-hut/src/components/SimulationPanelSlider.js new file mode 100644 index 0000000..e278655 --- /dev/null +++ b/smart-hut/src/components/SimulationPanelSlider.js @@ -0,0 +1,130 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Checkbox, Message, Label, +} from 'semantic-ui-react'; +import { connect } from 'react-redux'; +import { RemoteService } from '../remote'; + +class SimulationPanelSlider extends Component { + constructor(props) { + super(props); + console.log(this.props.device); + this.state = { + value: this.internalValue, + error: this.internalValue, + }; + this.updateSliderValues = this.updateSliderValues.bind(this); + } + + updateSliderValues(data) { + this.setState({ + [this.props.error ? 'error' : 'value']: data, + }); + console.log(this.state); + this.props.update(this.props.error, data, this.props.device.kind === 'motionSensor'); + } + + settings() { + let max; + let step; + switch (this.props.device.kind) { + case 'sensor': + if (this.props.device.sensorType === 'LIGHT') { + max = this.props.error ? 1000 : 15000; + step = 10; + } else { + max = 100; + step = 1; + } + break; + case 'thermostat': + max = 100; + step = 1; + break; + default: + break; + } + return { max, step }; + } + + get internalValue() { + if (this.props.device.kind === 'motionSensor') { + return this.props.device.detected; + } + return this.props.error ? this.props.device.err : this.props.device.typical.toFixed(2); + } + + get getValue() { + switch (this.props.device.kind) { + case 'motionSensor': + return this.props.device.detected; + case 'thermostat': + return this.props.device.internalSensorTemperature; + case 'sensor': + return this.props.device.value.toFixed(2); + default: + return ''; + } + } + + render() { + return ( + + + + {this.props.error ? 'Edit error' : 'Edit value'} +

+ Actual value of + {' '} + {this.props.device.name} +: + {this.props.device.kind === 'motionSensor' + ? this.getValue ? 'on' : 'off' : this.getValue} +

+

+ {this.props.error ? 'error' : 'typical value'} + {' '} +: + {this.props.device.kind === 'motionSensor' + ? this.internalValue ? 'on' : 'off' : this.internalValue} +

+ + { + this.props.device.kind === 'motionSensor' + ? ( + this.updateSliderValues(checked)} + /> + ) + : ( + <> + + this.updateSliderValues(value)} + step={this.settings().step} + type="range" + value={this.props.error ? this.state.error : this.state.value} + /> + + ) + } + + + ); + } +} + +const mapStateToProps = (state, ownProps) => ({ + device: state.devices[ownProps.id], + }); +const SimulationPanelSliderContainer = connect(mapStateToProps, RemoteService)(SimulationPanelSlider); +export default SimulationPanelSliderContainer; diff --git a/smart-hut/src/components/SliderHumidity.js b/smart-hut/src/components/SliderHumidity.js new file mode 100644 index 0000000..94e1242 --- /dev/null +++ b/smart-hut/src/components/SliderHumidity.js @@ -0,0 +1,45 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderHumidity extends Component { + state = { visible: true, duration: 78 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Humidity: ${duration} %`} +

+ + + + + ); + } +} diff --git a/smart-hut/src/components/SliderLight.js b/smart-hut/src/components/SliderLight.js new file mode 100644 index 0000000..e5a638c --- /dev/null +++ b/smart-hut/src/components/SliderLight.js @@ -0,0 +1,45 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderLight extends Component { + state = { visible: true, duration: 10500 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Light intensity: ${duration} lm`} +

+ + + + + ); + } +} diff --git a/smart-hut/src/components/SliderLightRange.js b/smart-hut/src/components/SliderLightRange.js new file mode 100644 index 0000000..0854a10 --- /dev/null +++ b/smart-hut/src/components/SliderLightRange.js @@ -0,0 +1,46 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderTempRange extends Component { + state = { visible: true, duration: 500 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Chosen tolerance: +/- ${duration}`} +

+ + + + + + ); + } +} diff --git a/smart-hut/src/components/SliderMotion.js b/smart-hut/src/components/SliderMotion.js new file mode 100644 index 0000000..8c3a8ce --- /dev/null +++ b/smart-hut/src/components/SliderMotion.js @@ -0,0 +1,45 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderLight extends Component { + state = { visible: true, duration: 5 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Range: ${duration} meters`} +

+ + + + + ); + } +} diff --git a/smart-hut/src/components/SliderTempRange.js b/smart-hut/src/components/SliderTempRange.js new file mode 100644 index 0000000..41035f3 --- /dev/null +++ b/smart-hut/src/components/SliderTempRange.js @@ -0,0 +1,46 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderTempRange extends Component { + state = { visible: true, duration: 5 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Chosen tolerance: +/- ${duration}`} +

+ + + + + + ); + } +} diff --git a/smart-hut/src/components/SliderTemperature.js b/smart-hut/src/components/SliderTemperature.js new file mode 100644 index 0000000..5cace21 --- /dev/null +++ b/smart-hut/src/components/SliderTemperature.js @@ -0,0 +1,45 @@ +import React, { Component } from 'react'; +import { + Form, Grid, Image, Transition, Divider, +} from 'semantic-ui-react'; + + +export default class SliderTemperature extends Component { + state = { visible: true, duration: 20 } + + handleChange = (e, { name, value }) => this.setState({ [name]: value }) + + handleVisibility = () => this.setState((prevState) => ({ visible: !prevState.visible })) + + render() { + const { duration } = this.state; + + return ( + + +

+ {`Heat: ${duration} Celsius Degrees`} +

+ + + + + ); + } +} diff --git a/smart-hut/src/components/dashboard/AutomationCreationModal.js b/smart-hut/src/components/dashboard/AutomationCreationModal.js index 1cad28d..15563c3 100644 --- a/smart-hut/src/components/dashboard/AutomationCreationModal.js +++ b/smart-hut/src/components/dashboard/AutomationCreationModal.js @@ -653,6 +653,7 @@ class AutomationSaveModal extends Component { } render() { + console.log(this.state.conditionsList); return ( ( {props.selectedVideo && ( )} - ); diff --git a/smart-hut/src/remote.js b/smart-hut/src/remote.js index b648c77..6d294bd 100644 --- a/smart-hut/src/remote.js +++ b/smart-hut/src/remote.js @@ -540,6 +540,19 @@ export const RemoteService = { }); }, + updateSimulation: (data) => (dispatch) => { + const url = `/sensor/${data.id}/simulation`; + return Endpoint.put(url, {}, data) + .then((res) => { + dispatch(actions.deviceSave(res.data)); + return res.data; + }) + .catch((err) => { + console.warn('Update device: ', data, 'error: ', err); + throw new RemoteError(['Network error']); + }); + }, + fastUpdateAutomation: (automation) => (dispatch) => Endpoint.put('/automation/fast', {}, automation) .then((res) => dispatch(actions.automationSave(res.data))) .catch((err) => { diff --git a/smart-hut/yarn.lock b/smart-hut/yarn.lock index 4bb93d7..29f6e6b 100644 --- a/smart-hut/yarn.lock +++ b/smart-hut/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@ant-design/css-animation@^1.7.2": + version "1.7.2" + resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.2.tgz#4ee5d2ec0fb7cc0a78b44e1c82628bd4621ac7e3" + integrity sha512-bvVOe7A+r7lws58B7r+fgnQDK90cV45AXuvGx6i5CCSX1W/M3AJnHsNggDANBxEtWdNdFWcDd5LorB+RdSIlBw== + "@babel/code-frame@7.8.3", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" @@ -1009,7 +1014,15 @@ dependencies: regenerator-runtime "^0.13.4" +<<<<<<< HEAD +<<<<<<< HEAD +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +======= "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== @@ -1292,6 +1305,20 @@ chalk "^3.0.0" "@material-ui/core@^4.9.4": +<<<<<<< HEAD +<<<<<<< HEAD + version "4.9.13" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz#024962bcdda05139e1bad17a1815bf4088702b15" + integrity sha512-GEXNwUr+laZ0N+F1efmHB64Fyg+uQIRXLqbSejg3ebSXgLYNpIjnMOPRfWdu4rICq0dAIgvvNXGkKDMcf3AMpA== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/react-transition-group" "^4.3.0" + "@material-ui/styles" "^4.9.13" + "@material-ui/system" "^4.9.13" + "@material-ui/types" "^5.0.1" +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b version "4.9.14" resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.14.tgz#4388f82cf94554cd3a935774fc12820f3c607a8a" integrity sha512-71oYrOpInx5honJ9GzZlygPjmsFhn7Bui61/SWLJsPTkMnfvuZfU3qVqlEHjXyDsnZ+uKmLAIdsrOYnphJxxXw== @@ -1300,6 +1327,10 @@ "@material-ui/styles" "^4.9.14" "@material-ui/system" "^4.9.14" "@material-ui/types" "^5.1.0" +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/utils" "^4.9.12" "@types/react-transition-group" "^4.2.0" clsx "^1.0.4" @@ -1307,7 +1338,15 @@ popper.js "^1.16.1-lts" prop-types "^15.7.2" react-is "^16.8.0" +<<<<<<< HEAD +<<<<<<< HEAD + react-transition-group "^4.3.0" +======= react-transition-group "^4.4.0" +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + react-transition-group "^4.4.0" +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/icons@^4.9.1": version "4.9.1" @@ -1316,6 +1355,29 @@ dependencies: "@babel/runtime" "^7.4.4" +<<<<<<< HEAD +<<<<<<< HEAD +"@material-ui/react-transition-group@^4.3.0": + version "4.3.0" + resolved "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz#92529142addb5cc179dbf42d246c7e3fe4d6104b" + integrity sha512-CwQ0aXrlUynUTY6sh3UvKuvye1o92en20VGAs6TORnSxUYeRmkX8YeTUN3lAkGiBX1z222FxLFO36WWh6q73rQ== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + +"@material-ui/styles@^4.9.13": + version "4.9.13" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz#08b3976bdd21c38bc076693d95834f97539f3b15" + integrity sha512-lWlXJanBdHQ18jW/yphedRokHcvZD1GdGzUF/wQxKDsHwDDfO45ZkAxuSBI202dG+r1Ph483Z3pFykO2obeSRA== + dependencies: + "@babel/runtime" "^7.4.4" + "@emotion/hash" "^0.8.0" + "@material-ui/types" "^5.0.1" +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/styles@^4.9.14": version "4.9.14" resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.14.tgz#0a9e93a2bf24e8daa0811411a6f3dabdafbe9a07" @@ -1324,6 +1386,10 @@ "@babel/runtime" "^7.4.4" "@emotion/hash" "^0.8.0" "@material-ui/types" "^5.1.0" +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/utils" "^4.9.6" clsx "^1.0.4" csstype "^2.5.2" @@ -1338,6 +1404,24 @@ jss-plugin-vendor-prefixer "^10.0.3" prop-types "^15.7.2" +<<<<<<< HEAD +<<<<<<< HEAD +"@material-ui/system@^4.9.13": + version "4.9.13" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz#adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d" + integrity sha512-6AlpvdW6KJJ5bF1Xo2OD13sCN8k+nlL36412/bWnWZOKIfIMo/Lb8c8d1DOIaT/RKWxTEUaWnKZjabVnA3eZjA== + dependencies: + "@babel/runtime" "^7.4.4" + "@material-ui/utils" "^4.9.6" + prop-types "^15.7.2" + +"@material-ui/types@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz#c4954063cdc196eb327ee62c041368b1aebb6d61" + integrity sha512-wURPSY7/3+MAtng3i26g+WKwwNE3HEeqa/trDBR5+zWKmcjO+u9t7Npu/J1r+3dmIa/OeziN9D/18IrBKvKffw== +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/system@^4.9.14": version "4.9.14" resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.14.tgz#4b00c48b569340cefb2036d0596b93ac6c587a5f" @@ -1352,6 +1436,10 @@ version "5.1.0" resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b "@material-ui/utils@^4.9.12", "@material-ui/utils@^4.9.6": version "4.9.12" @@ -1614,6 +1702,10 @@ "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "2.0.1" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== @@ -1621,7 +1713,16 @@ version "2.0.2" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5" integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz#79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5" + integrity sha512-rsZg7eL+Xcxsxk2XlBt9KcG8nOp9iYdKCOikY9x2RFJCyOdNj4MKPQty0e8oZr29vVAzKXr1BmR+kZauti3o1w== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 "@types/istanbul-lib-report@*": version "3.0.0" @@ -1632,6 +1733,10 @@ "@types/istanbul-reports@^1.1.1": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "1.1.1" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== @@ -1639,7 +1744,16 @@ version "1.1.2" resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "1.1.2" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2" + integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" @@ -1656,14 +1770,30 @@ "@types/node@*": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "13.13.5" resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz#96ec3b0afafd64a4ccea9107b75bf8489f0e5765" integrity sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g== +======= +<<<<<<< HEAD + version "14.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c" + integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "14.0.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c" + integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b ======= version "14.0.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.1.tgz#5d93e0a099cd0acd5ef3d5bde3c086e1f49ff68c" integrity sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA== >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 "@types/parse-json@^4.0.0": version "4.0.0" @@ -1681,9 +1811,21 @@ integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== "@types/react-dom@*": +<<<<<<< HEAD +<<<<<<< HEAD + version "16.9.7" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz#60844d48ce252d7b2dccf0c7bb937130e27c0cd2" + integrity sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA== +======= version "16.9.8" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423" integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "16.9.8" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423" + integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: "@types/react" "*" @@ -1695,9 +1837,21 @@ "@types/react" "*" "@types/react@*": +<<<<<<< HEAD +<<<<<<< HEAD + version "16.9.34" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349" + integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow== +======= version "16.9.35" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368" integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "16.9.35" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368" + integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: "@types/prop-types" "*" csstype "^2.2.0" @@ -1736,44 +1890,104 @@ integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== "@types/yargs@^13.0.0": +<<<<<<< HEAD +<<<<<<< HEAD + version "13.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99" + integrity sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA== +======= version "13.0.9" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1" integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "13.0.9" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.9.tgz#44028e974343c7afcf3960f1a2b1099c39a7b5e1" + integrity sha512-xrvhZ4DZewMDhoH1utLtOAwYQy60eYFoXeje30TzM3VOvQlBwQaEpKFq5m34k1wOw2AKIi2pwtiAjdmhvlBUzg== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: "@types/yargs-parser" "*" "@types/yargs@^15.0.0": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "15.0.4" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" integrity sha512-9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg== +======= +<<<<<<< HEAD + version "15.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" + integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "15.0.5" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" + integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b ======= version "15.0.5" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz#947e9a6561483bdee9adffc983e91a6902af8b79" integrity sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w== >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^2.10.0": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz#942c921fec5e200b79593c71fafb1e3f57aa2e36" + integrity sha512-iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg== + dependencies: + "@typescript-eslint/experimental-utils" "2.31.0" +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= version "2.32.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.32.0.tgz#5d5cc2e00b1d4a4b848cc68bfdd3aede1ef0ad16" integrity sha512-nb1kSUa8cd22hGgxpGdVT6/iyP7IKyrnyZEGYo+tN8iyDdXvXa+nfsX03tJVeFfhbkwR/0CDk910zPbqSflAsg== dependencies: "@typescript-eslint/experimental-utils" "2.32.0" ======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "2.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz#d6c8319d5011b4783bb3d2dadf105d8bdd499bd5" integrity sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ== dependencies: "@typescript-eslint/experimental-utils" "2.33.0" +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +"@typescript-eslint/experimental-utils@2.31.0": + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz#a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508" + integrity sha512-MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.31.0" +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= "@typescript-eslint/experimental-utils@2.32.0": version "2.32.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.32.0.tgz#bee7fbe1d21d13a273066d70abc82549d0b7943e" @@ -1782,6 +1996,7 @@ "@types/json-schema" "^7.0.3" "@typescript-eslint/typescript-estree" "2.32.0" ======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 "@typescript-eslint/experimental-utils@2.33.0": version "2.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz#000f1e5f344fbea1323dc91cc174805d75f99a03" @@ -1789,12 +2004,38 @@ dependencies: "@types/json-schema" "^7.0.3" "@typescript-eslint/typescript-estree" "2.33.0" +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 eslint-scope "^5.0.0" eslint-utils "^2.0.0" "@typescript-eslint/parser@^2.10.0": <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz#beddd4e8efe64995108b229b2862cd5752d40d6f" + integrity sha512-uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ== + dependencies: + "@types/eslint-visitor-keys" "^1.0.0" + "@typescript-eslint/experimental-utils" "2.31.0" + "@typescript-eslint/typescript-estree" "2.31.0" + eslint-visitor-keys "^1.1.0" + +"@typescript-eslint/typescript-estree@2.31.0": + version "2.31.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz#ac536c2d46672aa1f27ba0ec2140d53670635cfd" + integrity sha512-vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA== +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= version "2.32.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.32.0.tgz#a1ace8ab1af529580bfb6cc2cd55fd8d8b1e68ab" integrity sha512-swRtH835fUfm2khchiOVNchU3gVNaZNj2pY92QSx4kXan+RzaGNrwIRaCyX8uqzmK0xNPzseaUYHP8CsmrsjFw== @@ -1809,6 +2050,7 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.32.0.tgz#0e4ae2e883557f94039b13ac0ecfcfbb09835b8d" integrity sha512-hQpbWM/Y2iq6jB9FHYJBqa3h1R9IEGodOtajhb261cVHt9cz30AKjXM6WP7LxJdEPPlyJ9rPTZVgBUgZgiyPgw== ======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "2.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.33.0.tgz#395c0ef229ebef883608f8632a34f0acf02b9bdd" integrity sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA== @@ -1822,14 +2064,29 @@ version "2.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz#33504c050ccafd38f397a645d4e9534d2eccbb5c" integrity sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg== +<<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: debug "^4.1.1" eslint-visitor-keys "^1.1.0" glob "^7.1.6" is-glob "^4.0.1" lodash "^4.17.15" +<<<<<<< HEAD +<<<<<<< HEAD + semver "^6.3.0" +======= semver "^7.3.2" +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + semver "^7.3.2" +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b tsutils "^3.17.1" "@webassemblyjs/ast@1.8.5": @@ -2030,9 +2287,28 @@ acorn@^6.0.1, acorn@^6.0.4, acorn@^6.2.1: integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.1: +<<<<<<< HEAD +<<<<<<< HEAD + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" + integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== +======= version "7.2.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe" integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe" + integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== + +add-dom-event-listener@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310" + integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw== + dependencies: + object-assign "4.x" +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b address@1.1.2, address@^1.0.1: version "1.1.2" @@ -2551,7 +2827,7 @@ babel-preset-react-app@^9.1.1: babel-plugin-macros "2.8.0" babel-plugin-transform-react-remove-prop-types "0.4.24" -babel-runtime@^6.26.0: +babel-runtime@6.x, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -3019,14 +3295,30 @@ caniuse-api@^3.0.0: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001039, caniuse-lite@^1.0.30001043: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD + version "1.0.30001054" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz#7e82fc42d927980b0ce1426c4813df12381e1a75" + integrity sha512-jiKlTI6Ur8Kjfj8z0muGrV6FscpRvefcQVPSuMuXnvRCfExU7zlVLNjmOz1TnurWgUrAY7MMmjyy+uTgIl1XHw== +======= version "1.0.30001055" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001055.tgz#7b52c3537f7a8c0408aca867e83d2b04268b54cd" integrity sha512-MbwsBmKrBSKIWldfdIagO5OJWZclpJtS4h0Jrk/4HFrXJxTdVdH23Fd+xCiHriVGvYcWyW8mR/CPsYajlH8Iuw== +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 ======= version "1.0.30001059" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34" integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "1.0.30001059" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001059.tgz#7bff0613d94b6ea41cb5c864c966d340f8ae6d34" + integrity sha512-oOrc+jPJWooKIA0IrNZ5sYlsXc7NP7KLhNWrSGEJhnfSzDvDJ0zd3i6HXsslExY9bbu+x0FQ5C61LcqmPt7bOQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 capture-exit@^2.0.0: version "2.0.0" @@ -3157,7 +3449,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@^2.2.3, classnames@^2.2.6: +classnames@2.x, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6: version "2.2.6" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== @@ -4160,6 +4452,11 @@ dom-accessibility-api@^0.3.0: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.3.0.tgz#511e5993dd673b97c87ea47dba0e3892f7e0c983" integrity sha512-PzwHEmsRP3IGY4gv/Ug+rMeaTIyTJvadCb+ujYXYeIylbHJezIyNToe8KfEgHTCEYyC+/bUghYOGg8yMGlZ6vA== +dom-align@^1.7.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c" + integrity sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA== + dom-converter@^0.2: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -4306,14 +4603,30 @@ ee-first@1.1.1: electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.413: <<<<<<< HEAD - version "1.3.434" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.434.tgz#a67dcb268e93768e2169399999ccffa4783f048e" - integrity sha512-WjzGrE6appXvMyc2kH9Ide7OxsgTuRzag9sjQ5AcbOnbS9ut7P1HzOeEbJFLhr81IR7n2Hlr6qTTSGTXLIX5Pg== +<<<<<<< HEAD +<<<<<<< HEAD + version "1.3.432" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.432.tgz#3bf7b191978ff2e8bc3caf811bb52b1e9f9eab25" + integrity sha512-/GdNhXyLP5Yl2322CUX/+Xi8NhdHBqL6lD9VJVKjH6CjoPGakvwZ5CpKgj/oOlbzuWWjOvMjDw1bBuAIRCNTlw== ======= version "1.3.438" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920" integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "1.3.434" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.434.tgz#a67dcb268e93768e2169399999ccffa4783f048e" + integrity sha512-WjzGrE6appXvMyc2kH9Ide7OxsgTuRzag9sjQ5AcbOnbS9ut7P1HzOeEbJFLhr81IR7n2Hlr6qTTSGTXLIX5Pg== +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 +======= + version "1.3.438" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.438.tgz#56051a9b148842fec813b113e8070ae892a85920" + integrity sha512-QKMcpfA/fCOnqFHsZvKr2haQQb3eXkDI17zT+4hHxJJThyN5nShcG6q1VR8vRiE/2GCJM+0p3PzinYknkdsBYg== +<<<<<<< HEAD +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 elliptic@^6.0.0, elliptic@^6.5.2: version "6.5.2" @@ -4382,9 +4695,21 @@ entities@^1.1.1: integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== entities@^2.0.0: +<<<<<<< HEAD +<<<<<<< HEAD + version "2.0.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4" + integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw== +======= version "2.0.2" resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436" integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "2.0.2" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.2.tgz#ac74db0bba8d33808bbf36809c3a5c3683531436" + integrity sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b errno@^0.1.3, errno@~0.1.7: version "0.1.7" @@ -4479,6 +4804,11 @@ escodegen@^1.11.0, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b eslint-config-airbnb-base@^14.1.0: version "14.1.0" resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.1.0.tgz#2ba4592dd6843258221d9bff2b6831bd77c874e4" @@ -4497,6 +4827,10 @@ eslint-config-airbnb@^18.1.0: object.assign "^4.1.0" object.entries "^1.1.1" +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b eslint-config-react-app@^5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz#698bf7aeee27f0cea0139eaef261c7bf7dd623df" @@ -4531,11 +4865,20 @@ eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b eslint-plugin-chai-friendly@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/eslint-plugin-chai-friendly/-/eslint-plugin-chai-friendly-0.6.0.tgz#54052fab79302ed0cea76ab997351ea4809bfb77" integrity sha512-Uvvv1gkbRGp/qfN15B0kQyQWg+oFA8buDSqrwmW3egNSk/FpqH2MjQqKOuKwmEL6w4QIQrIjDp+gg6kGGmD3oQ== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b eslint-plugin-flowtype@4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz#82b2bd6f21770e0e5deede0228e456cb35308451" @@ -4723,9 +5066,21 @@ etag@~1.8.1: integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eventemitter3@^4.0.0: +<<<<<<< HEAD +<<<<<<< HEAD + version "4.0.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" + integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== +======= version "4.0.4" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "4.0.4" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384" + integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b events@^3.0.0: version "3.1.0" @@ -5738,14 +6093,30 @@ html-escaper@^2.0.0: html-minifier-terser@^5.0.1: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "5.1.0" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#95d3df037f04835e9d1a09d1767c0e361a7de916" integrity sha512-tiYE76O1zunboByeB/nFGwUEb263Z3nkNv6Lz2oLC1s6M36bLKfTrjQ+7ssVfaucVllE+N7hh/FbpbxvnIA+LQ== +======= +<<<<<<< HEAD + version "5.1.1" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" + integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "5.1.1" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" + integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b ======= version "5.1.1" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: camel-case "^4.1.1" clean-css "^4.2.3" @@ -7609,6 +7980,19 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.0.tgz#cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256" integrity sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY= +<<<<<<< HEAD +<<<<<<< HEAD +mini-create-react-context@^0.3.0: + version "0.3.2" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189" + integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw== + dependencies: + "@babel/runtime" "^7.4.0" + gud "^1.0.0" + tiny-warning "^1.0.2" +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b mini-create-react-context@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz#df60501c83151db69e28eac0ef08b4002efab040" @@ -7616,6 +8000,10 @@ mini-create-react-context@^0.4.0: dependencies: "@babel/runtime" "^7.5.5" tiny-warning "^1.0.3" +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b mini-css-extract-plugin@0.9.0: version "0.9.0" @@ -7665,6 +8053,10 @@ minipass-flush@^1.0.5: minipass-pipeline@^1.2.2: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "1.2.2" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a" integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA== @@ -7672,12 +8064,25 @@ minipass-pipeline@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34" integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "1.2.3" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz#55f7839307d74859d6e8ada9c3ebe72cec216a34" + integrity sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: minipass "^3.0.0" minipass@^3.0.0, minipass@^3.1.1: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w== @@ -7685,7 +8090,16 @@ minipass@^3.0.0, minipass@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "3.1.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" + integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b +======= >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: yallist "^4.0.0" @@ -7994,7 +8408,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@4.x, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -9273,9 +9687,21 @@ postcss@7.0.21: supports-color "^6.1.0" postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6: +<<<<<<< HEAD +<<<<<<< HEAD + version "7.0.29" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz#d3a903872bd52280b83bce38cdc83ce55c06129e" + integrity sha512-ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw== +======= version "7.0.30" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2" integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "7.0.30" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2" + integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -9520,7 +9946,7 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e" integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA== -raf@^3.4.1: +raf@^3.4.0, raf@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== @@ -9557,6 +9983,67 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +rc-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-3.0.0.tgz#5b0510aaa12dfef7b8d79877d39e43de5ef831bc" + integrity sha512-/T/4LOlKJLFe8EwsORuc3pFWOJ8caUpj2vtKIHWea4PhakoleM7KDQsx0n1WDQENIeSfrP9P1FowVxAdvhjsvw== + dependencies: + classnames "2.x" + dom-align "^1.7.0" + rc-util "^4.12.0" + resize-observer-polyfill "^1.5.1" + +rc-animate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.0.0.tgz#f76d7051136b7d650fb3d29366a160e95a369c0a" + integrity sha512-+ANeyCei4lWSJHWTcocywdYAy6lpRdBva/7Fs3nBBiAngW/W+Gmx+gQEcsmcgQBqziWUYnR91Bk12ltR3GBHPA== + dependencies: + "@ant-design/css-animation" "^1.7.2" + classnames "^2.2.6" + raf "^3.4.0" + rc-util "^4.15.3" + +rc-slider@^9.2.4: + version "9.2.4" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.2.4.tgz#92e2b58c53def9921ae0fc2822727ab5785b9ed0" + integrity sha512-wSr7vz+WtzzGqsGU2rTQ4mmLz9fkuIDMPYMYm8ygYFvxQ2Rh4uRhOWHYI0R8krNK5k1bGycckYxmQqUIvLAh3w== + dependencies: + babel-runtime "6.x" + classnames "^2.2.5" + rc-tooltip "^4.0.0" + rc-util "^4.0.4" + shallowequal "^1.1.0" + warning "^4.0.3" + +rc-tooltip@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-4.2.0.tgz#614235c94874861b7a473793992956fb666e2ba2" + integrity sha512-Ehf7nTQkn+2Y5J1awYIH8RmMTzHEBj+V7VpLLgCjMVMbigJLdW6pcB2XK6oSGUKl9VGzONdWqya+OKHIPd3D1Q== + dependencies: + rc-trigger "^4.2.1" + +rc-trigger@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-4.2.1.tgz#e30271c703d3a470fd47e75b7432102c7d0c9449" + integrity sha512-iFQ+/FbzDvYDrTS3jXbdk4MgVNU0R/A8UAAQkspXSr4Q6jTcR6p+lfNhSS0JJgJuXtfjoInC0+8jXK8HUShQ0g== + dependencies: + classnames "^2.2.6" + raf "^3.4.1" + rc-align "^3.0.0" + rc-animate "^3.0.0" + rc-util "^4.20.0" + +rc-util@^4.0.4, rc-util@^4.12.0, rc-util@^4.15.3, rc-util@^4.20.0: + version "4.20.5" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.20.5.tgz#f7c77569e971ae6a8ad56f899cadd22275398325" + integrity sha512-f67s4Dt1quBYhrVPq5QMKmK3eS2hN1NNIAyhaiG0HmvqiGYAXMQ7SP2AlGqv750vnzhJs38JklbkWT1/wjhFPg== + dependencies: + add-dom-event-listener "^1.1.0" + prop-types "^15.5.10" + react-is "^16.12.0" + react-lifecycles-compat "^3.0.4" + shallowequal "^1.1.0" + react-app-polyfill@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz#890f8d7f2842ce6073f030b117de9130a5f385f0" @@ -9646,6 +10133,11 @@ react-is@^16.12.0, react-is@^16.6.0, react-is@^16.6.3, react-is@^16.7.0, react-i resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + react-modal@^2.2.2: version "2.4.1" resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-2.4.1.tgz#cb09b26711b148eb9f59cb180e1b7d82980ded05" @@ -9695,14 +10187,39 @@ react-round-slider@^1.0.1: react "16.4.2" react-router-dom@^5.1.2: +<<<<<<< HEAD +<<<<<<< HEAD + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18" + integrity sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew== +======= version "5.2.0" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" + integrity sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: "@babel/runtime" "^7.1.2" history "^4.9.0" loose-envify "^1.3.1" prop-types "^15.6.2" +<<<<<<< HEAD +<<<<<<< HEAD + react-router "5.1.2" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" + +react-router@5.1.2, react-router@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418" + integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A== +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b react-router "5.2.0" tiny-invariant "^1.0.2" tiny-warning "^1.0.0" @@ -9711,12 +10228,24 @@ react-router@5.2.0, react-router@^5.1.2: version "5.2.0" resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.0.tgz#424e75641ca8747fbf76e5ecca69781aa37ea293" integrity sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b dependencies: "@babel/runtime" "^7.1.2" history "^4.9.0" hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" +<<<<<<< HEAD +<<<<<<< HEAD + mini-create-react-context "^0.3.0" +======= mini-create-react-context "^0.4.0" +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + mini-create-react-context "^0.4.0" +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b path-to-regexp "^1.7.0" prop-types "^15.6.2" react-is "^16.6.0" @@ -9783,7 +10312,15 @@ react-scripts@3.4.0: optionalDependencies: fsevents "2.1.2" +<<<<<<< HEAD +<<<<<<< HEAD +react-transition-group@^4.3.0: +======= react-transition-group@^4.4.0: +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +react-transition-group@^4.4.0: +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b version "4.4.1" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== @@ -10097,7 +10634,7 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -resize-observer-polyfill@^1.4.2: +resize-observer-polyfill@^1.4.2, resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== @@ -10264,9 +10801,21 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +<<<<<<< HEAD +<<<<<<< HEAD + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +======= version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b safe-regex@^1.1.0: version "1.1.0" @@ -10399,11 +10948,20 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== +<<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b semver@^7.3.2: version "7.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +<<<<<<< HEAD +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10731,14 +11289,30 @@ spdx-exceptions@^2.1.0: spdx-expression-parse@^3.0.0: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "3.0.0" resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== +======= +<<<<<<< HEAD + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b ======= version "3.0.1" resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" @@ -11283,7 +11857,15 @@ tiny-invariant@^1.0.2: resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875" integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw== +<<<<<<< HEAD +<<<<<<< HEAD +tiny-warning@^1.0.0, tiny-warning@^1.0.2: +======= tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3: +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= +tiny-warning@^1.0.0, tiny-warning@^1.0.2, tiny-warning@^1.0.3: +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== @@ -11386,14 +11968,30 @@ ts-pnp@^1.1.2: tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: <<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 version "1.11.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9" integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg== +======= +<<<<<<< HEAD + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +>>>>>>> c583c0e73e2d0b08fae52a663ee1bc68247430e7 +======= + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== +>>>>>>> b179115c159e5f38552c79e8814ed4b37b5a363b ======= version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== >>>>>>> 0d03c420ee368026e57f64e749ed248174f66edb +>>>>>>> 1872fff6f4515a209729926ff4fd1c9d57e3a0c4 tsutils@^3.17.1: version "3.17.1" diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index fb57ccd..0000000 --- a/yarn.lock +++ /dev/null @@ -1,4 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - -