release

dist/main/index.js

@@ -8071,7 +8071,7 @@
 
 
 	            // Initialise the Websocket connection
-	            websocket = (0, _websocket.initialise)(("http://35.162.145.41:8000"));
+	            websocket = (0, _websocket.initialise)(("http://35.167.249.144:8000"));
 
 	            websocket.on('data', function (action) {
 	              var reduxAction = (0, _mapWebsocketToRedux2.default)(store, action);
@@ -8276,14 +8276,14 @@
 	// Assign the global_env to process.env
 	// GLOBAL_ENV is set in webpack using the definePlugin
 	if (true) {
-	  Object.assign(process.env, ({"APP_TYPE":"desktop","NODE_ENV":"production","WEBSITE_URL":"http://localhost:3333","API_SERVER":"http://35.162.145.41","WEBSOCKET_SERVER":"http://35.162.145.41:8000","ELECTRON_CRASH_REPORT_SERVER":"http://35.162.145.41:2096"}));
+	  Object.assign(process.env, ({"APP_TYPE":"desktop","NODE_ENV":"production","WEBSITE_URL":"http://localhost:3333","API_SERVER":"http://35.167.249.144","WEBSOCKET_SERVER":"http://35.167.249.144:8000","ELECTRON_CRASH_REPORT_SERVER":"http://35.167.249.144:2096"}));
 	}
 
 	// Initialise Reporting
 	(0, _electronCrash2.default)();
 	(0, _ravenMain2.default)();
 
-	_axios2.default.defaults.baseURL = ("http://35.162.145.41") + '/';
+	_axios2.default.defaults.baseURL = ("http://35.167.249.144") + '/';
 
 /***/ },
 /* 299 */
@@ -10914,7 +10914,7 @@
 	  _electron.crashReporter.start({
 	    companyName: 'Stemn',
 	    productName: 'Stemn Desktop',
-	    submitURL: ("http://35.162.145.41:2096"),
+	    submitURL: ("http://35.167.249.144:2096"),
 	    autoSubmit: true,
 	    extra: {
 	      app_version: _package.version,
@@ -12644,10 +12644,10 @@
 	  value: true
 	});
 	// Sentry DSN for the Electron Main project
-	var sentryPrivate = exports.sentryPrivate = 'http://b882145da3624d20a8b388b1f499f1d7:70c3c691cdbc48529ace050e45b016f6@35.162.145.41:9000/4';
+	var sentryPrivate = exports.sentryPrivate = 'http://b882145da3624d20a8b388b1f499f1d7:70c3c691cdbc48529ace050e45b016f6@35.167.249.144:9000/4';
 
 	// Sentry DSN for the Electron Renderer project
-	var sentryPublic = exports.sentryPublic = 'http://fae90f76026746ecbb42464ba51ec2ec@35.162.145.41:9000/2';
+	var sentryPublic = exports.sentryPublic = 'http://fae90f76026746ecbb42464ba51ec2ec@35.167.249.144:9000/2';
 
 /***/ },
 /* 362 */
@@ -13431,11 +13431,6 @@
 	  appIcon = new _electron.Tray(trayIcon);
 	  appIcon.setToolTip('Stemn Desktop');
 
-	  if (_process2.default.platform == 'win32') {
-
-	    //    appIcon.setContextMenu(contextMenu);
-	  }
-
 	  var lastClickTime = Date.now();
 
 	  appIcon.on('right-click', function (event, trayBounds) {
@@ -13471,8 +13466,8 @@
 	      }
 	    }, {
 	      label: 'Account Settings',
-	      enabled: (auth.authToken && auth.user._id) === true,
-	      onClick: function onClick() {
+	      enabled: auth.authToken && auth.user._id ? true : false,
+	      click: function click() {
 	        windows.main.show();
 	        dispatch((0, _reactRouterRedux.push)({
 	          pathname: '/settings/account',
@@ -21384,7 +21379,6 @@
 	          description: description
 	        }
 	      }).then(function (response) {
-	        console.log();
 	        dispatch((0, _ToastsActions.show)({
 	          title: response.data.files.length + ' files commited',
 	          actions: [{
@@ -72983,7 +72977,7 @@
 	});
 
 	exports.default = function (fileMeta) {
-	  return fileMeta.project && fileMeta.project._id ? ("http://35.162.145.41") + '/api/v1/sync/download/' + fileMeta.project._id + '/' + fileMeta.fileId + (fileMeta.revisionId ? '?revisionId=' + fileMeta.revisionId : '') : ("http://35.162.145.41") + '/api/v1/remote/download/' + fileMeta.provider + '/' + fileMeta.fileId + (fileMeta.revisionId ? '?revisionId=' + fileMeta.revisionId : '');
+	  return fileMeta.project && fileMeta.project._id ? ("http://35.167.249.144") + '/api/v1/sync/download/' + fileMeta.project._id + '/' + fileMeta.fileId + (fileMeta.revisionId ? '?revisionId=' + fileMeta.revisionId : '') : ("http://35.167.249.144") + '/api/v1/remote/download/' + fileMeta.provider + '/' + fileMeta.fileId + (fileMeta.revisionId ? '?revisionId=' + fileMeta.revisionId : '');
 	};
 
 	module.exports = exports['default'];
@@ -73281,7 +73275,7 @@
 
 	  var dest = _path2.default.join(folderPath, name);
 	  var onProgress = function onProgress(progressPerc) {
-	    console.log(onProgressAction, progressPerc);
+	    //    console.log(onProgressAction, progressPerc);
 	  };
 	  return (0, _downloadToDisk2.default)({ url: url, params: params, dest: dest, extract: extract, onProgress: onProgress }).then(function (response1) {
 	    // If extract is true, we rename the files, then save them to the store
@@ -73341,6 +73335,7 @@
 	  var getFile = function getFile() {
 	    // If there is a render url, we check the render.status, otherwise we just download directly
 	    if (!renderUrl) {
+	      console.log(url);
 	      return downloadToDiskAndSave({ key: key, url: url, params: params, name: name, extract: extract, onProgressAction: onProgressAction }).then(processResult);
 	    } else {
 	      return (0, _axios2.default)({ url: renderUrl, params: params }).then(function (response) {
@@ -73352,7 +73347,9 @@
 	  };
 
 	  // If we have a cache entry, get the file
-	  return fileCache[key] ? fsPromise.stat(_path2.default.join(folderPath, fileCache[key].name)).then(processResult).catch(getFile) : getFile();
+	  return fileCache[key] ? fsPromise.stat(_path2.default.join(folderPath, fileCache[key].name)).then(processResult).catch(getFile)
+	  // Else, we download the file.
+	  : getFile();
 	};
 
 	/*******************************************************
@@ -95279,7 +95276,6 @@
 
 	      // unzip event uses close, but all others use end
 	      if (extract) {
-	        //        console.log('Download to Disk Complete', {url, params, dest, onProgress, extract});
 	        file.on('close', function (response) {
 	          resolve({
 	            size: total,
@@ -95295,6 +95291,8 @@
 	        });
 	      }
 	      stream.pipe(file);
+	    }).catch(function (error) {
+	      reject(error.response);
 	    });
 	  });
 	};
@@ -113258,6 +113256,7 @@
 	    case 'FILES/GET_FILE_PENDING':
 	      return _icepick2.default.assocIn(state, ['fileData', action.meta.cacheKey, 'loading'], true);
 	    case 'FILES/GET_FILE_REJECTED':
+	      console.log(action.payload);
 	      return _icepick2.default.assocIn(state, ['fileData', action.meta.cacheKey], {
 	        error: action.payload.data,
 	        loading: false
@@ -150547,7 +150546,7 @@
 	    port: 49554
 	  },
 	  websocket: {
-	    host: ("http://35.162.145.41:8000") || 'localhost',
+	    host: ("http://35.167.249.144:8000") || 'localhost',
 	    port: 8000
 	  }
 	};