diff --git a/.gitignore b/.gitignore index 7a9242b..0987642 100755 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ tags tags.lock tags.temp src/config.js +src/local.config.js diff --git a/data/timemap_data.xlsx b/data/timemap_data.xlsx index 8e9e6d9..3cfd05b 100644 Binary files a/data/timemap_data.xlsx and b/data/timemap_data.xlsx differ diff --git a/package-lock.json b/package-lock.json index 7c7eec8..0097d74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4894,6 +4894,11 @@ "minimist": "^1.2.5" } }, + "moment": { + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", + "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" + }, "morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", diff --git a/src/initialize.js b/src/initialize.js index 44e59bf..a6b99de 100755 --- a/src/initialize.js +++ b/src/initialize.js @@ -1,7 +1,6 @@ import StoreJson from './models/StoreJson' import fetchers from './lib/Fetcher' import Controller from './lib/Controller' -import config from './config' import R from 'ramda' const isntNull = n => n !== null @@ -9,6 +8,13 @@ const filterNull = ls => R.filter(isntNull, ls) const flattenfilterNull = ls => filterNull(R.flatten(ls)) let themFetchers +let config +try { + config = require('./local.config.js').default +} catch (_) { + config = require('./config.js').default +} + export default callback => { return Promise.resolve().then(() => { return Object.keys(config).map(fType => { diff --git a/src/lib.js b/src/lib.js index 2606845..e275101 100644 --- a/src/lib.js +++ b/src/lib.js @@ -6,8 +6,7 @@ function prefixedTabs (prefix, cfg) { return { [`${prf('events')}export_events`]: BP.deeprows, [`${prf('categories')}export_categories`]: [BP.groups, BP.rows], - [`${prf('filters')}export_filters`]: BP.tree, - [`${prf('narratives')}export_narratives`]: BP.rows, + [`${prf('associations')}export_associations`]: BP.deeprows, [`${prf('sources')}export_sources`]: BP.deepids, [`${prf('sites')}export_sites`]: BP.rows }