Merge pull request #79 from Optum/master

Patch for PM2 issues
Optum · Oct 9, 2018 · 6b77831 · 6b77831
2 parents 3c9b003 + 2c94288
commit 6b77831
Show file tree

Hide file tree

Showing 7 changed files with 202 additions and 186 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
+node_modules
 coverage
 uploads
 mocks

diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "passport-ldapauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^5.0.0",
-    "pm2": "^3.1.2",
+    "pm2": "3.1.2",
     "pretty-data": "^0.40.0",
     "request": "^2.88.0",
     "soap": "^0.24.0",

diff --git a/public/js/app/controllers.js b/public/js/app/controllers.js
@@ -327,6 +327,14 @@ var ctrl = angular.module("mockapp.controllers",['mockapp.services','ngFileSaver
                   $('#failure-modal').modal('toggle');
               });
             };
+
+          $scope.totalDisplayed = 10;
+
+          $scope.loadMore = function () {
+            $scope.totalDisplayed += 10;
+          };
+
+
     }])
 
 

diff --git a/public/partials/addapiform.html b/public/partials/addapiform.html
@@ -1,5 +1,5 @@
 <h2>Mock a REST or SOAP Service</h2>
-<form name="form" class="well col-xs-12" ng-controller="myMenuAppController">
+<form name="form" class="well col-xs-12">
   <div class="form-group req row">
     <label for="service_payloadtype" class="col-xs-2 col-form-label">Service Type</label>
     <div class="col-xs-9">

diff --git a/public/partials/spec.html b/public/partials/spec.html
@@ -1,6 +1,6 @@
 <h2>Mock from WSDL or OpenAPI</h2>
 
-<form name="form" class="well col-xs-12" ng-controller="specController">
+<form name="form" class="well col-xs-12">
 
     <div class="form-group req row">
         <label for="service_payloadtype" class="col-xs-2 col-form-label">Spec Type</label>

diff --git a/public/partials/templateForm.html b/public/partials/templateForm.html
@@ -3,7 +3,7 @@ <h2>Import Mock Service</h2>
 <br>
 <div><p><i>Please import a virtual service in JSON format. You may use the JSON document that Mockiato creates with it's export function or create one from scratch in <a target= "_blank" href="/api-docs/#/services/addVirtualService">this format.</a></i><p></div>
 <br>
-<form class="col-xs-12" ng-controller="templateController">
+<form class="col-xs-12">
     <div class="form-group row">
         <div class="col-xs-2">
             <file-field class="btn btn-primary" ng-model="importTemp" preview="previewTemp"><i class="glyphicon glyphicon-import"></i> Import Template</file-field>