Fixed several errors (mostly startup errors due to unset variables or missing files that get created on first update cycle), Fixed more styling issues, Improved settings display and function, where there are no notes, one is created and set as default. Additional editors should no longer be created due to them not being destroyed

Author: CoreParadox

config.json

@@ -1,6 +1,6 @@
 {
   "name": "stickynoteapp",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "codemirror": "^5.43.0",
+    "fs-extra": "^7.0.1",
     "hypermd": "^0.3.11",
     "vue": "^2.5.21",
     "vue-class-component": "^6.0.0",

package-lock.json

@@ -90,21 +90,14 @@ body {
   border-radius: 5px;
   color: white;
   padding: 5px;
-  margin-top:20px;
   text-align: center;
   text-decoration: none;
 }
+
 #settings{
   overflow: hidden;
 }
 
 #settings form{
   padding:10px;
-}
-
-#settings form p{
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 100vw;
-  color:red;
 }

package.json

@@ -47,42 +47,6 @@ function createWindow() {
 
 }
 
-import * as fs from 'fs';
-import * as path from 'path';
-function ensureExists(callback) {
-  Configuration.getConfig().then(c => {
-    fs.exists(c.notePath, folderExists => {
-      if (!folderExists) {
-        createDirectory(c, _ => {
-          createDefault(c, _ => callback());
-        })
-      } else {
-        fs.exists(path.join(c.notePath, c.defaultNote), fileExists => {
-          if (!fileExists) createDefault(c, _ => callback())
-          else callback();
-        })
-      };
-    })
-  });
-}
-
-function createDirectory(config: Configuration, callback) {
-  fs.mkdir(config.notePath, e => {
-    if (e){
-      console.log(e);
-      alert(e); 
-      process.exit();
-    }else{ 
-      callback(e);
-    }
-  });
-}
-
-function createDefault(config: Configuration, callback) {
-  fs.writeFile(path.join(config.notePath, config.defaultNote), "# Welcome to your new note!\nLet's write something awesome.", e => {
-    callback(e)
-  })
-}
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
@@ -109,10 +73,7 @@ app.on('ready', async () => {
     // Install Vue Devtools
     await installVueDevtools()
   }
-
-  ensureExists(function(){
-    createWindow()
-  })
+  createWindow();
 })
 
 var locked = app.requestSingleInstanceLock();

public/style.css

@@ -19,9 +19,8 @@ import VueEmitter from "@/utility/VueEmitter"
 export default class Editor extends VueEmitter {
   private internalEditor: any;
   private saveWatcher: any;
-  private config:Configuration = new Configuration();
+  private config;
   private file;
-
   private filePath() {
     return path.join(this.config.notePath, this.file);
   }
@@ -34,6 +33,11 @@ export default class Editor extends VueEmitter {
         this.registerEvents();
       }).catch(console.log);
   }
+  destroyed() {
+    document.removeChild(document.getElementsByClassName("CodeMirror")[0])
+    this.internalEditor = null;
+    clearInterval(this.saveWatcher);
+  }
 
   loadFile(file) {
     this.file = file;
@@ -67,10 +71,7 @@ export default class Editor extends VueEmitter {
     this.$root.$on(eventName, callback);
   }
 
-  destroyed() {
-    this.internalEditor = null;
-    clearInterval(this.saveWatcher);
-  }
+
 
   private Save(handler: ((err: Error) => void)) {
     writeFile(this.filePath(), this.internalEditor.getValue(), handler);
@@ -84,7 +85,7 @@ export default class Editor extends VueEmitter {
     }, 5000);
   }
 
-  private configureEditor(defaultValue) {
+  private configureEditor(defaultValue = "") {
     if(!this.internalEditor) this.internalEditor = HyperMD.fromTextArea(document.getElementById("input-area"),this.config.editorConfig);
     this.internalEditor.setValue(defaultValue.toString());
     this.internalEditor.markClean();

src/background.ts

@@ -1,4 +1,4 @@
-import { access, writeFile, constants as fsConstants, readFile } from 'fs';
+import {pathExists, writeFile, ensureDir, readFile} from "fs-extra"
 import {join} from "path";
 import { remote } from 'electron';
 const configPath = join(remote.app.getPath('userData'), "config.json")
@@ -19,14 +19,18 @@ export default class Configuration {
     static getConfig(){
         var stashed = new Configuration()
         return new Promise<Configuration>((r,e) =>{
-            access(configPath, fsConstants.F_OK, (err) => {
-                if(err) writeFile(configPath,JSON.stringify(stashed,null,"\t"),ex =>{
-                    if(ex) e(ex)
-                    this.readFile(stashed,r);
+            pathExists(configPath, (err, exists) =>{
+                if(err) e(err);
+                if(!err && !exists) writeFile(configPath,JSON.stringify(stashed,null,"\t"),err =>{
+                    if(err) e(err)
+                    this.readFile(stashed,c =>{
+                        ensureDir(c.notePath).then(e=>r(c))
+                    });
                 })
-                this.readFile(stashed,r);
-            });
-            
+                else this.readFile(stashed,c =>{
+                    ensureDir(c.notePath).then(e=>r(c))
+                });
+            })
         })
     }
 
@@ -38,14 +42,10 @@ export default class Configuration {
     }
 
     saveConfig(callback?){
-        //TODO: This is a hack, but vue adds some junk data when binding
-        delete (<any>this).data
-        delete (<any>this).type
-        console.log(JSON.stringify(this,null,"\t"))
         writeFile(configPath,JSON.stringify(this, null, "\t"),(e) => {
-            if(callback) callback(e);
-            else console.log(e);
-        })
+            if(callback) callback
+            else console.log(e)
+        });
     }
 }