From 880a9fab0f93afdbcc535968eff171e5d0722d26 Mon Sep 17 00:00:00 2001 From: Sam Ludford Date: Fri, 17 May 2019 13:12:04 +0100 Subject: [PATCH] moved required cover values into intitial.js --- example.config.js | 10 +++++----- src/selectors/index.js | 2 +- src/store/initial.js | 11 ++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/example.config.js b/example.config.js index d9d2b68..5b35c10 100644 --- a/example.config.js +++ b/example.config.js @@ -9,22 +9,22 @@ module.exports = { SITES_EXT: '/api/example/export_sites/rows', SHAPES_EXT: '/api/example/export_shapes/columns', INCOMING_DATETIME_FORMAT: '%m/%d/%YT%H:%M', - MAPBOX_TOKEN: 'pk.EXAMPLE_MAPBOX_TOKEN', + // MAPBOX_TOKEN: 'pk.YOUR_MAPBOX_TOKEN', features: { USE_COVER: false, USE_TAGS: false, USE_SEARCH: false, USE_SITES: true, USE_SOURCES: true, - USE_SHAPES: true, + USE_SHAPES: false, CATEGORIES_AS_TAGS: true }, store: { app: { cover: { - title: 'project title', //required - subtitle: 'project subtitle', //required - description: 'A description of the project goes here.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\nThis description may contain markdown.\n\n#### markdown\n\n### markdown\n\n## markdown', //required + // title: 'project title', + // subtitle: 'project subtitle', + // description: 'A description of the project goes here.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\nThis description may contain markdown.\n\n#### markdown\n\n### markdown\n\n## markdown', // subsubtitle: '', // bgVideo:'', // howToVideo: { diff --git a/src/selectors/index.js b/src/selectors/index.js index 0844549..bb19554 100644 --- a/src/selectors/index.js +++ b/src/selectors/index.js @@ -38,7 +38,7 @@ export const selectEvents = createSelector( [getEvents, getActiveTags, getActiveCategories, getTimeRange], (events, activeTags, activeCategories, timeRange) => { return events.reduce((acc, event) => { - const isMatchingTag = event.tags.map(tag => activeTags.includes(tag)).some(s => s) + const isMatchingTag = event.tags && event.tags.map(tag => activeTags.includes(tag)).some(s => s) const isActiveTag = isMatchingTag || activeTags.length === 0 const isActiveCategory = activeCategories.includes(event.category) || activeCategories.length === 0 const isActiveTime = isTimeRangedIn(event, timeRange) diff --git a/src/store/initial.js b/src/store/initial.js index 480797d..bbc2de3 100644 --- a/src/store/initial.js +++ b/src/store/initial.js @@ -72,9 +72,13 @@ const initial = { new Date(2016, 2, 23, 12) ], zoomLevels: [ + { label: '3 years', duration: 1576800 }, { label: '3 months', duration: 129600 }, { label: '3 days', duration: 4320 }, - { label: '12 hours', duration: 720 } + { label: '12 hours', duration: 720 }, + { label: '2 hours', duration: 120 }, + { label: '30 min', duration: 30 }, + { label: '10 min', duration: 10 } ] }, flags: { @@ -84,6 +88,11 @@ const initial = { isCardstack: true, isInfopopup: true, isShowingSites: true + }, + cover: { + title: 'project title', + subtitle: 'project subtitle', + description: 'A description of the project goes here.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\n\nThis description may contain markdown.\n\n#### markdown\n\n### markdown\n\n## markdown' } },