Update models more

design/models/hardhat/hardhat.mtl

@@ -1,13 +1,12 @@
 # Blender MTL File: 'hardhat.blend'
 # Material Count: 1
 
-newmtl mask
+newmtl Material
-Ns 94.117647
+Ns 96.078431
 Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.538025 0.000000
+Kd 0.640000 0.628157 0.012959
-Ks 0.588235 0.588235 0.588235
+Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
 illum 2
-map_Kd /Users/john/Map #3

design/models/question/question.mtl

@@ -1,13 +1,12 @@
 # Blender MTL File: 'question.blend'
 # Material Count: 1
 
-newmtl Blue
+newmtl Yellow
 Ns 237.254902
 Ka 1.000000 1.000000 1.000000
-Kd 0.649412 0.611712 0.000000
+Kd 0.649412 0.563220 0.009454
 Ks 0.196078 0.184390 0.009218
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
 illum 2
-map_Kd /Users/john/Map #147

design/models/question/question.obj

@@ -1333,7 +1333,7 @@ vn 0.0000 -1.0000 0.0000
 vn -0.9999 -0.0155 0.0000
 vn -0.1230 -0.9924 0.0000
 vn -0.9671 0.2544 0.0000
-usemtl Blue
+usemtl Yellow
 s 1
 f 102/1/1 55/2/1 128/3/1
 f 128/3/1 127/4/1 102/1/1

server/config/default.json5

@@ -11,11 +11,11 @@
     uploadTimout: 3600,
   },
   email: {
-    senderEmail: 'support@kingstonsoftware.solutions',
+    senderEmail: 'support@kss.us.com',
     maxEmailTokenAgeInHours: 36,
     maxPasswordTokenAgeInHours: 3,
     sendEmailDelayInSeconds: 3,
-    supportEmail: 'support@kingstonsoftware.solutions',
+    supportEmail: 'support@kss.us.com',
     sendEmail: true
   }
 }

server/config/templates/welcome.txt

@@ -1,6 +1,6 @@
 Hello {{recipientFullName}},
 
-Thank you for joining the Deighton AR system!
+Welcome to the Deighton AR training system!
 
 Please paste this link into your browser to go to the Deighton AR system and set your login password:
 
@@ -8,7 +8,7 @@ Please paste this link into your browser to go to the Deighton AR system and set
 
 This invitation expires in {{confirmEmailLinkExpirationHours}} hours. If it has expired or you have any problems creating a password or logging into our system, please contact {{supportEmail}}.
 
-Thank you and we look forward to working with you!
+Look forward to seeing you in the training scenario!
 
 Sincerely,
 

server/src/email/EmailHandlers.js

@@ -51,7 +51,9 @@ export class EmailHandlers {
     }
 
     // configure AWS SDK
-    aws.config = new aws.Config(config.get('awsConfig'));
+    const awsConfig = config.get('awsConfig')
+
+    aws.config = new aws.Config(awsConfig)
 
     // create Nodemailer SES transporter
     let transporter = nodemailer.createTransport({
@@ -60,7 +62,7 @@ export class EmailHandlers {
         })
     });
 
-    const senderEmail = config.get('senderEmail')
+    const senderEmail = config.get('email.senderEmail')
     const template = this.templates[templateName]
 
     if (!template) {

server/src/message-service/MS.js

@@ -13,8 +13,8 @@ export class MS {
 
   async connect(amqpUri) {
     this.connection = await amqp.connect(amqpUri)
-    this.connection.on('error', () => {
+    this.connection.on('error', (err) => {
-      this.log.error(`RabbitMQ has gone, shutting down service`)
+      this.log.error(`${err}. Shutting down service.`)
       process.exit(-1)
     })
 

website/package.json

@@ -6,6 +6,7 @@
     "animejs": "^2.2.0",
     "auto-bind2": "^1.0.2",
     "eventemitter3": "^2.0.3",
+    "npm": "^5.7.1",
     "prop-types": "^15.5.10",
     "radium": "^0.22.0",
     "react": "^16.2.0",

website/src/App.js

@@ -80,7 +80,9 @@ export class App extends Component {
       <Router basename='/'>
         <Column minHeight='100vh'>
           <Column.Item height={sizeInfo.headerHeight - sizeInfo.headerBorderWidth}>
-            <Box background={colorInfo.headerButtonBackground} borderBottom={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}>
+            <Box background={colorInfo.headerButtonBackground}
+              borderBottom={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}
+              style={{ boxSizing: 'content' }}>
               <Row minWidth='100vw'>
                 <Row.Item>{headerButtonsLeft}</Row.Item>
                 <Row.Item grow />

website/src/ui/HeaderButton.js

@@ -26,12 +26,12 @@ class HeaderButton extends Component {
   }
 
   render() {
-    const size = sizeInfo.headerHeight - 2 * sizeInfo.headerBorderWidth
+    const size = sizeInfo.headerHeight - 2 * sizeInfo.headerBorderWidth // Times two to account for zooming
     const { onClick, icon, image } = this.props
     let content = null
 
     if (image) {
-      content = (<Image source={image} width={size} height={size} margin={sizeInfo.headerButtonMargin} />)
+      content = (<Image source={image} width={size} height='100%' margin={sizeInfo.headerButtonMargin} />)
     } else if (icon) {
       content = (<Icon name={icon} size={size} margin={sizeInfo.headerButtonMargin} />)
     }