Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Markdown summary #794

Merged
merged 8 commits into from
Mar 22, 2017
Merged

Markdown summary #794

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e68852
Add markdown in meeting summary
ndey96 Feb 27, 2017
fca2358
Merge branch 'master' into markdownSummary
ndey96 Mar 1, 2017
c238bcd
Merge branch 'master' into markdownSummary
ndey96 Mar 7, 2017
f72cb75
Merge branch 'master' into markdownSummary
ndey96 Mar 10, 2017
1f8e578
Merge branch 'master' into markdownSummary
ndey96 Mar 12, 2017
9e624f6
Fix prop type errors
ndey96 Mar 12, 2017
0fd0d8f
Merge branch 'master' into markdownSummary
ndey96 Mar 22, 2017
529e66c
Move markdownCustomComponents to utils
ndey96 Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/universal/modules/email/components/Card/Card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import labels from 'universal/styles/theme/labels';
import ui from 'universal/styles/ui';
import {trimString} from 'universal/utils';
import EmptySpace from '../EmptySpace/EmptySpace';
import ReactMarkdown from 'react-markdown';
import LinkNewTab from 'universal/components/LinkNewTab/LinkNewTab';

const Card = (props) => {
const {content, status} = props;
Expand Down Expand Up @@ -53,6 +55,9 @@ const Card = (props) => {
};
}

const markdownCustomComponents = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's move this outside the component since it'll never change & then we can reuse that same object for all the cards.

Link: LinkNewTab
};
return (
<table style={ui.emailTableBase} width="100%">
<tbody>
Expand All @@ -66,7 +71,12 @@ const Card = (props) => {
<tr>
<td style={cellStyle}>
<div style={contentStyle}>
{trimString(content, 52)}
<ReactMarkdown
renderers={markdownCustomComponents}
source={trimString(content, 52)}
escapeHtml
softBreak="br"
/>
</div>
</td>
</tr>
Expand Down
3 changes: 2 additions & 1 deletion src/universal/modules/newTeam/components/NewTeam/NewTeam.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {DragDropContext as dragDropContext} from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend';

const NewTeam = (props) => {
console.log(props);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's nuke this

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ndey96 any update on this?

const {dispatch, params: {newOrg}} = props;
return (
<DashboardWrapper title="User Dashboard">
Expand All @@ -19,7 +20,7 @@ const NewTeam = (props) => {
NewTeam.propTypes = {
dispatch: PropTypes.func.isRequired,
params: PropTypes.shape({
newOrg: PropTypes.object
newOrg: PropTypes.string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch!

})
};

Expand Down
2 changes: 1 addition & 1 deletion src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class NewTeamFormContainer extends Component {

NewTeamFormContainer.propTypes = {
dispatch: PropTypes.func.isRequired,
initialOrgCount: PropTypes.func.number,
initialOrgCount: PropTypes.number,
initialValues: PropTypes.object,
isNewOrg: PropTypes.bool,
organizations: PropTypes.array,
Expand Down