Huge refactoring.

- use ES6 syntax for imports and exports
- create submodules and split code with components in mind

Author: marc92w

app/app.config.js

@@ -28,4 +28,5 @@ export default function routing($httpProvider, $routeProvider) {
     .otherwise({
       redirectTo: '/'
     });
-}
+
+} // end of export

app/app.js

@@ -1,124 +1,15 @@
-require('./utilities/q-all-settled');
-
-var app = angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap', 'ngCookies', 'qAllSettled']);
-
-var nodeLinkGraph = require('./components/graph/nodelink-graph.drv.js');
-var Slider = require('./directives/slider.drv');
-
-// Controllers
-var GraphCtrl = require('./components/graph/graph.ctrl.js');
-var HeaderCtrl = require('./components/header/header.ctrl.js');
-var StartCtrl = require('./components/start/start.ctrl');
-var SettingsCtrl = require('./components/settings/settings.ctrl.js');
-
-// Services
-var RequestConfig = require('./services/requests/request-config.srv');
-var QueryFactory = require('./services/requests/query-factory.srv');
-var RequestCounter = require('./services/requests/request-counter.srv');
-
-var ClassExtractor = require('./services/extractors/class-extractor.srv');
-var RelationExtractor = require('./services/extractors/relation-extractor.srv');
-var TypeExtractor = require('./services/extractors/type-extractor.srv');
-var DetailExtractor = require('./services/extractors/detail-extractor.srv');
-
-var Prefixes = require('./services/model/prefixes.srv');
-var Nodes = require('./services/model/nodes.srv');
-var Requests = require('./services/model/requests.srv');
-var Types = require('./services/model/types.srv'); // TODO unused?
-var Properties = require('./services/model/properties.srv');
-var Utils = require('./services/utils.srv');
-var Filters = require('./services/model/extraction-filters.srv');
-
-var Geometry = require('./services/math/geometry.srv');
-
-// accordion group directives
-var EndpointGroup = require('./directives/accordion-groups/endpoint-group.drv');
-var NamespaceGroup = require('./directives/accordion-groups/namespace-group.drv');
-var GraphSettingsGroup = require('./directives/accordion-groups/graph-settings-group.drv');
-var FilterGroup = require('./directives/accordion-groups/filter-group.drv');
-var SelectionGroup = require('./directives/accordion-groups/selection-group.drv');
-
-// selection directives
-var NoSelection = require('./directives/accordion-groups/selection/no-selection.drv');
-var ClassSelection = require('./directives/accordion-groups/selection/class-selection.drv');
-var TypeSelection = require('./directives/accordion-groups/selection/type-selection.drv');
-var PropertySelection = require('./directives/accordion-groups/selection/prop-selection.drv');
-var DatatypePropertySelection = require('./directives/accordion-groups/selection/datatype-prop-selection.drv');
-var SubclassPropertySelection = require('./directives/accordion-groups/selection/subclass-prop-selection.drv');
-
-// filters
-var HttpLessFilter = require('./filters/http-less');
-var UriLabelFilter = require('./filters/uri-label');
-
-// register constants
-
-app.constant('PREFIX', require('./constants/blacklist_prefixes'));
-app.constant('PROPERTY_BLACKLIST', require('./constants/blacklist_properties'));
-app.constant('CLASS_BLACKLIST', require('./constants/blacklist_classes'));
+// import dependencies
+import components from './components/components.module';
+import filters from './filters/index';
+import services from './services/services.module';
+import utilities from './utilities/utilities.module';
 
+// Configuration
 import routing from './app.config';
 import runBlock from './app.run';
 
-runBlock.$inject = ['$rootScope'];
-
-app.config(routing);
-app.run(runBlock);
-
-// FILTER
-
-app.filter('uriLabel', UriLabelFilter);
-app.filter('httpLess', HttpLessFilter);
-
-// register directives
-
-app.directive('nodeLinkGraph', ['$window', '$log', 'Properties', 'Nodes', 'Prefixes', 'Filters', 'Geometry', 'Utils',
-              nodeLinkGraph]);
-app.directive('slider', Slider);
-
-app.directive('endpointGroup', EndpointGroup);
-app.directive('namespaceGroup', NamespaceGroup);
-app.directive('graphSettingsGroup', GraphSettingsGroup);
-app.directive('filterGroup', FilterGroup);
-app.directive('selectionGroup', SelectionGroup);
-
-app.directive('noSelection', NoSelection);
-app.directive('classSelection', ClassSelection);
-app.directive('typeSelection', TypeSelection);
-app.directive('propSelection', PropertySelection);
-app.directive('datatypePropSelection', DatatypePropertySelection);
-app.directive('subclassPropSelection', SubclassPropertySelection);
-
-// register services
-
-app.service('RequestConfig', ['$cookies', RequestConfig]);
-app.factory('QueryFactory', QueryFactory);
-app.factory('RequestCounter', ['$q', 'Requests', RequestCounter]);
-
-app.service('Prefixes', ['$rootScope', '$log', Prefixes]);
-app.service('Nodes', ['$log', 'Properties', 'Prefixes', Nodes]);
-app.service('Properties', ['$interval', '$log', Properties]);
-app.service('Types', Types);
-app.service('Requests', ['$rootScope', Requests]);
-app.service('Utils', Utils);
-app.service('Filters', ['$cookies', '$log', Filters]);
-
-app.service('ClassExtractor', ['$http', '$q', '$log', 'PREFIX', 'CLASS_BLACKLIST', 'RequestConfig',
-  'QueryFactory', 'Nodes', ClassExtractor]);
-app.service('RelationExtractor', ['$http', '$q', '$log', 'PREFIX', 'PROPERTY_BLACKLIST', 'QueryFactory',
-  'RequestConfig', 'Nodes', 'Properties', RelationExtractor]);
-app.service('TypeExtractor', ['$http', '$log', 'RequestConfig', 'QueryFactory', 'Nodes', 'Properties',
-  'RelationExtractor', TypeExtractor]);
-app.service('DetailExtractor', ['$http', '$log', 'QueryFactory', 'RequestConfig', 'Nodes', DetailExtractor]);
-
-app.service('Geometry', ['Utils', Geometry]);
-
-// register controllers
-
-app.controller('GraphCtrl', ['$scope', '$q', '$log', 'Filters',  'ClassExtractor', 'RelationExtractor',
-  'TypeExtractor', 'DetailExtractor', 'RequestConfig', 'Requests', 'Prefixes', GraphCtrl]);
-app.controller('HeaderCtrl', ['$scope', '$location', HeaderCtrl]);
-app.controller('StartCtrl', ['$log','$location', 'Nodes', 'Properties', 'Requests', 'RequestConfig', StartCtrl]);
-app.controller('SettingsCtrl', ['PREFIX', 'PROPERTY_BLACKLIST', 'CLASS_BLACKLIST',
-  'RequestConfig', 'Nodes', 'Properties', 'Requests', 'ClassExtractor', 'RelationExtractor', SettingsCtrl]);
-
-module.exports = app;
+// create main app module
+module.exports = angular.module('ldVOWLApp', ['ngRoute', 'ngAnimate', 'ui.bootstrap', 'ngCookies', components, filters,
+  services, utilities])
+  .config(routing)
+  .run(runBlock);

app/app.run.js

@@ -1,5 +1,11 @@
-module.exports = function ($rootScope) {
+runBlock.$inject = ['$rootScope'];
+
+function runBlock($rootScope) {
+
   $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
     $rootScope.title = current.$$route.title;
   });
-};
+
+}
+
+export default runBlock;

app/components/components.module.js

@@ -0,0 +1,10 @@
+import angular from 'angular';
+
+import graph from './graph/graph.module';
+import header from './header/header.module';
+import settings from './settings/settings.module';
+import sidebar from './sidebar/sidebar.module';
+import start from './start/start.module';
+
+export default angular.module('components', [graph, header, settings, sidebar, start])
+                      .name;

app/components/graph/graph.ctrl.js

@@ -1,6 +1,9 @@
 'use strict';
 
-module.exports = function ($scope, $q, $log, Filters, ClassExtractor, RelationExtractor, TypeExtractor, DetailExtractor,
+graphCtrl.$inject = ['$scope', '$q', '$log', 'Filters',  'ClassExtractor', 'RelationExtractor', 'TypeExtractor',
+  'DetailExtractor', 'RequestConfig', 'Requests', 'Prefixes'];
+
+function graphCtrl($scope, $q, $log, Filters, ClassExtractor, RelationExtractor, TypeExtractor, DetailExtractor,
                            RequestConfig, Requests, Prefixes) {
 
   var vm = this;
@@ -187,4 +190,6 @@ module.exports = function ($scope, $q, $log, Filters, ClassExtractor, RelationEx
 
   vm.startLoading();
 
-};
+}
+
+export default graphCtrl;

app/components/graph/graph.module.js

@@ -0,0 +1,9 @@
+import angular from 'angular';
+
+import GraphCtrl from './graph.ctrl';
+import nodeLinkGraph from './nodelink-graph.drv';
+
+export default angular.module('components.graph', [])
+  .controller('GraphCtrl', GraphCtrl)
+  .directive('nodeLinkGraph', nodeLinkGraph)
+  .name;

app/components/graph/nodelink-graph.drv.js

@@ -1,9 +1,13 @@
 'use strict';
 
-var d3 = require('d3');
+import angular from 'angular';
+import d3 from 'd3';
+
+
+NodeLinkGraph.$inject = ['$window', '$log', 'Properties', 'Nodes', 'Prefixes', 'Filters', 'Geometry', 'Utils'];
 
 /**
- * @Name nodeLinkGraph
+ * @Name NodeLinkGraph
  *
  * @param $window
  * @param $log
@@ -16,7 +20,7 @@ var d3 = require('d3');
  *
  * @returns {{restrict: string, scope: {data: string, onClick: string}, link: link}}
  */
-module.exports = function ($window, $log, Properties, Nodes, Prefixes, Filters, Geometry, Utils) {
+function NodeLinkGraph($window, $log, Properties, Nodes, Prefixes, Filters, Geometry, Utils) {
   return {
     restrict: 'EA',
     scope: {
@@ -774,4 +778,6 @@ module.exports = function ($window, $log, Properties, Nodes, Prefixes, Filters,
       }; // end of scope.render()
     } // end of link()
   }; // end of directive
-}; // end of module.exports
+}
+
+export default NodeLinkGraph;

app/components/header/header.ctrl.js

@@ -5,7 +5,7 @@
  * @param $scope
  * @param $location
  */
-module.exports =  function ($scope, $location) {
+function HeaderCtrl($scope, $location) {
 
   /**
    * Returns true if the given view location is the current one, false otherwise.
@@ -17,4 +17,8 @@ module.exports =  function ($scope, $location) {
     return viewLocation === $location.path();
   };
 
-};
+}
+
+HeaderCtrl.$inject = ['$scope', '$location'];
+
+export default HeaderCtrl;

app/components/header/header.module.js

@@ -0,0 +1,7 @@
+import angular from 'angular';
+
+import HeaderCtrl from './header.ctrl';
+
+export default angular.module('components.header', [])
+              .controller('HeaderCtrl', HeaderCtrl)
+              .name;

app/components/settings/blacklist/blacklist.module.js

@@ -0,0 +1,11 @@
+import angular from 'angular';
+
+import BlacklistPrefixes from './blacklist_prefixes';
+import BlacklistProperties from './blacklist_properties';
+import BlacklistClasses from './blacklist_classes';
+
+export default angular.module('constants', [])
+  .constant('PREFIX', BlacklistPrefixes)
+  .constant('PROPERTY_BLACKLIST', BlacklistProperties)
+  .constant('CLASS_BLACKLIST', BlacklistClasses)
+  .name;

app/constants/blacklist_classes.js renamed to app/components/settings/blacklist/blacklist_classes.js

@@ -1,6 +1,10 @@
 'use strict';
 
-module.exports = function (PREFIX, PROPERTY_BLACKLIST, CLASS_BLACKLIST, RequestConfig, Nodes, Properties, Requests,
+settingsCtrl.$inject = ['PREFIX', 'PROPERTY_BLACKLIST', 'CLASS_BLACKLIST', 'RequestConfig', 'Nodes', 'Properties',
+  'Requests', 'ClassExtractor', 'RelationExtractor'];
+
+
+function settingsCtrl(PREFIX, PROPERTY_BLACKLIST, CLASS_BLACKLIST, RequestConfig, Nodes, Properties, Requests,
                            ClassExtractor, RelationExtractor) {
 
   var vm = this;
@@ -82,4 +86,6 @@ module.exports = function (PREFIX, PROPERTY_BLACKLIST, CLASS_BLACKLIST, RequestC
 
   vm.initialize();
 
-};
+}
+
+export default settingsCtrl;

app/constants/blacklist_prefixes.js renamed to app/components/settings/blacklist/blacklist_prefixes.js

@@ -0,0 +1,8 @@
+import angular from 'angular';
+
+import SettingsCtrl from './settings.ctrl';
+import blacklist from './blacklist/blacklist.module.js';
+
+export default angular.module('components.settings', [blacklist])
+  .controller('SettingsCtrl', SettingsCtrl)
+  .name;

app/constants/blacklist_properties.js renamed to app/components/settings/blacklist/blacklist_properties.js

@@ -0,0 +1,10 @@
+import endpointGroupTemplate from './endpoint-group.html';
+
+export default function endpointGroup() {
+
+  return {
+    restrict: 'E',
+    template: endpointGroupTemplate
+  };
+
+}

app/components/settings/settings.ctrl.js

@@ -0,0 +1,10 @@
+import filterGroupTemplate from './filter-group.html';
+
+export default function filterGroup() {
+
+  return {
+    restrict: 'E',
+    template: filterGroupTemplate
+  };
+
+}

app/components/settings/settings.module.js

@@ -0,0 +1,10 @@
+import graphSettingsGroupTemplate from './graph-settings-group.html';
+
+export default function graphSettingsGroup() {
+
+  return {
+    restrict: 'E',
+    template: graphSettingsGroupTemplate
+  };
+
+}

app/components/sidebar/endpoint-group.drv.js

@@ -0,0 +1,10 @@
+import namespaceGroupTemplate from './namespace-group.html';
+
+export default function namespaceGroup() {
+
+  return {
+    restrict: 'E',
+    template: namespaceGroupTemplate
+  };
+
+}

app/components/sidebar/filter-group.drv.js

@@ -0,0 +1,10 @@
+import selectionGroupTemplate from './selection-group.html';
+
+export default function selectionGroup() {
+
+  return {
+    restrict: 'E',
+    template: selectionGroupTemplate
+  };
+
+}

app/components/sidebar/graph-settings-group.drv.js

@@ -0,0 +1,10 @@
+import classSelectionTemplate from './class-selection.html';
+
+export default function classSelection() {
+
+  return {
+    restrict: 'E',
+    template: classSelectionTemplate
+  };
+
+}

app/components/sidebar/namespace-group.drv.js

@@ -0,0 +1,10 @@
+import datatypePropSelectionTemplate from './datatype-prop-selection.html';
+
+export default function datatypePropertySelection() {
+
+  return {
+    restrict: 'E',
+    template: datatypePropSelectionTemplate
+  };
+
+}

app/components/sidebar/selection-group.drv.js

@@ -0,0 +1,10 @@
+import noSelectionTemplate from './no-selection.html';
+
+export default function noSelection() {
+
+  return {
+    restrict: 'E',
+    template: noSelectionTemplate
+  };
+
+}

app/components/sidebar/selection/class-selection.drv.js

@@ -0,0 +1,10 @@
+import propSelectionTemplate from './prop-selection.html';
+
+export default function propertySelection() {
+
+  return {
+    restrict: 'E',
+    template: propSelectionTemplate
+  };
+
+}