updated packages

This commit is contained in:
Daniel
2018-04-23 14:23:40 -04:00
parent d8eb269068
commit 14498ccbb9
5 changed files with 42 additions and 34 deletions

File diff suppressed because one or more lines are too long

View File

@@ -14,11 +14,11 @@
"license": "MIT",
"dependencies": {
"lokijs": "^1.5.1",
"mobx": "^3.3.1",
"mobx-react": "^4.3.3",
"mobx": "^4.1.0",
"mobx-react": "^5.0.0",
"prop-types": "^15.6.0",
"react": "^16.0.0",
"react-collapsible": "^2.0.4",
"react-collapsible": "^2.2.x",
"react-digit-input": "^1.0.0",
"react-dom": "^16.0.0",
"react-interactive": "^0.8.1",
@@ -45,8 +45,9 @@
"eslint-plugin-jsx-a11y": "^6.0.0",
"eslint-plugin-react": "^7.0.0",
"extract-text-webpack-plugin": "^3.0.2",
"sass-loader": "^6.0.7",
"style-loader": "^0.20.2",
"node-sass": "^4.8.3",
"sass-loader": "^7.0.x",
"style-loader": "^0.21.x",
"webpack": "^3.11",
"webpack-dev-server": "^2.11.1"
}

View File

@@ -162,40 +162,47 @@ class CollectionDB {
}
setupDB() {
let db = new loki("chaotic_portal.db", {
autosave: true,
autoload: true,
autoloadCallback: databaseInitialize,
autosaveInterval: 4000,
persistenceMethod: 'localStorage'
});
// ignoring persistence for now
let db = new loki("chaotic_portal.db");
// let db = new loki("chaotic_portal.db");
this.attacks = db.addCollection('attacks');
this.battlegear = db.addCollection('battlegear');
this.creatures = db.addCollection('creatures');
this.locations = db.addCollection('locations');
this.mugic = db.addCollection('mugic');
this.db = db;
// let db = new loki("chaotic_portal.db", { autosave: true, autoload: true, autoloadCallback: databaseInitialize, autosaveInterval: 4000, persistenceMethod: 'localStorage' });
// this.db = db;
let databaseInitialize = () => {
var entries;
console.log(this);
// if ((entries = db.getCollection("attacks")) === null)
// entries = db.addCollection("attacks");
// this.attacks = entries;
// let databaseInitialize = () => {
// var entries;
// if ((entries = db.getCollection("attacks")) === null)
// entries = db.addCollection("attacks");
// this.attacks = entries;
// if ((entries = db.getCollection("battlegear")) === null)
// entries = db.addCollection("battlegear");
// this.battlegear = entries;
// if ((entries = db.getCollection("battlegear")) === null)
// entries = db.addCollection("battlegear");
// this.battlegear = entries;
// console.log(db.getCollection("creatures"));
// if ((entries = db.getCollection("creatures")) === null)
// entries = db.addCollection("creatures");
// this.creatures = db.addCollection('creatures');
// console.log(db.getCollection("creatures"));
// if ((entries = db.getCollection("creatures")) === null)
// entries = db.addCollection("creatures");
// this.creatures = db.addCollection('creatures');
// if ((entries = db.getCollection("locations")) === null)
// entries = db.addCollection("locations");
// this.locations = entries
// if ((entries = db.getCollection("locations")) === null)
// entries = db.addCollection("locations");
// this.locations = entries
// if ((entries = db.getCollection("mugic")) === null)
// entries = db.addCollection("mugic");
// this.mugic = entries;
// };
// if ((entries = db.getCollection("mugic")) === null)
// entries = db.addCollection("mugic");
// this.mugic = entries;
};
}
}

View File

@@ -25,7 +25,7 @@ export default class SearchCollection extends React.Component {
this.parseQuery();
}
cleanInput() {
cleanInput = () => {
let input = {
name: "",
text: "",
@@ -48,7 +48,7 @@ export default class SearchCollection extends React.Component {
this.input = input;
}
parseQuery() {
parseQuery = () => {
const queryString = this.props.location.search.toLowerCase();
let query = {};
@@ -259,7 +259,6 @@ export default class SearchCollection extends React.Component {
reset = (event) => {
event.preventDefault();
event.stopPropagation();
// this.props.history.push('/collection/');
this.cleanInput();
}
@@ -582,6 +581,7 @@ export default class SearchCollection extends React.Component {
if (results.length > 0) this.props.handleContent(results);
else this.props.handleContent([{'text': 'No Results Found'}]);
}
}

View File

@@ -15,7 +15,7 @@ export default class SearchPortal extends React.Component {
constructor(props) {
super(props);
this.search = this.search.bind(this);
// this.search = this.search.bind(this);
this.query = this.input = decodeURIComponent(this.props.location.search.substr(1));
}
@@ -29,7 +29,7 @@ export default class SearchPortal extends React.Component {
</div>);
}
search(event) {
search = (event) => {
event.preventDefault();
event.stopPropagation();