Models and services organization

rooong · Oct 3, 2015 · ad8d1ef · ad8d1ef
1 parent ec2d82f
commit ad8d1ef
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 34 deletions.
diff --git a/src/app/app.js b/src/app/app.js
@@ -15,14 +15,14 @@ angular.module('app', [
   }
 ])
 
-.run(['$window', '$animate', '$location', '$document', '$timeout', 'settingsService', 'projectService',
+.run(['$window', '$animate', '$location', '$document', '$timeout', 'settingsModel', 'projectModel',
   function Execute($window,
                    $animate,
                    $location,
                    $document,
                    $timeout,
-                   settingsService, 
-                   projectService) {
+                   settingsModel, 
+                   projectModel) {
 
     // reset path
     $location.path('/');
@@ -33,8 +33,8 @@ angular.module('app', [
       .attr('b3-drop-node', true);
 
     // initialize editor
-    settingsService.getSettings();
-    projectService
+    settingsModel.getSettings();
+    projectModel
       .getRecentProjects()
       .then(function(projects) {
 
@@ -49,7 +49,7 @@ angular.module('app', [
         }
 
         if (projects.length > 0 && projects[0].isOpen) {
-          projectService
+          projectModel
             .openProject(projects[0].path)
             .then(function() {
               closePreload();

diff --git a/src/app/services/project.service.js → src/app/models/project.model.js b/src/app/services/project.service.js → src/app/models/project.model.js
@@ -3,9 +3,9 @@
 
   angular
     .module('app')
-    .factory('projectService', projectService);
+    .factory('projectModel', projectModel);
 
-  projectService.$inject = [
+  projectModel.$inject = [
     '$q',
     '$rootScope',
     '$window',
@@ -15,7 +15,7 @@
     'editorService'
   ];
 
-  function projectService($q,
+  function projectModel($q,
                           $rootScope,
                           $window,
                           storageService,

diff --git a/src/app/services/settings.service.js → src/app/models/settings.model.js b/src/app/services/settings.service.js → src/app/models/settings.model.js
@@ -3,16 +3,16 @@
 
   angular
     .module('app')
-    .factory('settingsService', settingsService);
+    .factory('settingsModel', settingsModel);
 
-  settingsService.$inject = [
+  settingsModel.$inject = [
     '$q',
     'storageService',
     'systemService',
     'editorService'
   ];
 
-  function settingsService($q,
+  function settingsModel($q,
                            storageService, 
                            systemService,
                            editorService) {

diff --git a/src/app/pages/dash/dash.controller.js b/src/app/pages/dash/dash.controller.js
@@ -7,16 +7,16 @@
 
   DashController.$inject = [
     '$scope',
-    'projectService'
+    'projectModel'
   ];
 
-  function DashController($scope, projectService) {
+  function DashController($scope, projectModel) {
     var vm = this;
     vm.project = null;
     _activate();
 
     function _activate() {
-      vm.project = projectService.getProject();
+      vm.project = projectModel.getProject();
     }
     $scope.$on('dash-projectchanged', function() {
       _activate();

diff --git a/src/app/pages/editor/components/menubar.controller.js b/src/app/pages/editor/components/menubar.controller.js
@@ -10,15 +10,15 @@
     '$window',
     '$state',
     'dialogService',
-    'projectService',
+    'projectModel',
     'notificationService'
   ];
 
   function MenubarController($scope, 
                              $window,
                              $state,
                              dialogService,
-                             projectService,
+                             projectModel,
                              notificationService) {
     var vm = this;
     vm.onNewTree           = onNewTree;
@@ -136,7 +136,7 @@
 
     function onCloseProject() {
       function doClose() {
-        projectService.closeProject();
+        projectModel.closeProject();
         $state.go('dash.projects');
       }
 
@@ -154,7 +154,7 @@
       return false;
     }
     function onSaveProject() {
-      projectService
+      projectModel
         .saveProject()
         .then(function() {
           notificationService.success(

diff --git a/src/app/pages/projects/projects.controller.js b/src/app/pages/projects/projects.controller.js
@@ -11,15 +11,15 @@
     'dialogService',
     'systemService', 
     'notificationService',
-    'projectService'
+    'projectModel'
   ];
 
   function ProjectsController($state,
                               $window,
                               dialogService, 
                               systemService,
                               notificationService,
-                              projectService) {
+                              projectModel) {
 
     // HEAD //
     var vm = this;
@@ -38,15 +38,15 @@
     // BODY //
     function _activate() {
       vm.isDesktop = systemService.isDesktop;
-      projectService
+      projectModel
         .getRecentProjects()
         .then(function(recents) {
           vm.recentProjects = recents;
         });
     }
 
     function _newProject(path, name) {
-      projectService
+      projectModel
         .newProject(path, name)
         .then(function() {
           $state.go('editor');
@@ -97,7 +97,7 @@
     }
 
     function _openProject(path) {
-      projectService
+      projectModel
         .openProject(path)
         .then(function() {
           $state.go('editor');
@@ -133,7 +133,7 @@
     }
 
     function editProject() {
-      var project = projectService.getProject();
+      var project = projectModel.getProject();
 
       dialogService
         .prompt('Rename project', null, 'input', project.name)
@@ -148,7 +148,7 @@
           }
 
           project.name = name;
-          projectService
+          projectModel
             .saveProject(project)
             .then(function() {
               _activate();
@@ -161,7 +161,7 @@
     }
 
     function saveProject() {
-      projectService
+      projectModel
         .saveProject()
         .then(function() {
           notificationService.success(
@@ -178,7 +178,7 @@
 
     function closeProject() {
       function doClose() {
-        projectService.closeProject();
+        projectModel.closeProject();
       }
 
       if ($window.editor.isDirty()) {
@@ -199,7 +199,7 @@
           'Remove project?', 
           'Are you sure you want to remove this project?'
         ).then(function() {
-          projectService
+          projectModel
             .removeProject(path)
             .then(function() {
               _activate();

diff --git a/src/app/pages/settings/settings.controller.js b/src/app/pages/settings/settings.controller.js
@@ -7,12 +7,12 @@
 
   SettingsController.$inject = [
     'notificationService',
-    'settingsService',
+    'settingsModel',
     'dialogService',
   ];
 
   function SettingsController(notificationService,
-                              settingsService,
+                              settingsModel,
                               dialogService) {
 
     // HEADER //
@@ -25,15 +25,15 @@
 
     // BODY //
     function _activate() {
-      settingsService
+      settingsModel
         .getSettings()
         .then(function(settings) {
           vm.settings = settings;
         });
     }
 
     function saveSettings() {
-      settingsService
+      settingsModel
         .saveSettings(vm.settings)
         .then(function() {
           notificationService.success(
@@ -48,7 +48,7 @@
         'Reset Settings?',
         'Are you sure you want to reset to the default settings?'
       ).then(function() {
-        settingsService
+        settingsModel
           .resetSettings()
           .then(function() {
             notificationService.success(

diff --git a/src/app/services/filestorage.service.js → ...p/services/storage/filestorage.service.js b/src/app/services/filestorage.service.js → ...p/services/storage/filestorage.service.js
diff --git a/src/app/services/localstorage.service.js → .../services/storage/localstorage.service.js b/src/app/services/localstorage.service.js → .../services/storage/localstorage.service.js
diff --git a/src/app/services/storage.service.js → src/app/services/storage/storage.service.js b/src/app/services/storage.service.js → src/app/services/storage/storage.service.js