diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 86c445f..0000000 --- a/.babelrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["es2015", "react"] -} diff --git a/imports/api/Documents/server/publications.js b/imports/api/Documents/server/publications.js index 670f13e..f667a8b 100644 --- a/imports/api/Documents/server/publications.js +++ b/imports/api/Documents/server/publications.js @@ -9,9 +9,5 @@ Meteor.publish('documents', function documents() { // Note: documents.view is also used when editing an existing document. Meteor.publish('documents.view', function documentsView(documentId) { check(documentId, String); - - const doc = Documents.find(documentId); - const isOwner = doc.fetch()[0].owner === this.userId; - - return isOwner ? doc : this.ready(); + return Documents.find({ _id: documentId, owner: this.userId }); }); diff --git a/imports/startup/server/email.js b/imports/startup/server/email.js new file mode 100644 index 0000000..377599c --- /dev/null +++ b/imports/startup/server/email.js @@ -0,0 +1,3 @@ +import { Meteor } from 'meteor/meteor'; + +if (Meteor.isDevelopment) process.env.MAIL_URL = Meteor.settings.private.MAIL_URL; diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index 9696159..09fb6b3 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -1,3 +1,4 @@ import './accounts'; import './api'; import './fixtures'; +import './email'; diff --git a/imports/ui/components/Icon/Icon.js b/imports/ui/components/Icon/Icon.js new file mode 100644 index 0000000..078787f --- /dev/null +++ b/imports/ui/components/Icon/Icon.js @@ -0,0 +1,10 @@ +import React from 'react'; +import PropTypes from 'prop-types'; + +const Icon = ({ icon }) => (); + +Icon.propTypes = { + icon: PropTypes.string.isRequired, +}; + +export default Icon; diff --git a/imports/ui/components/InputHint/InputHint.js b/imports/ui/components/InputHint/InputHint.js index 1144379..6342880 100644 --- a/imports/ui/components/InputHint/InputHint.js +++ b/imports/ui/components/InputHint/InputHint.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import './InputHint.css'; +import './InputHint.scss'; const InputHint = ({ children }) => (
diff --git a/imports/ui/components/InputHint/InputHint.css b/imports/ui/components/InputHint/InputHint.scss similarity index 100% rename from imports/ui/components/InputHint/InputHint.css rename to imports/ui/components/InputHint/InputHint.scss diff --git a/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js b/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js index 24cca9e..06294ea 100644 --- a/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js +++ b/imports/ui/components/OAuthLoginButton/OAuthLoginButton.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Meteor } from 'meteor/meteor'; import { Bert } from 'meteor/themeteorchef:bert'; +import Icon from '../Icon/Icon'; import './OAuthLoginButton.scss'; @@ -30,9 +31,9 @@ const handleLogin = (service, callback) => { }; const serviceLabel = { - facebook: Log In with Facebook, - github: Log In with GitHub, - google: Log In with Google, + facebook: Log In with Facebook, + github: Log In with GitHub, + google: Log In with Google, }; const OAuthLoginButton = ({ service, callback }) => ( diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js index da65b43..58f5b1c 100644 --- a/imports/ui/layouts/App/App.js +++ b/imports/ui/layouts/App/App.js @@ -23,6 +23,7 @@ import NotFound from '../../pages/NotFound/NotFound'; import Footer from '../../components/Footer/Footer'; import Terms from '../../pages/Terms/Terms'; import Privacy from '../../pages/Privacy/Privacy'; +import ExamplePage from '../../pages/ExamplePage/ExamplePage'; import './App.scss'; @@ -45,6 +46,7 @@ const App = props => ( + diff --git a/imports/ui/layouts/App/App.test.js b/imports/ui/layouts/App/App.test.js deleted file mode 100644 index e69de29..0000000 diff --git a/imports/ui/pages/ExamplePage/ExamplePage.js b/imports/ui/pages/ExamplePage/ExamplePage.js new file mode 100644 index 0000000..349dedd --- /dev/null +++ b/imports/ui/pages/ExamplePage/ExamplePage.js @@ -0,0 +1,14 @@ +import React from 'react'; +import Page from '../Page/Page'; + +const ExamplePage = () => ( +
+ +
+); + +export default ExamplePage; diff --git a/imports/ui/pages/Logout/Logout.js b/imports/ui/pages/Logout/Logout.js index d13e01e..59b3cbe 100644 --- a/imports/ui/pages/Logout/Logout.js +++ b/imports/ui/pages/Logout/Logout.js @@ -1,4 +1,5 @@ import React from 'react'; +import Icon from '../../components/Icon/Icon'; import './Logout.scss'; @@ -11,9 +12,9 @@ const Logout = () => (

Stay safe out there.

{'Don\'t forget to like and follow Clever Beagle elsewhere on the web:'}

    -
    • -
    • -
    • +
    • +
    • +
); diff --git a/private/pages/example-page.md b/private/pages/example-page.md new file mode 100644 index 0000000..51dd9b0 --- /dev/null +++ b/private/pages/example-page.md @@ -0,0 +1,5 @@ +### This is my Markdown page + +I can type **any** Markdown I want into this file and it will ultimately be `parsed` as HTML by Pup's `utility.getPage` Method. + +To learn more, you can [read about this Method here](http://cleverbeagle.com/pup/v1/the-basics/methods#utility-methods). diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..ff7797e Binary files /dev/null and b/public/apple-touch-icon-precomposed.png differ diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..2b26d3d Binary files /dev/null and b/public/favicon.png differ