Person's name is required.
Minimum 3 characters.
Maximum of 100 characters.
+
diff --git a/app/templates/ui/app/components/profile/profile.js b/app/templates/ui/app/components/profile/profile.js
new file mode 100644
index 00000000..b0cdefc9
--- /dev/null
+++ b/app/templates/ui/app/components/profile/profile.js
@@ -0,0 +1,17 @@
+import angular from 'angular';
+import ngSanitize from 'angular-sanitize';
+
+import ProfileComponent from './profile.component';
+
+import User from '../user/user';
+
+//run globally since not in an es6 module
+import 'script!ml-common-ng/dist/ml-common-ng';
+import 'script!ng-toast';
+
+const module = angular.module('app.profile', ['ml.common', 'ngToast', ngSanitize, User])
+ .component('profile', ProfileComponent)
+ .name;
+
+export
+default module;
diff --git a/app/templates/ui/app/components/profile/profile.spec.js b/app/templates/ui/app/components/profile/profile.spec.js
new file mode 100644
index 00000000..892596e5
--- /dev/null
+++ b/app/templates/ui/app/components/profile/profile.spec.js
@@ -0,0 +1,138 @@
+/* jshint -W117, -W030 */
+import Module from './profile';
+
+import Controller from './profile.controller';
+import Component from './profile.component';
+import Template from './profile.html';
+
+describe('app.profile', () => {
+
+ let $rootScope, controller, $componentController, $compile;
+ let $q, MLRest;
+ let $state, userService;
+
+ let currentUser = {
+ emails: []
+ };
+
+ let currentState;
+
+ beforeEach(bard.appModule(Module));
+
+ beforeEach(inject(($injector) => {
+ $rootScope = $injector.get('$rootScope');
+ $componentController = $injector.get('$componentController');
+ $compile = $injector.get('$compile');
+
+ MLRest = $injector.get('MLRest');
+ $state = $injector.get('$state');
+ userService = $injector.get('userService');
+
+ $q = $injector.get('$q');
+
+ bard.mockService(MLRest, {
+ _default: $q.when([]),
+ updateDocument: $q.when()
+ });
+
+ bard.mockService(userService, {
+ currentUser: function() {
+ return currentUser;
+ }
+ });
+
+ bard.mockService($state, {
+ go: function(s) {
+ currentState = s;
+ }
+ });
+
+ }));
+
+ beforeEach(() => {
+ controller = $componentController('profile', {
+ $scope: $rootScope.$new()
+ });
+ $rootScope.$apply();
+ });
+
+ describe('Module', () => {
+ // top-level specs: i.e., routes, injection, naming
+ });
+
+ describe('Controller', () => {
+ // controller specs
+ it('should be created successfully', function() {
+ expect(controller).to.be.defined;
+ });
+
+ it('should not add a blank email', function() {
+ var newEmail = '';
+ controller.newEmail = newEmail;
+ expect(controller.user.emails.length).to.eq(0);
+ controller.addEmail();
+ $rootScope.$apply();
+ expect(controller.user.emails.length).to.eq(0);
+ });
+
+ it('should add a nonblank email', function() {
+ var newEmail = 'test@test.com';
+ controller.newEmail = newEmail;
+ expect(controller.user.emails.length).to.eq(0);
+ controller.addEmail();
+ $rootScope.$apply();
+ expect(controller.user.emails.length).to.eq(1);
+ expect(controller.user.emails[0]).to.eq(newEmail);
+ });
+
+ it('should remove an email', function() {
+ controller.user.emails = [
+ 'abc@def.com',
+ 'def@ghi.com'
+ ];
+
+ expect(controller.user.emails.length).to.eq(2);
+ controller.removeEmail(1);
+ $rootScope.$apply();
+ expect(controller.user.emails.length).to.eq(1);
+ expect(controller.user.emails[0]).to.eq('abc@def.com');
+ });
+
+ it('should not update the profile if form errors', function() {
+ var form = {
+ $valid: false
+ };
+ controller.submit(form);
+ $rootScope.$apply();
+ expect(currentState).to.not.be.defined;
+ });
+
+ it('should update the profile', function() {
+ var form = {
+ $valid: true
+ };
+ controller.submit(form);
+ $rootScope.$apply();
+ expect(currentState).to.eq('root');
+ });
+
+ });
+
+ describe('Template', () => {
+ // template specs
+ // tip: use regex to ensure correct bindings are used e.g., {{ }}
+ });
+
+ describe('Component', () => {
+ // component/directive specs
+ let component = Component;
+
+ it('includes the intended template', () => {
+ expect(component.template).to.equal(Template);
+ });
+
+ it('invokes the right controller', () => {
+ expect(component.controller).to.equal(Controller);
+ });
+ });
+});
diff --git a/app/templates/ui/app/search/search-results.html b/app/templates/ui/app/components/search/search-results.html
similarity index 100%
rename from app/templates/ui/app/search/search-results.html
rename to app/templates/ui/app/components/search/search-results.html
diff --git a/app/templates/ui/app/components/search/search.component.js b/app/templates/ui/app/components/search/search.component.js
new file mode 100644
index 00000000..38c8a7ef
--- /dev/null
+++ b/app/templates/ui/app/components/search/search.component.js
@@ -0,0 +1,11 @@
+import template from './search.html';
+import controller from './search.controller';
+
+const component = {
+ bindings: {},
+ controller: controller,
+ template: template
+};
+
+export
+default component;
diff --git a/app/templates/ui/app/components/search/search.controller.js b/app/templates/ui/app/components/search/search.controller.js
new file mode 100644
index 00000000..6be0624f
--- /dev/null
+++ b/app/templates/ui/app/components/search/search.controller.js
@@ -0,0 +1,33 @@
+/* globals MLSearchController: false */
+
+import searchResultsTemplate from './search-results.html';
+
+class SearchCtrl extends MLSearchController {
+ constructor($scope, $location, userService, searchFactory) {
+
+ super($scope, $location, searchFactory.newContext());
+
+ this.$scope = $scope;
+ this.$location = $location;
+ this.userService = userService;
+ this.searchFactory = searchFactory;
+ this.init();
+
+ //retrieve and insert searchResults template
+ this.searchResultsTemplate = searchResultsTemplate;
+
+ this.$scope.$watch(this.userService.currentUser, (newValue, oldValue) => {
+ this.currentUser = newValue;
+ });
+ }
+
+ setSnippet(type) {
+ this.mlSearch.setSnippet(type);
+ this.search();
+ }
+}
+
+SearchCtrl.$inject = ['$scope', '$location', 'userService', 'MLSearchFactory'];
+
+export
+default SearchCtrl;
diff --git a/app/templates/ui/app/components/search/search.html b/app/templates/ui/app/components/search/search.html
new file mode 100644
index 00000000..09518dc9
--- /dev/null
+++ b/app/templates/ui/app/components/search/search.html
@@ -0,0 +1,23 @@
+
Please log in to see content
+
+
+
+
+
+
No results to show
+
+
+
+
+
+
+
+
diff --git a/app/templates/ui/app/components/search/search.js b/app/templates/ui/app/components/search/search.js
new file mode 100644
index 00000000..7f773751
--- /dev/null
+++ b/app/templates/ui/app/components/search/search.js
@@ -0,0 +1,19 @@
+import angular from 'angular';
+
+//run dependencies that haven't been designed for npm/imports globally as if they were in a script tag and load if necessary
+import 'script!ml-common-ng/dist/ml-common-ng';
+import 'script!ml-search-ng/dist/ml-search-ng-tpls';
+import 'script!ml-search-ng/dist/ml-search-ng';
+
+import SearchComponent from './search.component';
+
+import User from '../user/user';
+import Snippet from './snippet';
+
+const Search = angular
+ .module('app.search', ['ml.search', User, Snippet])
+ .component('search', SearchComponent)
+ .name;
+
+export
+default Search;
diff --git a/app/templates/ui/app/components/search/search.spec.js b/app/templates/ui/app/components/search/search.spec.js
new file mode 100644
index 00000000..74e1aaee
--- /dev/null
+++ b/app/templates/ui/app/components/search/search.spec.js
@@ -0,0 +1,94 @@
+/* jshint -W117, -W030 */
+import Module from './search';
+
+import Controller from './search.controller';
+import Component from './search.component';
+import Template from './search.html';
+
+describe('app.search', () => {
+
+ let $rootScope, controller, $componentController, $compile;
+ let $q, $location, MLSearchFactory, userService, MLRest;
+
+ let results = [{
+ uri: 'abc'
+ }, {
+ uri: 'def'
+ }];
+
+ beforeEach(window.module(Module));
+
+ beforeEach(inject(($injector) => {
+ $rootScope = $injector.get('$rootScope');
+ $componentController = $injector.get('$componentController');
+ $compile = $injector.get('$compile');
+
+ MLRest = $injector.get('MLRest');
+ $location = $injector.get('$location');
+ MLSearchFactory = $injector.get('MLSearchFactory');
+ userService = $injector.get('userService');
+
+ $q = $injector.get('$q');
+
+ sinon.stub(MLRest, 'search').returns($q.resolve({
+ data: {
+ results: results
+ }
+ }));
+
+ sinon.stub(userService, 'currentUser').returns({
+ name: 'test'
+ });
+
+ }));
+
+ beforeEach(() => {
+ controller = $componentController('search', {
+ $scope: $rootScope.$new()
+ });
+ $rootScope.$apply();
+ });
+
+ describe('Module', () => {
+ // top-level specs: i.e., routes, injection, naming
+ });
+
+ describe('Controller', () => {
+ // controller specs
+ it('should be created successfully', function() {
+ expect(controller).to.be.defined;
+ });
+
+ it('should update the current user if it changes', function() {
+ expect(controller.currentUser).to.not.be.defined;
+ });
+
+ //test currently not working
+ it('should run a search', function() {
+
+ controller.search('stuff');
+ $rootScope.$apply();
+
+ expect(controller.response.results).to.eq(results);
+ });
+
+ });
+
+ describe('Template', () => {
+ // template specs
+ // tip: use regex to ensure correct bindings are used e.g., {{ }}
+ });
+
+ describe('Component', () => {
+ // component/directive specs
+ let component = Component;
+
+ it('includes the intended template', () => {
+ expect(component.template).to.equal(Template);
+ });
+
+ it('invokes the right controller', () => {
+ expect(component.controller).to.equal(Controller);
+ });
+ });
+});
diff --git a/app/templates/ui/app/components/search/snippet.component.js b/app/templates/ui/app/components/search/snippet.component.js
new file mode 100644
index 00000000..800246d3
--- /dev/null
+++ b/app/templates/ui/app/components/search/snippet.component.js
@@ -0,0 +1,30 @@
+SnippetController.$inject = ['$scope'];
+
+function SnippetController($scope) {
+ var ctrl = this;
+ ctrl.snippets = ['compact', 'detailed'];
+
+ angular.extend(ctrl, {
+ setSnippetType: setSnippetType
+ });
+
+ function setSnippetType(type) {
+ ctrl.snippetType = type;
+ ctrl.setSnippet({
+ type: type
+ });
+ }
+}
+
+import template from './snippet.html';
+
+const component = {
+ bindings: {
+ setSnippet: '&'
+ },
+ controller: SnippetController,
+ template: template
+};
+
+export
+default component;
diff --git a/app/templates/ui/app/search/snippet.html b/app/templates/ui/app/components/search/snippet.html
similarity index 53%
rename from app/templates/ui/app/search/snippet.html
rename to app/templates/ui/app/components/search/snippet.html
index d355693f..93600755 100644
--- a/app/templates/ui/app/search/snippet.html
+++ b/app/templates/ui/app/components/search/snippet.html
@@ -1,10 +1,10 @@
diff --git a/app/templates/ui/app/components/search/snippet.js b/app/templates/ui/app/components/search/snippet.js
new file mode 100644
index 00000000..d43d8c21
--- /dev/null
+++ b/app/templates/ui/app/components/search/snippet.js
@@ -0,0 +1,11 @@
+import angular from 'angular';
+
+import mlSnippet from './snippet.component';
+
+const Snippet =
+ angular.module('app.snippet', [])
+ .component('mlSnippet', mlSnippet)
+ .name;
+
+export
+default Snippet;
diff --git a/app/templates/ui/app/components/user/mlUser.component.js b/app/templates/ui/app/components/user/mlUser.component.js
new file mode 100644
index 00000000..833daf60
--- /dev/null
+++ b/app/templates/ui/app/components/user/mlUser.component.js
@@ -0,0 +1,28 @@
+import template from './user-component.html';
+
+UserController.$inject = ['$scope', 'userService', 'loginService'];
+
+function UserController($scope, userService, loginService) {
+ var ctrl = this;
+ angular.extend(ctrl, {
+ username: null,
+ password: null,
+ loginService: loginService
+ });
+ $scope.$watch(userService.currentUser, function(newValue) {
+ ctrl.currentUser = newValue;
+ });
+}
+
+const component = {
+ bindings: {
+ showCancel: '=',
+ mode: '@',
+ callback: '&'
+ },
+ controller: UserController,
+ template: template
+};
+
+export
+default component;
diff --git a/app/templates/ui/app/components/user/user-component.html b/app/templates/ui/app/components/user/user-component.html
new file mode 100644
index 00000000..6c42175a
--- /dev/null
+++ b/app/templates/ui/app/components/user/user-component.html
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
{{ $ctrl.currentUser.fullname || $ctrl.currentUser.name }} |
Account
+
+
+
+
+
+
diff --git a/app/templates/ui/app/components/user/user.js b/app/templates/ui/app/components/user/user.js
new file mode 100644
index 00000000..ad39ea94
--- /dev/null
+++ b/app/templates/ui/app/components/user/user.js
@@ -0,0 +1,19 @@
+import angular from 'angular';
+import ngSanitize from 'angular-sanitize';
+
+import UserService from './user.service';
+import MlUserComponent from './mlUser.component';
+
+import Login from '../login/login';
+
+//run globally since not in an es6 module
+import 'script!ml-common-ng/dist/ml-common-ng';
+import 'script!ng-toast';
+
+const user = angular.module('app.user', ['ml.common', 'ngToast', ngSanitize, Login])
+ .factory('userService', UserService)
+ .component('mlUser', MlUserComponent)
+ .name;
+
+export
+default user;
diff --git a/app/templates/ui/app/components/user/user.service.js b/app/templates/ui/app/components/user/user.service.js
new file mode 100644
index 00000000..286cbf23
--- /dev/null
+++ b/app/templates/ui/app/components/user/user.service.js
@@ -0,0 +1,63 @@
+import _ from 'lodash';
+
+UserService.$inject = ['$rootScope', 'loginService'];
+
+function UserService($rootScope, loginService) {
+ var _currentUser = null;
+
+ function currentUser() {
+ return _currentUser;
+ }
+
+ function getUser() {
+ if (_currentUser) {
+ return _currentUser;
+ }
+
+ return loginService.getAuthenticatedStatus().then(currentUser);
+ }
+
+ function updateUser(response) {
+ var data = response.data;
+
+ if (data.authenticated === false) {
+ return null;
+ }
+
+ _currentUser = {
+ name: data.username,
+ };
+
+ if (data.profile) {
+ _currentUser.hasProfile = true;
+ _currentUser.fullname = data.profile.fullname;
+
+ if (_.isArray(data.profile.emails)) {
+ _currentUser.emails = data.profile.emails;
+ } else if (data.profile.emails) {
+ // wrap single value in array, needed for repeater
+ _currentUser.emails = [data.profile.emails];
+ }
+ }
+
+ return _currentUser;
+ }
+
+ $rootScope.$on('loginService:login-success', function(e, user) {
+ updateUser({
+ data: user
+ });
+ });
+
+ $rootScope.$on('loginService:logout-success', function() {
+ _currentUser = null;
+ });
+
+ return {
+ currentUser: currentUser,
+ getUser: getUser
+ };
+}
+
+export
+default UserService;
diff --git a/app/templates/ui/app/components/user/user.spec.js b/app/templates/ui/app/components/user/user.spec.js
new file mode 100644
index 00000000..36151f0d
--- /dev/null
+++ b/app/templates/ui/app/components/user/user.spec.js
@@ -0,0 +1,126 @@
+/* jshint -W117, -W030 */
+import Module from './user';
+
+import Component from './mlUser.component';
+import Template from './user-component.html';
+
+describe('app.user', () => {
+
+ var service;
+ var _user = {
+ data: {
+ username: 'bob',
+ authenticated: true
+ }
+ };
+
+ beforeEach(bard.appModule(Module));
+
+ beforeEach(function() {
+ bard.inject('$q', '$http', '$rootScope', '$state', 'loginService');
+
+ bard.mockService($http, {
+ _default: $q.when([]),
+ get: $q.when(_user),
+ post: $q.when(_user)
+ });
+
+ bard.mockService($state, {
+ current: {
+ name: 'root.search',
+ params: {}
+ },
+ go: function(stateName, stateParams) {
+ this.current = {
+ name: stateName,
+ params: stateParams
+ };
+ return $q.when();
+ },
+ reload: function() {
+ return $q.when();
+ }
+ });
+
+ sinon.stub(loginService, 'getAuthenticatedStatus').returns($q.when());
+ });
+
+ beforeEach(inject(($injector) => {
+ service = $injector.get('userService');
+ }));
+
+ it('should be defined', function() {
+ expect(service).to.be.defined;
+ });
+
+ it('currentUser should not be defined', function() {
+ expect(service.currentUser()).to.not.be.defined;
+ });
+
+ it('should get the current logged in user - if loginService not init', function() {
+ service.getUser().then(function(user) {
+ expect(user).to.deep.eq(null);
+ });
+
+ expect(loginService.getAuthenticatedStatus).to.have.been.calledOnce;
+
+ $rootScope.$apply();
+ });
+
+ it('should update the current user when logged in using loginService', function(done) {
+ $rootScope.$broadcast('loginService:login-success', {
+ data: _user
+ });
+ $rootScope.$apply(service);
+
+ done();
+ expect(service.currentUser().name).to.eq('bob');
+ });
+
+ it('should not set user with invalid credentials', function() {
+ _user.data.authenticated = false;
+ $rootScope.$broadcast('loginService:login-success', {
+ data: _user
+ });
+ $rootScope.$apply(service);
+
+ expect(service.currentUser().name).to.eq(undefined);
+ });
+
+ it('should clear user after logout', function() {
+ $rootScope.$broadcast('loginService:logout-success');
+ $rootScope.$apply(service);
+
+ expect(service.currentUser()).to.not.be.defined;
+ });
+
+ describe('View', () => {
+ // view layer specs.
+ let scope, template, $compile;
+
+ beforeEach(inject(($injector) => {
+ $compile = $injector.get('$compile');
+ }));
+
+ beforeEach(() => {
+ scope = $rootScope.$new();
+
+ template = $compile('
')(scope);
+ scope.$apply();
+ });
+
+ it('Show Login button for login mode', () => {
+ expect(template.find('a')[0].innerHTML).to.eq('Login');
+ });
+ });
+
+ describe('Component', () => {
+ // component/directive specs
+ let component = Component;
+
+ it('includes the intended template', () => {
+ expect(component.template).to.equal(Template);
+ });
+ });
+
+});
diff --git a/app/templates/ui/app/create/create.controller.js b/app/templates/ui/app/create/create.controller.js
deleted file mode 100644
index 3dc94ed2..00000000
--- a/app/templates/ui/app/create/create.controller.js
+++ /dev/null
@@ -1,142 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.create')
- .controller('CreateCtrl', CreateCtrl);
-
- CreateCtrl.$inject = ['$scope', 'MLRest', '$state', 'userService',
- 'ngToast','x2js','doc','$stateParams'];
-
- function CreateCtrl($scope, mlRest, $state, userService, toast, x2js, doc, $stateParams) {
- var ctrl = this;
-
- ctrl.x2js = x2js;
-
- ctrl.mode = 'create';
-
- if (doc) {
- ctrl.mode = 'edit';
- //check extension
- if (doc.config.params.format === 'json') {
- ctrl.person = doc.data;
- } else {
- /* jscs: disable */
- //expect xml format
- /*jshint camelcase: false */
- var wrapped = x2js.xml_str2json(doc.data);
- ctrl.person = wrapped.xml;
- }
-
- if (!ctrl.person.tags) {
- ctrl.person.tags = [];
- }
-
- if (!ctrl.person.friends) {
- ctrl.person.friends = [];
- }
-
- if (!ctrl.person.location) {
- ctrl.person.location = {
- latitude: 0,
- longitude: 0
- };
- }
-
- ctrl.uri = $stateParams.uri;
-
- } else {
- ctrl.mode = 'create';
-
- ctrl.person = {
- isActive: true,
- balance: 0,
- picture: 'http://placehold.it/32x32',
- age: 0,
- eyeColor: null,
- name: null,
- gender: null,
- company: null,
- email: null,
- phone: null,
- address: null,
- about: null,
- registered: null,
- location: {
- latitude: 0,
- longitude: 0
- },
- tags: [],
- friends: [],
- greeting: null,
- favoriteFruit: null
- };
- }
-
- angular.extend(ctrl, {
- newTag: null,
- currentUser: null,
- editorOptions: {
- plugins : 'advlist autolink link image lists charmap print preview'
- },
- submit: submit,
- addTag: addTag,
- removeTag: removeTag
- });
-
- function submit() {
- var extension = '.json';
- var data = ctrl.person;
- if (ctrl.person.docFormat === 'xml') {
- extension = '.xml';
- var wrap = {
- xml : ctrl.person
- };
- /*jshint camelcase: false */
- data = x2js.json2xml_str(wrap);
- }
- /* jscs: enable */
-
- if (ctrl.mode === 'create') {
- mlRest.createDocument(data, {
- format: ctrl.person.docFormat,
- directory: '/content/',
- extension: extension,
- collection: ['data', 'data/people']
- // TODO: add read/update permissions here like this:
- // 'perm:sample-role': 'read',
- // 'perm:sample-role': 'update'
- }).then(function(response) {
- toast.success('Created');
- $state.go('root.view', { uri: response.replace(/(.*\?uri=)/, '') });
- }, function(response) {
- toast.danger(response.data);
- });
- } else {
- // use update when in update mode
- mlRest.updateDocument(data, {
- uri: ctrl.uri
- }).then(function(response) {
- toast.success('Saved');
- $state.go('root.view', { uri: ctrl.uri });
- }, function(response) {
- toast.danger(response.data);
- });
- }
- }
-
- function addTag() {
- if (ctrl.newTag && ctrl.newTag !== '' && ctrl.person.tags.indexOf(ctrl.newTag) < 0) {
- ctrl.person.tags.push(ctrl.newTag);
- }
- ctrl.newTag = null;
- }
-
- function removeTag(index) {
- ctrl.person.tags.splice(index, 1);
- }
-
- $scope.$watch(userService.currentUser, function(newValue) {
- ctrl.currentUser = newValue;
- });
- }
-}());
diff --git a/app/templates/ui/app/create/create.controller.spec.js b/app/templates/ui/app/create/create.controller.spec.js
deleted file mode 100644
index 649f5c56..00000000
--- a/app/templates/ui/app/create/create.controller.spec.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/* jshint -W117, -W030 */
-(function () {
- 'use strict';
-
- describe('Controller: CreateCtrl', function () {
-
- var controller;
- var controller2;
- var nextState;
-
- beforeEach(function() {
- bard.appModule('app.create');
- bard.inject('$controller', '$q', '$rootScope', 'MLRest', '$state', 'userService',
- 'x2js');
-
- bard.mockService(MLRest, {
- createDocument: $q.when('/?uri=blah'),
- updateDocument: $q.when('/?uri=blah')
- });
-
- bard.mockService($state, {
- go: function(state, params) {
- nextState = {
- state: state,
- params: params
- };
- }
- });
- });
-
- beforeEach(function () {
- // create mock data
- var doc = {
- uri: 'blah',
- config: {
- params: ''
- },
- data: '
test'
- };
-
- // for edit
- controller = $controller('CreateCtrl', { $scope: $rootScope.$new(), 'doc': doc,
- $stateParams: { uri: 'blah'} });
-
- // for create
- controller2 = $controller('CreateCtrl', { $scope: $rootScope.$new(), 'doc': null,
- $stateParams: { uri: null } });
-
- $rootScope.$apply();
- });
-
- it('should be created successfully', function () {
- expect(controller).to.be.defined;
- });
-
- it('should add tags - edit', function() {
- var tagValue = 'testTag';
- expect(controller.person.tags.length).to.eq(0);
- controller.newTag = tagValue;
- controller.addTag();
- expect(controller.person.tags.length).to.eq(1);
- expect(controller.person.tags[0]).to.eq(tagValue);
- expect(controller.newTag).to.eq.null;
- });
-
- it('should add tags - create', function() {
- var tagValue = 'testTag';
- expect(controller2.person.tags.length).to.eq(0);
- controller2.newTag = tagValue;
- controller2.addTag();
- expect(controller2.person.tags.length).to.eq(1);
- expect(controller2.person.tags[0]).to.eq(tagValue);
- expect(controller2.newTag).to.eq.null;
- });
-
- it('should show the detail view when submitted - edit', function() {
- controller.submit();
- $rootScope.$apply();
- expect(nextState).to.deep.eq({
- state: 'root.view',
- params: {
- uri: 'blah'
- }
- });
- });
-
- it('should show the detail view when submitted - create', function() {
- controller2.submit();
- $rootScope.$apply();
- expect(nextState).to.deep.eq({
- state: 'root.view',
- params: {
- uri: 'blah'
- }
- });
- });
-
- });
-}());
diff --git a/app/templates/ui/app/create/create.module.js b/app/templates/ui/app/create/create.module.js
deleted file mode 100644
index f994073a..00000000
--- a/app/templates/ui/app/create/create.module.js
+++ /dev/null
@@ -1,6 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.create', ['ml.common', 'app.user', 'ngToast','cb.x2js',
- 'ngMessages','mwl.confirm']);
-}());
diff --git a/app/templates/ui/app/create/stringtonumber.directive.js b/app/templates/ui/app/create/stringtonumber.directive.js
deleted file mode 100644
index 91e97671..00000000
--- a/app/templates/ui/app/create/stringtonumber.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.create')
- .directive('stringToNumber', StringToNumber);
-
- function StringToNumber () {
- return {
- require: 'ngModel',
- link: function(scope, element, attrs, ngModel) {
- ngModel.$parsers.push(function(value) {
- return '' + value;
- });
- ngModel.$formatters.push(function(value) {
- return parseFloat(value);
- });
- }
- };
- }
-
-}());
diff --git a/app/templates/ui/app/detail/detail.controller.js b/app/templates/ui/app/detail/detail.controller.js
deleted file mode 100644
index b8c39530..00000000
--- a/app/templates/ui/app/detail/detail.controller.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* global X2JS,vkbeautify */
-(function () {
- 'use strict';
- angular.module('app.detail')
- .controller('DetailCtrl', DetailCtrl);
-
- DetailCtrl.$inject = ['doc', '$stateParams','MLRest', 'ngToast',
- '$state','$scope','userService'];
- function DetailCtrl(doc, $stateParams, MLRest, toast, $state, $scope, userService) {
- var ctrl = this;
-
- var uri = $stateParams.uri;
-
- var contentType = doc.headers('content-type');
-
- var x2js = new X2JS();
- /* jscs: disable */
- if (contentType.lastIndexOf('application/json', 0) === 0) {
- /*jshint camelcase: false */
- ctrl.xml = vkbeautify.xml(x2js.json2xml_str(
- { xml: doc.data }
- ));
- ctrl.json = doc.data;
- ctrl.type = 'json';
- } else if (contentType.lastIndexOf('application/xml', 0) === 0) {
- ctrl.xml = vkbeautify.xml(doc.data);
- /*jshint camelcase: false */
- ctrl.json = x2js.xml_str2json(doc.data).xml;
- ctrl.type = 'xml';
- /* jscs: enable */
- } else if (contentType.lastIndexOf('text/plain', 0) === 0) {
- ctrl.xml = doc.data;
- ctrl.json = {'Document' : doc.data};
- ctrl.type = 'text';
- } else if (contentType.lastIndexOf('application', 0) === 0 ) {
- ctrl.xml = 'Binary object';
- ctrl.json = {'Document type' : 'Binary object'};
- ctrl.type = 'binary';
- } else {
- ctrl.xml = 'Error occured determining document type.';
- ctrl.json = {'Error' : 'Error occured determining document type.'};
- }
-
- function deleteFunc() {
- MLRest.deleteDocument (uri).then(function(response) {
- // create a toast with settings:
- toast.create({
- className: 'warning',
- content: 'Deleted ' + uri,
- dismissOnTimeout: true,
- timeout: 2000,
- onDismiss: function () {
- //redirect to search page
- $state.go('root.search');
- }
- });
- });
- }
-
- angular.extend(ctrl, {
- doc : doc.data,
- uri : uri,
- currentUser: null,
- delete: deleteFunc
- });
-
- $scope.$watch(userService.currentUser, function(newValue) {
- ctrl.currentUser = newValue;
- });
- }
-}());
diff --git a/app/templates/ui/app/detail/detail.controller.spec.js b/app/templates/ui/app/detail/detail.controller.spec.js
deleted file mode 100644
index 6ea21c5a..00000000
--- a/app/templates/ui/app/detail/detail.controller.spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/* jshint -W117, -W030 */
-(function () {
- 'use strict';
-
- describe('Controller: DetailCtrl', function () {
-
- var controller;
- var doc;
-
- beforeEach(function() {
- bard.appModule('app.detail');
- bard.inject('$controller', '$rootScope', 'MLRest', '$q', 'userService');
-
- bard.mockService(MLRest, {
- deleteDocument: $q.when('/?uri=blah')
- });
- });
-
- beforeEach(function () {
- // stub the document
- var headers = function() { return 'application/json'; };
- doc = {
- headers: headers,
- data: {
- name: 'hi'
- }
- };
- controller = $controller('DetailCtrl', { doc: doc, $scope: $rootScope.$new() });
- $rootScope.$apply();
- });
-
- it('should be created successfully', function () {
- expect(controller).to.be.defined;
- });
-
- it('should have the doc data we gave it', function() {
- expect(controller.doc).to.eq(doc.data);
- });
-
- });
-}());
diff --git a/app/templates/ui/app/detail/detail.module.js b/app/templates/ui/app/detail/detail.module.js
deleted file mode 100644
index a303387d..00000000
--- a/app/templates/ui/app/detail/detail.module.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.detail', [
- 'app.similar',
- 'app.user',
- 'ui.router',
- 'ml.common', // Using MLRest for delete
- 'ngToast', // Showing toast on delete
- 'mwl.confirm' // for delete confirmation popups
- ]);
-}());
diff --git a/app/templates/ui/app/detail/similar-directive.js b/app/templates/ui/app/detail/similar-directive.js
deleted file mode 100644
index 53a956ea..00000000
--- a/app/templates/ui/app/detail/similar-directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function () {
-
- 'use strict';
-
- angular.module('app.similar')
- .directive('mlSimilar', mlSimilar);
-
- mlSimilar.$inject = ['MLRest'];
-
- function mlSimilar(mlRest) {
- return {
- restrict: 'E',
- templateUrl: 'app/detail/similar-directive.html',
- scope: { uri: '@', limit: '@' },
- link: function(scope, iElement, iAttrs, ctrl) {
- mlRest.extension('extsimilar',
- {
- method: 'GET',
- params:
- {
- 'rs:uri': scope.uri,
- 'rs:limit': scope.limit ? scope.limit : 10
- }
- })
- .then(function(response) {
- scope.similar = response.data.similar;
- });
- }
- };
- }
-
-}());
diff --git a/app/templates/ui/app/detail/similar.module.js b/app/templates/ui/app/detail/similar.module.js
deleted file mode 100644
index 9bf5073f..00000000
--- a/app/templates/ui/app/detail/similar.module.js
+++ /dev/null
@@ -1,6 +0,0 @@
-(function() {
- 'use strict';
-
- angular.module('app.similar', []);
-
-}());
diff --git a/app/templates/ui/app/error/error.module.js b/app/templates/ui/app/error/error.module.js
deleted file mode 100644
index a45fad3f..00000000
--- a/app/templates/ui/app/error/error.module.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function () {
- 'use strict';
- angular.module('app.error', ['app.messageBoard']);
-}());
diff --git a/app/templates/ui/app/error/errorInterceptor.service.js b/app/templates/ui/app/error/errorInterceptor.service.js
deleted file mode 100644
index 7dc4eed5..00000000
--- a/app/templates/ui/app/error/errorInterceptor.service.js
+++ /dev/null
@@ -1,36 +0,0 @@
-(function() {
- 'use strict';
-
- angular.module('app.error')
- .factory('errorInterceptor', ErrorInterceptor)
- .config(['$httpProvider', function($httpProvider) {
- $httpProvider.interceptors.push('errorInterceptor');
- }]);
-
- ErrorInterceptor.$inject = ['$q', '$injector', 'ngToast'];
- function ErrorInterceptor($q, $injector, toast) {
- var errorInterceptor = {
- responseError: function(rejection) {
- if (rejection.status === 500 || rejection.status === 400) {
- var messageBoardService = $injector.get('messageBoardService');
- var msg;
- if (rejection.data && rejection.data.errorResponse) {
- msg = {
- title: rejection.data.errorResponse.status,
- body: rejection.data.errorResponse.message
- };
- } else {
- msg = {
- title: (rejection.status === 400) ? 'Bad Request' : 'Internal Server Error'
- };
- }
- messageBoardService.message(msg);
- var toastMsg = '
' + msg.title + '' + msg.body + '
';
- toast.danger(toastMsg);
- }
- return $q.reject(rejection);
- }
- };
- return errorInterceptor;
- }
-}());
diff --git a/app/templates/ui/app/login/login.controller.js b/app/templates/ui/app/login/login.controller.js
deleted file mode 100644
index b96c33ed..00000000
--- a/app/templates/ui/app/login/login.controller.js
+++ /dev/null
@@ -1,64 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.login')
- .controller('LoginCtrl', LoginCtrl)
- .controller('LoginFullCtrl', LoginFullCtrl);
-
- LoginCtrl.$inject = ['$scope', 'loginService'];
- function LoginCtrl($scope, loginService) {
- var ctrl = this;
- angular.extend(ctrl, {
- username: null,
- password: null,
- login: login,
- loginService: loginService,
- logout: logout,
- cancel: cancel
- });
-
- function login() {
- loginService.login(ctrl.username, ctrl.password).then(function(user) {
- callback(user);
- });
- }
-
- function logout() {
- loginService.logout().then(function() {
- callback();
- });
- }
-
- function cancel() {
- callback();
- }
-
- function callback(user) {
- if ($scope.callback && !loginService.loginError()) {
- $scope.callback({user: user});
- }
- }
- }
-
- LoginFullCtrl.$inject = ['$state', '$stateParams'];
- function LoginFullCtrl($state, $stateParams) {
- var ctrl = this;
- angular.extend(ctrl, {
- showCancel: $stateParams.state !== 'root.landing',
- toState: toState
- });
-
- function toState(user) {
- if (user) {
- var params = null;
- if ($stateParams.params && /^\{.*\}$/.test($stateParams.params)) {
- params = JSON.parse($stateParams.params);
- }
- $state.go($stateParams.state || 'root.landing', params);
- } else {
- $state.go('root.landing');
- }
- }
- }
-
-}());
diff --git a/app/templates/ui/app/login/login.directive.js b/app/templates/ui/app/login/login.directive.js
deleted file mode 100644
index 7087b564..00000000
--- a/app/templates/ui/app/login/login.directive.js
+++ /dev/null
@@ -1,23 +0,0 @@
-(function () {
-
- 'use strict';
-
- angular.module('app.login')
- .directive('login', LoginDirective);
-
- function LoginDirective() {
- return {
- restrict: 'EA',
- controller: 'LoginCtrl',
- controllerAs: 'ctrl',
- replace: true,
- scope: {
- showCancel: '=',
- mode: '@',
- callback: '&'
- },
- templateUrl: 'app/login/login-dir.html'
- };
- }
-
-}());
diff --git a/app/templates/ui/app/login/login.module.js b/app/templates/ui/app/login/login.module.js
deleted file mode 100644
index cba9264f..00000000
--- a/app/templates/ui/app/login/login.module.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function () {
- 'use strict';
- angular.module('app.login', ['app.messageBoard', 'ml.common', 'ui.bootstrap', 'ui.router']);
-}());
diff --git a/app/templates/ui/app/login/login.service.js b/app/templates/ui/app/login/login.service.js
deleted file mode 100644
index ad932cdb..00000000
--- a/app/templates/ui/app/login/login.service.js
+++ /dev/null
@@ -1,201 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.login')
- .factory('loginService', LoginService);
-
- LoginService.$inject = ['$http', '$uibModal', '$q', '$rootScope', '$state',
- '$stateParams', 'messageBoardService'];
- function LoginService($http, $uibModal, $q, $rootScope, $state,
- $stateParams, messageBoardService) {
-
- var service = {};
- var _loginMode = 'full'; // 'modal', 'top-right', or 'full'
- var _loginError;
- var _toStateName;
- var _toStateParams;
- var _isAuthenticated;
- var _userPrefix = '';
- var _protectedRoutes = [];
- var deregisterLoginSuccess;
-
- function loginMode(mode) {
- if (mode === undefined) {
- return _loginMode;
- }
- _loginMode = mode;
- }
-
- function failLogin(response) {
- if (response.status > 200) {
- _loginError = true;
- }
- }
-
- function loginError() {
- return _loginError;
- }
-
- function getAuthenticatedStatus() {
- if (_isAuthenticated !== undefined) {
- return _isAuthenticated;
- }
-
- return $http.get('/api/user/status', {}).then(function(response) {
- if (response.data.appUsersOnly) {
- _userPrefix = response.data.appName + '-';
- }
- if (response.data.authenticated === false) {
- _isAuthenticated = false;
- }
- else
- {
- loginSuccess(response);
- }
- return service.isAuthenticated();
- });
- }
-
- function loginSuccess(response) {
- _loginError = null;
- _isAuthenticated = true;
- $rootScope.$broadcast('loginService:login-success', response.data);
- }
-
- function login(username, password) {
- return $http.post('/api/user/login', {
- 'username': _userPrefix + username,
- 'password': password
- }).then(function(response) {
- loginSuccess(response);
- return response;
- }, failLogin);
- }
-
- function loginPrompt() {
- var d = $q.defer();
- if (_loginMode === 'modal') {
- $uibModal.open({
- controller: ['$uibModalInstance', function($uibModalInstance) {
- var ctrl = this;
- ctrl.showCancel = $state.current.name !== 'root.landing';
- ctrl.close = function(user) {
- if (user) {
- d.resolve(user);
- } else {
- d.reject();
- $state.go('root.landing');
- }
- return $uibModalInstance.close();
- };
- }],
- controllerAs: 'ctrl',
- templateUrl: '/app/login/login-modal.html',
- backdrop: 'static',
- keyboard: false
- });
- } else if (_loginMode === 'top-right') {
- messageBoardService.message({title: 'Please sign-in to see content.'});
- var deregisterMsgBoard = $rootScope.$on('loginService:login-success', function(e, user) {
- messageBoardService.message(null);
- d.resolve(user);
- deregisterMsgBoard();
- });
- } else {
- $state.go('root.login',
- {
- 'state': _toStateName || $state.current.name,
- 'params': JSON.stringify((_toStateParams || $stateParams))
- }).then(function() {
- d.reject();
- });
- }
- return d.promise;
- }
-
- function logout() {
- return $http.get('/api/user/logout').then(function(response) {
- $rootScope.$broadcast('loginService:logout-success', response);
- _loginError = null;
- _isAuthenticated = false;
- $state.reload();
- return response;
- });
- }
-
- function isAuthenticated() {
- return _isAuthenticated;
- }
-
- function protectedRoutes(routes) {
- if (routes === undefined) {
- return _protectedRoutes;
- }
- _protectedRoutes = routes;
- }
-
- function routeIsProtected(route) {
- return _protectedRoutes.indexOf(route) > -1;
- }
-
- function blockRoute(event, next, nextParams) {
- event.preventDefault();
- service.loginPrompt();
- if (_loginMode !== 'full') {
- if (deregisterLoginSuccess) {
- deregisterLoginSuccess();
- deregisterLoginSuccess = null;
- }
- deregisterLoginSuccess = $rootScope.$on('loginService:login-success', function() {
- deregisterLoginSuccess();
- deregisterLoginSuccess = null;
- $state.go(next.name, nextParams);
- });
- }
- }
-
- $rootScope.$on('$stateChangeStart', function(event, next, nextParams) {
- if (next.name !== 'root.login') {
- _toStateName = next.name;
- _toStateParams = nextParams;
- }
-
- if (routeIsProtected(next.name)) {
- var auth = service.getAuthenticatedStatus();
-
- if (angular.isFunction(auth.then)) {
- auth.then(function() {
- if (!service.isAuthenticated()) {
- //this does NOT block requests in a timely fashion...
- blockRoute(event, next, nextParams);
- }
- });
- }
- else {
- if (!auth) {
- blockRoute(event, next, nextParams);
- }
- }
-
- }
- });
-
- $rootScope.$on('loginService:profile-changed', function() {
- _isAuthenticated = undefined;
- service.getAuthenticatedStatus();
- });
-
- angular.extend(service, {
- login: login,
- logout: logout,
- loginPrompt: loginPrompt,
- loginError: loginError,
- loginMode: loginMode,
- isAuthenticated: isAuthenticated,
- getAuthenticatedStatus: getAuthenticatedStatus,
- protectedRoutes: protectedRoutes
- });
-
- return service;
- }
-}());
diff --git a/app/templates/ui/app/login/login.service.spec.js b/app/templates/ui/app/login/login.service.spec.js
deleted file mode 100644
index a6e7c547..00000000
--- a/app/templates/ui/app/login/login.service.spec.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/* jshint -W117, -W030 */
-(function () {
- 'use strict';
-
- describe('Service: loginService', function () {
-
- var service;
- var modalOpened = false;
- var _user = {
- data: {
- username: 'bob',
- authenticated: true
- }
- };
-
- beforeEach(function() {
- bard.appModule('app.login');
- bard.inject('$q', '$http', '$uibModal', '$rootScope', '$state', '$stateParams');
-
- bard.mockService($http, {
- _default: $q.when([]),
- get: $q.when(_user)
- });
-
- bard.mockService($state, {
- current: { name: 'root.search', params: {} },
- go: function(stateName, stateParams) {
- this.current = { name: stateName, params: stateParams };
- return $q.when();
- }
- });
-
- bard.mockService($uibModal, {
- open: function() {
- modalOpened = true;
- return { result: angular.noop };
- }
- });
-
- });
-
- beforeEach(inject(function (_loginService_) {
- service = _loginService_;
-
- modalOpened = false;
- }));
-
- it('should be defined', function () {
- expect(service).to.be.defined;
- });
-
- it('should open modal if mode is "modal"', function() {
- service.loginMode('modal');
- service.loginPrompt();
- expect(modalOpened).to.be.true;
- });
-
- it('should go to login page if mode is "full"', function() {
- service.loginMode('full');
- service.loginPrompt();
- expect($state.current.name).to.be.equal('root.login');
- });
-
- it('should not go to login page if mode is "modal"', function() {
- service.loginMode('modal');
- service.loginPrompt();
- expect($state.current.name).not.to.be.equal('root.login');
- });
- });
-
- describe('Service: loginService - should be authenticated if logged in already', function () {
-
- var service;
- var modalOpened = false;
- var _user = {
- data: {
- username: 'bob',
- authenticated: true
- }
- };
-
- beforeEach(function() {
- bard.appModule('app.login');
- bard.inject('$q', '$http', '$uibModal', '$rootScope', '$state', '$stateParams');
-
- bard.mockService($http, {
- _default: $q.when([]),
- get: $q.when(_user)
- });
-
- bard.mockService($state, {
- current: { name: 'root.search', params: {} },
- go: function(stateName, stateParams) {
- this.current = { name: stateName, params: stateParams };
- return $q.when();
- }
- });
-
- bard.mockService($uibModal, {
- open: function() {
- modalOpened = true;
- return { result: angular.noop };
- }
- });
-
- });
-
- beforeEach(inject(function (_loginService_) {
- service = _loginService_;
-
- modalOpened = false;
- }));
-
- //needs to be present for logged in already test
- afterEach(inject(function($rootScope) {
- $rootScope.$apply();
- }));
-
- it('should be defined', function () {
- expect(service).to.be.defined;
- });
-
- it('should be logged in already', function() {
- expect(service.isAuthenticated()).to.be.not.defined;
-
- var isLoggedIn = false;
- service.getAuthenticatedStatus($rootScope).then(function(done) {
- isLoggedIn = service.isAuthenticated();
- expect(isLoggedIn).to.eq(true);
- });
-
- });
- });
-}());
diff --git a/app/templates/ui/app/login/loginInterceptor.service.js b/app/templates/ui/app/login/loginInterceptor.service.js
deleted file mode 100644
index 5dce5083..00000000
--- a/app/templates/ui/app/login/loginInterceptor.service.js
+++ /dev/null
@@ -1,69 +0,0 @@
-(function() {
- 'use strict';
-
- angular.module('app.login')
- .factory('authInterceptor', AuthInterceptor)
- .config(['$httpProvider', function($httpProvider) {
- $httpProvider.interceptors.push('authInterceptor');
- }]);
-
- AuthInterceptor.$inject = ['$q', '$rootScope', '$injector'];
- function AuthInterceptor($q, $rootScope, $injector) {
- var waitingForLoginDefer;
- var waitingLineForLoginDefer = 0;
- function reduceWaitingLine() {
- waitingLineForLoginDefer--;
- if (waitingLineForLoginDefer <= 0) {
- waitingForLoginDefer = null;
- }
- }
- $rootScope.$on('$stateChangeSuccess', function() {
- waitingLineForLoginDefer = 0;
- waitingForLoginDefer = null;
- });
-
- var authInterceptor = {
- request: function(config) {
- if (/\/v1\//.test(config.url) && waitingForLoginDefer) {
- // hold off on additional REST API calls until login is resolved
- waitingLineForLoginDefer++;
- return waitingForLoginDefer.promise.then(function() {
- reduceWaitingLine();
- return config;
- },
- function() {
- reduceWaitingLine();
- });
- }
- return config;
- },
- responseError: function(rejection) {
- // Not logged in or session has expired
- var userService = $injector.get('userService');
- if (rejection.status === 419 || rejection.status === 401 &&
- !waitingForLoginDefer && !userService.currentUser() &&
- !/\/api\/user\/login/.test(rejection.config.url)) {
- var loginService = $injector.get('loginService');
- var $http = $injector.get('$http');
- waitingForLoginDefer = $q.defer();
- waitingLineForLoginDefer = 1;
-
- // We use login method that logs the user in using the current credentials and
- // returns a promise
- loginService.loginPrompt().then(
- waitingForLoginDefer.resolve, waitingForLoginDefer.reject);
- // When the session recovered, make the same backend call again and chain the request
- return waitingForLoginDefer.promise.then(function() {
- reduceWaitingLine();
- return $http(rejection.config);
- },
- function() {
- reduceWaitingLine();
- });
- }
- return $q.reject(rejection);
- }
- };
- return authInterceptor;
- }
-}());
diff --git a/app/templates/ui/app/message-board/message-board-dir.html b/app/templates/ui/app/message-board/message-board-dir.html
deleted file mode 100644
index 13d1c899..00000000
--- a/app/templates/ui/app/message-board/message-board-dir.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
{{msg.title || msg}}
-
{{msg.body}}
-
diff --git a/app/templates/ui/app/message-board/message-board.directive.js b/app/templates/ui/app/message-board/message-board.directive.js
deleted file mode 100644
index 9407d98d..00000000
--- a/app/templates/ui/app/message-board/message-board.directive.js
+++ /dev/null
@@ -1,45 +0,0 @@
-(function () {
-
- 'use strict';
-
- angular.module('app.messageBoard')
- .directive('messageBoard', MessageBoardDirective)
- .controller('MessageBoardController', MessageBoardController);
-
- function MessageBoardDirective() {
- return {
- restrict: 'E',
- controller: 'MessageBoardController',
- controllerAs: 'ctrl',
- replace: true,
- scope: {
- msg: '='
- },
- templateUrl: 'app/message-board/message-board-dir.html'
- };
- }
-
- MessageBoardController.$inject = ['$scope'];
-
- function MessageBoardController($scope) {
- var ctrl = this;
- angular.extend(ctrl, {
- isObject: isObject,
- collapseRaw: collapseRaw,
- expandRaw: expandRaw
- });
-
- function isObject(item) {
- return _.isObject(item);
- }
-
- function collapseRaw() {
- ctrl.showRaw = false;
- }
-
- function expandRaw() {
- ctrl.showRaw = true;
- }
- }
-
-}());
diff --git a/app/templates/ui/app/message-board/message-board.module.js b/app/templates/ui/app/message-board/message-board.module.js
deleted file mode 100644
index ab61a11f..00000000
--- a/app/templates/ui/app/message-board/message-board.module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.messageBoard', []);
-}());
diff --git a/app/templates/ui/app/message-board/message-board.service.js b/app/templates/ui/app/message-board/message-board.service.js
deleted file mode 100644
index dbfa3a71..00000000
--- a/app/templates/ui/app/message-board/message-board.service.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.messageBoard')
- .factory('messageBoardService', MessageBoardService);
-
- MessageBoardService.$inject = ['$rootScope'];
- function MessageBoardService($rootScope) {
- var _message = null;
-
- function message(msg) {
- if (msg === undefined) {
- return _message;
- }
- _message = msg;
- if (message) {
- $rootScope.$broadcast('message-board:set', _message);
- } else {
- $rootScope.$broadcast('message-board:cleared');
- }
- }
-
- $rootScope.$on('$stateChangeSuccess', function() {
- message(null);
- });
-
- return {
- message: message
- };
- }
-}());
diff --git a/app/templates/ui/app/root/root.controller.js b/app/templates/ui/app/root/root.controller.js
deleted file mode 100644
index d1770458..00000000
--- a/app/templates/ui/app/root/root.controller.js
+++ /dev/null
@@ -1,18 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.root')
- .controller('RootCtrl', RootCtrl);
-
- RootCtrl.$inject = ['messageBoardService', 'userService', '$scope'];
-
- function RootCtrl(messageBoardService, userService, $scope) {
- var ctrl = this;
- ctrl.currentYear = new Date().getUTCFullYear();
- ctrl.messageBoardService = messageBoardService;
-
- $scope.$watch(userService.currentUser, function(newValue) {
- ctrl.currentUser = newValue;
- });
- }
-}());
diff --git a/app/templates/ui/app/root/root.module.js b/app/templates/ui/app/root/root.module.js
deleted file mode 100644
index b90bbc34..00000000
--- a/app/templates/ui/app/root/root.module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.root', ['app.messageBoard']);
-}());
diff --git a/app/templates/ui/app/route/routes.js b/app/templates/ui/app/route/routes.js
index 1f020f72..b0687261 100644
--- a/app/templates/ui/app/route/routes.js
+++ b/app/templates/ui/app/route/routes.js
@@ -1,21 +1,18 @@
-(function () {
- 'use strict';
+import angular from 'angular';
+import uiRouter from 'angular-ui-router';
- angular.module('app')
- .run(['loginService', function(loginService) {
- loginService.protectedRoutes(['root.search', 'root.create', 'root.profile']);
- }])
- .config(Config);
-
- Config.$inject = ['$stateProvider', '$urlMatcherFactoryProvider',
- '$urlRouterProvider', '$locationProvider'
- ];
+import landingPageTemplate from '../components/landing/landing.html';
- function Config(
- $stateProvider,
- $urlMatcherFactoryProvider,
- $urlRouterProvider,
- $locationProvider) {
+let routesModule = angular.module('app.router', [
+ uiRouter
+ ])
+ .run(['loginService',
+ function(loginService) {
+ loginService.protectedRoutes(['root.search', 'root.create', 'root.profile']);
+ }
+ ])
+ .config(($stateProvider, $urlMatcherFactoryProvider, $urlRouterProvider, $locationProvider) => {
+ 'ngInject';
$urlRouterProvider.otherwise('/');
$locationProvider.html5Mode(true);
@@ -39,9 +36,7 @@
.state('root', {
url: '',
// abstract: true,
- templateUrl: 'app/root/root.html',
- controller: 'RootCtrl',
- controllerAs: 'ctrl',
+ component: 'root',
resolve: {
user: function(userService) {
return userService.getUser();
@@ -50,7 +45,7 @@
})
.state('root.landing', {
url: '/',
- templateUrl: 'app/landing/landing.html',
+ template: landingPageTemplate,
navLabel: {
text: 'Home',
area: 'dashboard',
@@ -59,9 +54,7 @@
})
.state('root.search', {
url: '/search',
- templateUrl: 'app/search/search.html',
- controller: 'SearchCtrl',
- controllerAs: 'ctrl',
+ component: 'search',
navLabel: {
text: 'Search',
area: 'dashboard',
@@ -70,14 +63,11 @@
})
.state('root.create', {
url: '/create',
- templateUrl: 'app/create/create.html',
- controller: 'CreateCtrl',
- controllerAs: 'ctrl',
+ component: 'create',
navLabel: {
text: 'Create',
area: 'dashboard',
- navClass: 'fa-wpforms',
- edit: true
+ navClass: 'fa-wpforms'
},
resolve: {
doc: function() {
@@ -86,10 +76,8 @@
}
})
.state('root.edit', {
- url: '/edit{uri:path}',
- templateUrl: 'app/create/create.html',
- controller: 'CreateCtrl',
- controllerAs: 'ctrl',
+ url: '/edit?{uri:path}',
+ component: 'create',
resolve: {
doc: function(MLRest, $stateParams) {
var uri = $stateParams.uri;
@@ -99,26 +87,28 @@
format = 'xml';
}
- return MLRest.getDocument(uri, { format: format }).then(function(response) {
+ return MLRest.getDocument(uri, {
+ format: format
+ }).then(function(response) {
return response;
});
}
}
})
.state('root.view', {
- url: '/detail{uri:path}',
+ url: '/detail?{uri:path}',
params: {
uri: {
value: null
}
},
- templateUrl: 'app/detail/detail.html',
- controller: 'DetailCtrl',
- controllerAs: 'ctrl',
+ component: 'detail',
resolve: {
doc: function(MLRest, $stateParams) {
var uri = $stateParams.uri;
- return MLRest.getDocument(uri, { format: 'json' }).then(function(response) {
+ return MLRest.getDocument(uri, {
+ format: 'json'
+ }).then(function(response) {
return response;
});
}
@@ -126,15 +116,14 @@
})
.state('root.profile', {
url: '/profile',
- templateUrl: 'app/user/profile.html',
- controller: 'ProfileCtrl',
- controllerAs: 'ctrl'
+ component: 'profile'
})
.state('root.login', {
url: '/login?state¶ms',
- templateUrl: 'app/login/login-full.html',
- controller: 'LoginFullCtrl',
- controllerAs: 'ctrl'
+ component: 'loginFull'
});
- }
-}());
+ })
+ .name;
+
+export
+default routesModule;
diff --git a/app/templates/ui/app/search/search.controller.js b/app/templates/ui/app/search/search.controller.js
deleted file mode 100644
index 083cd72c..00000000
--- a/app/templates/ui/app/search/search.controller.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* global MLSearchController */
-(function () {
- 'use strict';
-
- angular.module('app.search')
- .controller('SearchCtrl', SearchCtrl);
-
- SearchCtrl.$inject = ['$scope', '$location', 'userService', 'MLSearchFactory'];
-
- // inherit from MLSearchController
- var superCtrl = MLSearchController.prototype;
- SearchCtrl.prototype = Object.create(superCtrl);
-
- function SearchCtrl($scope, $location, userService, searchFactory) {
- var ctrl = this;
-
- superCtrl.constructor.call(ctrl, $scope, $location, searchFactory.newContext());
-
- ctrl.init();
-
- ctrl.setSnippet = function(type) {
- ctrl.mlSearch.setSnippet(type);
- ctrl.search();
- };
-
- $scope.$watch(userService.currentUser, function(newValue) {
- ctrl.currentUser = newValue;
- });
- }
-}());
diff --git a/app/templates/ui/app/search/search.controller.spec.js b/app/templates/ui/app/search/search.controller.spec.js
deleted file mode 100644
index ffa0d7bb..00000000
--- a/app/templates/ui/app/search/search.controller.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* jshint -W117, -W030 */
-(function () {
- 'use strict';
-
- describe('Controller: SearchCtrl', function () {
-
- var controller;
-
- var currentUser = null;
-
- var results = [
- {
- uri: 'abc'
- },
- {
- uri: 'def'
- }
- ];
-
- beforeEach(function() {
- bard.appModule('app.search');
- bard.inject('$controller', '$q', '$rootScope', '$location',
- 'userService', 'MLSearchFactory', 'MLRest');
-
- bard.mockService(userService, {
- currentUser: $q.when(currentUser)
- });
-
- bard.mockService(MLRest, {
- search: $q.when({
- data: {
- results: results
- }
- })
- });
-
- });
-
- beforeEach(function () {
- controller = $controller('SearchCtrl', { $scope: $rootScope.$new() });
- $rootScope.$apply();
- });
-
- it('should be created successfully', function () {
- expect(controller).to.be.defined;
- });
-
- it('should update the current user if it changes', function() {
- expect(controller.currentUser).to.not.be.defined;
- });
-
- it('should run a search', function() {
- controller.search('stuff');
- $rootScope.$apply();
- expect(controller.response.results).to.eq(results);
- });
- });
-}());
diff --git a/app/templates/ui/app/search/search.html b/app/templates/ui/app/search/search.html
deleted file mode 100644
index 0ddf1333..00000000
--- a/app/templates/ui/app/search/search.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
Please log in to see content
-
-
-
-
-
-
No results to show
-
-
-
-
-
-
-
-
diff --git a/app/templates/ui/app/search/search.module.js b/app/templates/ui/app/search/search.module.js
deleted file mode 100644
index b1977f01..00000000
--- a/app/templates/ui/app/search/search.module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.search', ['ml.search', 'app.user', 'app.snippet']);
-}());
diff --git a/app/templates/ui/app/search/snippet.directive.js b/app/templates/ui/app/search/snippet.directive.js
deleted file mode 100644
index f6681ff0..00000000
--- a/app/templates/ui/app/search/snippet.directive.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function () {
-
- 'use strict';
-
- angular.module('app.snippet')
- .directive('mlSnippet', SnippetDirective)
- .controller('SnippetController', SnippetController);
-
- function SnippetDirective() {
- return {
- restrict: 'E',
- controller: 'SnippetController',
- controllerAs: 'ctrl',
- replace: true,
- scope: {
- setSnippet: '&'
- },
- templateUrl: 'app/search/snippet.html'
- };
- }
-
- SnippetController.$inject = ['$scope'];
-
- function SnippetController($scope) {
- $scope.snippets = ['detailed', 'compact'];
-
- var ctrl = this;
- angular.extend(ctrl, {
- setSnippetType: setSnippetType
- });
-
- function setSnippetType(type) {
- $scope.snippetType = type;
- $scope.setSnippet({type: type});
- }
- }
-
-}());
diff --git a/app/templates/ui/app/search/snippet.module.js b/app/templates/ui/app/search/snippet.module.js
deleted file mode 100644
index f5164821..00000000
--- a/app/templates/ui/app/search/snippet.module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.snippet', []);
-}());
diff --git a/app/templates/ui/app/user/profile.controller.js b/app/templates/ui/app/user/profile.controller.js
deleted file mode 100644
index 34bb7ce7..00000000
--- a/app/templates/ui/app/user/profile.controller.js
+++ /dev/null
@@ -1,85 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.user')
- .controller('ProfileCtrl', ProfileCtrl);
-
- ProfileCtrl.$inject = ['$scope', '$state', 'MLRest', 'userService', 'ngToast', '$rootScope'];
-
- function ProfileCtrl($scope, $state, mlRest, userService, toast, $rootScope) {
- var ctrl = this;
- angular.extend(ctrl, {
- user: checkUser(userService.currentUser()),
- newEmail: '',
- addEmail: addEmail,
- removeEmail: removeEmail,
- submit: submit
- });
-
- function addEmail() {
- if (ctrl.user) {
- if (!ctrl.newEmail || hasEmailInputError()) {
- return;
- }
- ctrl.user.profile = ctrl.user.profile || {};
- if (!ctrl.user.profile.emails) {
- ctrl.user.profile.emails = [];
- }
- ctrl.user.profile.emails.push(ctrl.newEmail.trim());
- ctrl.newEmail = '';
- }
- }
-
- function removeEmail(index) {
- if (ctrl.user.profile && ctrl.user.profile.emails) {
- ctrl.user.profile.emails.splice(index, 1);
- }
- }
-
- function hasEmailInputError() {
- try {
- return $scope.profileForm.newEmail.$error.email === true;
- }
- catch (e) {
- return false;
- }
- }
-
- function submit(form) {
- if (form.$valid && ctrl.user.profile) {
- addEmail();
-
- if (ctrl.user.profile.emails) {
- _.pull(ctrl.user.profile.emails, '');
- }
-
- mlRest.updateDocument({
- user: ctrl.user.profile
- }, {
- format: 'json',
- uri: '/api/users/' + ctrl.user.username + '.json'
- }).then(function(data) {
- $rootScope.$broadcast('loginService:profile-changed');
- toast.success('Submitted');
- $state.go('root.landing');
- }, function(response) {
- toast.danger(response.data);
- });
- }
- }
-
- $scope.$watch(userService.currentUser, function(newValue) {
- ctrl.user = checkUser(newValue);
- });
-
- function checkUser(newValue) {
- var user = angular.copy(newValue);
- if (user && user.profile && user.profile.emails) {
- if (!angular.isArray(user.profile.emails)) {
- user.profile.emails = [user.profile.emails];
- }
- }
- return user;
- }
- }
-}());
diff --git a/app/templates/ui/app/user/profile.controller.spec.js b/app/templates/ui/app/user/profile.controller.spec.js
deleted file mode 100644
index 7b05e913..00000000
--- a/app/templates/ui/app/user/profile.controller.spec.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/* jshint -W117, -W030 */
-(function () {
- 'use strict';
-
- describe('Controller: ProfileCtrl', function () {
-
- var controller;
-
- var currentUser = {
- profile: {
- emails: []
- }
- };
-
- var currentState;
-
- beforeEach(function() {
- bard.appModule('app.user');
- bard.inject('$controller', '$q', '$rootScope', 'MLRest', '$state', 'userService',
- 'loginService');
-
- bard.mockService(MLRest, {
- _default: $q.when([]),
- updateDocument: $q.when()
- });
-
- bard.mockService(userService, {
- currentUser: function() {
- return currentUser;
- }
- });
-
- bard.mockService($state, {
- go: function(s) {
- currentState = s;
- }
- });
-
- bard.mockService(loginService, {
- getAuthenticatedStatus: $q.when()
- });
-
- });
-
- beforeEach(function () {
- controller = $controller('ProfileCtrl', {
- $scope: $rootScope.$new()
- });
- $rootScope.$apply();
- });
-
- it('should be created successfully', function () {
- expect(controller).to.be.defined;
- });
-
- it('should not add a blank email', function() {
- var newEmail = '';
- controller.newEmail = newEmail;
- expect(controller.user.profile.emails.length).to.eq(0);
- controller.addEmail();
- $rootScope.$apply();
- expect(controller.user.profile.emails.length).to.eq(0);
- });
-
- it('should add a nonblank email', function() {
- var newEmail = 'test@test.com';
- controller.newEmail = newEmail;
- expect(controller.user.profile.emails.length).to.eq(0);
- controller.addEmail();
- $rootScope.$apply();
- expect(controller.user.profile.emails.length).to.eq(1);
- expect(controller.user.profile.emails[0]).to.eq(newEmail);
- });
-
- it('should remove an email', function() {
- controller.user.profile.emails = [
- 'abc@def.com',
- 'def@ghi.com'
- ];
-
- expect(controller.user.profile.emails.length).to.eq(2);
- controller.removeEmail(1);
- $rootScope.$apply();
- expect(controller.user.profile.emails.length).to.eq(1);
- expect(controller.user.profile.emails[0]).to.eq('abc@def.com');
- });
-
- it('should not update the profile if form errors', function() {
- var form = {$valid:false};
- controller.submit(form);
- $rootScope.$apply();
- expect(currentState).to.not.be.defined;
- });
-
- it('should update the profile', function() {
- var form = {$valid:true};
- controller.submit(form);
- $rootScope.$apply();
- expect(currentState).to.eq('root.landing');
- });
-
- });
-}());
diff --git a/app/templates/ui/app/user/user-dir.html b/app/templates/ui/app/user/user-dir.html
deleted file mode 100644
index ec449d3d..00000000
--- a/app/templates/ui/app/user/user-dir.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
{{ currentUser.profile.fullname || currentUser.username }} |
Account
-
-
-
-
-
-
diff --git a/app/templates/ui/app/user/user.directive.js b/app/templates/ui/app/user/user.directive.js
deleted file mode 100644
index 28101c6e..00000000
--- a/app/templates/ui/app/user/user.directive.js
+++ /dev/null
@@ -1,38 +0,0 @@
-(function () {
-
- 'use strict';
-
- angular.module('app.user')
- .directive('mlUser', UserDirective)
- .controller('UserController', UserController);
-
- function UserDirective() {
- return {
- restrict: 'EA',
- controller: 'UserController',
- controllerAs: 'ctrl',
- replace: true,
- scope: {
- showCancel: '=',
- mode: '@',
- callback: '&'
- },
- templateUrl: 'app/user/user-dir.html'
- };
- }
-
- UserController.$inject = ['$scope', 'userService', 'loginService'];
-
- function UserController($scope, userService, loginService) {
- var ctrl = this;
- angular.extend(ctrl, {
- username: null,
- password: null,
- loginService: loginService
- });
- $scope.$watch(userService.currentUser, function(newValue) {
- $scope.currentUser = newValue;
- });
- }
-
-}());
diff --git a/app/templates/ui/app/user/user.module.js b/app/templates/ui/app/user/user.module.js
deleted file mode 100644
index 1a3b87c1..00000000
--- a/app/templates/ui/app/user/user.module.js
+++ /dev/null
@@ -1,5 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.user', ['ml.common', 'app.login', 'ngToast']);
-}());
diff --git a/app/templates/ui/app/user/user.service.js b/app/templates/ui/app/user/user.service.js
deleted file mode 100644
index b66083a8..00000000
--- a/app/templates/ui/app/user/user.service.js
+++ /dev/null
@@ -1,52 +0,0 @@
-(function () {
- 'use strict';
-
- angular.module('app.user')
- .factory('userService', UserService);
-
- UserService.$inject = ['$rootScope', 'loginService'];
- function UserService($rootScope, loginService) {
- var _currentUser = null;
-
- function currentUser() {
- return _currentUser;
- }
-
- function getUser() {
- if (_currentUser) {
- return _currentUser;
- }
-
- return loginService.getAuthenticatedStatus().then(currentUser);
- }
-
- function updateUser(response) {
- var data = response.data;
-
- if (data.authenticated === false) {
- return null;
- }
-
- // Copy all initially
- _currentUser = angular.copy(data);
-
- // Password property should not exist, delete anyhow just to be sure
- delete _currentUser.password;
-
- return _currentUser;
- }
-
- $rootScope.$on('loginService:login-success', function(e, user) {
- updateUser({ data: user });
- });
-
- $rootScope.$on('loginService:logout-success', function() {
- _currentUser = null;
- });
-
- return {
- currentUser: currentUser,
- getUser: getUser
- };
- }
-}());
diff --git a/app/templates/ui/app/user/user.service.spec.js b/app/templates/ui/app/user/user.service.spec.js
deleted file mode 100644
index 93378d93..00000000
--- a/app/templates/ui/app/user/user.service.spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/* jshint -W117, -W030 */
-(function() {
- 'use strict';
-
- describe('Service: userService', function() {
-
- var service;
- var _user = {
- data: {
- username: 'bob',
- authenticated: true
- }
- };
-
- beforeEach(function() {
- bard.appModule('app.user');
- bard.inject('$q', '$http', '$rootScope', '$state', 'loginService');
-
- bard.mockService($http, {
- _default: $q.when([]),
- get: $q.when(_user),
- post: $q.when(_user)
- });
-
- bard.mockService($state, {
- current: { name: 'root.search', params: {} },
- go: function(stateName, stateParams) {
- this.current = { name: stateName, params: stateParams };
- return $q.when();
- },
- reload: function() {
- return $q.when();
- }
- });
-
- bard.mockService(loginService, {
- getAuthenticatedStatus: $q.when()
- });
-
- });
-
- beforeEach(inject(function(_userService_) {
- service = _userService_;
- }));
-
- it('should be defined', function() {
- expect(service).to.be.defined;
- });
-
- it('currentUser should not be defined', function() {
- expect(service.currentUser()).to.not.be.defined;
- });
-
- it('should get the current logged in user - if loginService not init', function() {
- service.getUser().then(function(user) {
- expect(user).to.deep.eq(null);
- });
-
- expect(loginService.getAuthenticatedStatus).to.have.been.calledOnce;
-
- $rootScope.$apply();
- });
-
- it('should update the current user when logged in using loginService', function(done) {
- $rootScope.$broadcast('loginService:login-success', {data:_user});
- $rootScope.$apply(service);
-
- done();
- expect(service.currentUser().name).to.eq('bob');
- });
-
- it('should not set user with invalid credentials', function () {
- _user.data.authenticated = false;
- $rootScope.$broadcast('loginService:login-success', {data:_user});
- $rootScope.$apply(service);
-
- expect(service.currentUser().name).to.eq(undefined);
- });
-
- it('should clear user after logout', function () {
- $rootScope.$broadcast('loginService:logout-success');
- $rootScope.$apply(service);
-
- expect(service.currentUser()).to.not.be.defined;
- });
- });
-}());
diff --git a/app/templates/ui/index.html b/app/templates/ui/index.html
index 5e95dee0..908e7ee1 100644
--- a/app/templates/ui/index.html
+++ b/app/templates/ui/index.html
@@ -1,41 +1,15 @@
-
+
@sample-app-name
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ Loading...
+
diff --git a/app/templates/ui/robots.txt b/app/templates/ui/robots.txt
deleted file mode 100644
index 6ffbc308..00000000
--- a/app/templates/ui/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-User-agent: *
-Disallow: /
-
diff --git a/app/templates/ui/specs.html b/app/templates/ui/specs.html
deleted file mode 100644
index 4bfce393..00000000
--- a/app/templates/ui/specs.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
Spec Runner
-
-
-
-
-
-
-
-
-
-
-
-
Make sure the REMOTE server is running
- Click on a description title to narrow the scope to just its specs
- (see "
- ?grep" in address bar).
- Click on a spec title to see the test implementation.
- Click on page title to start over.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/templates/ui/styles/default.less b/app/templates/ui/styles/default.less
index 9f52d3ca..255f8ea4 100644
--- a/app/templates/ui/styles/default.less
+++ b/app/templates/ui/styles/default.less
@@ -21,7 +21,7 @@ nav.nav {
text-indent: 100%;
white-space: nowrap;
overflow: hidden;
- background: url('/images/marklogic.png') no-repeat;
+ background: url('../images/marklogic.png') no-repeat;
background-size: contain;
min-height: 30px;
height: 30px;
@@ -164,7 +164,7 @@ footer {
}
.powered {
- background: transparent url(/images/MarkLogic-Powered-By.png) no-repeat scroll 10px 10px;
+ background: transparent url('../images/MarkLogic-Powered-By.png') no-repeat scroll 10px 10px;
}
.detail {
diff --git a/app/templates/ui/styles/main.less b/app/templates/ui/styles/main.less
index 5e0c28ff..174f0e8f 100644
--- a/app/templates/ui/styles/main.less
+++ b/app/templates/ui/styles/main.less
@@ -1,8 +1,6 @@
-@import "../../bower_components/bootstrap/less/bootstrap.less";
-@import "../../bower_components/font-awesome/less/font-awesome.less";
-@import "../../bower_components/ml-search-ng/dist/ml-search-ng-tpls.less";
-@icon-font-path: "/fonts/";
-@FontAwesomePath: "/fonts/";
+@import "~bootstrap/less/bootstrap.less";
+@import "~font-awesome/less/font-awesome.less";
+@import "~ml-search-ng/dist/ml-search-ng-tpls.less";
/*****************************
* UI Themes
diff --git a/app/templates/webpack/webpack.dev.config.js b/app/templates/webpack/webpack.dev.config.js
new file mode 100644
index 00000000..eebbc6c9
--- /dev/null
+++ b/app/templates/webpack/webpack.dev.config.js
@@ -0,0 +1,70 @@
+var path = require('path');
+var webpack = require('webpack');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+
+module.exports = {
+ output: {
+ filename: '[name].bundle.js',
+ publicPath: 'http://localhost:3000/',
+ path: path.resolve(__dirname, 'ui')
+ },
+ devtool: 'cheap-module-eval-source-map',
+ entry: {},
+ module: {
+ loaders: [{
+ test: /\.js$/,
+ exclude: [/app\/lib/, /node_modules/],
+ loader: 'ng-annotate!babel'
+ }, {
+ test: /\.html$/,
+ loader: 'html'
+ }, {
+ test: /\.styl$/,
+ loader: 'style!css!stylus'
+ }, {
+ test: /\.less$/,
+ loader: 'style!css?sourceMap!less?sourceMap'
+ }, {
+ test: /\.css$/,
+ loader: 'style!css'
+ }, {
+ test: /\.(gif|png|jpe?g|svg|ico)(\?v=[0-9]\.[0-9]\.[0-9])?$/i,
+ loaders: [
+ 'file?hash=sha512&digest=hex&name=[hash].[ext]'
+ ]
+ }, {
+ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: 'url-loader?limit=10000&mimetype=application/font-woff'
+ }, {
+ test: /\.(ttf|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: 'file'
+ }]
+ },
+ plugins: [
+ new webpack.optimize.OccurenceOrderPlugin(),
+ // Injects bundles in your index.html instead of wiring all manually.
+ // It also adds hash to all injected assets so we don't have problems
+ // with cache purging during deployment.
+ new HtmlWebpackPlugin({
+ template: 'ui/index.html',
+ inject: 'body',
+ favicon: 'ui/images/favicon.ico',
+ hash: true
+ }),
+
+ // Automatically move all modules defined outside of application directory to vendor bundle.
+ // If you are using more complicated project structure, consider to specify common chunks manually.
+ new webpack.optimize.CommonsChunkPlugin({
+ name: 'vendor',
+ minChunks: function(module, count) {
+ return module.resource && module.resource.indexOf(path.resolve(__dirname, 'ui')) === -1;
+ }
+ }),
+ // Adds webpack HMR support. It act's like livereload,
+ // reloading page after webpack rebuilt modules.
+ // It also updates stylesheets and inline assets without page reloading.
+ new webpack.HotModuleReplacementPlugin(),
+ new webpack.NoErrorsPlugin()
+ ]
+};
diff --git a/app/templates/webpack/webpack.dist.config.js b/app/templates/webpack/webpack.dist.config.js
new file mode 100644
index 00000000..ebb21e63
--- /dev/null
+++ b/app/templates/webpack/webpack.dist.config.js
@@ -0,0 +1,92 @@
+var path = require('path');
+var webpack = require('webpack');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+
+module.exports = {
+ output: {
+ filename: '[name].bundle.js',
+ publicPath: '',
+ path: path.resolve(__dirname, '../dist')
+ },
+ devtool: 'sourcemap',
+ entry: {},
+ module: {
+ loaders: [{
+ test: /\.js$/,
+ exclude: [/app\/lib/, /node_modules/],
+ loader: 'ng-annotate!babel'
+ }, {
+ test: /\.html$/,
+ loader: 'html'
+ }, {
+ test: /\.styl$/,
+ loader: 'style!css!stylus'
+ }, {
+ test: /\.less$/,
+ loader: ExtractTextPlugin.extract(
+ // activate source maps via loader query
+ 'css?sourceMap!less?sourceMap'
+ )
+ }, {
+ test: /\.css$/,
+ loader: 'style!css'
+ }, {
+ test: /\.(gif|png|jpe?g|svg|ico)(\?v=[0-9]\.[0-9]\.[0-9])?$/i,
+ loaders: [
+ 'file?hash=sha512&digest=hex&name=[hash].[ext]',
+ 'image-webpack'
+ ]
+ }, {
+ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: 'url-loader?limit=10000&mimetype=application/font-woff'
+ }, {
+ test: /\.(ttf|eot)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
+ loader: 'file'
+ }]
+ },
+ plugins: [
+ // Injects bundles in your index.html instead of wiring all manually.
+ // It also adds hash to all injected assets so we don't have problems
+ // with cache purging during deployment.
+ new HtmlWebpackPlugin({
+ template: 'ui/index.html',
+ inject: 'body',
+ favicon: 'ui/images/favicon.ico',
+ hash: false
+ }),
+
+ // Automatically move all modules defined outside of application directory to vendor bundle.
+ // If you are using more complicated project structure, consider to specify common chunks manually.
+ new webpack.optimize.CommonsChunkPlugin({
+ name: 'vendor',
+ minChunks: function(module, count) {
+ return module.resource && module.resource.indexOf(path.resolve(__dirname, 'ui')) === -1;
+ }
+ }),
+ new ExtractTextPlugin('styles.css'),
+ new webpack.optimize.UglifyJsPlugin({
+ mangle: {
+
+ // You can specify all variables that should not be mangled.
+ // For example if your vendor dependency doesn't use modules
+ // and relies on global variables. Most of angular modules relies on
+ // angular global variable, so we should keep it unchanged
+ except: ['$super', '$', 'exports', 'require', 'angular']
+ }
+ })
+ ],
+ imageWebpackLoader: {
+ pngquant: {
+ quality: "65-90",
+ speed: 4
+ },
+ svgo: {
+ plugins: [{
+ removeViewBox: false
+ }, {
+ removeEmptyAttrs: false
+ }]
+ }
+ }
+};
