Removed direct db call from controllers

JLiscom · JLiscom · commit 0324402d818b · 2018-02-17T00:31:54.000-07:00
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-OpenNote [![Build Status](https://travis-ci.org/FoxUSA/OpenNote.png?branch=master)](https://travis-ci.org/FoxUSA/OpenNote)
-=============
+# OpenNote [![Build Status](https://travis-ci.org/FoxUSA/OpenNote.png?branch=master)](https://travis-ci.org/FoxUSA/OpenNote)
+
 ![][responsive]
-OpenNote was built to be a open source(MIT License), web based note taking software.
-It is designed to be self hosted and gives you ownership of your data.
+OpenNote is a progressive web application(PWA)/HTML5 offline app that was built to be a open source(MIT License), web based text editor/note taking software.
+It is designed to be self hosted and gives you ownership of your data
 
 Please support this project by:
 - [Using GitTip][GitTip],
@@ -25,9 +25,7 @@ https://foxusa.github.io/OpenNote/OpenNote/
 Features
 --------
 - BYOS(Bring Your Own Server)
-- Full WYSIWYG editor
 - Touch friendly and mouse friendly ui
-- Upload manager (not enabled in demo :) )
 - Light weight
 - Multi user support
 - Search
@@ -36,36 +34,25 @@ Features
 - Move Folders(Drag into another folder in the list view.)
 - Rename/Delete Folders(Click on folder title to get menu.)
 - Responsive
-
+- Tags
+- [CLI](https://github.com/FoxUSA/OpenNote-CLI)
 Upcoming Features
 -----------------
-- Tags (You win)
 - Email to note
-- Implement history viewer
-- Install script
-- Move Notes (Feature lost when migrating to Angular based list)
 - Mobile App
 
 Documentation
 -----------------
-[How to install][Install]
-
-[How to upgrade][Upgrade]
-
-[How to build](https://github.com/FoxUSA/OpenNote/blob/master/docs/Build.md)
-
-[Themes][Themes]
-
-[PHP backend][php]
-
+- [How to install][Install]
+- [How to upgrade][Upgrade]
+- [How to build](https://github.com/FoxUSA/OpenNote/blob/master/docs/Build.md)
+-[Themes][Themes]
 
-![][dark]
 License
 -------
 	JQuery - Distributed under the MIT License
 	Angular - Distributed under the MIT License
 	Bootstrap - Distributed under the MIT License
-	CKEditor - Distributed under the MPL License
 	Angular UI Tree - Distributed under the MIT License
 	Alertify.js - Distributed under the MIT License
 	PouchDB - Distributed under the Apache License
@@ -74,21 +61,19 @@ License
 
 	OpenNote Code - Distributed under the MIT License
 
-	© Jacob Liscom 2017
+	© Jacob Liscom 2018
 
 Credits
 -------
 	J. Liscom - Creator
 
 	Kam Bnkamalesh - His TODO project heavily influenced my UI design
 
-[topLevel]: https://raw.github.com/FoxUSA/OpenNote/master/docs/screenShots/topLevel.png
-[dark]: https://raw.github.com/FoxUSA/OpenNote/master/docs/screenShots/dark1.png
-[responsive]: https://raw.githubusercontent.com/FoxUSA/OpenNote/master/docs/screenShots/OpenNote.png
+[topLevel]: ./docs/screenShots/topLevel.png
+[responsive]: ./docs/screenShots/OpenNote.png
 
 [Install]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Install.md
 [Upgrade]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Upgrade.md
-[PHP]: https://github.com/FoxUSA/OpenNoteService-PHP
 [Dependencies]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Dependencies.md
 [Themes]: https://github.com/FoxUSA/OpenNote/blob/master/docs/Themes.md
 [GitTip]: https://www.gittip.com/FoxUSA/
diff --git a/docs/Upgrade.md b/docs/Upgrade.md
@@ -1,5 +1,9 @@
 # How to upgrade
 
+//TODO
+
+If you have an issue with the html use https://domchristie.github.io/turndown/ to convert
+
 ##Upgrading from 14.xx(Locomotive) to 15.07.01
 All you need to do is merge your existing deployment with the release folder while keeping your config files (`openNote\openNote.config.js` and `\Service\Config.php`).
 Make sure to backup your old folder and database.
diff --git a/openNote/controllers/folderController.js b/openNote/controllers/folderController.js
@@ -100,7 +100,7 @@ openNote.controller("folderController", ["$scope",
                 };
                 loadCurrentFolderContents();
             } else {
-                storageService.database().get($routeParams.id).then(function(doc) {
+                storageService.get($routeParams.id).then(function(doc) {
                     $scope.currentFolder = doc;
                     loadCurrentFolderContents();
 
@@ -109,7 +109,7 @@ openNote.controller("folderController", ["$scope",
                             name: "Home"
                         };
                     else
-                        storageService.database().get($scope.currentFolder.parentFolderID).then(function(doc) {
+                        storageService.get($scope.currentFolder.parentFolderID).then(function(doc) {
                             $scope.parentFolder = doc;
                             $scope.$apply();
                         });
@@ -175,7 +175,7 @@ openNote.controller("folderController", ["$scope",
                         return;
 
                     $scope.currentFolder.name = data;
-                    storageService.database().put($scope.currentFolder).then(function(result) {
+                    storageService.put($scope.currentFolder).then(function(result) {
                         $scope.currentFolder._rev = result.rev;
                         $rootScope.$emit("reloadListView", {});
                         $scope.$apply();
@@ -227,7 +227,7 @@ openNote.controller("folderController", ["$scope",
          */
         var createFolder = function(folder) {
             folder.type = "folder";
-            storageService.database().post(folder).then(function(response) {
+            storageService.post(folder).then(function(response) {
                 if (!response.ok)
                     throw "//FIXME";
                 $rootScope.$emit("reloadListView", {});
@@ -243,7 +243,7 @@ openNote.controller("folderController", ["$scope",
          * Load the current folders contents
          */
         var loadCurrentFolderContents = function() {
-            storageService.loadFolderContents($scope.currentFolder._id, function(results) {
+            storageService.loadFolderContents($scope.currentFolder._id).then(function(results) {
                 $scope.currentFolderContents = results.rows;
 
                 $scope.$apply();
diff --git a/openNote/controllers/noteController.js b/openNote/controllers/noteController.js
@@ -149,11 +149,11 @@ openNote.controller("noteController", ["$scope",
 
                 //Upsert
                 if (!$scope.note._id)
-                    storageService.database().post($scope.note).then(saveCallback, function() {
+                    storageService.post($scope.note).then(saveCallback, function() {
                         alertify.error("Error saving note");
                     });
                 else
-                    storageService.database().put($scope.note).then(saveCallback, function() {
+                    storageService.put($scope.note).then(saveCallback, function() {
                         alertify.error("Error modifing note");
                     });
             });
@@ -170,7 +170,7 @@ openNote.controller("noteController", ["$scope",
 
                     var folderID = $scope.note.parentFolderID; //need to keep track of this because we are about to delete it
                     $(".notePartial").fadeOut(config.fadeSpeedShort());
-                    storageService.database().remove($scope.note).then(function() {
+                    storageService.delete($scope.note).then(function() {
                         $rootScope.$emit("noteDeleted", $scope.note);
                         detachWindowUnload();
                         alertify.success("Note Deleted"); //all done. close the notify dialog
@@ -234,7 +234,7 @@ openNote.controller("noteController", ["$scope",
             /**
              * Load note
              */
-            storageService.database().get($routeParams.id).then(function(doc) {
+            storageService.get($routeParams.id).then(function(doc) {
                 $scope.note = doc;
                 $scope.noteHTML = marked($scope.note.note);
                 $(".notePartial").fadeIn(config.fadeSpeedLong());
diff --git a/openNote/controllers/tagController.js b/openNote/controllers/tagController.js
@@ -32,9 +32,8 @@ openNote.controller("tagController", ["$scope",
         var loadTags = function() {
             tagService.getMap().then(function(map) {
                 var tags = map.tags[$scope.tag];
-                var db = storageService.database();
                 tags.forEach(function(tag) {
-                    db.get(tag).then(function(note) {
+                    storageService.get(tag).then(function(note) {
                         $scope.notes.push(note);
                         $scope.$apply();
                     });
diff --git a/openNote/controllers/tagListController.js b/openNote/controllers/tagListController.js
@@ -53,7 +53,7 @@ openNote.controller("tagListController", [
                     var origParentFolderID = request.moveObject.parentFolderID;
 
                     request.moveObject.parentFolderID = request.destFolder._id;
-                    storageService.database().put(request.moveObject).then(function() {
+                    storageService.put(request.moveObject).then(function() {
                         $rootScope.$emit("changedFolder", { //fire off an event to tell everyone we just modified a folder
                             folder: request.moveObject,
                             oldParentFolderID: origParentFolderID
