Preparations for testnet release

src/css/style.css

@@ -161,7 +161,7 @@ body {
 }
 
 .balanceType {
-    
+
 }
 
 
@@ -733,18 +733,15 @@ header {
     height: 100%;
 }
 
-#tabs-Iconset span:focus {
-    outline: none;
-}
-
 #tabs-Iconset img {
     margin-top: 0px;
     margin-left: .5rem;
     margin-right: .5rem;
+    height: 90%;
 }
 
-#tabs-Iconset img {
-    height: 90%;
+#tabs-Iconset img:focus {
+    outline: none;
 }
 
 #tabs-Iconset img:hover {
@@ -754,7 +751,7 @@ header {
 }
 
 span.tabs-radio img {
-    opacity: .4; 
+    opacity: .4;
 }
 
 span.tabs-radio img:not(.selected) {
@@ -965,7 +962,7 @@ span.tabs-radio img.selected {
 
 #send-payment-confirmation button, #create-asset-confirmation button, #asset-transfer-dialog button, #asset-reissue-dialog button, #transfer-asset-confirmation button, #asset-reissue-confirm-dialog button, #asset-details-dialog button {
     border: 1px solid #37556E;
-    color: #37556E;  
+    color: #37556E;
 }
 
 #send-payment-confirmation button:hover, #create-asset-confirmation button:hover, #asset-transfer-dialog button:hover, #asset-reissue-dialog button:hover, #transfer-asset-confirmation button:hover, #asset-reissue-confirm-dialog button:hover, #asset-details-dialog button:hover {
@@ -1222,7 +1219,7 @@ span.tabs-radio img.selected {
     outline: none;
     text-align: center;
     text-decoration: none;
-    
+
     -webkit-user-select: none;
     /* Chrome/Safari */
     -moz-user-select: none;

src/index.html

@@ -21,8 +21,10 @@
     <meta charset="utf-8">
     <title>Waves Lite Client</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- CSS BEGIN -->
     <link rel="stylesheet" href="../bower_components/angular/angular-csp.css">
     <link rel="stylesheet" href="../bower_components/angular-material/angular-material.css">
+    <!-- CSS END -->
     <link rel="stylesheet" href="css/jquery.modal.css">
     <link rel="stylesheet" href="css/jquery.growl.css">
     <link rel="stylesheet" href="css/tooltipster.min.css">
@@ -813,7 +815,7 @@ <h2>LATEST BLOCKS INFORMATION</h2>
         </div>
     </div> <!-- Wrapper div END -->
 
-    <!-- JAVASCRIPT -->
+    <!-- JAVASCRIPT BEGIN -->
     <script src="../bower_components/jquery/dist/jquery.js"></script>
 
     <script src="../bower_components/js-sha3/src/sha3.js"></script>
@@ -849,7 +851,6 @@ <h2>LATEST BLOCKS INFORMATION</h2>
     <!-- application modules -->
     <script src="../bower_components/wavesplatform-core-js/distr/wavesplatform-core-js-0.2.0.js"></script>
 
-    <script src="js/app.js"></script>
     <script src="js/ui.module.js"></script>
     <script src="js/application.context.factory.js"></script>
     <script src="js/home.controller.js"></script>
@@ -901,5 +902,8 @@ <h2>LATEST BLOCKS INFORMATION</h2>
     <script src="js/portfolio/asset.filter.js"></script>
 
     <script src="js/style.js"></script>
+
+    <script src="js/app.js"></script>
+    <!-- JAVASCRIPT END -->
 </body>
 </html>

src/js/app.js

@@ -28,7 +28,18 @@ var app = angular.module('app', [
     'app.portfolio'
 ]).config(AngularApplicationConfig).run(AngularApplicationRun);
 
-function AngularApplicationConfig($validatorProvider) {
+function AngularApplicationConfig($provide, $validatorProvider, networkConstants, applicationSettings) {
+    $provide.constant(networkConstants,
+        angular.extend(networkConstants, {
+            NETWORK_NAME: 'devel',
+            NETWORK_CODE: 'T'
+        }));
+    $provide.constant(applicationSettings,
+        angular.extend(applicationSettings, {
+            CLIENT_VERSION: '0.4.1a',
+            NODE_ADDRESS: 'http://52.30.47.67:6869'
+        }));
+
     $validatorProvider.setDefaults({
         errorClass: 'wInput-error',
         onkeyup: false,
@@ -71,14 +82,14 @@ function AngularApplicationConfig($validatorProvider) {
         'one uppercase and one lowercase letter');
 }
 
-AngularApplicationConfig.$inject = ['$validatorProvider'];
+AngularApplicationConfig.$inject = ['$provide', '$validatorProvider', 'constants.network', 'constants.application'];
 
-function AngularApplicationRun(rest, coreConstants, notificationService, addressService) {
+function AngularApplicationRun(rest, applicationConstants, notificationService, addressService) {
     // restangular configuration
     rest.setDefaultHttpFields({
         timeout: 10000 // milliseconds
     });
-    var url = coreConstants.NODE_ADDRESS;
+    var url = applicationConstants.NODE_ADDRESS;
     //var url = 'http://52.28.66.217:6869';
     //var url = 'http://52.77.111.219:6869';
     //var url = 'http://127.0.0.1:6869';
@@ -93,5 +104,5 @@ function AngularApplicationRun(rest, coreConstants, notificationService, address
     };
 }
 
-AngularApplicationRun.$inject = ['Restangular', 'constants.core', 'notificationService', 'addressService'];
+AngularApplicationRun.$inject = ['Restangular', 'constants.application', 'notificationService', 'addressService'];
 

src/js/home.controller.js

@@ -7,10 +7,10 @@
         main: 'main-screen'
     };
 
-    function HomeController($scope, $window, events, constants,
+    function HomeController($scope, $window, events, networkConstants, applicationConstants,
                             dialogService, applicationContext, notificationService) {
         function isTestnet() {
-            return constants.NETWORK_NAME === 'devel';
+            return networkConstants.NETWORK_NAME === 'devel';
         }
 
         var home = this;
@@ -21,7 +21,7 @@
 
         var titlePrefix = isTestnet() ? 'TESTNET ' : '';
         home.title = titlePrefix + 'Lite Client';
-        home.version = constants.CLIENT_VERSION;
+        home.version = applicationConstants.CLIENT_VERSION;
 
         $scope.$on(events.SPLASH_COMPLETED, function () {
             home.screen = SCREENS.accounts;
@@ -48,10 +48,10 @@
         }
     }
 
-    HomeController.$inject = ['$scope', '$window', 'ui.events', 'constants.core',
+    HomeController.$inject = ['$scope', '$window', 'ui.events', 'constants.network', 'constants.application',
         'dialogService', 'applicationContext', 'notificationService'];
 
     angular
-        .module('app')
+        .module('app.ui')
         .controller('homeController', HomeController);
 })();

src/js/splash.controller.js

@@ -2,7 +2,7 @@
     'use strict';
 
     angular
-        .module('app')
+        .module('app.ui')
         .controller('splashController', ['$scope', 'apiService', 'ui.events', function ($scope, api, events) {
             NProgress.start();
 

src/js/ui.module.js

@@ -7,4 +7,12 @@
             SPLASH_COMPLETED: 'splash-completed',
             LOGIN_SUCCESSFUL: 'login-successful'
         });
+
+    angular
+        .module('app.ui')
+        // actual values are set in the application config phase
+        .constant('constants.application', {
+            CLIENT_VERSION: '',
+            NODE_ADDRESS: ''
+        });
 })();