Added loading for image files to url-loader config.

Fixed controller and service function names.
GovTechSG · Feb 21, 2018 · 1f8fe2f · 1f8fe2f
1 parent 0a16476
commit 1f8fe2f
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apex-signature-validator",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "APEX micro service and dev tool for testing level 0 - 2 requests",
   "scripts": {
     "build": "webpack --progress --colors --env.production --optimize-minimize",

diff --git a/src/controllers/navbarController.js b/src/controllers/navbarController.js
@@ -1,6 +1,6 @@
 import apex_logo from '../images/logo_apex.png';
 
-function foo($scope, $rootScope, ModalService, $uibModal) {
+function navbarController($scope, $rootScope, ModalService, $uibModal) {
     let controller = this;
 
     controller.apex_logo = apex_logo; // path to logo file
@@ -30,10 +30,7 @@ function foo($scope, $rootScope, ModalService, $uibModal) {
         }).result.then(function (jsonString) {
             var jsonObj = JSON.parse(jsonString);
             ModalService.setParams(jsonObj.params);
-            // ModalService.setBS(jsonObj.basestring)
             ModalService.setPem(jsonObj.pem);
-            // ModalService.setSig(jsonObj.signature)
-            // ModalService.setAuth(jsonObj.auth)
             ModalService.setPwd(jsonObj.password);
 
             $rootScope.$broadcast('navbar-modal-set');
@@ -53,4 +50,4 @@ function foo($scope, $rootScope, ModalService, $uibModal) {
     }
 }
 
-export default foo;
+export default navbarController;
diff --git a/src/service/modalService.js b/src/service/modalService.js
@@ -1,4 +1,4 @@
-function foo() {
+function modalService() {
     return {
         setParams: function (params) {
             this.params = params;
@@ -27,4 +27,4 @@ function foo() {
         }
     }
 }
-export default foo;
+export default modalService;
diff --git a/src/service/testService.js b/src/service/testService.js
@@ -1,6 +1,6 @@
 import KJUR from 'jsrsasign';
 
-function foo($http, UtilityService) {
+function testService($http, UtilityService) {
     return {
         generateBasestring: function (params) {
             let sortedParams = UtilityService.sortJSON(params);
@@ -85,4 +85,4 @@ function foo($http, UtilityService) {
     }
 }
 
-export default foo;
+export default testService;
diff --git a/webpack.config.js b/webpack.config.js
@@ -15,51 +15,43 @@ module.exports = (env = {}) => { // set env as empty object if unset from cli
             filename: '[name].bundle.js'
         },
         module: {
-            rules: [{
-                test: /\.js$/,
-                exclude: path.resolve(__dirname, 'node_modules'),
-                use: {
-                    loader: 'babel-loader',
-                    options: {
-                        presets: [
-                            [
-                                'babel-preset-env',
-                                {
-                                    targets: {
-                                        browsers: ['ie 11']
+            rules: [
+                {
+                    test: /\.js$/,
+                    exclude: path.resolve(__dirname, 'node_modules'),
+                    use: {
+                        loader: 'babel-loader',
+                        options: {
+                            presets: [
+                                [
+                                    'babel-preset-env',
+                                    {
+                                        targets: {
+                                            browsers: ['ie 11']
+                                        }
                                     }
-                                }
+                                ]
                             ]
-                        ]
+                        }
                     }
+                },
+                {
+                    test: /\.(png|jpg|gif|eot|otf|svg|ttf|woff|woff2)$/,
+                    use: [{
+                        loader: 'url-loader',
+                        options: {
+                            limit: 8192, // byte limit to inline files as data URL
+                            name: 'assets/[name].[ext]' // path to file for file-loader fallback
+                        }
+                    }]
+                },
+                {
+                    test: /\.css$/,
+                    use: ExtractTextPlugin.extract({
+                        use: 'css-loader',
+                        fallback: 'style-loader'
+                    })
                 }
-            },
-            {
-                test: /\.(eot|otf|svg|ttf|woff|woff2)$/,
-                use: [{
-                    loader: 'url-loader',
-                    options: {
-                        limit: 8192 // byte limit to inline files as data URL
-                    }
-                }]
-            },
-            {
-                test: /\.(png|jpg|gif)$/,
-                use: [{
-                    loader: 'file-loader',
-                    options: {
-                        name: '[name].[ext]',
-                        outputPath: 'assets/'
-                    }
-                }]
-            },
-            {
-                test: /\.css$/,
-                use: ExtractTextPlugin.extract({
-                    use: 'css-loader',
-                    fallback: 'style-loader'
-                })
-            }
             ]
         },
         plugins: [