diff --git a/ng-seed/angular.json b/ng-seed/angular.json index ee075da..3ea70da 100644 --- a/ng-seed/angular.json +++ b/ng-seed/angular.json @@ -33,7 +33,8 @@ "crossvent", "calendar-utils/date-adapters/date-fns", "contra/emitter", - "@mattlewis92/dom-autoscroller" + "@mattlewis92/dom-autoscroller", + "CommonJS" ], "styles": [ "node_modules/quill/dist/quill.snow.css", diff --git a/ng-seed/src/app/_guard/auth.guard.ts b/ng-seed/src/app/_guard/auth.guard.ts new file mode 100644 index 0000000..9200bd7 --- /dev/null +++ b/ng-seed/src/app/_guard/auth.guard.ts @@ -0,0 +1,70 @@ +import { Injectable } from '@angular/core'; +import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateChild } from '@angular/router'; +import { Observable , of } from 'rxjs'; +// import { CognitoService } from '../AwsService/cognito.service'; +@Injectable() +export class AuthGuard implements CanActivate, CanActivateChild { + + constructor(private router: Router) { } + + canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { + + const token = localStorage.getItem('user_token'); + + if(token != '' && token != undefined && token != null){ + return true + }else{ + alert("else"); + this.router.navigate(['authentication/login']); + return false; + } + + // if (this.shared.getToken()) { + // alert("if"); + // // this.router.navigate(['']); + // return true + // } else { + // alert("else"); + // this.router.navigate(['/login']); + // return false; + // } + } + + canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean { + + const token = localStorage.getItem('user_token'); + console.log(token) + if(token != '' && token != undefined && token != null){ + return true + }else{ + setTimeout(() => { + this.router.navigate(['authentication/login']); + return false; + },1000); + } + + // if (this.shared.getCurrentUser() != null && this.shared.getToken()) { + // // alert("if"); + + // return true; + // } else { + // // alert("else"); + // setTimeout(() => { + // this.router.navigate(['authentication/login']); + // return false; + // },1000); + + // } + } + + // public getToken(): string { + // return localStorage.getItem('token'); + // } + + // public logOut() { + // localStorage.clear(); + // if(localStorage.getItem('token') === null){ + // this.router.navigate(['/login']); + // } + // } +} \ No newline at end of file diff --git a/ng-seed/src/app/app.module.ts b/ng-seed/src/app/app.module.ts index 89a48c0..8b053e7 100644 --- a/ng-seed/src/app/app.module.ts +++ b/ng-seed/src/app/app.module.ts @@ -38,6 +38,7 @@ import { TokenInterceptor } from './_guard/token.interceptor'; import { SessionService } from './session-services/session.service'; import { AppointmentService } from './appoinment/appointment.service'; import { RoleMenuItemsPipe } from './layouts/role-menu-items.pipe'; +import { AuthGuard } from './_guard/auth.guard'; export function HttpLoaderFactory(http: HttpClient) { @@ -91,7 +92,7 @@ const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = { ], providers: [ TranslateService, - SessionService, + SessionService,AuthGuard, AppointmentService, { provide: PERFECT_SCROLLBAR_CONFIG, diff --git a/ng-seed/src/app/app.routing.ts b/ng-seed/src/app/app.routing.ts index b6579ef..e8c5a2e 100644 --- a/ng-seed/src/app/app.routing.ts +++ b/ng-seed/src/app/app.routing.ts @@ -2,6 +2,7 @@ import { Routes } from '@angular/router'; import { AdminLayoutComponent } from './layouts/admin/admin-layout.component'; import { AuthLayoutComponent } from './layouts/auth/auth-layout.component'; +import { AuthGuard } from './_guard/auth.guard'; export const AppRoutes: Routes = [{ path: '', @@ -10,34 +11,41 @@ export const AppRoutes: Routes = [{ }, { path: '', component: AdminLayoutComponent, + canActivateChild:[AuthGuard], children: [{ path: 'home', loadChildren: () => import('./dashboard/dashboard.module').then(m => m.DashboardModule) }, + { + path: 'business', + loadChildren: () => import('./appoinment/business/business.module').then(m => m.BusinessModule) + }, { path: 'appoinments', loadChildren: () => import('./appoinment/appoinments/appoinments.module').then(m => m.AppoinmentsModule) + }, + { - path: 'service', - loadChildren: () => import('./appoinment/service-list-details/service-list.module').then(m => m.ServiceListModule) - }, - { - path: 'users', - loadChildren: () => import('./appoinment/user/user.module').then(m => m.UserModule) - }, - { - path: 'consultants', - loadChildren: () => import('./appoinment/consultants/consultants.module').then(m => m.ConsultantsModule) + path: 'appoinment', + loadChildren: () => import('./appoinment/appoinment.module').then(m => m.AppoinmentModule) }, { path: 'customers', loadChildren: () => import('./appoinment/customers/customers.module').then(m => m.CustomersModule) }, { - path: 'business', - loadChildren: () => import('./appoinment/business/business.module').then(m => m.BusinessModule) + path: 'consultants', + loadChildren: () => import('./appoinment/consultants/consultants.module').then(m => m.ConsultantsModule) + }, { + path: 'users', + loadChildren: () => import('./appoinment/user/user.module').then(m => m.UserModule) }, + { + path: 'services', + loadChildren: () => import('./appoinment/service-list-details/service-list.module').then(m => m.ServiceListModule) + } + ] }, { path: '', diff --git a/ng-seed/src/app/appoinment/appoinment-routing.module.ts b/ng-seed/src/app/appoinment/appoinment-routing.module.ts index 0119427..0629b09 100644 --- a/ng-seed/src/app/appoinment/appoinment-routing.module.ts +++ b/ng-seed/src/app/appoinment/appoinment-routing.module.ts @@ -12,23 +12,15 @@ import { } from './service-list-details/service-list/service-list.component' import { ConsultantsListComponent } from './consultants/consultants-list/consultants-list.component'; -const routes: Routes = [ -// { -// path:'', -// redirectTo:'', -// pathMatch:'full' -// },{ -// path: 'add-business-list', -// component: AddBusinessListComponent -// }, -// { -// path: 'business-list', -// component: BusinessListComponent -// }, -// { -// path: 'add-user-list', -// component: AddUserListComponent -// }, +const routes: Routes = [ { + path: 'add-business-list', + component: AddBusinessListComponent +}, + +{ + path: 'add-user-list', + component: AddUserListComponent +}, // { // path: 'user-list', // component: UserListComponent @@ -41,10 +33,10 @@ const routes: Routes = [ // path: 'customers-list', // component: CustomersListComponent // }, -// // { -// // path: 'calendar-list', -// // component: CalendarListComponent -// // }, +// { +// path: 'calendar-list', +// component: CalendarListComponent +// }, // { // path: 'calendar-list', // component: CalendarListComponent diff --git a/ng-seed/src/app/appoinment/appoinment.module.ts b/ng-seed/src/app/appoinment/appoinment.module.ts index 6dcbaaf..45a774b 100644 --- a/ng-seed/src/app/appoinment/appoinment.module.ts +++ b/ng-seed/src/app/appoinment/appoinment.module.ts @@ -19,7 +19,7 @@ import { ConsultantsModule } from './consultants/consultants.module'; DemoMaterialModule, CommonModule, AppoinmentRoutingModule, - BusinessModule, + UserModule, AppoinmentsModule, CustomersModule, diff --git a/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts b/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts index d17286b..7fecc09 100644 --- a/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts +++ b/ng-seed/src/app/appoinment/appoinments/appoinments-routing.module.ts @@ -4,14 +4,11 @@ import { AppoinmentsListComponent } from './appoinments-list/appoinments-list.co const routes: Routes = [ { - path:'', - redirectTo:'appoinment/appoinments', - pathMatch:'full' - }, - { - path:'appoinment/appoinments', - component:AppoinmentsListComponent - }, + + path: '', + component: AppoinmentsListComponent + + } ]; @NgModule({ diff --git a/ng-seed/src/app/appoinment/business/business-routing.module.ts b/ng-seed/src/app/appoinment/business/business-routing.module.ts index 9d53057..60f9198 100644 --- a/ng-seed/src/app/appoinment/business/business-routing.module.ts +++ b/ng-seed/src/app/appoinment/business/business-routing.module.ts @@ -4,14 +4,9 @@ import { BusinessListComponent } from './business-list/business-list.component'; const routes: Routes = [ { - path:'', - redirectTo:'appoinment/business', - pathMatch:'full' - }, - { - path:'appoinment/business', - component:BusinessListComponent - }, + path: '', + component: BusinessListComponent + } ]; @NgModule({ diff --git a/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts b/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts index d95d432..c8bd4a5 100644 --- a/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts +++ b/ng-seed/src/app/appoinment/consultants/consultants-routing.module.ts @@ -4,14 +4,9 @@ import { ConsultantsListComponent } from './consultants-list/consultants-list.co const routes: Routes = [ { - path:'', - redirectTo:'appoinment/consultants', - pathMatch:'full' - }, - { - path:'appoinment/consultants', - component:ConsultantsListComponent - }, + path: '', + component: ConsultantsListComponent + } ]; @NgModule({ diff --git a/ng-seed/src/app/appoinment/customers/customers-routing.module.ts b/ng-seed/src/app/appoinment/customers/customers-routing.module.ts index ee6d999..fdcceaf 100644 --- a/ng-seed/src/app/appoinment/customers/customers-routing.module.ts +++ b/ng-seed/src/app/appoinment/customers/customers-routing.module.ts @@ -4,13 +4,8 @@ import { CustomersListComponent } from './customers-list/customers-list.componen const routes: Routes = [ { - path:'', - redirectTo:'appoinment/customers', - pathMatch:'full' - }, - { - path:'appoinment/customers', - component:CustomersListComponent + path: '', + component: CustomersListComponent }, ]; diff --git a/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts b/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts index 33d2178..b3de5ac 100644 --- a/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts +++ b/ng-seed/src/app/appoinment/service-list-details/service-list-routing.module.ts @@ -2,15 +2,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ServiceListComponent } from './service-list/service-list.component'; -const routes: Routes = [ +const routes: Routes = [ { - path:'', - redirectTo:'appoinment/service', - pathMatch:'full' - }, - { - path:'appoinment/service', - component:ServiceListComponent + path: '', + component: ServiceListComponent }, ]; diff --git a/ng-seed/src/app/appoinment/user/user-routing.module.ts b/ng-seed/src/app/appoinment/user/user-routing.module.ts index 7077cd2..b659b14 100644 --- a/ng-seed/src/app/appoinment/user/user-routing.module.ts +++ b/ng-seed/src/app/appoinment/user/user-routing.module.ts @@ -5,13 +5,8 @@ import { UserModule } from './user.module'; const routes: Routes = [ { - path:'', - redirectTo:'appoinment/users', - pathMatch:'full' - }, - { - path:'appoinment/users', - component:UserListComponent + path: '', + component: UserListComponent }, ]; diff --git a/ng-seed/src/app/dashboard/dashboard.component.html b/ng-seed/src/app/dashboard/dashboard.component.html index e69de29..1a03b16 100644 --- a/ng-seed/src/app/dashboard/dashboard.component.html +++ b/ng-seed/src/app/dashboard/dashboard.component.html @@ -0,0 +1 @@ +

welcome

\ No newline at end of file diff --git a/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts index 9cdf0cf..ec5d02d 100644 --- a/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -29,7 +29,7 @@ const HORIZONTALMENUITEMS = [ icon: 'explore' }, { - state: 'appoinments', + state: 'appoinment', name: 'Appoinments', type: 'link', icon: 'security', @@ -38,7 +38,7 @@ const HORIZONTALMENUITEMS = [ // ] }, { - state: 'business', + state: 'appoinment', name: 'Business', type: 'link', icon: 'security', @@ -57,7 +57,7 @@ const HORIZONTALMENUITEMS = [ // ] // }, { - state: 'customers', + state: 'appoinment', name: 'Customers', type: 'link', icon: 'security', @@ -66,7 +66,7 @@ const HORIZONTALMENUITEMS = [ // ] }, { - state: 'consultants', + state: 'appoinment', name: 'Consultants', type: 'link', icon: 'security', @@ -75,7 +75,7 @@ const HORIZONTALMENUITEMS = [ // ] }, { - state: 'users', + state: 'appoinment', name: 'Users', type: 'link', icon: 'security', @@ -85,7 +85,7 @@ const HORIZONTALMENUITEMS = [ // ] }, { - state: 'service', + state: 'appoinment', name: 'Services List', type: 'link', icon: 'security', diff --git a/ng-seed/src/app/shared/menu-items/menu-items.ts b/ng-seed/src/app/shared/menu-items/menu-items.ts index 0f3dd9d..04c469c 100644 --- a/ng-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng-seed/src/app/shared/menu-items/menu-items.ts @@ -84,7 +84,7 @@ const MENUITEMS : Menu[] = [ // ] }, { - state: 'service', + state: 'services', name: 'Services List', type: 'link', icon: 'security', diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +}