From 95fe832896c58e0561e1214e792be6e6bcd8ecd1 Mon Sep 17 00:00:00 2001 From: Thomas Haddad Date: Fri, 14 Apr 2017 11:54:37 +0200 Subject: Refs #2893: Add UPDATE_COLOR for tt metas Signed-off-by: Thomas Shawarma Haddad --- .../es6_browserified/time_tables/actions/index.js | 4 ++++ .../es6_browserified/time_tables/components/Metas.js | 14 ++++++++++---- .../es6_browserified/time_tables/containers/Metas.js | 3 +++ .../es6_browserified/time_tables/reducers/metas.js | 2 ++ 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts') diff --git a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js index 4dac1906a..f2d065917 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/actions/index.js +++ b/app/assets/javascripts/es6_browserified/time_tables/actions/index.js @@ -22,6 +22,10 @@ const actions = { type: 'UPDATE_COMMENT', comment }), + updateColor: (color) => ({ + type: 'UPDATE_COLOR', + color + }), fetchTimeTables: (dispatch, currentPage, nextPage) => { let urlJSON = window.location.pathname.split('/', 5).join('/') + '.json' diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js index 3edc86ae0..6fee6a590 100644 --- a/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js +++ b/app/assets/javascripts/es6_browserified/time_tables/components/Metas.js @@ -2,7 +2,7 @@ var React = require('react') var PropTypes = require('react').PropTypes let weekDays = ['D', 'L', 'Ma', 'Me', 'J', 'V', 'S'] -const Metas = ({metas, onUpdateDayTypes, onUpdateComment}) => { +const Metas = ({metas, onUpdateDayTypes, onUpdateComment, onUpdateColor}) => { let colorList = ["", "#9B9B9B", "#FFA070", "#C67300", "#7F551B", "#41CCE3", "#09B09C", "#3655D7", "#6321A0", "#E796C6", "#DD2DAA"] return (
@@ -40,14 +40,18 @@ const Metas = ({metas, onUpdateDayTypes, onUpdateComment}) => { >
{colorList.map((c, i) => - + {onUpdateColor(c)}} + >