feat(gDriveSync): add settings and improve structure

Author: johannesjo

app-src/index.html

@@ -132,6 +132,7 @@
 <script src="scripts/main/global-services/git-log-s.js"></script>
 <script src="scripts/main/global-services/git-s.js"></script>
 <script src="scripts/main/global-services/google-api-s.js"></script>
+<script src="scripts/main/global-services/google-drive-sync-s.js"></script>
 <script src="scripts/main/global-services/init-global-models-s.js"></script>
 <script src="scripts/main/global-services/jira-s.js"></script>
 <script src="scripts/main/global-services/notifier-s.js"></script>

app-src/scripts/constants.js

@@ -22,7 +22,9 @@
       'keys',
       'isShowWelcomeDialog',
       'config',
-      'keys'
+      'keys',
+      'googleDriveSync',
+      'googleTokens'
     ])
     .constant('ON_DEMAND_LS_FIELDS', [
       'doneBacklogTasks',
@@ -82,6 +84,11 @@
         refreshToken: undefined,
         expiresAt: undefined
       },
+      googleDriveSync: {
+        backupDocId: undefined,
+        lastLocalUpdate: undefined,
+        lastSyncToRemote: undefined,
+      },
       tasks: [],
       backlogTasks: [],
       doneBacklogTasks: [],
@@ -124,6 +131,12 @@
         togglePlay: 'y',
       },
       config: {
+        googleDriveSync: {
+          isAutoLogin: undefined,
+          isAutoSyncToRemote: false,
+          isAutoSyncFromRemote: false,
+          syncInterval: moment.duration(1, 'minutes'),
+        },
         automaticBackups: {
           isEnabled: false,
           path: '~/backup-{date}.json',

app-src/scripts/main/global-services/app-storage-s.js

@@ -124,13 +124,17 @@
       }
     }
 
-    saveToFileSystem(fs, path, cb, isSync) {
+    getCompleteBackupData() {
       const data = angular.copy(this.getCurrentAppState());
-
       // also add projects data
       data[this.PROJECTS_KEY] = this.getProjects();
       // also add backlog tasks
       data[this.DONE_BACKLOG_TASKS_KEY] = this.getDoneBacklogTasks();
+      return data;
+    }
+
+    saveToFileSystem(fs, path, cb, isSync) {
+      const data = this.getCompleteBackupData();
 
       fs.writeFile(path, JSON.stringify(data), function(err) {
         if (err) {

app-src/scripts/main/global-services/google-api-s.js

@@ -285,7 +285,7 @@
         });
     };
 
-    saveFile(metadata, content) {
+    saveFile(metadata = {}, content) {
       //window.gapi.client.setApiKey(this.GOOGLE.API_KEY);
 
       if (!angular.isString(content)) {
@@ -303,16 +303,19 @@
         method = 'POST';
       }
 
+      if (!metadata.mimeType) {
+        metadata.mimeType = 'application/json';
+      }
+
       const multipart = new MultiPartBuilder()
         .append('application/json', JSON.stringify(metadata))
-        //.append(metadata.mimeType, content)
-        .append('application/json', content)
+        .append(metadata.mimeType, content)
         .finish();
 
       return this.$http({
         method: method,
         url: `https://content.googleapis.com/upload/drive/v2/files/`,
-        //url: `https://content.googleapis.com/${path}`,
+        url: `https://content.googleapis.com${path}`,
         params: {
           'key': this.GOOGLE.API_KEY,
           uploadType: 'multipart',

app-src/scripts/main/global-services/google-drive-sync-s.js

@@ -0,0 +1,46 @@
+/**
+ * @ngdoc service
+ * @name superProductivity.GoogleDriveSync
+ * @description
+ * # GoogleDriveSync
+ * Service in the superProductivity.
+ */
+
+(() => {
+  'use strict';
+
+  const SYNC_FILE_NAME = 'SUPER_PRODUCTIVITY_SYNC.json';
+
+  class GoogleDriveSync {
+    /* @ngInject */
+    constructor(AppStorage, GoogleApi, $rootScope) {
+      this.AppStorage = AppStorage;
+      this.GoogleApi = GoogleApi;
+      this.$rootScope = $rootScope;
+    }
+
+    getData() {
+      return this.AppStorage.getCompleteBackupData();
+    }
+
+    saveTo() {
+      return this.GoogleApi.saveFile({
+        title: SYNC_FILE_NAME,
+        id: this.$rootScope.r.googleDriveSync.backupDocId,
+        editable: true
+      }, this.getData())
+        .then((res) => {
+          if (res && res.data) {
+            this.$rootScope.r.googleDriveSync.backupDocId = res.data.id;
+          }
+        });
+    }
+  }
+
+  angular
+    .module('superProductivity')
+    .service('GoogleDriveSync', GoogleDriveSync);
+
+  // hacky fix for ff
+  GoogleDriveSync.$$ngIsClass = true;
+})();

app-src/scripts/main/global-services/google-drive-sync-s.spec.js

@@ -0,0 +1,17 @@
+'use strict';
+
+describe('Service: GoogleDriveSync', () => {
+  // load the service's module
+  beforeEach(module('superProductivity'));
+
+  // instantiate service
+  let GoogleDriveSync;
+  beforeEach(inject((_GoogleDriveSync_) => {
+    GoogleDriveSync = _GoogleDriveSync_;
+  }));
+
+  it('should be defined', () => {
+    expect(true).toBe(true);
+  });
+
+});

app-src/scripts/routes/settings/settings-c.html

@@ -9,7 +9,7 @@
 
   <section class="config-section"
            md-whiteframe="2">
-    <backup-settings settings="r.config.automaticBackups"></backup-settings>
+    <backup-settings settings="r.config"></backup-settings>
   </section>
 
 

app-src/scripts/settings/backup-settings/backup-settings-d.html

@@ -38,29 +38,61 @@ <h3 class="md-caption">Sync via Google Drive</h3>
   <div>
     <md-button class="md-raised md-primary"
                ng-show="!vm.isLoggedIn"
-               ng-click="vm.login()">Login
+               ng-click="vm.login()">
+      <ng-md-icon icon="login"></ng-md-icon>
+      Login
     </md-button>
     <md-button class="md-raised md-primary"
                ng-show="vm.isLoggedIn"
-               ng-click="vm.logout()">Logout
+               ng-click="vm.logout()">
+      <ng-md-icon icon="logout"></ng-md-icon>
+      Logout
     </md-button>
+
     <md-button class="md-raised md-primary"
                ng-show="vm.isLoggedIn"
                external-link
                target="_blank"
-               href="https://myaccount.google.com/permissions">Revoke permissions
+               href="https://myaccount.google.com/permissions">
+      <ng-md-icon icon="remove_circle"></ng-md-icon>
+      Revoke permissions
     </md-button>
     <md-button class="md-raised md-primary"
                ng-show="vm.isLoggedIn"
-               ng-click="vm.test()">TEST
+               ng-click="vm.backupNow()">
+      <ng-md-icon icon="backup"></ng-md-icon>
+      Save Backup now
     </md-button>
   </div>
+
+  <div>
+    <md-switch ng-model="vm.settings.googleDriveSync.isAutoLogin"
+               aria-label="Auto login at when starting app">
+      Auto login at when starting app
+    </md-switch>
+  </div>
   <div>
-    <md-switch ng-model="vm.settings.isAutoStartNextTask"
-               aria-label="Auto sync tasks">
-      Auto sync tasks
+    <md-switch ng-model="vm.settings.googleDriveSync.isAutoSyncToRemote"
+               aria-label="Auto sync to remote">
+      Auto sync to remote
     </md-switch>
   </div>
+  <div>
+    <md-switch ng-model="vm.settings.googleDriveSync.isAutoSyncFromRemote"
+               aria-label="Auto sync from remote">
+      Auto sync from remote
+    </md-switch>
+  </div>
+  <md-input-container class="md-block md-icon-float"
+                      ng-show="vm.settings.googleDriveSync.isAutoSyncToRemote || vm.settings.googleDriveSync.isAutoSyncFromRemote">
+    <label>Remind when I worked longer than X without a break</label>
+    <ng-md-icon icon="timer"
+                aria-label="timer"></ng-md-icon>
+    <input type="text"
+           input-duration
+           ng-model="vm.settings.googleDriveSync.syncInterval">
+  </md-input-container>
+
 </section>
 
 
@@ -86,7 +118,7 @@ <h3 class="md-caption">Sync via Google Drive</h3>
 <section ng-if="vm.IS_ELECTRON">
   <h3 class="md-caption">Automatic Backups</h3>
   <div>
-    <md-switch ng-model="vm.settings.isEnabled"
+    <md-switch ng-model="vm.settings.automaticBackups.isEnabled"
                aria-label="Enable automatic backups">
       Enable automatic backups
     </md-switch>
@@ -95,22 +127,22 @@ <h3 class="md-caption">Automatic Backups</h3>
   <p><strong>NOTE:</strong> Changes to automated backup settings require you to restart the application to take effect.
   </p>
 
-  <div ng-show="vm.settings.isEnabled">
+  <div ng-show="vm.settings.automaticBackups.isEnabled">
     <md-input-container class="md-block">
       <label>Interval in seconds to make backups</label>
       <input type="number"
-             ng-model="vm.settings.intervalInSeconds">
+             ng-model="vm.settings.automaticBackups.intervalInSeconds">
     </md-input-container>
     <md-input-container class="md-block">
       <label>Path to backup (e.g. ~/backup-{date}.json)</label>
       <input type="text"
-             ng-model="vm.settings.path">
+             ng-model="vm.settings.automaticBackups.path">
     </md-input-container>
   </div>
 
   <h3 class="md-caption">Automatic Sync</h3>
   <div>
-    <md-switch ng-model="vm.settings.isSyncEnabled"
+    <md-switch ng-model="vm.settings.automaticBackups.isSyncEnabled"
                aria-label="Enable automatic backups">
       Enable auto sync
     </md-switch>
@@ -120,11 +152,11 @@ <h3 class="md-caption">Automatic Sync</h3>
     <strong>a highly experimental feature!!!</strong> Take care! Make a backup! Changes to the sync settings require you to restart the application to take effect.
   </p>
 
-  <div ng-show="vm.settings.isSyncEnabled">
+  <div ng-show="vm.settings.automaticBackups.isSyncEnabled">
     <md-input-container class="md-block">
       <label>Path to sync file</label>
       <input type="text"
-             ng-model="vm.settings.syncPath">
+             ng-model="vm.settings.automaticBackups.syncPath">
     </md-input-container>
   </div>
 </section>

app-src/scripts/settings/backup-settings/backup-settings-d.js

@@ -27,7 +27,7 @@
   }
 
   /* @ngInject */
-  function BackupSettingsCtrl(AppStorage, IS_ELECTRON, GoogleApi) {
+  function BackupSettingsCtrl(AppStorage, IS_ELECTRON, GoogleApi, GoogleDriveSync) {
     let vm = this;
     vm.IS_ELECTRON = IS_ELECTRON;
 
@@ -37,15 +37,8 @@
       AppStorage.importData(settings);
     };
 
-    vm.test = () => {
-      GoogleApi.saveFile({
-        title: 'SUPER_PRODUCTIVITY_SYNC.json',
-        id: null,
-        editable: true
-      }, {
-        test: 'DDDDDDDDDDDDDDDDDDDDDDDDD'
-      })
-        .then((res) => console.log(res));
+    vm.backupNow = () => {
+      GoogleDriveSync.saveTo();
     };
 
     vm.login = () => {