Tweaks and cleanups

Author: philipmjohnson

app/client/main.js

@@ -4,7 +4,3 @@ import '/imports/api/stuff';
 import '/imports/ui/layouts';
 import '/imports/ui/pages';
 import '/imports/ui/stylesheets/style.css';
-
-// The following is a hack for autoform. Remove it once autoform is removed.
-import { Stuff } from '../imports/api/stuff/stuff.js';
-window.Stuff = Stuff;

app/imports/api/stuff/stuff.js

@@ -1,7 +1,7 @@
 import { Mongo } from 'meteor/mongo';
 import { SimpleSchema } from 'meteor/aldeed:simple-schema';
 
-/* eslint-disable object-shorthand, prefer-arrow-callback */
+/* eslint-disable object-shorthand */
 
 export const stuff = 'Stuff';  // avoid typos, this string occurs three times.
 export const Stuff = new Mongo.Collection(stuff);

app/imports/startup/client/router.js

@@ -39,36 +39,3 @@ FlowRouter.notFound = {
     BlazeLayout.render('App_Body', { main: 'App_Not_Found' });
   },
 };
-
-/**
- //  * Configure Iron Router.
- //  * See: http://iron-meteor.github.io/iron-router/
- //  */
-//
-// /* eslint-disable object-shorthand, prefer-arrow-callback */
-//
-// Router.configure({
-//   layoutTemplate: 'Layout',
-//   loadingTemplate: 'Loading',
-// });
-//
-// // waitOn: function waitOn() { return Meteor.subscribe('Stuff'); },
-//
-// Router.route('/', {
-//   name: 'Home',
-// });
-//
-// Router.route('/list', {
-//   name: 'ListStuff',
-// });
-//
-// Router.route('/add', {
-//   name: 'AddStuff',
-// });
-//
-//
-// Router.route('/stuff/:_id', {
-//   name: 'EditStuff',
-//   data: function editStuff() { return Stuff.findOne(this.params._id); },
-// });
-

app/imports/startup/server/stuff.js

@@ -1,8 +1,6 @@
 import { Stuff } from '../../api/stuff/stuff.js';
 import { _ } from 'meteor/underscore';
 
-/* eslint-disable prefer-arrow-callback */
-
 /**
  * A list of Stuff to pre-fill the Collection.
  * @type {*[]}

app/imports/ui/layouts/app-body.js

@@ -1,7 +1,5 @@
 import { Template } from 'meteor/templating';
 
-/* eslint-disable prefer-arrow-callback */
-
 Template.App_Body.onCreated(function appBodyOnCreated() {
   // placeholder: typically you will put global subscriptions here if you remove the autopublish package.
 });

app/imports/ui/layouts/if-logged-in.html

@@ -5,8 +5,10 @@
     {{#if canShow}}
       {{> UI.contentBlock }}
     {{else}}
-      <p>You are not authorized to view this page.</p>
-      <p>Please login.</p>
+      <div style="padding-top: 40px" class="ui text container">
+        <p>You are not authorized to view this page.</p>
+        <p>Please login.</p>
+      </div>
     {{/if}}
   {{/if}}
 </template>

app/imports/ui/pages/add-stuff-page.html

@@ -1,8 +1,8 @@
 <template name="Add_Stuff_Page">
   {{#If_Logged_In}}
-    <div style="padding-top: 40px" class="ui text container">
+    <div style="padding-top: 20px" class="ui text container">
       {{> quickForm
-      collection="Stuff"
+      collection=stuffCollection
       template="semanticUI"
       id="AddStuffForm"
       type="insert"

app/imports/ui/pages/add-stuff-page.js

@@ -1,5 +1,7 @@
 import { AutoForm } from 'meteor/aldeed:autoform';
 import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import { Stuff } from '../../api/stuff/stuff.js';
 
 /* eslint-disable object-shorthand, no-unused-vars */
 
@@ -19,3 +21,9 @@ AutoForm.hooks({
     },
   },
 });
+
+Template.Add_Stuff_Page.helpers({
+  stuffCollection() {
+    return Stuff;
+  },
+});

app/imports/ui/pages/edit-stuff-page.html

@@ -1,12 +1,12 @@
 <template name="Edit_Stuff_Page">
   {{#If_Logged_In}}
-    <div style="padding-top: 40px" class="ui text container">
+    <div style="padding-top: 20px" class="ui text container">
       {{> quickForm
-      collection="Stuff"
+      collection=stuffCollection
       template="semanticUI"
       id="EditStuffForm"
       type="update"
-      doc=doc
+      doc=getDoc
       buttonContent="Update"
       }}
     </div>

app/imports/ui/pages/edit-stuff-page.js

@@ -23,9 +23,11 @@ AutoForm.hooks({
 });
 
 Template.Edit_Stuff_Page.helpers({
-  doc: function getDoc() {
+  getDoc() {
     return Stuff.findOne(FlowRouter.getParam('_id'));
   },
-
+  stuffCollection() {
+    return Stuff;
+  },
 });