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..00da66a 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,38 @@ 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: '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..ede9e9d 100644
--- a/ng-seed/src/app/appoinment/appoinment.module.ts
+++ b/ng-seed/src/app/appoinment/appoinment.module.ts
@@ -19,13 +19,13 @@ import { ConsultantsModule } from './consultants/consultants.module';
DemoMaterialModule,
CommonModule,
AppoinmentRoutingModule,
- BusinessModule,
- UserModule,
- AppoinmentsModule,
- CustomersModule,
- CalendarsModule,
- ServiceListModule,
- ConsultantsModule
+
+ // UserModule,
+ // AppoinmentsModule,
+ // CustomersModule,
+ // CalendarsModule,
+ // ServiceListModule,
+ // ConsultantsModule
],
providers:[
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/appoinments/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts
index 229ef67..04a563e 100644
--- a/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts
+++ b/ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts
@@ -117,7 +117,7 @@ export class DialogBoxComponent implements OnInit {
console.log(this.local_data, this.selects)
// this.form.controls['note'].setValue('Sample')
this.form.patchValue(this.local_data)
- }
+}
public myError = (controlName: string, errorName: string) =>{
return this.form.controls[controlName].hasError(errorName);
}
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-details/consultants-details.component.html b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.html
new file mode 100644
index 0000000..76ec4a3
--- /dev/null
+++ b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.html
@@ -0,0 +1,107 @@
+
+
+
+Date & Time:
+{{selected | date:'mediumDate'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
I have read and un derstood the Terms & Conditions of usage of 24x7,
+ Privacy policy, Refund Policy and consent to the same.
+
+
+
diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss
new file mode 100644
index 0000000..05b16bc
--- /dev/null
+++ b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.scss
@@ -0,0 +1,49 @@
+$color_red_orange_approx: #4caf50;
+$white: #fff;
+.button{
+ margin-bottom: 1rem;
+ background-color: #ffff !important;
+ margin-top: -3rem;
+ float: right;
+}
+.calender{
+ margin-left: -1rem;
+ padding-right: 6rem;
+}
+mat-card{
+ width: 140%;
+}
+::ng-deep .mat-tab-label {
+margin-left: -3rem!important;
+}
+.img{
+ width: 50px;
+}
+.btn-red {
+ background-color: $color_red_orange_approx;
+ color: $white;
+ border: 1px solid $color_red_orange_approx;
+ float: right;
+}
+h6{
+ color: #0087ba;
+ font-weight: 600;
+}
+.primary{
+ background-color: #658F9B;
+ color: white;
+}
+::ng-deep .mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar {
+ background-color: #658F9B!important;
+}
+::ng-deep .mat-form-field-appearance-legacy .mat-form-field-wrapper {
+ width: 250%;
+}
+.success {
+ background: #fff;
+ box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
+ padding: 5px;
+ color: #0087ba;
+ font-weight: 600;
+ border-radius: 10px;
+ }
\ No newline at end of file
diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.spec.ts b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.spec.ts
new file mode 100644
index 0000000..32a57b6
--- /dev/null
+++ b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ConsultantsDetailsComponent } from './consultants-details.component';
+
+describe('ConsultantsDetailsComponent', () => {
+ let component: ConsultantsDetailsComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ ConsultantsDetailsComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ConsultantsDetailsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.ts b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.ts
new file mode 100644
index 0000000..3c46d6a
--- /dev/null
+++ b/ng-seed/src/app/appoinment/consultants/consultants-details/consultants-details.component.ts
@@ -0,0 +1,59 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+export interface DialogData {
+ animal: string;
+ name: string;
+}
+export interface UsersData {
+ workspace: string;
+}
+@Component({
+ selector: 'app-consultants-details',
+ templateUrl: './consultants-details.component.html',
+ styleUrls: ['./consultants-details.component.scss']
+})
+export class ConsultantsDetailsComponent implements OnInit {
+ form: FormGroup;
+ local_data:any;
+ selected: Date | null;
+ name = 'Angular';
+ date = new Date();
+ control = new FormControl(
+ {
+ from: this.date,
+ // to: new Date(this.date.getTime() + 1 * 24 * 60 * 60 * 1000),
+ },
+ Validators.required
+ );
+ workspace = new FormControl('', [Validators.required]);
+ selects = [
+ {workspace: 'test 1'},
+ {workspace: 'test 2'},
+ {workspace: 'test 3'},
+ ];
+ constructor(
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data: DialogData) {}
+
+ onNoClick(): void {
+ this.dialogRef.close();
+ }
+ close() {
+ // console.log(this.form.value);
+ this.dialogRef.close();
+}
+
+ ngOnInit(): void {
+ this.form = new FormGroup({
+
+ workspace: new FormControl('', [Validators.required]),
+ });
+console.log(this.local_data, this.selects)
+// this.form.controls['note'].setValue('Sample')
+ this.form.patchValue(this.local_data)
+ }
+ submit(){
+ console.log(this.form.value);
+ }
+}
diff --git a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html b/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html
index 51d21e5..297a47f 100644
--- a/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html
+++ b/ng-seed/src/app/appoinment/consultants/consultants-list/consultants-list.component.html
@@ -39,8 +39,8 @@
-