Merge pull request #303 from pwm-project/move-helpdesk-module

Moved helpdesk module under the "./src/modules" folder.

client/src/helpdesk/helpdesk-detail.component.ts → client/src/modules/helpdesk/helpdesk-detail.component.ts

@@ -21,14 +21,14 @@
  */
 
 
-import {Component} from '../component';
-import {IButtonInfo, IHelpDeskService, ISuccessResponse} from '../services/helpdesk.service';
+import {Component} from '../../component';
+import {IButtonInfo, IHelpDeskService, ISuccessResponse} from '../../services/helpdesk.service';
 import {IScope, ui} from 'angular';
 import {noop} from 'angular';
-import {IHelpDeskConfigService, PASSWORD_UI_MODES} from '../services/helpdesk-config.service';
-import {IPeopleService} from '../services/people.service';
-import {IPerson} from '../models/person.model';
-import {IChangePasswordSuccess} from '../changepassword/success-change-password.controller';
+import {IHelpDeskConfigService, PASSWORD_UI_MODES} from '../../services/helpdesk-config.service';
+import {IPeopleService} from '../../services/people.service';
+import {IPerson} from '../../models/person.model';
+import {IChangePasswordSuccess} from '../../changepassword/success-change-password.controller';
 
 let autogenChangePasswordTemplateUrl = require('changepassword/autogen-change-password.component.html');
 let helpdeskDetailDialogTemplateUrl = require('./helpdesk-detail-dialog.template.html');
@@ -42,8 +42,8 @@ const STATUS_CONFIRM = 'confirm';
 const STATUS_SUCCESS = 'success';
 
 @Component({
-    stylesheetUrl: require('helpdesk/helpdesk-detail.component.scss'),
-    templateUrl: require('helpdesk/helpdesk-detail.component.html')
+    stylesheetUrl: require('modules/helpdesk/helpdesk-detail.component.scss'),
+    templateUrl: require('modules/helpdesk/helpdesk-detail.component.html')
 })
 export default class HelpDeskDetailComponent {
     person: any;

client/src/helpdesk/helpdesk-search-base.component.ts → client/src/modules/helpdesk/helpdesk-search-base.component.ts

@@ -21,13 +21,13 @@
  */
 
 
-import {IPeopleService} from '../services/people.service';
-import SearchResult from '../models/search-result.model';
+import {IPeopleService} from '../../services/people.service';
+import SearchResult from '../../models/search-result.model';
 import {isArray, isString, IPromise, IQService, IScope} from 'angular';
-import {IPerson} from '../models/person.model';
-import {IHelpDeskConfigService} from '../services/helpdesk-config.service';
-import LocalStorageService from '../services/local-storage.service';
-import PromiseService from '../services/promise.service';
+import {IPerson} from '../../models/person.model';
+import {IHelpDeskConfigService} from '../../services/helpdesk-config.service';
+import LocalStorageService from '../../services/local-storage.service';
+import PromiseService from '../../services/promise.service';
 
 let verificationsDialogTemplateUrl = require('./verifications-dialog.template.html');
 let recentVerificationsDialogTemplateUrl = require('./recent-verifications-dialog.template.html');

client/src/helpdesk/helpdesk-search-cards.component.ts → client/src/modules/helpdesk/helpdesk-search-cards.component.ts

@@ -21,19 +21,19 @@
  */
 
 
-import {Component} from '../component';
-import {IPeopleService} from '../services/people.service';
+import {Component} from '../../component';
+import {IPeopleService} from '../../services/people.service';
 import {IQService, IScope} from 'angular';
-import {IHelpDeskConfigService} from '../services/helpdesk-config.service';
-import LocalStorageService from '../services/local-storage.service';
+import {IHelpDeskConfigService} from '../../services/helpdesk-config.service';
+import LocalStorageService from '../../services/local-storage.service';
 import HelpDeskSearchBaseComponent from './helpdesk-search-base.component';
-import SearchResult from '../models/search-result.model';
-import {IPerson} from '../models/person.model';
-import PromiseService from '../services/promise.service';
+import SearchResult from '../../models/search-result.model';
+import {IPerson} from '../../models/person.model';
+import PromiseService from '../../services/promise.service';
 
 @Component({
-    stylesheetUrl: require('helpdesk/helpdesk-search.component.scss'),
-    templateUrl: require('helpdesk/helpdesk-search-cards.component.html')
+    stylesheetUrl: require('modules/helpdesk/helpdesk-search.component.scss'),
+    templateUrl: require('modules/helpdesk/helpdesk-search-cards.component.html')
 })
 export default class HelpDeskSearchCardsComponent extends HelpDeskSearchBaseComponent {
     static $inject = [

client/src/helpdesk/helpdesk-search-table.component.ts → client/src/modules/helpdesk/helpdesk-search-table.component.ts

@@ -23,16 +23,16 @@
 
 import {IQService, IScope} from 'angular';
 import HelpDeskSearchBaseComponent from './helpdesk-search-base.component';
-import {Component} from '../component';
-import SearchResult from '../models/search-result.model';
-import {IPeopleService} from '../services/people.service';
-import {IHelpDeskConfigService} from '../services/helpdesk-config.service';
-import LocalStorageService from '../services/local-storage.service';
-import PromiseService from '../services/promise.service';
+import {Component} from '../../component';
+import SearchResult from '../../models/search-result.model';
+import {IPeopleService} from '../../services/people.service';
+import {IHelpDeskConfigService} from '../../services/helpdesk-config.service';
+import LocalStorageService from '../../services/local-storage.service';
+import PromiseService from '../../services/promise.service';
 
 @Component({
-    stylesheetUrl: require('helpdesk/helpdesk-search.component.scss'),
-    templateUrl: require('helpdesk/helpdesk-search-table.component.html')
+    stylesheetUrl: require('modules/helpdesk/helpdesk-search.component.scss'),
+    templateUrl: require('modules/helpdesk/helpdesk-search-table.component.html')
 })
 export default class HelpDeskSearchTableComponent extends HelpDeskSearchBaseComponent {
     columnConfiguration: any;

client/src/helpdesk/helpdesk-search.component.scss → client/src/modules/helpdesk/helpdesk-search.component.scss

@@ -54,7 +54,7 @@ help-desk-search-table {
 }
 
 .loading-gif-25 {
-  background-image: url('../../images/icons/wait_25.gif');
+  background-image: url('../../../images/icons/wait_25.gif');
   display: inline-block;
   height: 25px;
   width: 25px;

client/src/helpdesk/helpdesk.module.ts → client/src/modules/helpdesk/helpdesk.module.ts

@@ -26,19 +26,19 @@ import { DateFilter } from './date.filters';
 import HelpDeskDetailComponent from './helpdesk-detail.component';
 import HelpDeskSearchTableComponent from './helpdesk-search-table.component';
 import HelpDeskSearchCardsComponent from './helpdesk-search-cards.component';
-import LocalStorageService from '../services/local-storage.service';
-import ObjectService from '../services/object.service';
-import PersonCardDirective from '../peoplesearch/person-card.component';
-import PromiseService from '../services/promise.service';
+import LocalStorageService from '../../services/local-storage.service';
+import ObjectService from '../../services/object.service';
+import PersonCardDirective from '../../peoplesearch/person-card.component';
+import PromiseService from '../../services/promise.service';
 import RecentVerificationsDialogController from './recent-verifications-dialog.controller';
-import uxModule from '../ux/ux.module';
+import uxModule from '../../ux/ux.module';
 import VerificationsDialogController from './verifications-dialog.controller';
-import AutogenChangePasswordController from '../changepassword/autogen-change-password.controller';
-import RandomChangePasswordController from '../changepassword/random-change-password.controller';
-import SuccessChangePasswordController from '../changepassword/success-change-password.controller';
-import TypeChangePasswordController from '../changepassword/type-change-password.controller';
+import AutogenChangePasswordController from '../../changepassword/autogen-change-password.controller';
+import RandomChangePasswordController from '../../changepassword/random-change-password.controller';
+import SuccessChangePasswordController from '../../changepassword/success-change-password.controller';
+import TypeChangePasswordController from '../../changepassword/type-change-password.controller';
 
-require('../peoplesearch/peoplesearch.scss');
+require('../../peoplesearch/peoplesearch.scss');
 
 const moduleName = 'help-desk';
 

client/src/helpdesk/main.dev.ts → client/src/modules/helpdesk/main.dev.ts

@@ -24,11 +24,11 @@ import { bootstrap, module } from 'angular';
 import helpDeskModule from './helpdesk.module';
 import routes from './routes';
 import uiRouter from '@uirouter/angularjs';
-import PeopleService from '../services/people.service.dev';
-import HelpDeskConfigService from '../services/helpdesk-config.service.dev';
-import HelpDeskService from '../services/helpdesk.service.dev';
-import PasswordService from '../services/password.service.dev';
-import PwmService from '../services/pwm.service.dev';
+import PeopleService from '../../services/people.service.dev';
+import HelpDeskConfigService from '../../services/helpdesk-config.service.dev';
+import HelpDeskService from '../../services/helpdesk.service.dev';
+import PasswordService from '../../services/password.service.dev';
+import PwmService from '../../services/pwm.service.dev';
 
 
 module('app', [

client/src/helpdesk/main.ts → client/src/modules/helpdesk/main.ts

@@ -22,14 +22,14 @@
 
 import { bootstrap, module } from 'angular';
 import helpDeskModule from './helpdesk.module';
-import PeopleService from '../services/people.service';
-import PwmService from '../services/pwm.service';
+import PeopleService from '../../services/people.service';
+import PwmService from '../../services/pwm.service';
 import routes from './routes';
-import TranslationsLoaderFactory from '../services/translations-loader.factory';
+import TranslationsLoaderFactory from '../../services/translations-loader.factory';
 import uiRouter from '@uirouter/angularjs';
-import HelpDeskConfigService from '../services/helpdesk-config.service';
-import HelpDeskService from '../services/helpdesk.service';
-import PasswordService from '../services/password.service';
+import HelpDeskConfigService from '../../services/helpdesk-config.service';
+import HelpDeskService from '../../services/helpdesk.service';
+import PasswordService from '../../services/password.service';
 
 
 module('app', [

client/src/helpdesk/recent-verifications-dialog.controller.ts → client/src/modules/helpdesk/recent-verifications-dialog.controller.ts

@@ -21,7 +21,7 @@
  */
 
 
-import {IHelpDeskService, IRecentVerifications} from '../services/helpdesk.service';
+import {IHelpDeskService, IRecentVerifications} from '../../services/helpdesk.service';
 
 export default class RecentVerificationsDialogController {
     recentVerifications: IRecentVerifications;

client/src/helpdesk/verifications-dialog.controller.ts → client/src/modules/helpdesk/verifications-dialog.controller.ts

@@ -25,10 +25,10 @@ import {ui, ITimeoutService} from 'angular';
 import {
     IHelpDeskConfigService, IVerificationMap, TOKEN_CHOICE,
     VERIFICATION_METHOD_NAMES
-} from '../services/helpdesk-config.service';
-import {IHelpDeskService, IVerificationTokenResponse} from '../services/helpdesk.service';
-import {IPerson} from '../models/person.model';
-import ObjectService from '../services/object.service';
+} from '../../services/helpdesk-config.service';
+import {IHelpDeskService, IVerificationTokenResponse} from '../../services/helpdesk.service';
+import {IPerson} from '../../models/person.model';
+import ObjectService from '../../services/object.service';
 
 const STATUS_FAILED = 'failed';
 const STATUS_NONE = 'none';

client/webpack.build.js

@@ -33,7 +33,7 @@ module.exports = webpackMerge(commonConfig, {
         'peoplesearch.ng': './src/main',
         'changepassword.ng': './src/modules/changepassword/changepassword.module',
         'configeditor.ng': './src/modules/configeditor/configeditor.module',
-        'helpdesk.ng': './src/helpdesk/main'
+        'helpdesk.ng': './src/modules/helpdesk/main'
     },
     plugins: [
         new CopyWebpackPlugin([