Merge branch 'master' of https://github.com/microting/eform-angular-frontend

Author: renemadsen

eFormAPI/eFormAPI/Global.asax.cs

@@ -3,6 +3,7 @@
 using System.Data.Entity.Infrastructure;
 using System.Data.Entity.Migrations;
 using System.Diagnostics;
+using System.Web;
 using System.Web.Configuration;
 using System.Web.Http;
 using System.Web.Mvc;
@@ -49,5 +50,11 @@ protected void Application_Start()
                 throw new Exception($"Error while migrate database: {exception.Message}");
             }
         }
+
+        protected void Application_BeginRequest()
+        {
+            Context.Response.Cache.SetLastModifiedFromFileDependencies();
+           // Context.Response.Cache.SetCacheability(HttpCacheability.NoCache);
+        }
     }
 }

eform-client/protractor.conf.js

@@ -6,8 +6,7 @@ var SpecReporter = require('jasmine-spec-reporter');
 exports.config = {
   allScriptsTimeout: 20000,
   specs: [
-    './e2e/settings.site-header.e2e-spec.ts',
-    // './e2e/settings.login-page.e2e-spec.ts'
+    './e2e/settings.site-header.e2e-spec.ts'
   ],
   capabilities: {
     'browserName': 'chrome'

eform-client/src/app/app.module.ts

@@ -13,13 +13,13 @@ import {FullLayoutComponent} from './layouts/fulllayout/fulllayout.component';
 import {SettingsModule} from './modules/settings/settings.module';
 import {DndModule} from 'ng2-dnd';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
-import {AdminModule} from 'app/modules/admin/admin.module';
+import {AccountManagementModule} from 'app/modules/account-management/account-management.module';
 import {AuthComponent} from 'app/components/auth/auth.component';
 import {SimpleLayoutComponent} from 'app/layouts/simple-layout/simple-layout.component';
 import {SimpleSitesModule} from 'app/modules/simple-sites/simple-sites.module';
 import {EFormService} from 'app/services/eform/eform.service';
 import {
-  AdminService, EntitySearchService,EntitySelectService, SettingsService, SitesService, UnitsService,
+  AdminService, EntitySearchService, EntitySelectService, SettingsService, SitesService, UnitsService,
   WorkersService
 } from 'app/services';
 import {SimpleSitesService} from 'app/services/simple-sites.service';
@@ -69,7 +69,7 @@ import {EformTagService} from 'app/services/eform/eform-tag.service';
     SettingsModule,
     NgxGalleryModule,
     HelpersModule,
-    AdminModule,
+    AccountManagementModule,
     BrowserAnimationsModule,
     CommonModule,
     DndModule.forRoot()

eform-client/src/app/app.routing.ts

@@ -40,9 +40,9 @@ export const routes: Routes = [
         loadChildren: './modules/settings/settings.module#SettingsModule'
       },
       {
-        path: 'admin',
+        path: 'account-management',
         canActivate: [AuthGuard],
-        loadChildren: './modules/admin/admin.module#AdminModule'
+        loadChildren: './modules/account-management/account-management.module#AccountManagementModule'
       }
     ]
   },

eform-client/src/app/components/navigation/navigation.component.html

@@ -7,10 +7,13 @@
             {{userInfo.lastName || 'name'}}</a>
           <ul class="dropdown-menu dropdown-menu-right">
             <li *ngIf="userInfo.role == 'admin'">
-              <a routerLink="/admin/users" routerLinkActive="active">User Management</a>
+              <a routerLink="/account-management/users" routerLinkActive="active">User Management</a>
             </li>
             <li>
-              <a routerLink="/admin/change-password" routerLinkActive="active">Change password</a>
+              <a routerLink="/account-management/google-authenticator" routerLinkActive="active">Google Authenticator</a>
+            </li>
+            <li>
+              <a routerLink="/account-management/change-password" routerLinkActive="active">Change password</a>
             </li>
             <li>
               <a (click)="signOut()" id="sign-out">Sign out</a>
@@ -71,7 +74,7 @@
               </a>
             </li>
             <li class="">
-              <a routerLink="/settings" routerLinkActive="active">
+              <a routerLink="/settings" routerLinkActive="active" *ngIf="userInfo.role == 'admin'">
                 Settings
               </a>
             </li>

eform-client/src/app/modules/account-management/account-management-routing.module.ts

@@ -0,0 +1,27 @@
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {ChangePasswordComponent} from './components/change-password/change-password.component';
+import {UserComponent} from './components/user/user.component';
+import {GoogleAuthenticatorComponent} from "./components/google-authenticator/google-authenticator.component";
+
+const routes: Routes = [
+  {
+    path: 'users',
+    component: UserComponent,
+  },
+  {
+    path: 'change-password',
+    component: ChangePasswordComponent,
+  },
+  {
+    path: 'google-authenticator',
+    component: GoogleAuthenticatorComponent,
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AccountManagementRoutingModule {
+}

eform-client/src/app/modules/account-management/account-management.module.ts

@@ -0,0 +1,37 @@
+import {HelpersModule} from '../helpers/helpers.module';
+import {FormsModule} from '@angular/forms';
+import {AccountManagementRoutingModule} from './account-management-routing.module';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {Ng2Bs3ModalModule} from 'ng2-bs3-modal/ng2-bs3-modal';
+import {TooltipModule} from 'ngx-bootstrap';
+import {AdminComponent} from './components/admin.component';
+import {UserGridComponent} from './components/user-grid/user-grid.component';
+import {UserComponent} from './components/user/user.component';
+import {UserPaginationComponent} from './components/user-pagination/user-pagination.component';
+import {UserEditComponent} from './components/user-edit/user-edit.component';
+import {ChangePasswordComponent} from './components/change-password/change-password.component';
+import {GoogleAuthenticatorComponent} from './components/google-authenticator/google-authenticator.component';
+
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    AccountManagementRoutingModule,
+    TooltipModule.forRoot(),
+    Ng2Bs3ModalModule,
+    HelpersModule
+  ],
+  declarations: [
+    AdminComponent,
+    UserGridComponent,
+    ChangePasswordComponent,
+    UserComponent,
+    UserPaginationComponent,
+    UserEditComponent,
+    GoogleAuthenticatorComponent
+  ],
+})
+export class AccountManagementModule {
+}