From c8f35e88e2bd344c320ece345c9d2d219fe07740 Mon Sep 17 00:00:00 2001 From: SachaG Date: Fri, 15 Sep 2017 10:05:18 +0200 Subject: [PATCH] vulcan:embedly -> vulcan:embed --- .../lib/modules/posts/embedly.js | 4 +-- .../lib/server/posts/callbacks/embedly.js | 2 +- packages/example-forum/package.js | 2 +- .../vulcan-cloudinary/lib/custom_fields.js | 28 ------------------- .../lib/modules/containers/withMutation.js | 2 +- .../.gitignore | 0 .../README.md | 0 .../lib/client/main.js | 0 .../lib/components/EmbedURL.jsx} | 10 +++---- .../lib/modules/embed.js | 0 packages/vulcan-embed/lib/modules/index.js | 3 ++ .../lib/server/integrations/builtin.js | 0 .../lib/server/integrations/embedapi.js | 0 .../lib/server/integrations/embedly.js | 0 .../lib/server/main.js | 0 .../lib/server/methods.js | 0 .../lib/server/mutations.js | 0 .../lib/stylesheets/embedly.scss | 0 .../package.js | 4 +-- packages/vulcan-embedly/lib/modules/index.js | 3 -- 20 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 packages/vulcan-cloudinary/lib/custom_fields.js rename packages/{vulcan-embedly => vulcan-embed}/.gitignore (100%) rename packages/{vulcan-embedly => vulcan-embed}/README.md (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/client/main.js (100%) rename packages/{vulcan-embedly/lib/components/EmbedlyURL.jsx => vulcan-embed/lib/components/EmbedURL.jsx} (96%) rename packages/{vulcan-embedly => vulcan-embed}/lib/modules/embed.js (100%) create mode 100644 packages/vulcan-embed/lib/modules/index.js rename packages/{vulcan-embedly => vulcan-embed}/lib/server/integrations/builtin.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/server/integrations/embedapi.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/server/integrations/embedly.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/server/main.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/server/methods.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/server/mutations.js (100%) rename packages/{vulcan-embedly => vulcan-embed}/lib/stylesheets/embedly.scss (100%) rename packages/{vulcan-embedly => vulcan-embed}/package.js (85%) delete mode 100644 packages/vulcan-embedly/lib/modules/index.js diff --git a/packages/example-forum/lib/modules/posts/embedly.js b/packages/example-forum/lib/modules/posts/embedly.js index 05e2dea0c..57890024b 100644 --- a/packages/example-forum/lib/modules/posts/embedly.js +++ b/packages/example-forum/lib/modules/posts/embedly.js @@ -1,11 +1,11 @@ import Posts from '../posts/index.js'; -import { EmbedlyURL } from 'meteor/vulcan:embedly'; +import { EmbedURL } from 'meteor/vulcan:embed'; Posts.addField([ { fieldName: 'url', fieldSchema: { - control: EmbedlyURL, // we are just extending the field url, not replacing it + control: EmbedURL, // we are just extending the field url, not replacing it } }, { diff --git a/packages/example-forum/lib/server/posts/callbacks/embedly.js b/packages/example-forum/lib/server/posts/callbacks/embedly.js index 38e544f03..2116d43c1 100644 --- a/packages/example-forum/lib/server/posts/callbacks/embedly.js +++ b/packages/example-forum/lib/server/posts/callbacks/embedly.js @@ -5,7 +5,7 @@ Callbacks to add media/thumbnail after submit and on edit */ import { addCallback, getSetting } from 'meteor/vulcan:core'; -import Embed from 'meteor/vulcan:embedly'; +import Embed from 'meteor/vulcan:embed'; const embedProvider = getSetting('embedProvider', 'builtin'); diff --git a/packages/example-forum/package.js b/packages/example-forum/package.js index 3d54752bf..3b0a8b116 100644 --- a/packages/example-forum/package.js +++ b/packages/example-forum/package.js @@ -23,7 +23,7 @@ Package.onUse(function (api) { 'vulcan:forms', 'vulcan:newsletter', 'vulcan:events', - 'vulcan:embedly', + 'vulcan:embed', ]); diff --git a/packages/vulcan-cloudinary/lib/custom_fields.js b/packages/vulcan-cloudinary/lib/custom_fields.js deleted file mode 100644 index c655dbae9..000000000 --- a/packages/vulcan-cloudinary/lib/custom_fields.js +++ /dev/null @@ -1,28 +0,0 @@ -import { Posts } from 'meteor/example-forum'; - -Posts.addField([ - { - fieldName: 'cloudinaryId', - fieldSchema: { - type: String, - optional: true, - viewableBy: ['guests'], - } - }, - { - fieldName: 'cloudinaryUrls', - fieldSchema: { - type: Array, - optional: true, - viewableBy: ['guests'], - } - }, - { - fieldName: 'cloudinaryUrls.$', - fieldSchema: { - type: Object, - blackbox: true, - optional: true - } - } -]); diff --git a/packages/vulcan-core/lib/modules/containers/withMutation.js b/packages/vulcan-core/lib/modules/containers/withMutation.js index 8ced01323..85999ffb1 100644 --- a/packages/vulcan-core/lib/modules/containers/withMutation.js +++ b/packages/vulcan-core/lib/modules/containers/withMutation.js @@ -7,7 +7,7 @@ Example usage: export default withMutation({ name: 'getEmbedData', args: {url: 'String'}, -})(EmbedlyURL); +})(EmbedURL); */ diff --git a/packages/vulcan-embedly/.gitignore b/packages/vulcan-embed/.gitignore similarity index 100% rename from packages/vulcan-embedly/.gitignore rename to packages/vulcan-embed/.gitignore diff --git a/packages/vulcan-embedly/README.md b/packages/vulcan-embed/README.md similarity index 100% rename from packages/vulcan-embedly/README.md rename to packages/vulcan-embed/README.md diff --git a/packages/vulcan-embedly/lib/client/main.js b/packages/vulcan-embed/lib/client/main.js similarity index 100% rename from packages/vulcan-embedly/lib/client/main.js rename to packages/vulcan-embed/lib/client/main.js diff --git a/packages/vulcan-embedly/lib/components/EmbedlyURL.jsx b/packages/vulcan-embed/lib/components/EmbedURL.jsx similarity index 96% rename from packages/vulcan-embedly/lib/components/EmbedlyURL.jsx rename to packages/vulcan-embed/lib/components/EmbedURL.jsx index ba555ddc7..d07b8659b 100644 --- a/packages/vulcan-embedly/lib/components/EmbedlyURL.jsx +++ b/packages/vulcan-embed/lib/components/EmbedURL.jsx @@ -6,7 +6,7 @@ import FRC from 'formsy-react-components'; const Input = FRC.Input; -class EmbedlyURL extends Component { +class EmbedURL extends Component { constructor(props) { super(props); @@ -182,13 +182,13 @@ class EmbedlyURL extends Component { } } -EmbedlyURL.propTypes = { +EmbedURL.propTypes = { name: PropTypes.string, value: PropTypes.any, label: PropTypes.string } -EmbedlyURL.contextTypes = { +EmbedURL.contextTypes = { updateCurrentValues: PropTypes.func, addToDeletedValues: PropTypes.func, throwError: PropTypes.func, @@ -202,6 +202,6 @@ const options = { args: {url: 'String'}, } -export default withMutation(options)(EmbedlyURL); +export default withMutation(options)(EmbedURL); -registerComponent('EmbedlyURL', EmbedlyURL, [withMutation, options]); \ No newline at end of file +registerComponent('EmbedURL', EmbedURL, [withMutation, options]); \ No newline at end of file diff --git a/packages/vulcan-embedly/lib/modules/embed.js b/packages/vulcan-embed/lib/modules/embed.js similarity index 100% rename from packages/vulcan-embedly/lib/modules/embed.js rename to packages/vulcan-embed/lib/modules/embed.js diff --git a/packages/vulcan-embed/lib/modules/index.js b/packages/vulcan-embed/lib/modules/index.js new file mode 100644 index 000000000..a5a4e52da --- /dev/null +++ b/packages/vulcan-embed/lib/modules/index.js @@ -0,0 +1,3 @@ +export { EmbedURL } from '../components/EmbedURL.jsx'; + +export * from './embed.js'; \ No newline at end of file diff --git a/packages/vulcan-embedly/lib/server/integrations/builtin.js b/packages/vulcan-embed/lib/server/integrations/builtin.js similarity index 100% rename from packages/vulcan-embedly/lib/server/integrations/builtin.js rename to packages/vulcan-embed/lib/server/integrations/builtin.js diff --git a/packages/vulcan-embedly/lib/server/integrations/embedapi.js b/packages/vulcan-embed/lib/server/integrations/embedapi.js similarity index 100% rename from packages/vulcan-embedly/lib/server/integrations/embedapi.js rename to packages/vulcan-embed/lib/server/integrations/embedapi.js diff --git a/packages/vulcan-embedly/lib/server/integrations/embedly.js b/packages/vulcan-embed/lib/server/integrations/embedly.js similarity index 100% rename from packages/vulcan-embedly/lib/server/integrations/embedly.js rename to packages/vulcan-embed/lib/server/integrations/embedly.js diff --git a/packages/vulcan-embedly/lib/server/main.js b/packages/vulcan-embed/lib/server/main.js similarity index 100% rename from packages/vulcan-embedly/lib/server/main.js rename to packages/vulcan-embed/lib/server/main.js diff --git a/packages/vulcan-embedly/lib/server/methods.js b/packages/vulcan-embed/lib/server/methods.js similarity index 100% rename from packages/vulcan-embedly/lib/server/methods.js rename to packages/vulcan-embed/lib/server/methods.js diff --git a/packages/vulcan-embedly/lib/server/mutations.js b/packages/vulcan-embed/lib/server/mutations.js similarity index 100% rename from packages/vulcan-embedly/lib/server/mutations.js rename to packages/vulcan-embed/lib/server/mutations.js diff --git a/packages/vulcan-embedly/lib/stylesheets/embedly.scss b/packages/vulcan-embed/lib/stylesheets/embedly.scss similarity index 100% rename from packages/vulcan-embedly/lib/stylesheets/embedly.scss rename to packages/vulcan-embed/lib/stylesheets/embedly.scss diff --git a/packages/vulcan-embedly/package.js b/packages/vulcan-embed/package.js similarity index 85% rename from packages/vulcan-embedly/package.js rename to packages/vulcan-embed/package.js index 9052d1928..59bbec6b2 100644 --- a/packages/vulcan-embedly/package.js +++ b/packages/vulcan-embed/package.js @@ -1,6 +1,6 @@ Package.describe({ - name: "vulcan:embedly", - summary: "Vulcan Embedly module package", + name: "vulcan:embed", + summary: "Vulcan Embed package", version: '1.7.0', git: 'https://github.com/VulcanJS/Vulcan.git' }); diff --git a/packages/vulcan-embedly/lib/modules/index.js b/packages/vulcan-embedly/lib/modules/index.js deleted file mode 100644 index f2a40afce..000000000 --- a/packages/vulcan-embedly/lib/modules/index.js +++ /dev/null @@ -1,3 +0,0 @@ -export { EmbedlyURL } from '../components/EmbedlyURL.jsx'; - -export * from './embed.js'; \ No newline at end of file