Open platform to collect and prioritize feedback
add markdown rendering to ui (#62)
Guilherme Oenning1ffab3209d59
diff --git a/package-lock.json b/package-lock.jsonindex 44e4c3f55..9f683c25d 100644--- a/package-lock.json+++ b/package-lock.json@@ -9,12 +9,24 @@"integrity": "sha512-uF/ymNUqAFoiC4NpsuXrBwy4l7yoH/0V/BXpL9yi17HfyDlqei+pL1JxyQr84yCzFAjxoLcUciPMe5DyqwRVJA==","dev": true},+ "@types/markdown-it": {+ "version": "0.0.2",+ "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-0.0.2.tgz",+ "integrity": "sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=",+ "dev": true+ },"@types/md5": {"version": "2.1.32","resolved": "https://registry.npmjs.org/@types/md5/-/md5-2.1.32.tgz","integrity": "sha1-k+I0N/zRenucqY0CqmAC6DWEL+g=","dev": true},+ "@types/moment": {+ "version": "2.13.0",+ "resolved": "https://registry.npmjs.org/@types/moment/-/moment-2.13.0.tgz",+ "integrity": "sha1-YE69GJvDvDShVIaJQE5hoqSqyJY=",+ "dev": true+ },"@types/node": {"version": "8.0.3","resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.3.tgz",@@ -122,8 +134,7 @@"argparse": {"version": "1.0.9","resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",- "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",- "dev": true+ "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY="},"arr-diff": {"version": "2.0.0",@@ -799,6 +810,11 @@"integrity": "sha1-n0tib1dyRe3PSyrYPYbhf09CHew=","dev": true},+ "entities": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",+ "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="+ },"errno": {"version": "0.1.4","resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",@@ -2368,6 +2384,11 @@"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=","dev": true},+ "linkify-it": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",+ "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08="+ },"load-json-file": {"version": "1.1.0","resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",@@ -2469,6 +2490,11 @@"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=","dev": true},+ "markdown-it": {+ "version": "8.3.1",+ "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.3.1.tgz",+ "integrity": "sha1-L0tiKUjM3Bk9ZvPKLUMSWsSscyM="+ },"math-expression-evaluator": {"version": "1.2.17","resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",@@ -2480,6 +2506,11 @@"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz","integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk="},+ "mdurl": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",+ "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="+ },"memory-fs": {"version": "0.4.1","resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",@@ -3532,8 +3563,7 @@"sprintf-js": {"version": "1.0.3","resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",- "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",- "dev": true+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="},"sshpk": {"version": "1.13.1",@@ -3718,6 +3748,11 @@"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.13.tgz","integrity": "sha1-zZ3S+GSTs/RNvu7zeA/adMXuFL4="},+ "uc.micro": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",+ "integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI="+ },"uglify-js": {"version": "2.8.29","resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",diff --git a/package.json b/package.jsonindex 296d2d071..6bd1ba1ac 100644--- a/package.json+++ b/package.json@@ -14,6 +14,7 @@"inversify": "^4.2.0","inversify-inject-decorators": "^3.0.1","jquery": "^3.2.1",+ "markdown-it": "^8.3.1","md5": "^2.2.1","moment": "^2.18.1","react": "^15.6.1",@@ -24,7 +25,9 @@},"devDependencies": {"@types/jquery": "^3.2.6",+ "@types/markdown-it": "0.0.2","@types/md5": "^2.1.32",+ "@types/moment": "^2.13.0","@types/react": "^15.0.35","@types/react-dom": "^15.5.1","css-loader": "^0.28.4",diff --git a/public/components/ShowIdeaResponse.tsx b/public/components/ShowIdeaResponse.tsxindex 1dccd31e1..8dfebc1aa 100644--- a/public/components/ShowIdeaResponse.tsx+++ b/public/components/ShowIdeaResponse.tsx@@ -1,7 +1,6 @@import * as React from 'react';-import * as moment from 'moment';import { User, IdeaResponse, IdeaStatus } from '@fider/models';-import { Gravatar, MultiLineText } from '@fider/components/common';+import { Gravatar, MultiLineText, Moment } from '@fider/components/common';interface IdeaResponseProps {status: number;@@ -14,15 +13,13 @@ export const ShowIdeaResponse = (props: IdeaResponseProps): JSX.Element => {if (props.response && status.show) {return <div className="fdr-response item ui raised segment"><span className={`ui ribbon label ${status.color}`}>{ status.title }</span>- <div className="info">- <Gravatar hash={props.response.user.gravatar}/> <u>{props.response.user.name}</u>- <span title={props.response.respondedOn.toString()}>- { moment(props.response.respondedOn).fromNow() }- </span>- </div>- <div className="content">- <MultiLineText text={ props.response.text } />- </div>+ <div className="info">+ <Gravatar hash={props.response.user.gravatar}/> <u>{props.response.user.name}</u>+ <Moment date={props.response.respondedOn} />+ </div>+ <div className="content">+ <MultiLineText text={ props.response.text } markdown={true} />+ </div></div>;}return <div/>;diff --git a/public/components/common/Moment.tsx b/public/components/common/Moment.tsxnew file mode 100644index 000000000..e40f72587--- /dev/null+++ b/public/components/common/Moment.tsx@@ -0,0 +1,20 @@+import * as React from 'react';+import * as moment from 'moment';++interface MomentText {+ date: Date | string;+}++export const Moment = (props: MomentText) => {+ if (!props.date) {+ return <span></span>;+ }++ const m = moment(props.date);+ const diff = m.diff(new Date(), 'years');+ const display = (diff !== 0) ? m.format('Do MMM YYYY') : m.fromNow();++ return <span className="date" title={m.format('Do MMM YYYY, hh:mm')}>+ { display }+ </span>;+};diff --git a/public/components/common/MultiLineText.tsx b/public/components/common/MultiLineText.tsxindex 0627a36ce..25c608576 100644--- a/public/components/common/MultiLineText.tsx+++ b/public/components/common/MultiLineText.tsx@@ -1,11 +1,24 @@import * as React from 'react';+import * as md from 'markdown-it';-export const MultiLineText = (props: {text?: string}) => {+const cm = md('commonmark', { html: false, linkify: true }).enable('linkify');+const linkify = md('zero', { linkify: true }).enable('linkify');++interface MultiLineText {+ text?: string;+ markdown?: boolean;+}++export const MultiLineText = (props: MultiLineText) => {if (!props.text) {return <p></p>;}+ if (props.markdown) {+ return <div dangerouslySetInnerHTML={{__html: cm.render(props.text)}}></div>;+ }+return <div>{props.text.split('\n').map((item, i) =>- <span>{item}<br/></span>+ <span dangerouslySetInnerHTML={{__html: linkify.renderInline(item) + '<br />'}}></span>)}</div>;};diff --git a/public/components/common/index.tsx b/public/components/common/index.tsxindex 588e9bd6b..2d6857141 100644--- a/public/components/common/index.tsx+++ b/public/components/common/index.tsx@@ -8,3 +8,4 @@ export * from './Footer';export * from './Header';export * from './SocialSignInButton';export * from './SocialSignInList';+export * from './Moment';diff --git a/public/pages/ShowIdeaPage.tsx b/public/pages/ShowIdeaPage.tsxindex 0785e51e2..091fd8aab 100644--- a/public/pages/ShowIdeaPage.tsx+++ b/public/pages/ShowIdeaPage.tsx@@ -1,4 +1,3 @@-import * as moment from 'moment';import * as React from 'react';import { User, Comment, Idea } from '@fider/models';@@ -9,7 +8,7 @@ import { CommentInput } from '@fider/components/CommentInput';import { ResponseForm } from '@fider/components/ResponseForm';import { SupportCounter } from '@fider/components/SupportCounter';import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';-import { Gravatar, MultiLineText, Footer, Header, SocialSignInButton } from '@fider/components/common';+import { Gravatar, Moment, MultiLineText, Footer, Header, SocialSignInButton } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { Session } from '@fider/services';@@ -41,7 +40,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {<div className="content"><span className="author">{ c.user.name }</span><div className="metadata">- <span className="date" title={c.createdOn}>{ moment(c.createdOn).fromNow() }</span>+ <Moment date={c.createdOn} /></div><div className="text"><MultiLineText text={ c.content } />@@ -68,13 +67,13 @@ export class ShowIdeaPage extends React.Component<{}, {}> {<p>#{ this.idea.number } shared by <Gravatar hash={this.idea.user.gravatar}/> <u>{this.idea.user.name}</u> - <span title={this.idea.createdOn}>{ moment(this.idea.createdOn).fromNow() }</span>+ <Moment date={this.idea.createdOn} /></p></div></div></div>- <MultiLineText text={ this.idea.description } />+ <MultiLineText text={ this.idea.description } markdown={true} /><ShowIdeaResponse status={ this.idea.status } response={ this.idea.response } />{diff --git a/public/pages/SiteHomePage.tsx b/public/pages/SiteHomePage.tsxindex b093a7267..70bd3953e 100644--- a/public/pages/SiteHomePage.tsx+++ b/public/pages/SiteHomePage.tsx@@ -1,7 +1,6 @@-import * as moment from 'moment';import * as React from 'react';import { Idea, User } from '@fider/models';-import { Gravatar, MultiLineText, Header, Footer} from '@fider/components/common';+import { Gravatar, MultiLineText, Moment, Header, Footer } from '@fider/components/common';import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';import { SupportCounter } from '@fider/components/SupportCounter';import { IdeaInput } from '@fider/components/IdeaInput';@@ -31,11 +30,11 @@ export class SiteHomePage extends React.Component<{}, {}> {{ x.title }</a><div className="description">- <MultiLineText text={ x.description } />+ <MultiLineText text={ x.description } markdown={true} /></div><div className="extra">#{ x.number } shared by <Gravatar hash={x.user.gravatar}/> <u>{x.user.name}</u>- <span title={x.createdOn}>{ moment(x.createdOn).fromNow() }</span>+ <Moment date={x.createdOn} /></div><ShowIdeaResponse status={ x.status } response={ x.response } /></div>