Merge pull request #14 from joeblas/globalUI

Global ui
joeblas · Nov 17, 2017 · d728ed3 · d728ed3
2 parents 3a444f8 + 8a4d38c
commit d728ed3
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 73 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/main.html b/client/main.html
@@ -1,11 +1,11 @@
 <head>
   <meta charset="utf-8">
-  <title>CloudControl</title>
+  <title>ControlCloud</title>
   <meta name="description" content="A description for the application.">
   <meta name="viewport" content="initial-scale=1, minimal-ui, maximum-scale=1, minimum-scale=1" />
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
-  <link rel="shortcut icon" type="image/png" href="/favicon.png?v1" sizes="16x16 32x32 64x64">
-  <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-precomposed.png">
+  <link rel="shortcut icon" type="image/png" href="/favicon.png" sizes="16x16 32x32 64x64">
+  <link rel="apple-touch-icon" sizes="120x120" href="/favicon.png">
 </head>
 
 <body>

diff --git a/imports/ui/components/DocumentEditor/DocumentEditor.js b/imports/ui/components/DocumentEditor/DocumentEditor.js
@@ -0,0 +1,97 @@
+/* eslint-disable max-len, no-return-assign */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormGroup, ControlLabel, Button } from 'react-bootstrap';
+import { Meteor } from 'meteor/meteor';
+import { Bert } from 'meteor/themeteorchef:bert';
+import validate from '../../../modules/validate';
+
+class DocumentEditor extends React.Component {
+  componentDidMount() {
+    const component = this;
+    validate(component.form, {
+      rules: {
+        title: {
+          required: true,
+        },
+        body: {
+          required: true,
+        },
+      },
+      messages: {
+        title: {
+          required: 'Need a title in here, please.',
+        },
+        body: {
+          required: 'This needs a body, please.',
+        },
+      },
+      submitHandler() { component.handleSubmit(); },
+    });
+  }
+
+  handleSubmit() {
+    const { history } = this.props;
+    const existingDocument = this.props.doc && this.props.doc._id;
+    const methodToCall = existingDocument ? 'documents.update' : 'documents.insert';
+    const doc = {
+      title: this.title.value.trim(),
+      body: this.body.value.trim(),
+    };
+
+    if (existingDocument) doc._id = existingDocument;
+
+    Meteor.call(methodToCall, doc, (error, documentId) => {
+      if (error) {
+        Bert.alert(error.reason, 'danger');
+      } else {
+        const confirmation = existingDocument ? 'Document updated!' : 'Document added!';
+        this.form.reset();
+        Bert.alert(confirmation, 'success');
+        history.push(`/documents/${documentId}`);
+      }
+    });
+  }
+
+  render() {
+    const { doc } = this.props;
+    return (<form ref={form => (this.form = form)} onSubmit={event => event.preventDefault()}>
+      <FormGroup>
+        <ControlLabel>Title</ControlLabel>
+        <input
+          type="text"
+          className="form-control"
+          name="title"
+          ref={title => (this.title = title)}
+          defaultValue={doc && doc.title}
+          placeholder="Oh, The Places You'll Go!"
+        />
+      </FormGroup>
+      <FormGroup>
+        <ControlLabel>Body</ControlLabel>
+        <textarea
+          className="form-control"
+          name="body"
+          ref={body => (this.body = body)}
+          defaultValue={doc && doc.body}
+          placeholder="Congratulations! Today is your day. You're off to Great Places! You're off and away!"
+        />
+      </FormGroup>
+      <Button type="submit" bsStyle="success">
+        {doc && doc._id ? 'Save Changes' : 'Add Document'}
+      </Button>
+    </form>);
+  }
+}
+
+DocumentEditor.defaultProps = {
+  doc: { title: '', body: '' },
+};
+
+DocumentEditor.propTypes = {
+  doc: PropTypes.object,
+  history: PropTypes.object.isRequired,
+};
+
+export default DocumentEditor;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "bcrypt": "^1.0.3",
     "commonmark": "^0.28.1",
     "core-js": "^2.5.1",
+    "es5-shim": "^4.5.9",
     "fs": "0.0.1-security",
     "handlebars": "^4.0.10",
     "html-pdf": "^2.2.0",

diff --git a/public/favicon.png b/public/favicon.png