Merge pull request #77 from LanceGundersen/dev

Production Push

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,15 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+ - OS: [e.g. macos, linux, windows]
+ - App Store: [e.g. snapcraft, mac, windows, n/a]
+ - Version [e.g. 1.4.3]
+
 
 **Additional context**
 Add any other context about the problem here.

appveyor.yml

@@ -14,7 +14,7 @@ install:
   - ps: Install-Product node 10 x64
   - yarn
   - ps: $env:package_version = (Get-Content -Raw -Path package.json | ConvertFrom-Json).version
-  - ps: Update-AppveyorBuild -Version "$env:package_version-$env:APPVEYOR_BUILD_NUMBER"
+  - ps: Update-AppveyorBuild -Version "$env:package_version"
 
 build_script:
   - yarn electron:build --win appx nsis
@@ -25,4 +25,15 @@ artifacts:
   - path: dist_electron/*.appx
     name: navfit
 
+deploy:
+  - provider: GitHub
+    description: 'AppVeyor Release'
+    auth_token:
+      secure: fEkXGI1MwwnXikl6PyKr9q8U1Dcgw+yZuPznmh/YqHS4QtwLBkqxl0C4cDwB1vVf
+    draft: true
+    artifact: navfit2020
+    force_update: true
+    on:
+      branch: prod
+
 test: off

package.json

@@ -1,6 +1,6 @@
 {
   "name": "navfit",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "private": true,
   "description": "Navy Evaluation/Fitrep Writer Modernized.",
   "author": "Lance Gundersen",

snap/snapcraft.yaml

@@ -1,12 +1,12 @@
  name: navfit
- version: '0.5.2'
+ version: '0.5.3'
  summary: Navy Evaluation/Fitrep Writer Modernized
  description: |
    Navy evaluation and FITREP creation application to replace NavFit98. Allows for
    adding, editing, deleting, and exporting to offical US Navy NAVPERS PDF's.
  grade: devel
  confinement: devmode
- 
+
  parts:
   electron-navfit:
     plugin: nil

src/App.vue

@@ -34,6 +34,7 @@ export default Vue.extend({
   data: () => ({}),
   created() {
     this.$store.dispatch("loadDb");
+    this.$router.push({ name: "home" }).catch(() => {});
   }
 });
 </script>

src/background.js

@@ -119,13 +119,23 @@ if (isDevelopment) {
   }
 }
 
+export function showDialog(type, title, msg, filePath, error) {
+  writeToLogFile(`EVAL EXPORT: ${type} ${title} ${msg} ${filePath} ${error}`);
+  win.webContents.send("dialog:show", { type, title, msg, filePath, error, });
+}
+
 ipcMain.on("db:load", async () => {
   win.webContents.send("db:loaded", JSON.parse(JSON.stringify(await api.readDatabase())));
 });
 
 ipcMain.on("db:add:sailor", async (event, args) => {
   const result = await api.addSailor(args);
-  win.webContents.send("db:add:sailor:result", result);
+  const sailor = await api.getSailor(result);
+  if (sailor.uuid) {
+    win.webContents.send("db:add:sailor:result", sailor);
+  } else {
+    showDialog("error", "Add Sailor Error", "Error adding Sailor", null, result.error);
+  }
 });
 
 ipcMain.on("db:update:sailor", async (event, args) => {
@@ -178,8 +188,3 @@ ipcMain.on("pdf:export", async (event, args) => {
     if (!saveTo.canceled) exportEval(args.sailor, args.id, saveTo.filePath);
   });
 });
-
-export function showDialog(type, title, msg, filePath, error) {
-  writeToLogFile(`EVAL EXPORT: ${type} ${title} ${msg} ${filePath} ${error}`);
-  win.webContents.send("dialog:show", { type, title, msg, filePath, error, });
-}

src/components/TheAddEditSailorDialogComponent.vue

@@ -127,9 +127,6 @@ export default Vue.extend({
     getCommandInfo() {
       return this.$store.getters.getCommandInfo;
     },
-    getSelectedSailor() {
-      return this.$store.getters.getSelectedSailor;
-    },
     getSailorEditForm() {
       return this.$store.getters.getSailorEditForm;
     },
@@ -153,13 +150,8 @@ export default Vue.extend({
             }
           });
       } else {
-        this.$store.dispatch("addSailor")
-          .then(() => {
-            if (!this.$store.getters.isError) {
-              this.$router.push({ name: "detail", params: { uuid: this.getSelectedSailor.uuid } }).catch(() => {});
-              this.closeDialog();
-            }
-          });
+        this.$store.dispatch("addSailor");
+        this.closeDialog();
       }
     },
   },

src/components/TheNavigationDrawerComponent.vue

@@ -69,7 +69,6 @@ export default Vue.extend({
         .catch(() => {
           this.drawer = !this.drawer;
         });
-      // this.$router.push({ name: "detail", params: { uuid: givenUuid } }).catch(() => {});
     },
     deleteSailor(givenUuid) {
       this.uuid = givenUuid;

src/components/TheSailorDetailComponent.vue

@@ -155,11 +155,11 @@ export default Vue.extend({
       return this.$store.getters.getSelectedSailor;
     },
   },
-  beforeCreate() {
-    if (!this.$store.getters.getSelectedSailor.uuid) {
-      this.$router.push({ name: "home" });
-    }
-  },
+  // beforeCreate() {
+  //   if (!this.$store.getters.getSelectedSailor.uuid) {
+  //     this.$router.push({ name: "home" });
+  //   }
+  // },
   methods: {
     showAddEditEvalDialog(recordId) {
       this.$store.dispatch("clearEvalEditForm");

src/store/actions.js

@@ -1,10 +1,19 @@
+import router from "@/router";
+
 export default {
+  routeToSelectedSailor() {
+    const uuid = this.getters.getSelectedSailorId;
+    router.push({
+      name: "detail",
+      params: { uuid }
+    });
+  },
   loadApp() {
     window.ipcRenderer.send("app:load");
   },
   loadDb({ commit }) {
     window.ipcRenderer.send("db:load");
-    window.ipcRenderer.on("db:loaded", (event, args) => {
+    window.ipcRenderer.once("db:loaded", (event, args) => {
       if (args.commandInfo) {
         commit("SET_COMMAND", args.commandInfo);
       }
@@ -14,21 +23,21 @@ export default {
   addSailor({ commit, dispatch }) {
     const form = this.getters.getSailorEditForm;
     window.ipcRenderer.send("db:add:sailor", form);
-    window.ipcRenderer.on("db:add:sailor:result", (_, args) => {
-      if (args.error) {
-        commit("setError");
-        commit("setErrorMsg", args.error.toString());
-        commit("setErrorObj", args);
-      }
-      dispatch("loadDb").then(() => {
-        dispatch("setSelectedSailor", args.uuid);
-      });
+    window.ipcRenderer.once("db:add:sailor:result", (event, args) => {
+      dispatch("loadDb");
+      commit("SET_SELECTED_SAILOR", { ...args });
+      commit("SET_SAILOR_EDIT_FORM", { ...args });
+      dispatch("routeToSelectedSailor");
+    });
+    window.ipcRenderer.once("dialog:show", (event, args) => {
+      commit("SET_DIALOG_INFO", args);
+      commit("SHOW_DIALOG");
     });
   },
   updateSailor({ commit, dispatch }) {
     const form = this.getters.getSailorEditForm;
     window.ipcRenderer.send("db:update:sailor", form);
-    window.ipcRenderer.on("db:update:sailor:result", (_, args) => {
+    window.ipcRenderer.once("db:update:sailor:result", (_, args) => {
       if (args.error) {
         commit("setError");
         commit("setErrorMsg", args.error.toString());
@@ -39,7 +48,7 @@ export default {
   },
   deleteSailor({ commit, dispatch }, payload) {
     window.ipcRenderer.send("db:delete:sailor", payload);
-    window.ipcRenderer.on("db:delete:sailor:result", (_, args) => {
+    window.ipcRenderer.once("db:delete:sailor:result", (_, args) => {
       if (args.error) {
         commit("setError");
         commit("setErrorMsg", args.error.toString());
@@ -56,7 +65,7 @@ export default {
     };
 
     window.ipcRenderer.send("db:add:record", { uuid, form });
-    window.ipcRenderer.on("db:add:record:result", (_, args) => {
+    window.ipcRenderer.once("db:add:record:result", (_, args) => {
       if (args.error) {
         commit("setError");
         commit("setErrorMsg", args.error.toString());
@@ -72,7 +81,7 @@ export default {
     const { uuid } = this.getters.getSelectedSailor;
 
     window.ipcRenderer.send("db:update:record", { uuid, form });
-    window.ipcRenderer.on("db:update:record:result", (_, args) => {
+    window.ipcRenderer.once("db:update:record:result", (_, args) => {
       if (args.error) {
         commit("setError");
         commit("setErrorMsg", args.error.toString());
@@ -86,7 +95,7 @@ export default {
   saveCommandDefaults({ commit, dispatch }) {
     const form = this.getters.getCommandEditForm;
     window.ipcRenderer.send("db:add:commandDefaults", form);
-    window.ipcRenderer.on("db:add:commandDefaults:result", (_, args) => {
+    window.ipcRenderer.once("db:add:commandDefaults:result", (_, args) => {
       if (args.error) {
         commit("setError");
         commit("setErrorMsg", args.error.toString());
@@ -104,11 +113,14 @@ export default {
   clearCommandEditForm({ commit }) {
     commit("CLEAR_COMMAND_EDIT_FORM");
   },
-  setSelectedSailor({ commit }, uuid) {
+  async setSelectedSailor({ commit }, uuid) {
     const sailorData = this.getters.getSailorById(uuid);
     commit("SET_SELECTED_SAILOR", sailorData);
     commit("SET_SAILOR_EDIT_FORM", sailorData);
   },
+  async clearSelectedSailor({ commit }) {
+    commit("CLEAR_SELECTED_SAILOR");
+  },
   setSailorEditForm({ commit }, payload) {
     commit("SET_SAILOR_EDIT_FORM", payload);
   },
@@ -130,7 +142,7 @@ export default {
   exportEval({ commit }, payload) {
     const sailor = this.getters.getSelectedSailor;
     window.ipcRenderer.send("pdf:export", { sailor, id: payload });
-    window.ipcRenderer.on("dialog:show", (event, args) => {
+    window.ipcRenderer.once("dialog:show", (event, args) => {
       commit("SET_DIALOG_INFO", args);
       commit("SHOW_DIALOG");
     });

src/store/api.js

@@ -44,6 +44,11 @@ export default {
       return { error };
     }
   },
+  async getSailor(payload) {
+    return db.get("sailors")
+      .find({ uuid: payload.uuid })
+      .value();
+  },
   async updateSailor(payload) {
     try {
       await db.get("sailors")

src/store/modules/selected.js

@@ -6,8 +6,12 @@ export default {
     SET_SELECTED_SAILOR(state, payload) {
       state.sailor = payload;
     },
+    CLEAR_SELECTED_SAILOR(state) {
+      state.sailor = {};
+    }
   },
   getters: {
     getSelectedSailor: state => state.sailor,
+    getSelectedSailorId: state => state.sailor.uuid,
   },
 };