From 46f17f538136daf34c8b3522a77230e3d0b96e5d Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 24 Aug 2017 19:10:30 -0300 Subject: [PATCH] Fully working :) --- client/coral-configure/components/QuestionBoxBuilder.js | 4 ++-- .../components}/Markdown.js | 0 client/talk-plugin-infobox/InfoBox.js | 2 +- client/talk-plugin-questionbox/QuestionBox.js | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) rename client/{talk-plugin-infobox => coral-framework/components}/Markdown.js (100%) diff --git a/client/coral-configure/components/QuestionBoxBuilder.js b/client/coral-configure/components/QuestionBoxBuilder.js index d3285b173..8ccc6ba31 100644 --- a/client/coral-configure/components/QuestionBoxBuilder.js +++ b/client/coral-configure/components/QuestionBoxBuilder.js @@ -1,6 +1,6 @@ import React from 'react'; import QuestionBox from 'talk-plugin-questionbox/QuestionBox'; -import {Icon} from 'coral-ui'; +import {Icon, Spinner} from 'coral-ui'; import DefaultIcon from './DefaultIcon'; import cn from 'classnames'; import styles from './QuestionBoxBuilder.css'; @@ -32,7 +32,7 @@ class QuestionBoxBuilder extends React.Component { const {loading, MarkdownEditor} = this.state; if (loading) { - return
Loading
; + return ; } return ( diff --git a/client/talk-plugin-infobox/Markdown.js b/client/coral-framework/components/Markdown.js similarity index 100% rename from client/talk-plugin-infobox/Markdown.js rename to client/coral-framework/components/Markdown.js diff --git a/client/talk-plugin-infobox/InfoBox.js b/client/talk-plugin-infobox/InfoBox.js index 3b9d7da75..658f4ffcc 100644 --- a/client/talk-plugin-infobox/InfoBox.js +++ b/client/talk-plugin-infobox/InfoBox.js @@ -1,5 +1,5 @@ import React from 'react'; -import Markdown from './Markdown'; +import Markdown from 'coral-framework/components/Markdown'; const packagename = 'talk-plugin-infobox'; diff --git a/client/talk-plugin-questionbox/QuestionBox.js b/client/talk-plugin-questionbox/QuestionBox.js index 8cc8d7efa..f15549b7c 100644 --- a/client/talk-plugin-questionbox/QuestionBox.js +++ b/client/talk-plugin-questionbox/QuestionBox.js @@ -2,6 +2,7 @@ import React from 'react'; import cn from 'classnames'; import styles from './QuestionBox.css'; import {Icon} from 'coral-ui'; +import Markdown from 'coral-framework/components/Markdown'; import Slot from 'coral-framework/components/Slot'; @@ -20,7 +21,7 @@ const QuestionBox = ({content, enable, icon = '', className = ''}) => ( ) }
- {content} +