feat(disallow to remove hislink and client): disallow to remove hislink and client

disallow to remove hislink and client when have relationship

client/components/Client.vue

@@ -5,7 +5,7 @@
       <v-btn color="pink" @click="deleteClient">{{$t("Client.YesBtn")}}</v-btn>
       <v-btn color="pink" @click="snackbar = false">{{$t("Client.NoBtn")}}</v-btn>
     </v-snackbar>
-    <v-snackbar color="primary" v-model="alertSnackbar" :timeout="2000">{{alertText}}</v-snackbar>
+    <v-snackbar :color="alertColor" v-model="alertSnackbar" :timeout="2000">{{alertText}}</v-snackbar>
     <v-dialog v-model="dialog" max-width="600px">
       <v-card>
         <v-card-title>
@@ -49,13 +49,27 @@
           <v-card-actions>
             <v-row style="margin:auto">
               <v-col cols="12" class="d-flex justify-center align-center flex-wrap">
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="openNewDialog">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="openNewDialog"
+                >
                   <strong>{{$t("HISLink.newBtn")}}</strong>
                 </v-btn>
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="openEditDialog" :disabled="this.selectedItemInTable.length == 0">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="openEditDialog"
+                  :disabled="this.selectedItemInTable.length == 0"
+                >
                   <strong>{{$t("HISLink.editBtn")}}</strong>
                 </v-btn>
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="deleteSnackbar" :disabled="this.selectedItemInTable.length == 0">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="deleteSnackbar"
+                  :disabled="this.selectedItemInTable.length == 0"
+                >
                   <strong>{{$t("HISLink.deleteBtn")}}</strong>
                 </v-btn>
               </v-col>
@@ -123,6 +137,7 @@ export default {
       snackbar: false,
       alertSnackbar: false,
       alertText: "",
+      alertColor:"primary",
       loading: false,
       search: ""
     };
@@ -209,8 +224,15 @@ export default {
       let deleteHislink = {};
       deleteHislink._id = this.selectedItemInTable[0]["_id"];
 
-      Meteor.call("deleteClient", deleteHislink, function() {
-        me.alertSnackbarMethod(this.$t("Client.clientDeleteStatement"));
+      Meteor.call("deleteClient", deleteHislink, function(error, result) {
+        if (error.reason == "relationShipError") {
+          me.alertColor = "error";
+          me.alertSnackbar = true;
+          me.alertText = me.$t("Client.clientRelationshipError");
+          return;
+        }
+
+        me.alertSnackbarMethod(me.$t("Client.clientDeleteStatement"));
       });
     },
     deleteSnackbar() {

client/components/DeviceMap.vue

@@ -69,13 +69,27 @@
           <v-card-actions>
             <v-row style="margin:auto">
               <v-col cols="12" class="d-flex justify-center align-center flex-wrap">
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="openNewDialog">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="openNewDialog"
+                >
                   <strong>{{$t("HISLink.newBtn")}}</strong>
                 </v-btn>
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="openEditDialog" :disabled="this.selectedItemInTable.length == 0">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="openEditDialog"
+                  :disabled="this.selectedItemInTable.length == 0"
+                >
                   <strong>{{$t("HISLink.editBtn")}}</strong>
                 </v-btn>
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="deleteSnackbar" :disabled="this.selectedItemInTable.length == 0">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="deleteSnackbar"
+                  :disabled="this.selectedItemInTable.length == 0"
+                >
                   <strong>{{$t("HISLink.deleteBtn")}}</strong>
                 </v-btn>
               </v-col>
@@ -140,9 +154,10 @@ export default {
       DevicemapForm: {
         GroupName: "",
         CodeInHIS: "",
-        CodeInPacs: "",
+        // CodeInPacs: "",
         Modality: "",
         HisLinkId: "",
+        ClientId: "",
         MaxLen: 0,
         _id: ""
       },
@@ -158,7 +173,8 @@ export default {
       let headers = [
         "GroupName",
         "CodeInHIS",
-        "CodeInPacs",
+        // "CodeInPacs",
+        "Client",
         "Modality",
         "HisName"
       ];
@@ -183,13 +199,29 @@ export default {
             { _id: devicemap.HisLinkId },
             { fields: { Name: 1 } }
           ).fetch();
+
           if (
             hislink != undefined &&
             hislink != null &&
             // hislink.length > 0 &&
             hislink[0].Name != undefined
           )
-            currentDevicemap.push({ ...devicemap, HisName: hislink[0].Name });
+            devicemap = { ...devicemap, HisName: hislink[0].Name };
+
+          let client = Client.find(
+            { _id: devicemap.ClientId },
+            { fields: { Caption: 1 } }
+          ).fetch();
+
+          if (
+            client != undefined &&
+            client != null &&
+            // hislink.length > 0 &&
+            client[0].Caption != undefined
+          )
+            devicemap = { ...devicemap, Client: client[0].Caption };
+
+          currentDevicemap.push({ ...devicemap });
         }
 
         return currentDevicemap;
@@ -250,9 +282,13 @@ export default {
       this.selectedClient = undefined;
       this.selectedHisLink = undefined;
       let me = this;
-      this.selectedClient = this.clients.filter(client => {
-        return client.Caption == me.DevicemapForm.CodeInPacs;
-      })[0];
+      // this.selectedClient = this.clients.filter(client => {
+      //   return client._id == me.DevicemapForm.ClientId;
+      // })[0];
+
+      this.selectedClient = Client.find({
+        _id: me.DevicemapForm.ClientId
+      }).fetch()[0];
 
       this.selectedHisLink = HisLink.find({
         _id: me.DevicemapForm.HisLinkId
@@ -267,7 +303,7 @@ export default {
       let me = this;
       if (this.newOrEdit == "new") {
         if (this.selectedClient != undefined && this.selectedClient != null)
-          this.DevicemapForm.CodeInPacs = this.selectedClient.Caption;
+          this.DevicemapForm.ClientId = this.selectedClient._id;
 
         if (this.selectedHisLink != undefined && this.selectedHisLink != null) {
           this.DevicemapForm.HisLinkId = this.selectedHisLink._id;
@@ -277,7 +313,7 @@ export default {
       }
       if (this.newOrEdit == "edit") {
         if (this.selectedClient != undefined && this.selectedClient != null)
-          this.DevicemapForm.CodeInPacs = this.selectedClient.Caption;
+          this.DevicemapForm.ClientId = this.selectedClient._id;
 
         if (this.selectedHisLink != undefined && this.selectedHisLink != null) {
           this.DevicemapForm.HisLinkId = this.selectedHisLink._id;

client/components/HisLink.vue

@@ -5,7 +5,7 @@
       <v-btn color="pink" @click="deleteHislink">{{$t("HISLink.YesBtn")}}</v-btn>
       <v-btn color="pink" @click="snackbar = false">{{$t("HISLink.NoBtn")}}</v-btn>
     </v-snackbar>
-    <v-snackbar color="primary" v-model="alertSnackbar" :timeout="2000">{{alertText}}</v-snackbar>
+    <v-snackbar :color="alertColor" v-model="alertSnackbar" :timeout="2000">{{alertText}}</v-snackbar>
     <v-dialog v-model="dialog" max-width="600px">
       <v-card>
         <v-card-title>
@@ -97,7 +97,11 @@
           <v-card-actions>
             <v-row style="margin:auto">
               <v-col cols="12" class="d-flex justify-center align-center flex-wrap">
-                <v-btn color="rgb(94, 181, 177,.85)" class="white--text ma-1" @click="openNewDialog">
+                <v-btn
+                  color="rgb(94, 181, 177,.85)"
+                  class="white--text ma-1"
+                  @click="openNewDialog"
+                >
                   <strong>{{$t("HISLink.newBtn")}}</strong>
                 </v-btn>
                 <v-btn
@@ -194,7 +198,7 @@
       :HisWorklistDialogProp="HisWorklistDialog"
       :closeDialog="closeHisWorklistMethod"
       :selectedBrand="selectedBrand"
-    ></his-worklist> -->
+    ></his-worklist>-->
   </v-container>
 </template>
 <script>
@@ -231,6 +235,7 @@ export default {
       snackbar: false,
       alertSnackbar: false,
       alertText: "",
+      alertColor: "primary",
       loading: false,
       // HisWorklistDialog: false,
       selectedBrand: null,
@@ -325,7 +330,7 @@ export default {
       let me = this;
       this.loading = true;
       if (this.newOrEdit == "new") {
-        Meteor.call("createHisLink", this.HisLinkForm, function() {
+        Meteor.call("createHisLink", this.HisLinkForm, function(error, result) {
           // me.dialog = false;
         });
       }
@@ -346,7 +351,16 @@ export default {
       let deleteHislink = {};
       deleteHislink._id = this.selectedItemInTable[0]["_id"];
 
-      Meteor.call("deleteHisLink", deleteHislink, function() {
+      Meteor.call("deleteHisLink", deleteHislink, function(error, result) {
+    
+        if (error) {
+          if (error.reason == "relationShipError") {
+            me.alertColor = "error";
+            me.alertSnackbar = true;
+            me.alertText = me.$t("HISLink.hislinkRelationshipError");
+            return;
+          }
+        }
         me.alertSnackbarMethod(me.$t("HISLink.hislinkDeleteStatement"));
       });
     },
@@ -354,6 +368,7 @@ export default {
       this.snackbar = true;
     },
     alertSnackbarMethod(text) {
+      me.alertColor = "primary";
       this.alertText = text;
       this.alertSnackbar = true;
     },

client/plugins/i18n.js

@@ -97,7 +97,8 @@ const messages = {
             hislinkActiveStatement: "HisLink has been activated",
             hislinkDeactiveStatement: "HisLink has been deactivated",
             hislinkAuthenticateFailed: "authenticate failed",
-            hislinkAuthenticateSuccess: "authenticate success"
+            hislinkAuthenticateSuccess: "authenticate success",
+            hislinkRelationshipError: "selected HisLink have been linked to a devicemap"
         },
         Client: {
             DeleteMessage: "Are You Sure?",
@@ -110,6 +111,7 @@ const messages = {
             editBtn: "Edit",
             clientSelectStatement: "please select one of Clients",
             clientDeleteStatement: "Client has been deleted",
+            clientRelationshipError: "selected Client have been linked to a devicemap"
         },
         DeviceMap: {
             DeleteMessage: "Are You Sure?",
@@ -279,7 +281,8 @@ const messages = {
             hislinkActiveStatement: "HISLink فعال شد",
             hislinkDeactiveStatement: "HISLink غیرفعال شد",
             hislinkAuthenticateFailed: "authenticate failed",
-            hislinkAuthenticateSuccess: "authenticate success"
+            hislinkAuthenticateSuccess: "authenticate success",
+            hislinkRelationshipError: "درگاه انتخاب شده دارای یک  نگاشت می باشد"
         },
         Client: {
             DeleteMessage: "آیا مطمین هستید؟",
@@ -292,6 +295,7 @@ const messages = {
             editBtn: "ویرایش",
             clientSelectStatement: "لطفا یکی از Client ها را انتخاب نمایید",
             clientDeleteStatement: "Client حذف گردید",
+            clientRelationshipError: "دستگاه انتخاب شده دارای یک  نگاشت می باشد"
         },
         DeviceMap: {
             DeleteMessage: "آیا مطمین هستید؟",

imports/api/methods/clients.js

@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { HTTP } from 'meteor/http';
 
+import DeviceMap from '../collections/devicemap.js'
+
 Meteor.methods({
     'createClient' (item) {
 
@@ -46,6 +48,11 @@ Meteor.methods({
     },
     "deleteClient" (item) {
         this.unblock();
+        let relationShipCount = DeviceMap.find({ ClientId: item._id }).count();
+        if (relationShipCount > 0) {
+            throw new Meteor.Error(500, "relationShipError");
+        }
+
         if (this.userId) {
             try {
                 let options = {

imports/api/methods/hisLink.js

@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { HTTP } from 'meteor/http';
 
+import DeviceMap from '../collections/devicemap.js'
+
 Meteor.methods({
     'createHisLink' (item) {
 
@@ -9,6 +11,7 @@ Meteor.methods({
         if (this.userId) {
             try {
 
+
                 let options = {
                     data: item,
                     headers: {
@@ -53,7 +56,16 @@ Meteor.methods({
     "deleteHisLink" (item) {
         this.unblock();
         if (this.userId) {
+
+
+            let relationShipCount = DeviceMap.find({ HisLinkId: item._id }).count();
+            if (relationShipCount > 0) {
+                throw new Meteor.Error(500, "relationShipError");
+
+            }
+
             try {
+
                 let options = {
                     data: item,
                     headers: {
@@ -68,7 +80,7 @@ Meteor.methods({
             } catch (e) {
                 // Got a network error, timeout, or HTTP error in the 400 or 500 range.
                 console.log(e);
-                return false;
+                return e.reason;
             }
         }
     },

package-lock.json

@@ -1111,6 +1111,15 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -1687,7 +1696,6 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
       "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1828,7 +1836,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -1874,8 +1881,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -1910,8 +1916,7 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.1.2",
@@ -1922,14 +1927,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
       "version": "0.19.0",
@@ -2283,7 +2286,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -2521,6 +2523,17 @@
         "ssri": "^6.0.1",
         "unique-filename": "^1.1.1",
         "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "cache-base": {
@@ -2608,8 +2621,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "2.4.2",
@@ -2840,7 +2852,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
@@ -3290,6 +3301,17 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "copy-descriptor": {
@@ -3620,7 +3642,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -3779,8 +3800,7 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
@@ -3945,7 +3965,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -4449,20 +4468,17 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -4634,14 +4650,12 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -4978,7 +4992,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -5163,14 +5176,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
@@ -5447,7 +5458,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -5826,8 +5836,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -5867,8 +5876,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "istanbul-lib-coverage": {
       "version": "2.0.5",
@@ -5943,6 +5951,15 @@
             "ms": "^2.1.1"
           }
         },
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -8740,8 +8757,7 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
     },
     "jsdom": {
       "version": "11.12.0",
@@ -8800,20 +8816,17 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
       "version": "2.1.1",
@@ -8851,7 +8864,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -10392,14 +10404,12 @@
     "mime-db": {
       "version": "1.40.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-      "dev": true
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
     },
     "mime-types": {
       "version": "2.1.24",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
       "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "dev": true,
       "requires": {
         "mime-db": "1.40.0"
       }
@@ -10544,6 +10554,17 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "ms": {
@@ -10707,6 +10728,16 @@
         "rimraf": "^2.6.1",
         "semver": "^5.3.0",
         "tar": "^4"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "node-releases": {
@@ -10808,8 +10839,7 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
     },
     "object-assign": {
       "version": "4.1.1",
@@ -11230,8 +11260,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
       "version": "2.0.7",
@@ -11482,8 +11511,7 @@
     "psl": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-      "dev": true
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -11535,8 +11563,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "q": {
       "version": "1.5.1",
@@ -11547,8 +11574,7 @@
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "querystring": {
       "version": "0.2.0",
@@ -11830,7 +11856,6 @@
       "version": "2.88.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -11963,14 +11988,6 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -12501,7 +12518,6 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz",
       "integrity": "sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==",
-      "dev": true,
       "requires": {
         "nan": "^2.12.1",
         "node-pre-gyp": "^0.11.0",
@@ -12512,7 +12528,6 @@
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz",
           "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==",
-          "dev": true,
           "requires": {
             "detect-libc": "^1.0.2",
             "mkdirp": "^0.5.1",
@@ -12524,6 +12539,16 @@
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
             "tar": "^4"
+          },
+          "dependencies": {
+            "rimraf": {
+              "version": "2.7.1",
+              "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+              "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            }
           }
         }
       }
@@ -12532,7 +12557,6 @@
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -13046,6 +13070,17 @@
       "dev": true,
       "requires": {
         "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
       }
     },
     "tmpl": {
@@ -13116,7 +13151,6 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -13125,8 +13159,7 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
         }
       }
     },
@@ -13185,7 +13218,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -13193,8 +13225,7 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
     },
     "type-check": {
       "version": "0.3.2",
@@ -13434,7 +13465,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -13537,7 +13567,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",

package.json

@@ -69,7 +69,6 @@
         "meteor-jest-stubs": "^2.0.0",
         "sass": "^1.22.9",
         "sass-loader": "^7.2.0",
-
         "standard-version": "^7.0.0",
         "uglifyjs-webpack-plugin": "^2.2.0",
         "vue-jest": "^3.0.5",

webpack.config.js

@@ -170,11 +170,12 @@ const clientConfig = {
     performance: {
         hints: false
     },
-    devtool: process.env.NODE_ENV == 'production' ? '' : 'source-map',
+    devtool: process.env.NODE_ENV == 'production' ? '' : 'eval-source-map',
     plugins: [
         new webpack.HotModuleReplacementPlugin(),
         new HtmlWebpackPlugin({
-            template: './client/main.html'
+            template: './client/main.html',
+
         }),
         new VueLoaderPlugin(),
         new webpack.DefinePlugin({
@@ -206,7 +207,7 @@ const serverConfig = {
         hot: true,
         open: true
     },
-    devtool: process.env.NODE_ENV == 'production' ? '' : 'source-map',
+    devtool: process.env.NODE_ENV == 'production' ? '' : 'eval-source-map',
     mode: process.env.NODE_ENV,
     module: {
         rules: [{