Fix some rebasing conflicts

src/actions/index.js

@@ -66,7 +66,7 @@ export function fetchDomain () {
 
     let tagsPromise
     if (process.env.features.USE_TAGS) {
-      tagsPromise = fetch(TAG_TREE_URL)
+      tagsPromise = fetch(TAG_URL)
         .then(response => response.json())
         .catch(handleError('tags'))
     }
@@ -164,14 +164,6 @@ export function updateTagFilters(tag) {
   }
 }
 
-export const UPDATE_NARRATIVE = 'UPDATE_NARRATIVE';
- export function updateNarrative(narrative) {
-   return {
-     type: UPDATE_NARRATIVE,
-     narrative
-   }
- }
-
 export const UPDATE_TIMERANGE = 'UPDATE_TIMERANGE';
 export function updateTimeRange(timerange) {
   return {
@@ -264,11 +256,3 @@ export function fetchSourceError(msg) {
     msg
   }
 }
-
-export const TOGGLE_MAPVIEW = 'TOGGLE_MAPVIEW';
-export function toggleMapView(layer) {
-  return {
-    type: TOGGLE_MAPVIEW,
-    layer
-  }
-}

src/components/Toolbar.jsx

@@ -156,16 +156,19 @@ class Toolbar extends React.Component {
 
   renderToolbarTabs() {
     const title = copy[this.props.language].toolbar.title;
+    const isTags = this.props.tags && (this.props.tags.children > 0);
+
     return (
       <div className="toolbar">
         <div className="toolbar-header"><p>{title}</p></div>
         <div className="toolbar-tabs">
           {/*this.renderToolbarTab(0, 'search')*/}
-          {(this.props.isModeGuided)
-            ? this.renderToolbarNavs()
-            : this.renderToolbarTagRoot()}
+          {this.renderToolbarTab(0, 'Narratives')}
+          {(isTags) ? this.renderToolbarTab(1, 'Explore by tag') : ''}
         </div>
-        {/* {this.renderBottomActions()} */}
+        <ToolbarBottomActions
+          actions={this.props.actions}
+        />
       </div>
     )
   }

src/components/presentational/CardCategory.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { capitalizeFirstLetter } from '../../js/data/utilities.js';
+import { capitalizeFirstLetter } from '../../js/utilities.js';
 
 const CardCategory = ({ categoryTitle, categoryLabel, color }) => (
   <div className="card-row card-cell category">

src/store/initial.js

@@ -106,8 +106,8 @@ const initial = {
       categories: {
         default: 'red',
         // Add here other categories to differentiate by color, like:
-        alpha: '#c73e1d',
-        beta: '#f40000',
+        alpha: '#00ff00',
+        beta: '#ff0000',
         other: '#f3de2c'
       },
 

webpack.config.js

@@ -1,7 +1,7 @@
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const userConfig = require('./dev.config');
+const userConfig = require('./config');
 const userConfigJSON = {};
 
 const devMode = process.env.NODE_ENV !== 'production';