Alamantus/Lexiconga
1
0
Fork 0
mirror of https://github.com/Alamantus/Lexiconga.git synced 2025-07-12 10:25:54 +02:00
Code Issues Releases Activity

Fix code style

Browse source 
Remove misguided comma-first style, add floating commas, and improve
spacing and parentheses for single-param inline arrow functions.
This commit is contained in:
Robbie Antenesse 2017-07-25 22:11:33 -06:00
parent d4043e2d79
commit a443fe4c3f
16 changed files with 401 additions and 391 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/MainDisplay.jsx
View file

@ -28,7 +28,7 @@ export const MainDisplay = ({dictionaryInfo, wordsToDisplay, updateDisplay, last
details={{
custom: [
{
name: 'Test Tab'
name: 'Test Tab',
}
]
}}

16
src/components/display/DictionaryDetails.jsx
View file

@ -3,10 +3,10 @@ import Component from 'inferno-component';
import marked from 'marked';
const DISPLAY = {
NONE: false
, DESCRIPTION: 1
, DETAILS: 2
, STATS: 3
NONE: false,
DESCRIPTION: 1,
DETAILS: 2,
STATS: 3,
}
export class DictionaryDetails extends Component {
@ -14,15 +14,15 @@ export class DictionaryDetails extends Component {
super(props);
this.state = {
currentDisplay: DISPLAY.NONE
currentDisplay: DISPLAY.NONE,
}
this._descriptionHTML = marked(props.description);
}
componentWillReceiveProps (nextProps) {
const currentDescription = this.props.description
, nextDescription = nextProps.description;
const currentDescription = this.props.description,
nextDescription = nextProps.description;
if (currentDescription !== nextDescription) {
this._descriptionHTML = marked(nextProps.description);
@ -33,7 +33,7 @@ export class DictionaryDetails extends Component {
display = (this.state.currentDisplay !== display) ? display : DISPLAY.NONE;
this.setState({
currentDisplay: display
currentDisplay: display,
});
}

2
src/components/display/WordDisplay.jsx
View file

@ -12,7 +12,7 @@ export class WordDisplay extends Component {
super(props);
this.state = {
isEditing: false
isEditing: false,
}
}

32
src/components/management/IPAField.jsx
View file

@ -17,9 +17,9 @@ export class IPAField extends Component {
super(props);
this.state = {
value: props.value || ''
, doShowHelp: false
, doShowTable: false
value: props.value || '',
doShowHelp: false,
doShowTable: false,
}
this.field = null;
@ -27,7 +27,7 @@ export class IPAField extends Component {
componentWillReceiveProps (nextProps) {
this.setState({
value: nextProps.value
value: nextProps.value,
});
}
@ -48,7 +48,9 @@ export class IPAField extends Component {
<section className='modal-card-body'>
<div className='content'
dangerouslySetInnerHTML={{__html: phondueUsage}} />
dangerouslySetInnerHTML={{
__html: phondueUsage,
}} />
</section>
</div>
@ -63,7 +65,7 @@ export class IPAField extends Component {
<IPATable
value={ this.state.value }
close={ () => this.setState({ doShowTable: false }) }
update={newValue => this.setState({ value: newValue }, this.field.focus())} />
update={ (newValue) => this.setState({ value: newValue }, this.field.focus()) } />
);
}
}
@ -90,12 +92,12 @@ export class IPAField extends Component {
}
onInput (event) {
let val = event.target.value
, pos = this.field.selectionStart || val.length;
let val = event.target.value,
pos = this.field.selectionStart || val.length;
if (event.key) {
const key = event.key
, digraph = digraphs[val.substr(pos - 1, 1) + key];
const key = event.key,
digraph = digraphs[val.substr(pos - 1, 1) + key];
if (digraph) {
event.preventDefault();
@ -116,11 +118,13 @@ export class IPAField extends Component {
<div className='field'>
<label className='label'>Pronunciation</label>
<p className='control'>
<input className='input' type='text' disabled={!!this.props.isDisplayOnly} placeholder='[prə.ˌnʌn.si.ˈeɪ.ʃən]'
ref={input => this.field = input}
<input className='input' type='text'
placeholder='[prə.ˌnʌn.si.ˈeɪ.ʃən]'
disabled={ !!this.props.isDisplayOnly }
ref={ (input) => this.field = input }
value={ this.state.value }
onInput={event => this.onInput(event)}
onKeyDown={event => this.onInput(event)}
onInput={ (event) => this.onInput(event) }
onKeyDown={ (event) => this.onInput(event) }
onChange={ () => this.props.onChange(this.state.value) } />
</p>
{ this.showButtons() }

284
src/components/management/IPATable.jsx
View file

File diff suppressed because it is too large Load diff

18
src/components/management/SearchBox/index.jsx
View file

@ -56,7 +56,7 @@ export class SearchBox extends Component {
<p className='control'>
<span className='select'>
<select value={ this.state.searchingIn }
onChange={event => {
onChange={(event) => {
this.setState({ searchingIn: event.target.value });
}}>
<option value='name'>Word</option>
@ -67,11 +67,11 @@ export class SearchBox extends Component {
</p>
<p className='control is-expanded'>
<input className='input' type='text' placeholder='Search Term'
ref={input => {
ref={(input) => {
this.searchBox = input;
}}
value={ this.state.searchTerm }
onChange={event => {
onChange={(event) => {
console.log(event);
this.setState({ searchTerm: event.target.value });
}} />
@ -115,7 +115,7 @@ export class SearchBox extends Component {
<input type='radio' name='searchmethod'
value={ METHOD.contains }
checked={ this.state.searchMethod === METHOD.contains }
onClick={event => {
onClick={(event) => {
if (event.currentTarget.checked) {
this.setState({
searchMethod: event.currentTarget.value,
@ -131,7 +131,7 @@ export class SearchBox extends Component {
<input type='radio' name='searchmethod'
value={ METHOD.startsWith }
checked={ this.state.searchMethod === METHOD.startsWith }
onClick={event => {
onClick={(event) => {
if (event.currentTarget.checked) {
this.setState({
searchMethod: event.currentTarget.value,
@ -147,7 +147,7 @@ export class SearchBox extends Component {
<input type='radio' name='searchmethod'
value={ METHOD.endsWith }
checked={ this.state.searchMethod === METHOD.endsWith }
onClick={event => {
onClick={(event) => {
if (event.currentTarget.checked) {
this.setState({
searchMethod: event.currentTarget.value,
@ -163,7 +163,7 @@ export class SearchBox extends Component {
<input type='radio' name='searchmethod'
value={ METHOD.isExactly }
checked={ this.state.searchMethod === METHOD.isExactly }
onClick={event => {
onClick={(event) => {
if (event.currentTarget.checked) {
this.setState({
searchMethod: event.currentTarget.value,
@ -234,13 +234,13 @@ export class SearchBox extends Component {
showHeader () {
this.setState({
showHeader: true
showHeader: true,
});
}
hideHeader () {
this.setState({
showHeader: false
showHeader: false,
});
}

60
src/components/management/WordForm.jsx
View file

@ -9,24 +9,24 @@ export class WordForm extends Component {
super(props);
this.state = {
wordName: this.props.name || ''
, wordPronunciation: this.props.pronunciation || ''
, wordPartOfSpeech: this.props.partOfSpeech || ''
, wordDefinition: this.props.definition || ''
, wordDetails: this.props.details || ''
wordName: this.props.name || '',
wordPronunciation: this.props.pronunciation || '',
wordPartOfSpeech: this.props.partOfSpeech || '',
wordDefinition: this.props.definition || '',
wordDetails: this.props.details || '',
, nameIsValid: true
, pronunciationIsValid: true
, partOfSpeechIsValid: true
, definitionIsValid: true
, detailsIsValid: true
nameIsValid: true,
pronunciationIsValid: true,
partOfSpeechIsValid: true,
definitionIsValid: true,
detailsIsValid: true,
}
}
isValidWord () {
let nameIsValid = true
, definitionIsValid = true
, detailsIsValid = true;
let nameIsValid = true,
definitionIsValid = true,
detailsIsValid = true;
if (this.state.wordName === '') {
nameIsValid = false;
@ -43,9 +43,9 @@ export class WordForm extends Component {
}
this.setState({
nameIsValid
, definitionIsValid
, detailsIsValid
nameIsValid,
definitionIsValid,
detailsIsValid,
});
return nameIsValid == true && definitionIsValid == true && detailsIsValid == true;
@ -53,11 +53,11 @@ export class WordForm extends Component {
submitWord () {
const word = new Word({
name: this.state.wordName
, pronunciation: this.state.wordPronunciation
, partOfSpeech: this.state.wordPartOfSpeech
, definition: this.state.wordDefinition
, details: this.state.wordDetails
name: this.state.wordName,
pronunciation: this.state.wordPronunciation,
partOfSpeech: this.state.wordPartOfSpeech,
definition: this.state.wordDefinition,
details: this.state.wordDetails,
});
@ -80,11 +80,11 @@ export class WordForm extends Component {
clearForm () {
this.setState({
wordName: ''
, wordPronunciation: ''
, wordPartOfSpeech: ''
, wordDefinition: ''
, wordDetails: ''
wordName: '',
wordPronunciation: '',
wordPartOfSpeech: '',
wordDefinition: '',
wordDetails: '',
});
}
@ -108,20 +108,22 @@ export class WordForm extends Component {
</div>
<IPAField value={ this.state.wordPronunciation }
onChange={newValue => this.setState({ wordPronunciation: newValue })} />
onChange={ (newValue) => this.setState({ wordPronunciation: newValue }) } />
<div className='field'>
<label className='label'>Part of Speech</label>
<p className='control'>
<span className='select'>
<select value={ this.state.wordPartOfSpeech }
onChange={event => {
onChange={(event) => {
this.setState({ wordPartOfSpeech: event.target.value });
}}>
<option value=''></option>
{this.props.partsOfSpeech.map((partOfSpeech) => {
return (
<option value={partOfSpeech}>{partOfSpeech}</option>
<option value={ partOfSpeech }>
{ partOfSpeech }
</option>
);
})}
</select>

2
src/components/structure/Header.jsx
View file

@ -25,7 +25,7 @@ export class Header extends Component {
<div className='nav-item'>
<SearchBox
partsOfSpeech={ this.props.partsOfSpeech }
search={ searchConfig => this.props.search(searchConfig) } />
search={ (searchConfig) => this.props.search(searchConfig) } />
</div>
</div>

4
src/index.jsx
View file

@ -50,7 +50,7 @@ class App extends Component {
// const {searchIn, searchTerm, filteredPartsOfSpeech} = this.state.searchConfig;
// TODO: Sort out searching to remove this temporary solution.
dictionary.wordsPromise.then(words => {
dictionary.wordsPromise.then((words) => {
this.setState({
displayedWords: words,
})
@ -68,7 +68,7 @@ class App extends Component {
<div>
<Header
partsOfSpeech={ this.state.partsOfSpeech }
search={ searchConfig => this.search(searchConfig) } />
search={ (searchConfig) => this.search(searchConfig) } />
<MainDisplay
dictionaryInfo={ this.dictionaryInfo }

12
src/managers/DictionaryData.js
View file

@ -4,10 +4,10 @@ import wordDb from './WordDatabase';
import idManager from './IDManager';
const defaultDictionary = {
name: 'New'
, specification: 'Dictionary'
, description: 'A new dictionary.'
, partsOfSpeech: ['Noun', 'Adjective', 'Verb']
name: 'New',
specification: 'Dictionary',
description: 'A new dictionary.',
partsOfSpeech: ['Noun', 'Adjective', 'Verb'],
}
class DictionaryData {
@ -80,8 +80,8 @@ class DictionaryData {
if (Array.isArray(partOfSpeech)) {
words = words.anyOf(partOfSpeech);
} else {
assert(typeof partOfSpeech === 'string'
, 'You must use either a string or an array when searching for words with a particular part of speech');
assert(typeof partOfSpeech === 'string',
'You must use either a string or an array when searching for words with a particular part of speech');
words = words.equals(partOfSpeech);
}

4
src/managers/Word.js
View file

@ -17,7 +17,7 @@ export class Word {
this.modifiedTime = null;
return wordDb.words.add(this)
.then(id => {
.then((id) => {
this.id = id;
console.log('Word added successfully');
})
@ -31,7 +31,7 @@ export class Word {
this.modifiedTime = timestampInSeconds;
return wordDb.words.put(this, wordId)
.then(id => {
.then((id) => {
console.log('Word modified successfully');
})
.catch(error => {

2
src/managers/WordDatabase.js
View file

@ -4,7 +4,7 @@ import {Word} from './Word';
const db = new Dexie('Lexiconga');
db.version(1).stores({
words: '++id, name, partOfSpeech, createdTime, modifiedTime'
words: '++id, name, partOfSpeech, createdTime, modifiedTime',
});
if (['emptydb', 'donotsave'].includes(process.env.NODE_ENV)) {

140
webpack.config.js
View file

@ -13,97 +13,101 @@ const BUILD_DIR = path.resolve(__dirname, 'public');
const APP_DIR = path.resolve(__dirname, 'src');
const webpackConfig = {
entry: APP_DIR + '/index.jsx'
, output: {
path: BUILD_DIR
, filename: 'lexiconga.js'
}
, module: {
entry: APP_DIR + '/index.jsx',
output: {
path: BUILD_DIR,
filename: 'lexiconga.js',
},
module: {
rules: [
{
test: (/\.scss$/)
, exclude: (/node_modules/)
, use: [
'style-loader'
, 'css-loader'
, {
loader: 'sass-loader'
, options: {
test: (/\.scss$/),
exclude: (/node_modules/),
use: [
'style-loader',
'css-loader',
{
loader: 'sass-loader',
options: {
file: './src/sass/styles.scss',
outFile: './public/styles.css',
outputStyle: 'compressed'
}
}
]
}
, {
test: (/\.html$/)
, exclude: (/node_modules/)
, use: [
'html-loader'
]
}
, {
test: (/\.txt$/)
, exclude: (/node_modules/)
, use: [
outputStyle: 'compressed',
},
},
],
},
{
test: (/\.html$/),
exclude: (/node_modules/),
use: [
'html-loader',
],
},
{
test: (/\.txt$/),
exclude: (/node_modules/),
use: [
'raw-loader'
]
}
, {
test: (/\.jsx?$/)
, exclude: (/node_modules/)
, use: [
],
},
{
loader: 'babel-loader'
, options: {
test: (/\.jsx?$/),
exclude: (/node_modules/),
use: [
{
loader: 'babel-loader',
options: {
presets: [
'es2016'
]
, plugins: [
'inferno'
]
'es2016',
],
plugins: [
'inferno',
],
},
}
}
]
}
, {
test: (/\.(png|woff|woff2|eot|ttf|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/)
, use: [
],
},
{
loader: 'url-loader'
, options: {
limit: 100000
, mimetype: 'application/font-woff'
, name: './assets/fonts/[name].[ext]'
test: (/\.(png|woff|woff2|eot|ttf|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/),
use: [
{
loader: 'url-loader',
options: {
limit: 100000,
mimetype: 'application/font-woff',
name: './assets/fonts/[name].[ext]',
}
}
]
}
]
}
, resolve: {
},
resolve: {
extensions: [
'.js'
, '.jsx'
'.js',
'.jsx',
]
}
, plugins: [
},
plugins: [
new webpack.DefinePlugin({
'process.env': {
'NODE_ENV': JSON.stringify(BUILDMODE)
}
})
]
'NODE_ENV': JSON.stringify(BUILDMODE),
},
}),
],
};
if (BUILDMODE === 'production') {
webpackConfig.plugins.push(
new webpack.optimize.UglifyJsPlugin({
mangle: true
, compress: {
warnings: false
}
mangle: true,
compress: {
warnings: false,
},
})
);