embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop_51' of github.com:status-im/embark-area-51 into develop_51

This commit is contained in:
Iuri Matias 2018-10-28 12:10:28 +01:00
parent d1d5450747 6f626179ac
commit 1576db38d5
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
embark-ui/.eslintrc Normal file
View File

@ -0,0 +1,6 @@
{
"extends": "react-app",
"rules": {
"react/prop-types": "warn"
}
}

3
embark-ui/package.json
View File

@ -123,8 +123,5 @@
"presets": [ "presets": [
"react-app" "react-app"
] ]
},
"eslintConfig": {
"extends": "react-app"
} }
} }

2
embark-ui/src/components/SearchBar.js
View File

@ -44,7 +44,7 @@ class SearchBar extends React.Component {
render() { render() {
return ( return (
<Form inline className={classNames('search-bar', 'mr-2', {hidden: this.props.hidden})}> <Form inline className={classNames('search-bar', 'mr-2')}>
{!this.props.loading && {!this.props.loading &&
<React.Fragment> <React.Fragment>
<div className={classNames({'d-sm-down-none': !this.state.showForm})}> <div className={classNames({'d-sm-down-none': !this.state.showForm})}>

20
embark-ui/src/components/TextEditor.js
View File

@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import FontAwesomeIcon from 'react-fontawesome'; import FontAwesomeIcon from 'react-fontawesome';
import classNames from 'classnames'; import classNames from 'classnames';
import {DARK_THEME} from '../constants'; import {DARK_THEME, LIGHT_THEME} from '../constants';
import './TextEditor.css'; import './TextEditor.css';
const SUPPORTED_LANGUAGES = ['css', 'sol', 'html', 'json']; const SUPPORTED_LANGUAGES = ['css', 'sol', 'html', 'json'];
@ -120,8 +120,8 @@ class TextEditor extends React.Component {
} }
componentDidUpdate(prevProps) { componentDidUpdate(prevProps) {
if (this.props.currentFile.content && this.props.currentFile.content !== prevProps.currentFile.content) { if (this.props.currentFile.content !== prevProps.currentFile.content) {
editor.setValue(this.props.currentFile.content); editor.setValue(this.props.currentFile.content || '');
} }
this.updateMarkers(); this.updateMarkers();
@ -137,18 +137,20 @@ class TextEditor extends React.Component {
renderTabs() { renderTabs() {
return ( return (
<ul className="list-inline m-0 p-2"> <ul className="list-inline m-0 p-0">
{this.props.editorTabs.map(file => ( {this.props.editorTabs.map(file => (
<li key={file.name} className={classNames("m-1", "list-inline-item", "border-right")}> <li key={file.name} className={classNames("p-2", "list-inline-item", "mr-0", "border-right", {
'bg-white': file.active && LIGHT_THEME === this.props.theme,
'bg-black': file.active && DARK_THEME === this.props.theme
})}>
<a <a
href="#switch-tab" href="#switch-tab"
onClick={() => this.props.addEditorTabs(file)} onClick={() => this.props.addEditorTabs(file)}
className={classNames('p-2', {'text-muted': !file.active}, className="p-2 text-muted"
{'text-primary': file.active}) >
}>
{file.name} {file.name}
</a> </a>
<FontAwesomeIcon style={{cursor: 'pointer'}} onClick={() => this.props.removeEditorTabs(file)} className="mx-1" name="close"/> <FontAwesomeIcon style={{cursor: 'pointer'}} onClick={() => this.props.removeEditorTabs(file)} className="px-1" name="close"/>
</li> </li>
))} ))}
</ul> </ul>

6
embark-ui/src/index.css
View File

@ -21,9 +21,6 @@
.relative { .relative {
position: relative; position: relative;
} }
.hidden {
display: none;
}
.react-json-view { .react-json-view {
border-radius: .25rem; border-radius: .25rem;
@ -77,3 +74,6 @@
text-decoration: none; text-decoration: none;
} }
.bg-black {
background-color: #1C1C1C;
}

2
package.json
View File

@ -27,7 +27,7 @@
}, },
"main": "./lib/index.js", "main": "./lib/index.js",
"scripts": { "scripts": {
"lint": "eslint bin/embark lib/", "lint": "eslint bin/embark lib/ embark-ui/src",
"prepack": "cd embark-ui && npm install && npm run build", "prepack": "cd embark-ui && npm install && npm run build",
"test": "npm-run-all lint test:*", "test": "npm-run-all lint test:*",
"test:embark": "mocha test/ --no-timeouts --exit", "test:embark": "mocha test/ --no-timeouts --exit",