Skip to content

Commit

Permalink
Merge pull request #20 from sota1235/feature-settings_for_travis
Browse files Browse the repository at this point in the history
Settings for TravisCI
  • Loading branch information
sota1235 committed Jan 11, 2017
2 parents 3ca18c0 + 897d99e commit bd0a326
Show file tree
Hide file tree
Showing 53 changed files with 123 additions and 134 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
@@ -0,0 +1,3 @@
node_modules/
compiled/
dist/
6 changes: 6 additions & 0 deletions .eslintrc
@@ -0,0 +1,6 @@
{
"extends": ["standard", "standard-jsx"],
"rules": {
"no-useless-escape": 0
}
}
6 changes: 6 additions & 0 deletions .travis.yml
@@ -0,0 +1,6 @@
language: node_js
node_js:
- 'stable'
- 'lts/*'

script: npm run lint && npm run test
8 changes: 4 additions & 4 deletions browser/components/NoteItem.js
Expand Up @@ -75,8 +75,8 @@ const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleNoteCont
: <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />
}

{note.isStarred ?
<i styleName='item-star' className='fa fa-star' /> : ''
{note.isStarred
? <i styleName='item-star' className='fa fa-star' /> : ''
}
</div>
</div>
Expand All @@ -91,10 +91,10 @@ NoteItem.propTypes = {
type: PropTypes.string.isRequired,
title: PropTypes.string.isrequired,
tags: PropTypes.array,
isStarred: PropTypes.bool.isRequired,
isStarred: PropTypes.bool.isRequired
}),
handleNoteClick: PropTypes.func.isRequired,
handleNoteContextMenu: PropTypes.func.isRequired,
handleNoteContextMenu: PropTypes.func.isRequired
}

export default CSSModules(NoteItem, styles)
4 changes: 2 additions & 2 deletions browser/components/NoteItemSimple.js
Expand Up @@ -40,10 +40,10 @@ NoteItemSimple.propTypes = {
storage: PropTypes.string.isRequired,
key: PropTypes.string.isRequired,
type: PropTypes.string.isRequired,
title: PropTypes.string.isrequired,
title: PropTypes.string.isrequired
}),
handleNoteClick: PropTypes.func.isRequired,
handleNoteContextMenu: PropTypes.func.isRequired,
handleNoteContextMenu: PropTypes.func.isRequired
}

export default CSSModules(NoteItemSimple, styles)
2 changes: 1 addition & 1 deletion browser/components/ProfileImage.js
Expand Up @@ -12,7 +12,7 @@ export default class ProfileImage extends React.Component {
className={className}
width={this.props.size}
height={this.props.size}
src={src}/>
src={src} />
)
}
}
Expand Down
8 changes: 4 additions & 4 deletions browser/components/SideNavFilter.js
Expand Up @@ -17,17 +17,17 @@ const SideNavFilter = ({
isFolded, isHomeActive, handleAllNotesButtonClick,
isStarredActive, handleStarredButtonClick
}) => (
<div styleName={ isFolded ? 'menu--folded' : 'menu' }>
<div styleName={isFolded ? 'menu--folded' : 'menu'}>
<button styleName={isHomeActive ? 'menu-button--active' : 'menu-button'}
onClick={handleAllNotesButtonClick}
>
<i className='fa fa-book fa-fw'/>
<i className='fa fa-book fa-fw' />
<span styleName='menu-button-label'>All Notes</span>
</button>
<button styleName={isStarredActive ? 'menu-button--active' : 'menu-button'}
onClick={handleStarredButtonClick}
>
<i className='fa fa-star fa-fw'/>
<i className='fa fa-star fa-fw' />
<span styleName='menu-button-label'>Starred</span>
</button>
</div>
Expand All @@ -38,7 +38,7 @@ SideNavFilter.propTypes = {
isHomeActive: PropTypes.bool.isRequired,
handleAllNotesButtonClick: PropTypes.func.isRequired,
isStarredActive: PropTypes.bool.isRequired,
handleStarredButtonClick: PropTypes.func.isRequired,
handleStarredButtonClick: PropTypes.func.isRequired
}

export default CSSModules(SideNavFilter, styles)
4 changes: 2 additions & 2 deletions browser/components/SnippetTab.js
@@ -1,4 +1,4 @@
import React, { PropTypes } from 'react'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './SnippetTab.styl'
import context from 'browser/lib/context'
Expand Down Expand Up @@ -117,7 +117,7 @@ class SnippetTab extends React.Component {
<button styleName='deleteButton'
onClick={(e) => this.handleDeleteButtonClick(e)}
>
<i className='fa fa-times'/>
<i className='fa fa-times' />
</button>
}
</div>
Expand Down
6 changes: 3 additions & 3 deletions browser/components/StorageItem.js
Expand Up @@ -27,8 +27,8 @@ const StorageItem = ({
onClick={handleButtonClick}
onContextMenu={handleContextMenu}
>
<span styleName={isFolded ?
'folderList-item-name--folded' : 'folderList-item-name'
<span styleName={isFolded
? 'folderList-item-name--folded' : 'folderList-item-name'
}
style={{borderColor: folderColor}}
>
Expand All @@ -52,7 +52,7 @@ StorageItem.propTypes = {
folderName: PropTypes.string.isRequired,
folderColor: PropTypes.string,
isFolded: PropTypes.bool.isRequired,
noteCount: PropTypes.number,
noteCount: PropTypes.number
}

export default CSSModules(StorageItem, styles)
6 changes: 2 additions & 4 deletions browser/finder/NoteDetail.js
@@ -1,4 +1,4 @@
import React, { PropTypes } from 'react'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './NoteDetail.styl'
import MarkdownPreview from 'browser/components/MarkdownPreview'
Expand Down Expand Up @@ -97,9 +97,7 @@ class NoteDetail extends React.Component {
let { note, config } = this.props
if (note == null) {
return (
<div styleName='root'>

</div>
<div styleName='root' />
)
}

Expand Down
5 changes: 2 additions & 3 deletions browser/finder/NoteList.js
@@ -1,4 +1,4 @@
import React, { PropTypes } from 'react'
import React from 'react'
import NoteItem from 'browser/components/NoteItem'
import moment from 'moment'

Expand Down Expand Up @@ -54,12 +54,11 @@ class NoteList extends React.Component {
}

render () {
let { storageMap, notes, index } = this.props
let { notes, index } = this.props

let notesList = notes
.slice(0, 10 + 10 * this.state.range)
.map((note, _index) => {

const isActive = (index === _index)
const key = `${note.storage}-${note.key}`
const dateDisplay = moment(note.updatedAt).fromNow()
Expand Down
2 changes: 1 addition & 1 deletion browser/finder/StorageSection.js
@@ -1,4 +1,4 @@
import React, { PropTypes } from 'react'
import React from 'react'
import CSSModules from 'browser/lib/CSSModules'
import styles from './StorageSection.styl'
import StorageItem from 'browser/components/StorageItem'
Expand Down
3 changes: 1 addition & 2 deletions browser/finder/index.js
Expand Up @@ -2,7 +2,6 @@ import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import { connect, Provider } from 'react-redux'
import _ from 'lodash'
import ipc from './ipcClient'
import store from './store'
import CSSModules from 'browser/lib/CSSModules'
import styles from './FinderMain.styl'
Expand Down Expand Up @@ -351,7 +350,7 @@ function refreshData () {

ReactDOM.render((
<Provider store={store}>
<Finder/>
<Finder />
</Provider>
), document.getElementById('content'), function () {
refreshData()
Expand Down
1 change: 0 additions & 1 deletion browser/lib/customMeta.js
@@ -1,4 +1,3 @@
import CodeMirror from 'codemirror'
import _ from 'lodash'

CodeMirror.modeInfo.push({name: 'Stylus', mime: 'text/x-styl', mode: 'stylus', ext: ['styl'], alias: ['styl']})
6 changes: 3 additions & 3 deletions browser/lib/date-formatter.js
@@ -1,17 +1,17 @@
/**
* @fileoverview Formatting date string.
*/
import moment from 'moment';
import moment from 'moment'

/**
* @description Return date string. For example, 'Sep.9, 2016 12:00'.
* @param {mixed}
* @return {string}
*/
export function getLastUpdated(date) {
export function getLastUpdated (date) {
const m = moment(date)
if (!m.isValid()) {
throw Error('Invalid argument.');
throw Error('Invalid argument.')
}

return m.format('MMM D, gggg H:mm')
Expand Down
2 changes: 1 addition & 1 deletion browser/lib/markdown.js
Expand Up @@ -58,7 +58,7 @@ md.use(math, {
})
md.use(require('markdown-it-footnote'))
// Override task item
md.block.ruler.at('paragraph', function (state, startLine/*, endLine*/) {
md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
let content, terminate, i, l, token
let nextLine = startLine + 1
let terminatorRules = state.md.block.ruler.getRules('paragraph')
Expand Down
4 changes: 2 additions & 2 deletions browser/main/Detail/FolderSelect.js
Expand Up @@ -128,8 +128,8 @@ class FolderSelect extends React.Component {
}

nextOption () {
let { storages } = this.props
let { optionIndex } = this.state
let { folders } = this.props

optionIndex++
if (optionIndex >= folders.length) optionIndex = 0
Expand Down Expand Up @@ -268,7 +268,7 @@ class FolderSelect extends React.Component {
<span styleName='idle-label-name-surfix'>in {currentOption.storage.name}</span>
</span>
</div>
<i styleName='idle-caret' className='fa fa-fw fa-caret-down'/>
<i styleName='idle-caret' className='fa fa-fw fa-caret-down' />
</div>
}

Expand Down
2 changes: 1 addition & 1 deletion browser/main/Detail/LastUpdatedString.js
Expand Up @@ -21,7 +21,7 @@ const LastUpdatedString = ({ date }) => {
}

LastUpdatedString.propTypes = {
date: PropTypes.string,
date: PropTypes.string
}

export default CSSModules(LastUpdatedString, styles)
2 changes: 1 addition & 1 deletion browser/main/Detail/MarkdownNoteDetail.js
Expand Up @@ -205,7 +205,7 @@ class MarkdownNoteDetail extends React.Component {
}

render () {
let { data, config } = this.props
let { config } = this.props
let { note } = this.state

return (
Expand Down
13 changes: 7 additions & 6 deletions browser/main/Detail/SnippetNoteDetail.js
Expand Up @@ -14,6 +14,7 @@ import SnippetTab from 'browser/components/SnippetTab'
import StatusBar from '../StatusBar'
import context from 'browser/lib/context'
import ConfigManager from 'browser/main/lib/ConfigManager'
import _ from 'lodash'

function pass (name) {
switch (name) {
Expand Down Expand Up @@ -459,7 +460,7 @@ class SnippetNoteDetail extends React.Component {
}

render () {
let { data, config } = this.props
let { config } = this.props
let { note } = this.state

let editorFontSize = parseInt(config.editor.fontSize, 10)
Expand Down Expand Up @@ -538,7 +539,7 @@ class SnippetNoteDetail extends React.Component {
<button styleName='info-right-button'
onClick={(e) => this.handleContextButtonClick(e)}
>
<i className='fa fa-ellipsis-v'/>
<i className='fa fa-ellipsis-v' />
</button>
</div>
</div>
Expand All @@ -563,7 +564,7 @@ class SnippetNoteDetail extends React.Component {
<button styleName='plusButton'
onClick={(e) => this.handleTabPlusButtonClick(e)}
>
<i className='fa fa-plus'/>
<i className='fa fa-plus' />
</button>
</div>
{viewList}
Expand All @@ -577,19 +578,19 @@ class SnippetNoteDetail extends React.Component {
? 'Select Syntax...'
: this.state.note.snippets[this.state.snippetIndex].mode
}&nbsp;
<i className='fa fa-caret-down'/>
<i className='fa fa-caret-down' />
</button>
<button
onClick={(e) => this.handleIndentTypeButtonClick(e)}
>
Indent: {config.editor.indentType}&nbsp;
<i className='fa fa-caret-down'/>
<i className='fa fa-caret-down' />
</button>
<button
onClick={(e) => this.handleIndentSizeButtonClick(e)}
>
size: {config.editor.indentSize}&nbsp;
<i className='fa fa-caret-down'/>
<i className='fa fa-caret-down' />
</button>
</div>

Expand Down
4 changes: 2 additions & 2 deletions browser/main/Detail/TagSelect.js
Expand Up @@ -8,7 +8,7 @@ class TagSelect extends React.Component {
super(props)

this.state = {
newTag: '',
newTag: ''
}
}

Expand Down Expand Up @@ -111,7 +111,7 @@ class TagSelect extends React.Component {
<button styleName='tag-removeButton'
onClick={(e) => this.handleTagRemoveButtonClick(tag)(e)}
>
<i className='fa fa-times fa-fw tag-removeButton-icon'/>
<i className='fa fa-times fa-fw tag-removeButton-icon' />
</button>
</span>
)
Expand Down
4 changes: 2 additions & 2 deletions browser/main/Main.js
Expand Up @@ -112,7 +112,7 @@ class Main extends React.Component {
ConfigManager.set({ navWidth })
dispatch({
type: 'SET_NAV_WIDTH',
navWidth,
navWidth
})
})
}
Expand Down Expand Up @@ -169,7 +169,7 @@ class Main extends React.Component {
onMouseDown={(e) => this.handleLeftSlideMouseDown(e)}
draggable='false'
>
<div styleName='slider-hitbox'/>
<div styleName='slider-hitbox' />
</div>
}
<div styleName={config.isSideNavFolded ? 'body--expanded' : 'body'}
Expand Down
8 changes: 4 additions & 4 deletions browser/main/NoteList/index.js
Expand Up @@ -324,8 +324,8 @@ class NoteList extends React.Component {
const isDefault = config.listStyle === 'DEFAULT'
const isActive = location.query.key === note.storage + '-' + note.key
const dateDisplay = moment(
config.sortBy === 'CREATED_AT' ?
note.createdAt : note.updatedAt
config.sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt
).fromNow()
const key = `${note.storage}-${note.key}`

Expand Down Expand Up @@ -376,15 +376,15 @@ class NoteList extends React.Component {
}
onClick={(e) => this.handleListStyleButtonClick(e, 'DEFAULT')}
>
<i className='fa fa-th-large'/>
<i className='fa fa-th-large' />
</button>
<button styleName={config.listStyle === 'SMALL'
? 'control-button--active'
: 'control-button'
}
onClick={(e) => this.handleListStyleButtonClick(e, 'SMALL')}
>
<i className='fa fa-list-ul'/>
<i className='fa fa-list-ul' />
</button>
</div>
<div styleName='list'
Expand Down
2 changes: 1 addition & 1 deletion browser/main/SideNav/StorageItem.js
Expand Up @@ -181,7 +181,7 @@ class StorageItem extends React.Component {
<button styleName='header-addFolderButton'
onClick={(e) => this.handleAddFolderButtonClick(e)}
>
<i className='fa fa-plus'/>
<i className='fa fa-plus' />
</button>
}

Expand Down

0 comments on commit bd0a326

Please sign in to comment.