resolve merge conflicts and linting errors

Author: mr-rob0to

.eslintrc.json

@@ -0,0 +1,38 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "jest/globals": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:prettier/recommended",
+    "prettier/react",
+    "prettier/standard"
+  ],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "plugins": ["react", "prettier", "jest"],
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "rules": {
+    "prettier/prettier": "error",
+    "react/prop-types": "warn",
+    "react/no-unescaped-entities": 0
+  }
+}

.travis.yml

@@ -0,0 +1,21 @@
+# https://forums.meteor.com/t/integrating-with-travis-ci/2608
+# https://docs.travis-ci.com/user/languages/javascript-with-nodejs/#meteor-apps
+
+language: node_js
+node_js:
+  - "8"
+before_script:
+  # Install meteor
+  - curl https://install.meteor.com | /bin/sh
+  # Add meteor to path (instead of asking for sudo in the Travis container)
+  # We can then use the faster container infrastructure - http://docs.travis-ci.com/user/workers/container-based-infrastructure/
+  - export PATH=$HOME/.meteor:$PATH
+  # Install all the dependencies! 
+  - npm install
+script:
+  - npm run lint
+services:
+  - mongodb
+cache:
+  directories: 
+    - node_modules

babel.config.js

@@ -0,0 +1,21 @@
+module.exports = {
+  // Allows Jest to use ES6 syntax and read JSX
+  presets: ['@babel/preset-env', '@babel/react'],
+  plugins: [
+    // Allows for class properties in React Components to be transpiled
+    ['@babel/plugin-proposal-class-properties'],
+
+    // Defines file paths to make import statements shorter;
+    // Avoids things like `import from ../../../`
+    [
+      'module-resolver',
+      {
+        root: './',
+        alias: {
+          lib: './lib',
+          components: './imports/ui/components',
+        },
+      },
+    ],
+  ],
+};

client/main.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Meteor } from 'meteor/meteor';
 import { render } from 'react-dom';
 import { renderRoutes } from './routes.jsx';

client/routes.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 import Login from '../imports/ui/components/login.jsx';
 import Landing from '../imports/ui/components/landing.jsx';
 import Navbar from '../imports/ui/components/navbar.jsx';
@@ -9,7 +9,6 @@ import Apply from '../imports/ui/components/apply.jsx';
 import ForgotPassword from '../imports/ui/components/forgot_password.jsx';
 import SetPassword from '../imports/ui/components/set_password.jsx';
 import Moderator from '../imports/ui/components/moderator.jsx';
-import Dashboard from '../imports/ui/components/dashboard/dashboard';
 import Profile from '../imports/ui/components/dashboard/profile';
 import AuthenticatedRoute from '../imports/ui/components/hoc/AuthenticatedRoute';
 import { AuthProvider } from '../imports/ui/components/hoc/AuthProvider';

imports/api/entries/entries.js

@@ -1,4 +1,3 @@
-import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 const Entries = new Mongo.Collection('entries');
 import SimpleSchema from 'simpl-schema';

imports/api/entries/server/methods.js

@@ -1,2 +1,3 @@
+/* eslint-disable no-unused-vars */
 import { Meteor } from 'meteor/meteor';
 import Entries from '/imports/api/entries/entries.js';

imports/api/entries/server/publications.js

@@ -1,5 +1,6 @@
+import { Meteor } from 'meteor/meteor';
 import Entries from '/imports/api/entries/entries.js';
 
-Meteor.publish('entries.board', function(argument) {
+Meteor.publish('entries.board', function() {
   return Entries.find({}, { limit: 100 });
 });

imports/ui/components/apply.jsx

@@ -19,7 +19,7 @@ class Apply extends React.Component {
       processStep: 1,
       formValidated: false,
       error: null,
-      processing: false
+      processing: false,
     };
   }
 
@@ -73,15 +73,30 @@ class Apply extends React.Component {
           <Card.Body>
             <Form.Group controlId="name">
               <Form.Label>Hello, my name is:</Form.Label>
-              <Form.Control type="text" required defaultValue={name} pattern="[A-Za-z0-9 ]{3,50}" data-error="Please enter" />
-              <Form.Control.Feedback type="invalid">Your name needs to be between 3 and 50 characters long.</Form.Control.Feedback>
+              <Form.Control
+                type="text"
+                required
+                defaultValue={name}
+                pattern="[A-Za-z0-9 ]{3,50}"
+                data-error="Please enter"
+              />
+              <Form.Control.Feedback type="invalid">
+                Your name needs to be between 3 and 50 characters long.
+              </Form.Control.Feedback>
               <Form.Text className="text-muted">Your name will be anonymous except to your match</Form.Text>
             </Form.Group>
 
             <Form.Group controlId="oneLineIntro">
               <Form.Label>One-line intro of yourself:</Form.Label>
-              <Form.Control type="text" required defaultValue={oneLineIntro} pattern="[A-Za-z0-9,!?\x27\x22\s\.]{8,140}" />
-              <Form.Control.Feedback type="invalid">Please share an intro between 8 and 140 characters long.</Form.Control.Feedback>
+              <Form.Control
+                type="text"
+                required
+                defaultValue={oneLineIntro}
+                pattern="[A-Za-z0-9,!?\x27\x22\s\.]{8,140}"
+              />
+              <Form.Control.Feedback type="invalid">
+                Please share an intro between 8 and 140 characters long.
+              </Form.Control.Feedback>
             </Form.Group>
 
             <Form.Group controlId="lookingFor">
@@ -106,7 +121,7 @@ class Apply extends React.Component {
 
   getForm3() {
     const { email, timezone } = this._formData || {};
-    const { formValidated, processing  } = this.state;
+    const { formValidated, processing } = this.state;
     return (
       <Form noValidate validated={formValidated} onSubmit={this.handleSubmit}>
         <Card>
@@ -157,18 +172,17 @@ class Apply extends React.Component {
     if (this.state.processStep === 3) {
       // TODO submit the form to backend
       const data = this._formData;
-      this.setState({ 'processing' : true });
-      Meteor.call("users.enroll", data, (error, result) => {
+      this.setState({ processing: true });
+      Meteor.call('users.enroll', data, (error, result) => {
         if (error) {
-          this.setState({ 'error' : error.reason });
-          this.setState({ 'processing' : false });
+          this.setState({ error: error.reason });
+          this.setState({ processing: false });
         }
         if (result) {
-          this.setState({ 'processing' : false });
-          this.props.history.push('/woohoo')
+          this.setState({ processing: false });
+          this.props.history.push('/woohoo');
         }
       });
-
     } else {
       // Move to next form
       this.setState(state => ({ formValidated: false, processStep: state.processStep + 1 }));

imports/ui/components/board/board.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router-dom';
-import { Card, Collapse, Container, Row, Col } from 'react-bootstrap';
+import { Container } from 'react-bootstrap';
 import Column from './column';
 import '/imports/ui/styles/_board.scss';
 import { categories } from '/lib/data/categories.js';
@@ -22,7 +21,6 @@ class Board extends React.Component {
   }
 
   render() {
-    const { loading } = this.props;
     // TODO - if loading is true show some nice loading animation!
     return <Container id="board">{this.getColumns()}</Container>;
   }