Leahnaya/chaoticbackup.github.io
1
0
Fork 0
mirror of https://github.com/chaoticbackup/chaoticbackup.github.io.git synced 2026-08-21 08:04:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed parentheses in name search

Browse Source
This commit is contained in:
Daniel
2018-08-11 20:46:43 -04:00
parent 880a0bb037
commit 18eb39940b
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bundle.js
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@@ -47,7 +47,7 @@
"extract-text-webpack-plugin": "^3.0.2",
"node-sass": "^4.8.3",
"sass-loader": "^7.0.x",
"style-loader": "^0.21.x",
"style-loader": "^0.22.x",
"webpack": "^3.11",
"webpack-dev-server": "^2.11.1"
}

23
src/components/collection/Search.js
View File

@@ -283,25 +283,28 @@ export default class SearchCollection extends React.Component {
// Search by name
if (this.input.name.length > 0) {
// clean name
let inputname = this.input.name.replace(/\\/g, '').replace(/\(|\)/g, (match) => {return ("\\"+match)});
console.log(inputname);
attackResults = attackResults.find({'$or': [
{'gsx$name': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$tags': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
{'gsx$tags': {'$regex': new RegExp(inputname, 'i')}},
]});
battlegearResults = battlegearResults.find({'$or': [
{'gsx$name': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$tags': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
{'gsx$tags': {'$regex': new RegExp(inputname, 'i')}},
]});
creatureResults = creatureResults.find({'$or': [
{'gsx$name': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$tags': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
{'gsx$tags': {'$regex': new RegExp(inputname, 'i')}},
]});
locationResults = locationResults.find({'$or': [
{'gsx$name': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$tags': {'$regex': new RegExp(this.input.name, 'i')}}
{'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
{'gsx$tags': {'$regex': new RegExp(inputname, 'i')}}
]});
mugicResults = mugicResults.find({'$or': [
{'gsx$name': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$tags': {'$regex': new RegExp(this.input.name, 'i')}},
{'gsx$name': {'$regex': new RegExp(inputname, 'i')}},
{'gsx$tags': {'$regex': new RegExp(inputname, 'i')}},
]});
}