version bump

-Changed port number used
-Moved sample_db.sqlite location to persist after upgrading app

Author: m-murphy

.gitignore

@@ -19,3 +19,5 @@ app
 run.spec
 
 yarn-error\.log
+
+\.idea/

README.md

@@ -56,4 +56,13 @@ A CSV file [(template here)](https://github.com/Greenhouse-Lab/sample_db/blob/ma
 In the case that tubes or specimens must be deleted from the database, navigate to the **Delete** tab, and upload the indicated files ([Delete by Specimen Template](https://github.com/Greenhouse-Lab/sample_db/blob/master/templates/delete_specimen_template.csv) or [Delete by Barcode Template](https://github.com/Greenhouse-Lab/sample_db/blob/master/templates/delete_barcode_template.csv)). Succesful deletion will result in a message with the number of specimens and tubes that have been deleted from the database.
 
 # Backup and Restore Databases
-SampleDB will automatically backup the database the first time that it is run every day. Backups are stored in `/path/to/sampledb/Resources/app/db-server/db_backups` and may be restored by overwriting `/path/to/sampledb/Resources/app/db-server/sample_db.sqlite`. **Be sure to close SampleDB after use, otherwise the database will not be backed up daily**
+SampleDB will automatically backup the database the first time that it is run every day. Backups are stored at the following locations
+
+|Platform |Path |
+|-|-|
+|Windows:|`C:\\User\yourUserName\Local\com.greenhouse.sampledb\{current_version}\db_backups`|
+|Mac:|`~/Library/Application Support/com.greenhouse.sampledb/{current_version}/db_backups` |
+
+Backups may be restored by overwriting the sample_db.sqlite file contained in the application data folder.
+
+ **Be sure to close SampleDB after use, otherwise the database will not be backed up daily**

src/electron/main.js

@@ -40,7 +40,8 @@ function createWindow () {
     // when you should delete the corresponding element.
     mainWindow = null
   })
-  createWindow = () => {};
+
+  // createWindow = () => {};
 }
 
 // This method will be called when Electron has finished
@@ -70,15 +71,15 @@ app.on('ready', () => {
 
   // Make electron sever local files called from the app.
   protocol.interceptFileProtocol('file', (request, callback) => {
-    const url = request.url.substr(7);
-    callback({ path: path.normalize(`${__dirname}/db-app/${url}`)})
+    const item_url = request.url.substr(7);
+    callback({ path: path.normalize(`${__dirname}/db-app/${item_url}`)})
   }, (err) => {
     if (err) console.error('Failed to register protocol');
   });
 
 
   let p = setInterval(() => {
-      http.get('http://localhost:5000/status', (response) => {
+      http.get('http://localhost:17327/status', (response) => {
         response.on('data', (chunk) => {
           clearInterval(p);
           createWindow();

src/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-db",
-  "version": "1.0.0",
+  "version": "1.1.5",
   "description": "Sample Database management application.",
   "main": "main.js",
   "repository": "https://github.com/greenhouse-lab/sample_db",

src/sample-db-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-db",
-  "version": "1.0.0",
+  "version": "1.1.5",
   "license": "MIT",
   "scripts": {
     "build": "webpack",

src/sample-db-app/src/app/guards/location-exists.ts

@@ -47,7 +47,7 @@ export class LocationExistsGuard implements CanActivate {
           return of(inStore);
         }
         return this.hasLocationInApi(id);
-      })
+      });
   }
 
   canActivate(route: ActivatedRouteSnapshot): Observable<boolean> {

src/sample-db-app/src/app/services/bulk.ts

@@ -10,7 +10,7 @@ export interface DeleteQuery {
 
 @Injectable()
 export class BulkService {
-  private API_PATH = 'http://localhost:5000';
+  private API_PATH = 'http://localhost:17327';
   private postFileHeaders = new Headers({'Content-Type': undefined});
 
   constructor(private http: Http) {}

src/sample-db-app/src/app/services/location.ts

@@ -5,7 +5,7 @@ import { Location } from '../models/location';
 
 @Injectable()
 export class LocationService {
-  private API_PATH = 'http://localhost:5000';
+  private API_PATH = 'http://localhost:17327';
 
   private headers = new Headers({'Content-Type': 'application/json'});
 

src/sample-db-app/src/app/services/logging.ts

@@ -9,7 +9,7 @@ interface LogMessage {
 }
 @Injectable()
 export class LoggingService {
-  private API_PATH = 'http://localhost:5000';
+  private API_PATH = 'http://localhost:17327';
   private headers = new Headers({'Content-Type': 'application/json'});
 
   constructor(private http: Http) {}

src/sample-db-app/src/app/services/plate.ts

@@ -7,7 +7,7 @@ import * as _ from 'lodash';
 
 @Injectable()
 export class MatrixPlateService {
-  private API_PATH = 'http://localhost:5000';
+  private API_PATH = 'http://localhost:17327';
   private headers = new Headers({'Content-Type': 'application/json'});
   private postFileHeaders = new Headers({'Content-Type': undefined});