Updated front to use custom config

Author: Flyers

back-end/Dockerfile

@@ -4,6 +4,8 @@ ADD . /var/www
 WORKDIR /var/www
 
 RUN usermod -u 1000 www-data
+RUN mkdir -p /var/www/app/cache
+RUN mkdir -p /var/www/app/logs
 RUN chmod -R 777 /var/www/app/cache
 RUN chmod -R 777 /var/www/app/logs
 

front-end/src/index.html

@@ -15,9 +15,10 @@
 
   <div>Angular seed app: v<span app-version></span></div>
 
-  <script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha1.js"></script>
-  <script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha512.js"></script>
-  <script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/components/enc-base64-min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/core-min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/sha1-min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/sha512-min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/components/enc-base64-min.js"></script>
   <script src="lib/angular/angular.js"></script>
   <script src="lib/angular/angular-cookies.js"></script>
   <script src="lib/angular/angular-resource.js"></script>

front-end/src/js/app.js

@@ -1,12 +1,14 @@
 'use strict';
 
-
 // Declare app level module which depends on filters, and services
 angular.module('myApp', ['myApp.filters', 'myApp.services', 'myApp.directives', 'myApp.controllers']).
-  constant('apiUrl', 'http://localhost:8080/')
+  constant('cfg', {
+    url: 'http://localhost:8080/',
+    httpTimeout: 5000
+  }).
   config(['$routeProvider', function($routeProvider) {
-    $routeProvider.when('/login', {templateUrl: '/bundles/app/partials/login.html', controller: 'Login'});
-    $routeProvider.when('/view1', {templateUrl: '/bundles/app/partials/partial1.html', controller: 'MyCtrl1'});
-    $routeProvider.when('/view2', {templateUrl: '/bundles/app/partials/partial2.html', controller: 'MyCtrl2'});
+    $routeProvider.when('/login', {templateUrl: 'partials/login.html', controller: 'Login'});
+    $routeProvider.when('/view1', {templateUrl: 'partials/partial1.html', controller: 'MyCtrl1'});
+    $routeProvider.when('/view2', {templateUrl: 'partials/partial2.html', controller: 'MyCtrl2'});
     $routeProvider.otherwise({redirectTo: '/login'});
   }]);

front-end/src/js/services.js

@@ -104,9 +104,9 @@ factory('TokenHandler', [ '$http', 'Base64', function($http, Base64) {
 
     return tokenHandler;
 }]).
-factory('Salt', ['$resource', function($resource) {
+factory('Salt', ['cfg', '$resource', function(cfg, $resource) {
     // Service to load Salt
-    return $resource(':username/salt', {username:'@id'});
+    return $resource(cfg.url+':username/salt', {username:'@id'});
 }]).
 factory('Digest', ['$q', function($q) {
     var factory = {
@@ -137,20 +137,20 @@ factory('Digest', ['$q', function($q) {
     };
     return factory;
 }]).
-factory('Hello', ['$resource', 'TokenHandler', function($resource, tokenHandler) {
-    var resource = $resource('api/hello');
+factory('Hello', ['cfg', '$resource', 'TokenHandler', function(cfg, $resource, tokenHandler) {
+    var resource = $resource(cfg.url+'api/hello');
     resource = tokenHandler.wrapActions(resource, ['get']);
     return resource;
 }]).
-factory('Todos', ['$resource', 'TokenHandler', function($resource, tokenHandler){
-    var resource = $resource('api/todos', {}, {
+factory('Todos', ['cfg', '$resource', 'TokenHandler', function(cfg, $resource, tokenHandler){
+    var resource = $resource(cfg.url+'api/todos', {}, {
         query: {method:'GET', params:{}, isArray:true}
     });
     resource = tokenHandler.wrapActions(resource, ['get', 'query']);
     return resource;
 }]).
-factory('Todo', ['$resource', 'TokenHandler', function($resource, tokenHandler){
-    var resource = $resource('api/todo', {}, {
+factory('Todo', ['cfg', '$resource', 'TokenHandler', function(cfg, $resource, tokenHandler){
+    var resource = $resource(cfg.url+'api/todo', {}, {
         update: {method:'PUT'},
     });
     resource = tokenHandler.wrapActions(resource, ['get', 'update']);