Skip to content

Commit

Permalink
add last minute tweaks found while writing docs
Browse files Browse the repository at this point in the history
  • Loading branch information
cleverbeagle committed Jun 13, 2017
1 parent ab22ebc commit 3bc98bc
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .babelrc

This file was deleted.

6 changes: 1 addition & 5 deletions imports/api/Documents/server/publications.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
});
3 changes: 3 additions & 0 deletions imports/startup/server/email.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { Meteor } from 'meteor/meteor';

if (Meteor.isDevelopment) process.env.MAIL_URL = Meteor.settings.private.MAIL_URL;
1 change: 1 addition & 0 deletions imports/startup/server/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import './accounts';
import './api';
import './fixtures';
import './email';
10 changes: 10 additions & 0 deletions imports/ui/components/Icon/Icon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';

const Icon = ({ icon }) => (<i className={`fa fa-${icon}`} />);

Icon.propTypes = {
icon: PropTypes.string.isRequired,
};

export default Icon;
2 changes: 1 addition & 1 deletion imports/ui/components/InputHint/InputHint.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';

import './InputHint.css';
import './InputHint.scss';

const InputHint = ({ children }) => (
<div className="InputHint">
Expand Down
7 changes: 4 additions & 3 deletions imports/ui/components/OAuthLoginButton/OAuthLoginButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -30,9 +31,9 @@ const handleLogin = (service, callback) => {
};

const serviceLabel = {
facebook: <span><i className="fa fa-facebook" /> Log In with Facebook</span>,
github: <span><i className="fa fa-github" /> Log In with GitHub</span>,
google: <span><i className="fa fa-google" /> Log In with Google</span>,
facebook: <span><Icon icon="facebook-official" /> Log In with Facebook</span>,
github: <span><Icon icon="github" /> Log In with GitHub</span>,
google: <span><Icon icon="google" /> Log In with Google</span>,
};

const OAuthLoginButton = ({ service, callback }) => (
Expand Down
2 changes: 2 additions & 0 deletions imports/ui/layouts/App/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -45,6 +46,7 @@ const App = props => (
<Route name="reset-password" path="/reset-password/:token" component={ResetPassword} />
<Route name="terms" path="/terms" component={Terms} />
<Route name="privacy" path="/privacy" component={Privacy} />
<Route name="examplePage" path="/example-page" component={ExamplePage} />
<Route component={NotFound} />
</Switch>
</Grid>
Expand Down
Empty file removed imports/ui/layouts/App/App.test.js
Empty file.
14 changes: 14 additions & 0 deletions imports/ui/pages/ExamplePage/ExamplePage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react';
import Page from '../Page/Page';

const ExamplePage = () => (
<div className="ExamplePage">
<Page
title="My Example Page"
subtitle="A subtitle for my example page."
page="example-page"
/>
</div>
);

export default ExamplePage;
7 changes: 4 additions & 3 deletions imports/ui/pages/Logout/Logout.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import Icon from '../../components/Icon/Icon';

import './Logout.scss';

Expand All @@ -11,9 +12,9 @@ const Logout = () => (
<h1>Stay safe out there.</h1>
<p>{'Don\'t forget to like and follow Clever Beagle elsewhere on the web:'}</p>
<ul className="FollowUsElsewhere">
<li><a href="https://facebook.com/cleverbeagle"><i className="fa fa-facebook-official" /></a></li>
<li><a href="https://twitter.com/clvrbgl"><i className="fa fa-twitter" /></a></li>
<li><a href="https://github.com/cleverbeagle"><i className="fa fa-github" /></a></li>
<li><a href="https://facebook.com/cleverbeagle"><Icon icon="facebook-official" /></a></li>
<li><a href="https://twitter.com/clvrbgl"><Icon icon="twitter" /></a></li>
<li><a href="https://github.com/cleverbeagle"><Icon icon="github" /></a></li>
</ul>
</div>
);
Expand Down
5 changes: 5 additions & 0 deletions private/pages/example-page.md
Original file line number Diff line number Diff line change
@@ -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).
Binary file added public/apple-touch-icon-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3bc98bc

Please sign in to comment.