diff --git a/.eslintignore b/.eslintignore index d74bce1d3..ded9d13ad 100644 --- a/.eslintignore +++ b/.eslintignore @@ -24,7 +24,8 @@ public !plugins/talk-plugin-profile-settings !plugins/talk-plugin-remember-sort !plugins/talk-plugin-respect -!plugins/talk-plugin-rte +!plugins/talk-plugin-rich-text +!plugins/talk-plugin-rich-text-pell !plugins/talk-plugin-sort-most-liked !plugins/talk-plugin-sort-most-loved !plugins/talk-plugin-sort-most-replied diff --git a/.gitignore b/.gitignore index 4431a21ca..48ce6e5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,8 @@ plugins/* !plugins/talk-plugin-subscriber !plugins/talk-plugin-flag-details !plugins/talk-plugin-slack-notifications -!plugins/talk-plugin-rte +!plugins/talk-plugin-rich-text +!plugins/talk-plugin-rich-text-pell !plugins/talk-plugin-profile-settings **/node_modules/* diff --git a/plugins/talk-plugin-rte/client/translations.yml b/plugins/talk-plugin-rich-text-pell/README.md similarity index 100% rename from plugins/talk-plugin-rte/client/translations.yml rename to plugins/talk-plugin-rich-text-pell/README.md diff --git a/plugins/talk-plugin-rte/client/.eslintrc.json b/plugins/talk-plugin-rich-text-pell/client/.eslintrc.json similarity index 100% rename from plugins/talk-plugin-rte/client/.eslintrc.json rename to plugins/talk-plugin-rich-text-pell/client/.eslintrc.json diff --git a/plugins/talk-plugin-rte/client/components/CommentContent.js b/plugins/talk-plugin-rich-text-pell/client/components/CommentContent.js similarity index 72% rename from plugins/talk-plugin-rte/client/components/CommentContent.js rename to plugins/talk-plugin-rich-text-pell/client/components/CommentContent.js index e9f33fee5..49f2572df 100644 --- a/plugins/talk-plugin-rte/client/components/CommentContent.js +++ b/plugins/talk-plugin-rich-text-pell/client/components/CommentContent.js @@ -1,17 +1,17 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { name } from '../../package.json'; +import { pluginName } from '../../package.json'; class CommentContent extends React.Component { render() { const { comment } = this.props; return comment.htmlBody ? (
) : ( -
{comment.body}
+
{comment.body}
); } } diff --git a/plugins/talk-plugin-rte/client/components/Editor.css b/plugins/talk-plugin-rich-text-pell/client/components/Editor.css similarity index 100% rename from plugins/talk-plugin-rte/client/components/Editor.css rename to plugins/talk-plugin-rich-text-pell/client/components/Editor.css diff --git a/plugins/talk-plugin-rte/client/components/Editor.js b/plugins/talk-plugin-rich-text-pell/client/components/Editor.js similarity index 96% rename from plugins/talk-plugin-rte/client/components/Editor.js rename to plugins/talk-plugin-rich-text-pell/client/components/Editor.js index c921c846c..0800950e8 100644 --- a/plugins/talk-plugin-rte/client/components/Editor.js +++ b/plugins/talk-plugin-rich-text-pell/client/components/Editor.js @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import { init } from 'pell'; import styles from './Editor.css'; import cn from 'classnames'; - -const pluginName = 'talk-plugin-rte'; +import { pluginName } from '../../package.json'; class Editor extends React.Component { ref = null; @@ -62,7 +61,7 @@ class Editor extends React.Component { Editor.defaultProps = { defaultContent: '', - styleWithCSS: true, + styleWithCSS: false, actions: ['bold', 'italic', 'quote'], classNames: { button: '', diff --git a/plugins/talk-plugin-rte/client/containers/CommentContent.js b/plugins/talk-plugin-rich-text-pell/client/containers/CommentContent.js similarity index 100% rename from plugins/talk-plugin-rte/client/containers/CommentContent.js rename to plugins/talk-plugin-rich-text-pell/client/containers/CommentContent.js diff --git a/plugins/talk-plugin-rte/client/index.js b/plugins/talk-plugin-rich-text-pell/client/index.js similarity index 100% rename from plugins/talk-plugin-rte/client/index.js rename to plugins/talk-plugin-rich-text-pell/client/index.js diff --git a/plugins/talk-plugin-rich-text-pell/client/translations.yml b/plugins/talk-plugin-rich-text-pell/client/translations.yml new file mode 100644 index 000000000..e69de29bb diff --git a/plugins/talk-plugin-rich-text-pell/index.js b/plugins/talk-plugin-rich-text-pell/index.js new file mode 100644 index 000000000..f053ebf79 --- /dev/null +++ b/plugins/talk-plugin-rich-text-pell/index.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/plugins/talk-plugin-rich-text-pell/package.json b/plugins/talk-plugin-rich-text-pell/package.json new file mode 100644 index 000000000..6b35d5ea9 --- /dev/null +++ b/plugins/talk-plugin-rich-text-pell/package.json @@ -0,0 +1,12 @@ +{ + "name": "@coralproject/talk-plugin-rich-text-pell", + "pluginName": "talk-plugin-rich-text-pell", + "version": "0.0.1", + "description": "Pell's Rich Text Editor for Talk", + "main": "index.js", + "author": "The Coral Project Team ", + "license": "Apache-2.0", + "dependencies": { + "pell": "^0.7.0" + } +} diff --git a/plugins/talk-plugin-rich-text/README.md b/plugins/talk-plugin-rich-text/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/plugins/talk-plugin-rte/index.js b/plugins/talk-plugin-rich-text/index.js similarity index 100% rename from plugins/talk-plugin-rte/index.js rename to plugins/talk-plugin-rich-text/index.js diff --git a/plugins/talk-plugin-rte/package.json b/plugins/talk-plugin-rich-text/package.json similarity index 62% rename from plugins/talk-plugin-rte/package.json rename to plugins/talk-plugin-rich-text/package.json index ce0ee0f46..e665c2799 100644 --- a/plugins/talk-plugin-rte/package.json +++ b/plugins/talk-plugin-rich-text/package.json @@ -1,13 +1,12 @@ { - "name": "@coralproject/talk-plugin-rte", - "pluginName": "talk-plugin-rte", + "name": "@coralproject/talk-plugin-rich-text", + "pluginName": "talk-plugin-rich-text", "version": "0.0.1", "description": "Rich Text Editor for Talk", "main": "index.js", "author": "The Coral Project Team ", "license": "Apache-2.0", "dependencies": { - "dompurify": "^1.0.3", - "pell": "^0.7.0" + "dompurify": "^1.0.3" } } diff --git a/plugins/talk-plugin-rte/server/config.js b/plugins/talk-plugin-rich-text/server/config.js similarity index 100% rename from plugins/talk-plugin-rte/server/config.js rename to plugins/talk-plugin-rich-text/server/config.js diff --git a/plugins/talk-plugin-rte/server/hooks.js b/plugins/talk-plugin-rich-text/server/hooks.js similarity index 100% rename from plugins/talk-plugin-rte/server/hooks.js rename to plugins/talk-plugin-rich-text/server/hooks.js diff --git a/plugins/talk-plugin-rte/server/resolvers.js b/plugins/talk-plugin-rich-text/server/resolvers.js similarity index 100% rename from plugins/talk-plugin-rte/server/resolvers.js rename to plugins/talk-plugin-rich-text/server/resolvers.js diff --git a/plugins/talk-plugin-rte/server/typeDefs.graphql b/plugins/talk-plugin-rich-text/server/typeDefs.graphql similarity index 100% rename from plugins/talk-plugin-rte/server/typeDefs.graphql rename to plugins/talk-plugin-rich-text/server/typeDefs.graphql diff --git a/plugins/talk-plugin-rte/yarn.lock b/plugins/talk-plugin-rte/yarn.lock deleted file mode 100644 index 2c4f5b272..000000000 --- a/plugins/talk-plugin-rte/yarn.lock +++ /dev/null @@ -1,11 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -dompurify@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.3.tgz#3f2f6ecb6ecd27599a506b410ff47d6eb90fd05d" - -pell@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/pell/-/pell-0.7.0.tgz#46b3fcdfa8dd7e5999f73c550a337ecc80193dcc"