Merge remote-tracking branch 'origin/master' into features/ee

bulktrade · Feb 9, 2017 · 6d63be4 · 6d63be4
2 parents a0620af + 9285d6f
commit 6d63be4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/modules/admin/src/app/app.module.ts b/modules/admin/src/app/app.module.ts
@@ -14,12 +14,11 @@ import { AuthService } from "./services/auth/auth.service";
 import { TokenService } from "./services/auth/token.service";
 // import { CrudService } from "./crud/crud.service";
 import { AuthGuard } from "./common/auth.guard";
-import { NotificationService } from "./services/notification-service";
 import { LoadingGridService } from "./services/loading/loading-grid.service";
 import { APP_RESOLVER_PROVIDERS } from "./app.resolver";
 import { createNewHosts, removeNgStyles, createInputTransfer } from "@angularclass/hmr";
 import { ENV_PROVIDERS } from "./environment";
-import { SimpleNotificationsModule } from "angular2-notifications";
+import { SimpleNotificationsModule, NotificationsService } from "angular2-notifications";
 import { TranslateModule, TranslateLoader, TranslateStaticLoader } from "ng2-translate";
 import { GridService } from "./services/grid.service";
 import { SidebarComponent } from "./sidebar/sidebar.component";
@@ -48,6 +47,7 @@ import { LoadingRouterOutletModule } from "./common/components/loading-router-ou
 import { CommonService } from "./services/common";
 import "../styles/styles.scss";
 import { CustomersViewService } from "./customers/customers-view/customers-view.service";
+import { NotificationService } from "./services/notification-service";
 
 type StoreType = {
     state: InternalStateType,
@@ -70,6 +70,7 @@ export const APP_PROVIDERS = [
     GridService,
     TokenService,
     AuthService,
+    NotificationsService,
     NotificationService,
     AuthGuard,
     AppState,

diff --git a/modules/admin/src/app/customers/customers-view/customers-view.service.ts b/modules/admin/src/app/customers/customers-view/customers-view.service.ts
@@ -25,7 +25,7 @@ export class CustomersViewService {
 
         rowData.forEach((item, i, arr) => {
             if (item) {
-                _rowData += item[titleColumns] || item['id'];
+                _rowData += item[titleColumns] || item['id'] || '';
             }
 
             if (i !== arr.length - 1) {

diff --git a/modules/admin/src/app/login/login.component.html b/modules/admin/src/app/login/login.component.html
@@ -11,19 +11,20 @@ <h1 class="title">{{'login.title' | translate}}</h1>
 				<div class="input-container">
 					<input type="text" required
 					       [(ngModel)]="model.username" id="username" name="username"
-					       autocomplete="on" #username="ngModel"/>
+					       #username="ngModel"/>
 					<label for="Username">{{'login.username' | translate}}</label>
 					<div class="bar"></div>
 				</div>
 				<div class="input-container">
 					<input type="password" required id="password"
 					       maxlength="64" [(ngModel)]="model.password" name="password"
-					       autocomplete="on" #password="ngModel"/>
+					       #password="ngModel"/>
 					<label for="Password">{{"login.password" | translate}}</label>
 					<div class="bar"></div>
 				</div>
 				<div class="button-container">
-					<button type="submit" class="submitButton" [disabled]="loginForm.form.invalid">
+					<button [ngClass]="{'button-submitted': loadingSpinner}" type="submit" class="submitButton"
+					        [disabled]="loginForm.form.invalid">
 						<span>{{'login.btnLogin' | translate}}</span>
 						<i *ngIf="loadingSpinner" class="fa fa-spinner fa-pulse fa-3x fa-fw loading-spinner"></i>
 					</button>

diff --git a/modules/admin/src/app/login/login.component.scss b/modules/admin/src/app/login/login.component.scss
@@ -222,7 +222,7 @@ body {
     transition: .3s ease;
 
     .loading-spinner {
-        color: #fff;
+        color: #ddd;
         font-size: 24px
     }
 
@@ -389,8 +389,7 @@ body {
                 }
             }
 
-            &:active,
-            &:focus {
+            &.button-submitted {
                 span {
                     color: $white;
                 }

diff --git a/modules/admin/src/styles/styles.scss b/modules/admin/src/styles/styles.scss
@@ -2,7 +2,7 @@
 /* This file is for setting global styles  */
 @import '~primeng/resources/primeng.min.css';
 @import '~normalize.css/normalize.css';
-@import '~webpack-material-design-icons/material-design-icons.css';
+@import '~font-awesome/css/font-awesome.css';
 @import '~primeng/resources/themes/omega/theme.css';
 @import '~primeng/resources/primeng.min.css';
 @import './../app/common/components/cube-grid/cube-grid.component.scss';
diff --git a/modules/core/src/main/java/io/smsc/config/SecurityConfiguration.java b/modules/core/src/main/java/io/smsc/config/SecurityConfiguration.java
@@ -74,7 +74,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .csrf().disable()
                 .authorizeRequests()
                 // /rest/auth/** is used for token receiving and updating
-                .antMatchers("/**").permitAll()
+                .antMatchers("/").permitAll()
                 .antMatchers("/rest/repository/browser/**").permitAll()
                 .antMatchers("/admin/**").permitAll()
                 .antMatchers("/rest/auth/**").permitAll()