Moved the peoplesearch folder underneath the "./src/modules" folder.

client/src/main.dev.ts

@@ -23,7 +23,7 @@
 
 import { bootstrap, module } from 'angular';
 import ConfigService from './services/peoplesearch-config.service.dev';
-import peopleSearchModule from './peoplesearch/peoplesearch.module';
+import peopleSearchModule from './modules/peoplesearch/peoplesearch.module';
 import PeopleService from './services/people.service.dev';
 import PwmService from './services/pwm.service.dev';
 import routes from './routes';

client/src/main.ts

@@ -23,7 +23,7 @@
 
 import { bootstrap, module } from 'angular';
 import ConfigService from './services/peoplesearch-config.service';
-import peopleSearchModule from './peoplesearch/peoplesearch.module';
+import peopleSearchModule from './modules/peoplesearch/peoplesearch.module';
 import PeopleService from './services/people.service';
 import PwmService from './services/pwm.service';
 import routes from './routes';

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

@@ -28,7 +28,7 @@ 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 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';
@@ -38,7 +38,7 @@ import RandomChangePasswordController from '../../changepassword/random-change-p
 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/peoplesearch/orgchart-search.component.ts → client/src/modules/peoplesearch/orgchart-search.component.ts

@@ -21,18 +21,18 @@
  */
 
 
-import { Component } from '../component';
-import { IPeopleSearchConfigService } from '../services/peoplesearch-config.service';
-import { IPeopleService } from '../services/people.service';
-import IPwmService from '../services/pwm.service';
+import { Component } from '../../component';
+import { IPeopleSearchConfigService } from '../../services/peoplesearch-config.service';
+import { IPeopleService } from '../../services/people.service';
+import IPwmService from '../../services/pwm.service';
 import { isArray, isString, IPromise, IQService, IScope } from 'angular';
-import LocalStorageService from '../services/local-storage.service';
-import IOrgChartData from '../models/orgchart-data.model';
-import { IPerson } from '../models/person.model';
+import LocalStorageService from '../../services/local-storage.service';
+import IOrgChartData from '../../models/orgchart-data.model';
+import { IPerson } from '../../models/person.model';
 
 @Component({
-    stylesheetUrl: require('peoplesearch/orgchart-search.component.scss'),
-    templateUrl: require('peoplesearch/orgchart-search.component.html')
+    stylesheetUrl: require('modules/peoplesearch/orgchart-search.component.scss'),
+    templateUrl: require('modules/peoplesearch/orgchart-search.component.html')
 })
 export default class OrgChartSearchComponent {
     directReports: IPerson[];

client/src/peoplesearch/orgchart.component.ts → client/src/modules/peoplesearch/orgchart.component.ts

@@ -21,11 +21,11 @@
  */
 
 
-import { Component } from '../component';
+import { Component } from '../../component';
 import { element, IAugmentedJQuery, IFilterService, IScope, IWindowService } from 'angular';
-import ElementSizeService from '../ux/element-size.service';
-import { IPerson } from '../models/person.model';
-import {IPeopleSearchConfigService} from '../services/peoplesearch-config.service';
+import ElementSizeService from '../../ux/element-size.service';
+import { IPerson } from '../../models/person.model';
+import {IPeopleSearchConfigService} from '../../services/peoplesearch-config.service';
 
 export enum OrgChartSize {
     ExtraSmall = 0,
@@ -41,8 +41,8 @@ export enum OrgChartSize {
         person: '<',
         showImages: '<'
     },
-    stylesheetUrl: require('peoplesearch/orgchart.component.scss'),
-    templateUrl: require('peoplesearch/orgchart.component.html')
+    stylesheetUrl: require('modules/peoplesearch/orgchart.component.scss'),
+    templateUrl: require('modules/peoplesearch/orgchart.component.html')
 })
 export default class OrgChartComponent {
     directReports: IPerson[];

client/src/peoplesearch/peoplesearch-base.component.ts → client/src/modules/peoplesearch/peoplesearch-base.component.ts

@@ -22,13 +22,13 @@
 
 
 import { isArray, isString, IPromise, IQService, IScope } from 'angular';
-import { IPeopleSearchConfigService } from '../services/peoplesearch-config.service';
-import { IPeopleService } from '../services/people.service';
-import IPwmService from '../services/pwm.service';
-import LocalStorageService from '../services/local-storage.service';
-import { IPerson } from '../models/person.model';
-import PromiseService from '../services/promise.service';
-import SearchResult from '../models/search-result.model';
+import { IPeopleSearchConfigService } from '../../services/peoplesearch-config.service';
+import { IPeopleService } from '../../services/people.service';
+import IPwmService from '../../services/pwm.service';
+import LocalStorageService from '../../services/local-storage.service';
+import { IPerson } from '../../models/person.model';
+import PromiseService from '../../services/promise.service';
+import SearchResult from '../../models/search-result.model';
 
 const SEARCH_TEXT_LOCAL_STORAGE_KEY = 'searchText';
 

client/src/peoplesearch/peoplesearch-cards.component.ts → client/src/modules/peoplesearch/peoplesearch-cards.component.ts

@@ -21,17 +21,17 @@
  */
 
 
-import { Component } from '../component';
-import ElementSizeService from '../ux/element-size.service';
-import IPeopleSearchConfigService from '../services/peoplesearch-config.service';
-import IPeopleService from '../services/people.service';
-import IPwmService from '../services/pwm.service';
+import { Component } from '../../component';
+import ElementSizeService from '../../ux/element-size.service';
+import IPeopleSearchConfigService from '../../services/peoplesearch-config.service';
+import IPeopleService from '../../services/people.service';
+import IPwmService from '../../services/pwm.service';
 import { isString, IAugmentedJQuery, IQService, IScope } from 'angular';
-import LocalStorageService from '../services/local-storage.service';
+import LocalStorageService from '../../services/local-storage.service';
 import PeopleSearchBaseComponent from './peoplesearch-base.component';
-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';
+import SearchResult from '../../models/search-result.model';
 
 export enum PeopleSearchCardsSize {
     Small = 0,
@@ -40,8 +40,8 @@ export enum PeopleSearchCardsSize {
 }
 
 @Component({
-    stylesheetUrl: require('peoplesearch/peoplesearch-cards.component.scss'),
-    templateUrl: require('peoplesearch/peoplesearch-cards.component.html')
+    stylesheetUrl: require('modules/peoplesearch/peoplesearch-cards.component.scss'),
+    templateUrl: require('modules/peoplesearch/peoplesearch-cards.component.html')
 })
 export default class PeopleSearchCardsComponent extends PeopleSearchBaseComponent {
     photosEnabled: boolean;

client/src/peoplesearch/peoplesearch-table.component.ts → client/src/modules/peoplesearch/peoplesearch-table.component.ts

@@ -21,19 +21,19 @@
  */
 
 
-import { Component } from '../component';
-import { IPeopleSearchConfigService } from '../services/peoplesearch-config.service';
-import IPeopleService from '../services/people.service';
-import IPwmService from '../services/pwm.service';
+import { Component } from '../../component';
+import { IPeopleSearchConfigService } from '../../services/peoplesearch-config.service';
+import IPeopleService from '../../services/people.service';
+import IPwmService from '../../services/pwm.service';
 import { IQService, IScope } from 'angular';
-import LocalStorageService from '../services/local-storage.service';
+import LocalStorageService from '../../services/local-storage.service';
 import PeopleSearchBaseComponent from './peoplesearch-base.component';
-import PromiseService from '../services/promise.service';
-import SearchResult from '../models/search-result.model';
+import PromiseService from '../../services/promise.service';
+import SearchResult from '../../models/search-result.model';
 
 @Component({
-    stylesheetUrl: require('peoplesearch/peoplesearch-table.component.scss'),
-    templateUrl: require('peoplesearch/peoplesearch-table.component.html')
+    stylesheetUrl: require('modules/peoplesearch/peoplesearch-table.component.scss'),
+    templateUrl: require('modules/peoplesearch/peoplesearch-table.component.html')
 })
 export default class PeopleSearchTableComponent extends PeopleSearchBaseComponent {
     columnConfiguration: any;

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

@@ -30,9 +30,9 @@ import PeopleSearchTableComponent from './peoplesearch-table.component';
 import PeopleSearchCardsComponent from './peoplesearch-cards.component';
 import PersonCardDirective from './person-card.component';
 import PersonDetailsDialogComponent from './person-details-dialog.component';
-import LocalStorageService from '../services/local-storage.service';
-import PromiseService from '../services/promise.service';
-import uxModule from '../ux/ux.module';
+import LocalStorageService from '../../services/local-storage.service';
+import PromiseService from '../../services/promise.service';
+import uxModule from '../../ux/ux.module';
 
 require('./peoplesearch.scss');
 

client/src/peoplesearch/peoplesearch.scss → client/src/modules/peoplesearch/peoplesearch.scss

@@ -78,7 +78,7 @@ body {
 }
 
 .ias-avatar {
-  background: transparent url('../../images/user.png') no-repeat center center;
+  background: transparent url('../../../images/user.png') no-repeat center center;
   background-size: contain;
 }
 

client/src/peoplesearch/person-card.component.ts → client/src/modules/peoplesearch/person-card.component.ts

@@ -22,10 +22,10 @@
 
 
 import {IAugmentedJQuery} from 'angular';
-import { IPerson } from '../models/person.model';
-import { IPeopleService } from '../services/people.service';
+import { IPerson } from '../../models/person.model';
+import { IPeopleService } from '../../services/people.service';
 
-const templateUrl = require('peoplesearch/person-card.component.html');
+const templateUrl = require('modules/peoplesearch/person-card.component.html');
 
 class PersonCardController {
     private details: any[]; // For large style cards

client/src/peoplesearch/person-details-dialog.component.ts → client/src/modules/peoplesearch/person-details-dialog.component.ts

@@ -21,15 +21,15 @@
  */
 
 
-import { Component } from '../component';
-import { IPeopleSearchConfigService } from '../services/peoplesearch-config.service';
-import { IPeopleService } from '../services/people.service';
+import { Component } from '../../component';
+import { IPeopleSearchConfigService } from '../../services/peoplesearch-config.service';
+import { IPeopleService } from '../../services/people.service';
 import { IAugmentedJQuery, ITimeoutService } from 'angular';
-import { IPerson } from '../models/person.model';
+import { IPerson } from '../../models/person.model';
 
 @Component({
-    stylesheetUrl: require('peoplesearch/person-details-dialog.component.scss'),
-    templateUrl: require('peoplesearch/person-details-dialog.component.html')
+    stylesheetUrl: require('modules/peoplesearch/person-details-dialog.component.scss'),
+    templateUrl: require('modules/peoplesearch/person-details-dialog.component.html')
 })
 export default class PersonDetailsDialogComponent {
     person: IPerson;

client/src/peoplesearch/person.filters.ts → client/src/modules/peoplesearch/person.filters.ts

@@ -21,7 +21,7 @@
  */
 
 
-import { IPerson } from '../models/person.model';
+import { IPerson } from '../../models/person.model';
 
 export function FullNameFilter(): (person: IPerson) => string {
     return (person: IPerson): string => {

client/webpack.dev.js

@@ -31,7 +31,7 @@ module.exports = webpackMerge(commonConfig, {
         'peoplesearch.ng': './src/main.dev',
         'changepassword.ng': './src/modules/changepassword/changepassword.module',
         'configeditor.ng': './src/modules/configeditor/configeditor.module',
-        'helpdesk.ng': './src/helpdesk/main.dev'
+        'helpdesk.ng': './src/modules/helpdesk/main.dev'
     },
     plugins: [
         // Don't forget to add this to karma.conf.js