diff --git a/console-webapp/src/app/app-routing.module.ts b/console-webapp/src/app/app-routing.module.ts index 647cf6dee..e06425e91 100644 --- a/console-webapp/src/app/app-routing.module.ts +++ b/console-webapp/src/app/app-routing.module.ts @@ -24,6 +24,10 @@ import SettingsSecurityComponent from './settings/security/security.component'; import { RegistrarGuard } from './registrar/registrar.guard'; import { RegistrarComponent } from './registrar/registrarsTable.component'; import { EmptyRegistrar } from './registrar/emptyRegistrar.component'; +import ContactComponent from './settings/contact/contact.component'; +import WhoisComponent from './settings/whois/whois.component'; +import SecurityComponent from './settings/security/security.component'; +import UsersComponent from './settings/users/users.component'; const routes: Routes = [ { path: '', redirectTo: '/home', pathMatch: 'full' }, @@ -32,7 +36,7 @@ const routes: Routes = [ { path: 'home', component: HomeComponent, canActivate: [RegistrarGuard] }, { path: 'tlds', component: TldsComponent, canActivate: [RegistrarGuard] }, { - path: 'settings', + path: SettingsComponent.PATH, component: SettingsComponent, children: [ { @@ -41,32 +45,27 @@ const routes: Routes = [ pathMatch: 'full', }, { - path: 'contact', + path: ContactComponent.PATH, component: SettingsContactComponent, canActivate: [RegistrarGuard], }, { - path: 'whois', + path: WhoisComponent.PATH, component: SettingsWhoisComponent, canActivate: [RegistrarGuard], }, { - path: 'security', + path: SecurityComponent.PATH, component: SettingsSecurityComponent, canActivate: [RegistrarGuard], }, { - path: 'epp-password', - component: SettingsSecurityComponent, - canActivate: [RegistrarGuard], - }, - { - path: 'users', + path: UsersComponent.PATH, component: SettingsUsersComponent, canActivate: [RegistrarGuard], }, { - path: 'registrars', + path: RegistrarComponent.PATH, component: RegistrarComponent, }, ], diff --git a/console-webapp/src/app/app.component.ts b/console-webapp/src/app/app.component.ts index 9fdaf0173..f4cc2884b 100644 --- a/console-webapp/src/app/app.component.ts +++ b/console-webapp/src/app/app.component.ts @@ -14,6 +14,7 @@ import { Component } from '@angular/core'; import { RegistrarService } from './registrar/registrar.service'; +import { UserDataService } from './shared/services/userData.service'; import { GlobalLoaderService } from './shared/services/globalLoader.service'; @Component({ @@ -25,6 +26,7 @@ export class AppComponent { renderRouter: boolean = true; constructor( protected registrarService: RegistrarService, + protected userDataService: UserDataService, protected globalLoader: GlobalLoaderService ) { registrarService.activeRegistrarIdChange.subscribe(() => { diff --git a/console-webapp/src/app/app.module.ts b/console-webapp/src/app/app.module.ts index 0029a9126..b58960fcc 100644 --- a/console-webapp/src/app/app.module.ts +++ b/console-webapp/src/app/app.module.ts @@ -46,6 +46,7 @@ import { EppWidgetComponent } from './home/widgets/epp-widget.component'; import { BillingWidgetComponent } from './home/widgets/billing-widget.component'; import { DomainsWidgetComponent } from './home/widgets/domains-widget.component'; import { SettingsWidgetComponent } from './home/widgets/settings-widget.component'; +import { UserDataService } from './shared/services/userData.service'; @NgModule({ declarations: [ @@ -81,6 +82,7 @@ import { SettingsWidgetComponent } from './home/widgets/settings-widget.componen BackendService, GlobalLoaderService, RegistrarGuard, + UserDataService, { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { diff --git a/console-webapp/src/app/home/widgets/contact-widget.component.html b/console-webapp/src/app/home/widgets/contact-widget.component.html index 5003d7c89..6511c6069 100644 --- a/console-webapp/src/app/home/widgets/contact-widget.component.html +++ b/console-webapp/src/app/home/widgets/contact-widget.component.html @@ -13,13 +13,13 @@ Give us a Call
- Call Google Registry support at +1 (404) 978 8419 + Call Google Registry support at +1 (404) 978 8419
- Email Google Registry at support@google.com + Email Google Registry at support@google.com
diff --git a/console-webapp/src/app/home/widgets/resources-widget.component.html b/console-webapp/src/app/home/widgets/resources-widget.component.html index 65cc39777..e0cc78142 100644 --- a/console-webapp/src/app/home/widgets/resources-widget.component.html +++ b/console-webapp/src/app/home/widgets/resources-widget.component.html @@ -1,13 +1,16 @@