Dev

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build-job:
     working_directory: ~/origin-calendar
     docker:
-      - image: circleci/node:8.11.0
+      - image: circleci/node:latest-browsers
       - image: mongo:3.4.4
     steps:
       - checkout

client/css/style.css

@@ -124,6 +124,14 @@ label {
   border-top: 1px solid #9393932b;
 }
 
+.table-striped {
+  overflow: scroll;
+  max-height: 500px;
+}
+.trash {
+  fill: #dc4245;
+}
+
 th {
   color: whitesmoke;
   background-color: #4f6995;
@@ -145,3 +153,22 @@ th {
     opacity: 1
   }
 }
+
+.text-center{
+  margin:auto;
+  justify-content: center;
+}
+
+#cancelbro{
+  margin:10;
+}
+
+select.form-control{
+  width:30%;
+  margin:left;
+}
+.auth {
+  position: absolute;
+  right: 15px;
+  top: 3px;
+}

package.json

@@ -8,10 +8,10 @@
   "scripts": {
     "build": "webpack --mode production",
     "lint": "eslint .",
-    "start": "node .",
+    "start": "node server/server.js",
     "dev-start": "npm run build && node server/server.js",
     "dev": "webpack -w --mode development",
-    "test": "mocha tests --exit",
+    "test": "npm run build && mocha tests/* --exit",
     "posttest": " "
   },
   "dependencies": {
@@ -27,6 +27,7 @@
     "cors": "^2.5.2",
     "dotenv": "^6.0.0",
     "express": "^4.16.3",
+    "googleapis": "^27.0.0",
     "helmet": "^3.13.0",
     "loopback": "^3.0.0",
     "loopback-boot": "^2.6.5",
@@ -35,14 +36,18 @@
     "loopback-connector-sendgrid": "^2.2.4",
     "mocha": "^5.2.0",
     "moment": "^2.22.2",
+    "moment-timezone": "^0.5.21",
     "morgan": "^1.9.0",
+    "nightmare": "^3.0.1",
+    "opn": "^5.4.0",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-router-dom": "^4.3.1",
     "serve-favicon": "^2.0.1",
     "strong-error-handler": "^2.0.0",
-    "webpack": "^4.12.0",
-    "webpack-cli": "^3.0.8"
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.0.8",
+    "webpack-node-externals": "^1.7.2"
   },
   "devDependencies": {
     "eslint": "^3.17.1",

server/boot/create-admin.js

@@ -1,44 +1,86 @@
 'use strict';
 
-require('dotenv').config();
-
 module.exports = (app) => {
   const {Visitor, Role, RoleMapping} = app.models;
-  Visitor.findOrCreate({
-    where: {
-      email: 'instructor@origincodeacademy.com',
-    },
-  },
+
+  const instructors = [
     {
       email: 'instructor@origincodeacademy.com',
       firstName: 'John',
       lastName: 'Doe',
       password: process.env.ADMIN_PASSWORD,
-      emailVerified: true,
     },
-    (err, visitor) => {
-      if (err) console.log(err);
-      Role.findOrCreate({
-        where: {
-          name: 'ADMIN',
-        },
+    {
+      email: 'anthony@origincodeacademy.com',
+      firstName: 'Anthony',
+      lastName: 'Valera',
+      password: process.env.ADMIN_PASSWORD,
+    },
+    {
+      email: 'christian@origincodeacademy.com',
+      firstName: 'Christian',
+      lastName: 'McFarland',
+      password: process.env.ADMIN_PASSWORD2,
+    },
+    {
+      email: 'michael@origincodeacademy.com',
+      firstName: 'Michael',
+      lastName: 'Roberts',
+      password: process.env.ADMIN_PASSWORD3,
+    },
+  ];
+
+  instructors.forEach(({email, firstName, lastName, password}) => {
+    Visitor.findOrCreate({
+      where: {
+        email,
+      },
+    },
+      {
+        email,
+        firstName,
+        lastName,
+        password,
+        emailVerified: true,
+        authToken: {},
       },
-        {
-          name: 'ADMIN',
+      (err, visitor) => {
+        Role.findOrCreate({
+          where: {
+            name: 'ADMIN',
+          },
         },
-        (err, role) => {
-          if (err) console.log('error creating role', err);
-          RoleMapping.findOrCreate({
-            where: {
-              principalType: 'ADMIN',
-            },
+          {
+            name: 'ADMIN',
           },
-            {
-              principalType: 'ADMIN',
-              principalId: visitor.id,
-            }, (error, mapping) => {
-              if (err) console.log(err);
-            });
-        });
+          (err, role) => {
+            if (err) console.log('error creating role', err);
+            RoleMapping.findOrCreate({
+              where: {
+                principalType: 'ADMIN',
+                principalId: visitor.id,
+              },
+            },
+              {
+                principalType: 'ADMIN',
+                principalId: visitor.id,
+              }, (error, mapping) => {
+                if (err) console.log(err);
+              });
+          });
+      });
+  });
+
+  Visitor.findOrCreate({
+    where: {
+      email: 'student@origincodeacademy.com',
+    },
+  },
+    {
+      email: 'student@origincodeacademy.com',
+      firstName: 'Student',
+      lastName: 'Studentson',
+      password: 'abc123',
+      emailVerified: true,
     });
 };

server/models/apt-request.js

@@ -39,4 +39,63 @@ module.exports = function(Aptrequest) {
               {arg: 'time', type: 'string', required: true}],
     returns: {arg: 'res', type: 'Object'},
   });
+
+  Aptrequest.removeApt = function(email, time, cb) {
+    Aptrequest.app.models.Email.send({
+      to: email,
+      from: 'instructor@origincodeacademy.com',
+      subject: 'Appointment Removed',
+      text: `Your appointment on ${moment(time).format('L')}
+     at ${moment(time).format('hh:mm a')} was removed`,
+    }, function(err, mail) {
+      if (err) console.log(err);
+      return cb(null, mail);
+    });
+  };
+
+  Aptrequest.remoteMethod('removeApt', {
+    accepts: [{arg: 'email', type: 'string', required: true},
+            {arg: 'time', type: 'string', required: true}],
+    returns: {arg: 'res', type: 'Object'},
+  });
+
+  Aptrequest.replacedApt = function(email, time, cb) {
+    Aptrequest.app.models.Email.send({
+      to: email,
+      from: 'instructor@origincodeacademy.com',
+      subject: 'Appointment unavailable',
+      text: `Your appointment on ${moment(time).format('L')}
+       at ${moment(time).format('hh:mm a')} is no longer available.`,
+    }, function(err, mail) {
+      if (err) cb(err);
+      return cb(null, mail);
+    });
+  };
+
+  Aptrequest.remoteMethod('replacedApt', {
+    accepts: [{arg: 'email', type: 'string', required: true},
+              {arg: 'time', type: 'string', required: true}],
+    returns: {arg: 'res', type: 'Object'},
+  });
+
+  Aptrequest.emailAdmin = function(instructorEmail, time, studentName, cb) {
+    Aptrequest.app.models.Email.send({
+      to: instructorEmail,
+      from: 'instructor@origincodeacademy.com',
+      subject: `${studentName} Requested Your 
+      ${moment(time).format('hh:mma')} Appointment`,
+      text: `${studentName} has requested your appointment at 
+      ${moment(time).format('hh:mm a')} on ${moment(time).format('L')}`,
+    }, function(err, mail) {
+      if (err) cb(err);
+      return cb(null, mail);
+    });
+  };
+
+  Aptrequest.remoteMethod('emailAdmin', {
+    accepts: [{arg: 'instructorEmail', type: 'string', required: true},
+              {arg: 'time', type: 'string', required: true},
+              {arg: 'studentName', type: 'string', required: true}],
+    returns: {arg: 'res', type: 'Object'},
+  });
 };

server/models/apt-request.json

@@ -18,6 +18,10 @@
       "type": "string",
       "required": true
     },
+    "instructorId": {
+      "type": "string",
+      "required": false
+    },
     "time": {
       "type": "date",
       "required": true

server/models/booked-apt.js

@@ -1,5 +1,30 @@
 'use strict';
+const moment = require('moment');
 
-module.exports = function(Bookedapt) {
+module.exports = function(BookedApt) {
+
+
+    BookedApt.removedConfirmed = function(email, time, studentName, cb) {
+        BookedApt.app.models.Email.send({
+          to: email,
+          from: 'instructor@origincodeacademy.com',
+          subject: ' Confirmed Appointment Removed',
+          text: `Your appointment on ${moment(time).format('L')}
+         at ${moment(time).format('hh:mm a')} was removed${studentName}`,
+        }, function(err, mail) {
+          if (err) console.log(err);
+          return cb(null, mail);
+        });
+      };
+
+      BookedApt.remoteMethod('removedConfirmed', {
+        accepts: [{arg: 'email', type: 'string', required: true},
+                {arg: 'time', type: 'string', required: true},
+                {arg: 'studentName', type: 'string', required: true}],
+                http:{path:'/removedConfirmed', verb:'post'},
+        returns: {arg: 'res', type: 'Object'},
+      });
+
+
 
 };

server/models/booked-apt.json

@@ -14,6 +14,10 @@
       "type": "string",
       "required": true
     },
+    "instructorId": {
+      "type": "string",
+      "required": true
+    },
     "duration": {
       "type": "number",
       "required": true