Merge pull request #302 from pwm-project/move-to-modules

Created a "modules" folder, and moved the configeditor and changepass…

client/src/pages/changepassword/changepassword.controller.ts → client/src/modules/changepassword/changepassword.controller.ts

@@ -28,8 +28,8 @@ declare const PWM_GLOBAL: any;
 declare const PWM_MAIN: any;
 
 const PWM_CHANGEPW = window['PWM_CHANGEPW'];
-const PW_SUGGESTIONS_TEMPLATE = require("pages/changepassword/password-suggestions.html");
-require("pages/changepassword/password-suggestions.scss");
+const PW_SUGGESTIONS_TEMPLATE = require("./password-suggestions.html");
+require("./password-suggestions.scss");
 
 export default class ChangePasswordController {
     static $inject = ["$scope", "$compile", "$templateCache"];

client/webpack.build.js

@@ -31,8 +31,8 @@ module.exports = webpackMerge(commonConfig, {
     devtool: 'source-map',
     entry: {
         'peoplesearch.ng': './src/main',
-        'changepassword.ng': './src/pages/changepassword/changepassword.module',
-        'configeditor.ng': './src/pages/configeditor/configeditor.module',
+        'changepassword.ng': './src/modules/changepassword/changepassword.module',
+        'configeditor.ng': './src/modules/configeditor/configeditor.module',
         'helpdesk.ng': './src/helpdesk/main'
     },
     plugins: [

client/webpack.dev.js

@@ -29,8 +29,8 @@ module.exports = webpackMerge(commonConfig, {
     devtool: 'cheap-module-source-map',
     entry: {
         'peoplesearch.ng': './src/main.dev',
-        'changepassword.ng': './src/pages/changepassword/changepassword.module',
-        'configeditor.ng': './src/pages/configeditor/configeditor.module',
+        'changepassword.ng': './src/modules/changepassword/changepassword.module',
+        'configeditor.ng': './src/modules/configeditor/configeditor.module',
         'helpdesk.ng': './src/helpdesk/main.dev'
     },
     plugins: [

server/src/main/webapp/WEB-INF/jsp/changepassword.jsp

@@ -137,7 +137,7 @@
 
 <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
-<pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
+<pwm:script-ref url="/public/resources/webjars/angular-translate/angular-translate.min.js" />
 
 <pwm:script-ref url="/public/resources/js/changepassword.js"/>
 <pwm:script-ref url="/public/resources/webjars/pwm-client/changepassword.ng.js" />

server/src/main/webapp/WEB-INF/jsp/configeditor.jsp

@@ -165,7 +165,7 @@
 <%--Add support for angular--%>
 <pwm:script-ref url="/public/resources/webjars/angular/angular.min.js" />
 <pwm:script-ref url="/public/resources/webjars/angular-ui-router/release/angular-ui-router.min.js" />
-<pwm:script-ref url="/public/resources/webjars/angular-translate/dist/angular-translate.min.js" />
+<pwm:script-ref url="/public/resources/webjars/angular-translate/angular-translate.min.js" />
 <%--/ Add support for angular--%>
 
 <%--Add support for the "textAngular" library (a control for editing HTML)--%>