refresh button

app/assets/javascripts/app/frontend/controllers/header.js

@@ -69,6 +69,16 @@ angular.module('app.frontend')
       }
     }
 
+    this.getLastRefreshDate = function() {
+      return apiController.lastRefreshDate;
+    }
+
+    this.refreshData = function() {
+      apiController.refreshItems(function(items){
+
+      })
+    }
+
     this.loginSubmitPressed = function() {
       this.loginData.status = "Generating Login Keys...";
       $timeout(function(){

app/assets/javascripts/app/frontend/controllers/home.js

@@ -7,6 +7,11 @@ angular.module('app.frontend')
       $scope.allTag = new Tag({all: true});
       $scope.allTag.content.title = "All";
       $scope.tags = modelManager.tags;
+      $scope.allTag.notes = modelManager.notes;
+
+      // setInterval(function () {
+      //   apiController.refreshItems(null);
+      // }, 1000);
 
       // apiController.verifyEncryptionStatusOfAllItems($scope.defaultUser, function(success){});
     }
@@ -28,7 +33,7 @@ angular.module('app.frontend')
     */
 
     $scope.updateAllTag = function() {
-      $scope.allTag.notes = modelManager.filteredNotes;
+      // $scope.allTag.notes = modelManager.notes;
     }
 
     $scope.tagsWillMakeSelection = function(tag) {
@@ -94,10 +99,7 @@ angular.module('app.frontend')
       if(!$scope.selectedTag.all) {
         modelManager.addTagToNote($scope.selectedTag, note);
         $scope.updateAllTag();
-      } else {
-        $scope.selectedTag.notes.unshift(note);
       }
-
     }
 
     /*
@@ -108,7 +110,6 @@ angular.module('app.frontend')
       modelManager.addDirtyItems(note);
 
       apiController.saveDirtyItems(function(){
-        modelManager.addNote(note);
         note.hasChanges = false;
 
         if(callback) {

app/assets/javascripts/app/services/apiController.js

@@ -236,10 +236,11 @@ angular.module('app.frontend')
         })
       }
 
-      this.refreshItems = function(updatedAfter, callback) {
+      this.refreshItems = function(callback) {
         var request = Restangular.one("users", this.user.uuid).one("items");
-        request.get(updatedAfter ? {"updated_after" : updatedAfter.toString()} : {})
+        request.get(this.lastRefreshDate ? {"updated_after" : this.lastRefreshDate.toString()} : {})
         .then(function(response){
+          this.lastRefreshDate = new Date();
           var items = this.handleItemsResponse(response.items, null);
           callback(items);
         }.bind(this))

app/assets/javascripts/app/services/itemManager.js

@@ -21,6 +21,7 @@ class ItemManager {
   }
 
   mapResponseItemsToLocalModelsOmittingFields(items, omitFields) {
+    console.log("map response items", items);
     var models = []
     for (var json_obj of items) {
       json_obj = _.omit(json_obj, omitFields || [])
@@ -75,7 +76,9 @@ class ItemManager {
   }
 
   addItem(item) {
-    this.items.push(item);
+    if(!this.findItem(item.uuid)) {
+      this.items.push(item);
+    }
   }
 
   // returns dirty item references that need saving

app/assets/javascripts/app/services/modelManager.js

@@ -11,6 +11,7 @@ class ModelManager extends ItemManager {
     super.resolveReferences()
 
     this.notes.push.apply(this.notes, _.difference(this.itemsForContentType("Note"), this.notes));
+    Item.sortItemsByDate(this.notes);
     this.notes.forEach(function(note){
       note.updateReferencesLocalMapping();
     })
@@ -48,7 +49,6 @@ class ModelManager extends ItemManager {
   addTag(tag) {
     this.tags.unshift(tag);
     this.addItem(tag);
-    console.log("adding tag", tag, "tags", this.tags);
   }
 
   addTagToNote(tag, note) {
@@ -84,9 +84,6 @@ class ModelManager extends ItemManager {
     this.addDirtyItems(dirty);
   }
 
-  filteredNotes() {
-    return Note.filterDummyNotes(this.notes);
-  }
 }
 
 angular.module('app.frontend').service('modelManager', ModelManager);

app/assets/stylesheets/app/_header.scss

@@ -30,7 +30,6 @@
 }
 
 .menu {
-  // float: right;
   margin-left: 15px;
   padding-top: 5px;
   margin-top: 0px;
@@ -39,6 +38,15 @@
   margin-bottom: 0px;
   font-size: 11px;
 
+  &.left {
+    float: left;
+  }
+
+  &.right {
+    float: right;
+    margin-right: 10px;
+  }
+
  .login-panel .login-input {
    border-radius: 0px;
  }
@@ -96,6 +104,11 @@
   float: left;
 }
 
+.item.last-refreshed {
+  font-weight: normal !important;
+  cursor: default !important;
+}
+
 .item.account {
 
   .email {

app/assets/templates/frontend/header.html.haml

@@ -1,6 +1,6 @@
 .header
   .header-content
-    .menu
+    .menu.left
       .items
         .item.account
           %div{"ng-click" => "ctrl.accountMenuPressed()"}
@@ -90,3 +90,10 @@
         .item
           %a{"href" => "https://standardnotes.org", "target" => "_blank"}
             Help
+
+    .menu.right
+      .items
+        .item.last-refreshed{"ng-if" => "ctrl.getLastRefreshDate()"}
+          Last refreshed {{ctrl.getLastRefreshDate() | appDateTime}}
+        .item{"ng-click" => "ctrl.refreshData()"}
+          Refresh

vendor/assets/javascripts/transpiled.js

@@ -760,6 +760,14 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
     }
   };
 
+  this.getLastRefreshDate = function () {
+    return apiController.lastRefreshDate;
+  };
+
+  this.refreshData = function () {
+    apiController.refreshItems(function (items) {});
+  };
+
   this.loginSubmitPressed = function () {
     this.loginData.status = "Generating Login Keys...";
     $timeout(function () {
@@ -861,6 +869,11 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
     $scope.allTag = new Tag({ all: true });
     $scope.allTag.content.title = "All";
     $scope.tags = modelManager.tags;
+    $scope.allTag.notes = modelManager.notes;
+
+    // setInterval(function () {
+    //   apiController.refreshItems(null);
+    // }, 1000);
 
     // apiController.verifyEncryptionStatusOfAllItems($scope.defaultUser, function(success){});
   };
@@ -882,7 +895,7 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
   */
 
   $scope.updateAllTag = function () {
-    $scope.allTag.notes = modelManager.filteredNotes;
+    // $scope.allTag.notes = modelManager.notes;
   };
 
   $scope.tagsWillMakeSelection = function (tag) {
@@ -948,8 +961,6 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
     if (!$scope.selectedTag.all) {
       modelManager.addTagToNote($scope.selectedTag, note);
       $scope.updateAllTag();
-    } else {
-      $scope.selectedTag.notes.unshift(note);
     }
   };
 
@@ -961,7 +972,6 @@ angular.module('app.frontend').controller('BaseCtrl', BaseCtrl);
     modelManager.addDirtyItems(note);
 
     apiController.saveDirtyItems(function () {
-      modelManager.addNote(note);
       note.hasChanges = false;
 
       if (callback) {
@@ -1745,9 +1755,10 @@ var User = function User(json_obj) {
       });
     };
 
-    this.refreshItems = function (updatedAfter, callback) {
+    this.refreshItems = function (callback) {
       var request = Restangular.one("users", this.user.uuid).one("items");
-      request.get(updatedAfter ? { "updated_after": updatedAfter.toString() } : {}).then(function (response) {
+      request.get(this.lastRefreshDate ? { "updated_after": this.lastRefreshDate.toString() } : {}).then(function (response) {
+        this.lastRefreshDate = new Date();
         var items = this.handleItemsResponse(response.items, null);
         callback(items);
       }.bind(this)).catch(function (response) {
@@ -2457,6 +2468,7 @@ var ItemManager = function () {
   }, {
     key: 'mapResponseItemsToLocalModelsOmittingFields',
     value: function mapResponseItemsToLocalModelsOmittingFields(items, omitFields) {
+      console.log("map response items", items);
       var models = [];
       var _iteratorNormalCompletion3 = true;
       var _didIteratorError3 = false;
@@ -2537,7 +2549,9 @@ var ItemManager = function () {
   }, {
     key: 'addItem',
     value: function addItem(item) {
-      this.items.push(item);
+      if (!this.findItem(item.uuid)) {
+        this.items.push(item);
+      }
     }
 
     // returns dirty item references that need saving
@@ -2622,6 +2636,7 @@ var ModelManager = function (_ItemManager) {
       _get(ModelManager.prototype.__proto__ || Object.getPrototypeOf(ModelManager.prototype), 'resolveReferences', this).call(this);
 
       this.notes.push.apply(this.notes, _.difference(this.itemsForContentType("Note"), this.notes));
+      Item.sortItemsByDate(this.notes);
       this.notes.forEach(function (note) {
         note.updateReferencesLocalMapping();
       });
@@ -2659,7 +2674,6 @@ var ModelManager = function (_ItemManager) {
     value: function addTag(tag) {
       this.tags.unshift(tag);
       this.addItem(tag);
-      console.log("adding tag", tag, "tags", this.tags);
     }
   }, {
     key: 'addTagToNote',
@@ -2700,11 +2714,6 @@ var ModelManager = function (_ItemManager) {
       _.remove(this.tags, tag);
       this.addDirtyItems(dirty);
     }
-  }, {
-    key: 'filteredNotes',
-    value: function filteredNotes() {
-      return Note.filterDummyNotes(this.notes);
-    }
   }, {
     key: 'filteredNotes',
     get: function get() {