From b705392364306a919f7f8c433a5544333fcfb039 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 23 Oct 2019 13:46:35 -0400 Subject: [PATCH] tslint curly spaces --- .eslintrc.js | 2 +- src/components/SpreadsheetData.js | 4 +-- src/components/collection/search/search.js | 32 +++++++++++----------- src/components/entercode/EnterTheCode.js | 2 +- src/components/index.js | 4 +-- src/components/portal/Category.js | 2 +- src/components/portal/Single/Creature.js | 2 +- src/components/portal/Single/_base.js | 2 +- src/components/portal/Tribes.js | 2 +- src/styles/style.js | 2 +- webpack.config.babel.js | 4 +-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index ecb5710..eb43f0f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -31,7 +31,7 @@ module.exports = exports = { "no-unused-expressions": ["error", { "allowShortCircuit": true, "allowTernary": true }], "no-plusplus": "off", "no-prototype-builtins": "off", - "object-curly-spacing": "off", + "object-curly-spacing": ["warn", "never", {"objectsInObjects": false, "arraysInObjects": false}], "object-curly-newline": "off", "linebreak-style": "off", "eqeqeq": "off", diff --git a/src/components/SpreadsheetData.js b/src/components/SpreadsheetData.js index b48a16b..c6ede8b 100644 --- a/src/components/SpreadsheetData.js +++ b/src/components/SpreadsheetData.js @@ -42,11 +42,11 @@ class CollectionDB { if ((new Date(data[0].updated)) > (new Date(cookie))) { this[type].clear(); this[type].insert(data); - cookies.set(`${this.format}_${type}`, data[0].updated, { path: '/' }); + cookies.set(`${this.format}_${type}`, data[0].updated, {path: '/'}); } } else { - cookies.set(`${this.format}_${type}`, data[0].updated, { path: '/' }); + cookies.set(`${this.format}_${type}`, data[0].updated, {path: '/'}); } }); return resolve(); diff --git a/src/components/collection/search/search.js b/src/components/collection/search/search.js index 3e64a67..338326e 100644 --- a/src/components/collection/search/search.js +++ b/src/components/collection/search/search.js @@ -97,10 +97,10 @@ export default function search_api(input) { return ({'$regex': new RegExp(item.trim(), 'i')}); }); - creatureResults = creatureResults.find({'gsx$types': {'$or': subtypesList} }); + creatureResults = creatureResults.find({'gsx$types': {'$or': subtypesList}}); locationResults = locationResults.find({'$or': [{'gsx$initiative': {'$or': subtypesList}}, {'gsx$types': {'$or': subtypesList}}]}); attackResults = attackResults.limit(0); - battlegearResults = battlegearResults.find({'gsx$types': {'$or': subtypesList} }); + battlegearResults = battlegearResults.find({'gsx$types': {'$or': subtypesList}}); mugicResults = mugicResults.limit(0); } @@ -111,8 +111,8 @@ export default function search_api(input) { tribesList.push({'$regex': new RegExp(tribe, 'i')}); } if (tribesList.length > 0) { - creatureResults = creatureResults.find({'gsx$tribe': {'$or': tribesList} }); - mugicResults = mugicResults.find({'gsx$tribe': {'$or': tribesList} }); + creatureResults = creatureResults.find({'gsx$tribe': {'$or': tribesList}}); + mugicResults = mugicResults.find({'gsx$tribe': {'$or': tribesList}}); attackResults = attackResults.limit(0); battlegearResults = battlegearResults.limit(0); locationResults = locationResults.limit(0); @@ -170,11 +170,11 @@ export default function search_api(input) { } if (elementsList.length > 0) { if (input.elements.and) { - creatureResults = creatureResults.find({'gsx$elements': {'$and': elementsList} }); + creatureResults = creatureResults.find({'gsx$elements': {'$and': elementsList}}); attackResults = attackResults.find({'$and': elementsList2}); } else { - creatureResults = creatureResults.find({'gsx$elements': {'$or': elementsList} }); + creatureResults = creatureResults.find({'gsx$elements': {'$or': elementsList}}); attackResults = attackResults.find({'$or': elementsList2}); } @@ -272,11 +272,11 @@ export default function search_api(input) { setsList.push({'$eq': key.toUpperCase()}); } if (setsList.length > 0) { - attackResults = attackResults.find({'gsx$set': {'$or': setsList} }); - battlegearResults = battlegearResults.find({'gsx$set': {'$or': setsList} }); - creatureResults = creatureResults.find({'gsx$set': {'$or': setsList} }); - locationResults = locationResults.find({'gsx$set': {'$or': setsList} }); - mugicResults = mugicResults.find({'gsx$set': {'$or': setsList} }); + attackResults = attackResults.find({'gsx$set': {'$or': setsList}}); + battlegearResults = battlegearResults.find({'gsx$set': {'$or': setsList}}); + creatureResults = creatureResults.find({'gsx$set': {'$or': setsList}}); + locationResults = locationResults.find({'gsx$set': {'$or': setsList}}); + mugicResults = mugicResults.find({'gsx$set': {'$or': setsList}}); } // Rarity @@ -286,11 +286,11 @@ export default function search_api(input) { rarityList.push({'$eq': key.split(" ").map(st => {return st.charAt(0).toUpperCase()+st.slice(1)}).join(" ")}); } if (rarityList.length > 0) { - attackResults = attackResults.find({'gsx$rarity': {'$or': rarityList} }); - battlegearResults = battlegearResults.find({'gsx$rarity': {'$or': rarityList} }); - creatureResults = creatureResults.find({'gsx$rarity': {'$or': rarityList} }); - locationResults = locationResults.find({'gsx$rarity': {'$or': rarityList} }); - mugicResults = mugicResults.find({'gsx$rarity': {'$or': rarityList} }); + attackResults = attackResults.find({'gsx$rarity': {'$or': rarityList}}); + battlegearResults = battlegearResults.find({'gsx$rarity': {'$or': rarityList}}); + creatureResults = creatureResults.find({'gsx$rarity': {'$or': rarityList}}); + locationResults = locationResults.find({'gsx$rarity': {'$or': rarityList}}); + mugicResults = mugicResults.find({'gsx$rarity': {'$or': rarityList}}); } // Gender diff --git a/src/components/entercode/EnterTheCode.js b/src/components/entercode/EnterTheCode.js index e80f5ab..a874d1c 100644 --- a/src/components/entercode/EnterTheCode.js +++ b/src/components/entercode/EnterTheCode.js @@ -35,7 +35,7 @@ s.hyphen = { @inject((stores, props, context) => props) @observer export default class EnterTheCode extends React.Component { @observable code = ""; - message = observable({contents: null}, { contents: observable.ref }); + message = observable({contents: null}, {contents: observable.ref}); @observable fan = null; render() { diff --git a/src/components/index.js b/src/components/index.js index b3757de..8460f9c 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import { render } from 'react-dom'; -import { BrowserRouter as Router, Link, Route, Switch } from 'react-router-dom'; +import {render} from 'react-dom'; +import {BrowserRouter as Router, Link, Route, Switch} from 'react-router-dom'; import loadable from '@loadable/component'; import s from '../styles/app.style'; diff --git a/src/components/portal/Category.js b/src/components/portal/Category.js index 90edca0..f234e0e 100644 --- a/src/components/portal/Category.js +++ b/src/components/portal/Category.js @@ -1,6 +1,6 @@ import React from 'react'; import Interactive from 'react-interactive'; -import { Link, Route } from 'react-router-dom'; +import {Link, Route} from 'react-router-dom'; import {observable} from 'mobx'; import {observer, inject} from 'mobx-react'; import s from '../../styles/app.style'; diff --git a/src/components/portal/Single/Creature.js b/src/components/portal/Single/Creature.js index 3d5b0b9..5188044 100644 --- a/src/components/portal/Single/Creature.js +++ b/src/components/portal/Single/Creature.js @@ -1,6 +1,6 @@ import React from 'react'; import Interactive from 'react-interactive'; -import { Link } from 'react-router-dom'; +import {Link} from 'react-router-dom'; import API from '../../SpreadsheetData'; import s from '../../../styles/app.style'; import {observer, inject} from 'mobx-react'; diff --git a/src/components/portal/Single/_base.js b/src/components/portal/Single/_base.js index 11f80ce..8c2ec55 100644 --- a/src/components/portal/Single/_base.js +++ b/src/components/portal/Single/_base.js @@ -1,7 +1,7 @@ import React from 'react'; import {observable} from "mobx"; import {observer, inject} from 'mobx-react'; -import { Link } from 'react-router-dom'; +import {Link} from 'react-router-dom'; import API from '../../SpreadsheetData'; import {Rarity, Ability} from '../../Snippets'; import s from '../../../styles/app.style'; diff --git a/src/components/portal/Tribes.js b/src/components/portal/Tribes.js index 89dd6e1..a6bec5c 100644 --- a/src/components/portal/Tribes.js +++ b/src/components/portal/Tribes.js @@ -1,6 +1,6 @@ import React from 'react'; import Interactive from 'react-interactive'; -import { Link, Route } from 'react-router-dom'; +import {Link, Route} from 'react-router-dom'; import {observable} from 'mobx'; import {observer, inject} from 'mobx-react'; import loki from 'lokijs'; diff --git a/src/styles/style.js b/src/styles/style.js index 0b12d41..bd0f697 100644 --- a/src/styles/style.js +++ b/src/styles/style.js @@ -58,7 +58,7 @@ export default { }} {...props} > - – + – {content} ), diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 8ddd142..e47ae37 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -84,8 +84,8 @@ const config = { ], plugins: [ '@babel/plugin-transform-runtime', - ['@babel/plugin-proposal-decorators', {legacy: true }], - ['@babel/plugin-proposal-class-properties', { loose: true }], + ['@babel/plugin-proposal-decorators', {legacy: true}], + ['@babel/plugin-proposal-class-properties', {loose: true}], '@babel/plugin-syntax-dynamic-import', '@babel/proposal-object-rest-spread', ],