From 4bd47f728ad7896ed28fada342df6f649acfbd2f Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 25 Jun 2018 23:16:59 -0400 Subject: [PATCH] stub out domain rules page --- jslib | 2 +- src/app/app-routing.module.ts | 2 ++ src/app/app.module.ts | 2 ++ src/app/settings/domain-rules.component.html | 20 +++++++++++ src/app/settings/domain-rules.component.ts | 36 ++++++++++++++++++++ src/locales/en/messages.json | 12 +++++++ 6 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 src/app/settings/domain-rules.component.html create mode 100644 src/app/settings/domain-rules.component.ts diff --git a/jslib b/jslib index 0d2cd4c482..32a636e5a5 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 0d2cd4c482c19ee3385677e957bbd99ae2eafbb6 +Subproject commit 32a636e5a5068f705b167f8f16dd15b53493b821 diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 309c94bafa..869c589626 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -15,6 +15,7 @@ import { RegisterComponent } from './accounts/register.component'; import { TwoFactorComponent } from './accounts/two-factor.component'; import { AccountComponent } from './settings/account.component'; +import { DomainRulesComponent } from './settings/domain-rules.component'; import { OptionsComponent } from './settings/options.component'; import { SettingsComponent } from './settings/settings.component'; @@ -53,6 +54,7 @@ const routes: Routes = [ { path: '', pathMatch: 'full', redirectTo: 'account' }, { path: 'account', component: AccountComponent, canActivate: [AuthGuardService] }, { path: 'options', component: OptionsComponent, canActivate: [AuthGuardService] }, + { path: 'domain-rules', component: DomainRulesComponent, canActivate: [AuthGuardService] }, ], }, { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0dedd4e1ca..123ae8dfc8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -37,6 +37,7 @@ import { ChangeEmailComponent } from './settings/change-email.component'; import { ChangePasswordComponent } from './settings/change-password.component'; import { DeauthorizeSessionsComponent } from './settings/deauthorize-sessions.component'; import { DeleteAccountComponent } from './settings/delete-account.component'; +import { DomainRulesComponent } from './settings/domain-rules.component'; import { OptionsComponent } from './settings/options.component'; import { ProfileComponent } from './settings/profile.component'; import { PurgeVaultComponent } from './settings/purge-vault.component'; @@ -110,6 +111,7 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; CollectionsComponent, DeauthorizeSessionsComponent, DeleteAccountComponent, + DomainRulesComponent, ExportComponent, FallbackSrcDirective, FolderAddEditComponent, diff --git a/src/app/settings/domain-rules.component.html b/src/app/settings/domain-rules.component.html new file mode 100644 index 0000000000..588367e3f1 --- /dev/null +++ b/src/app/settings/domain-rules.component.html @@ -0,0 +1,20 @@ + +

{{'domainRulesDesc' | i18n}}

+

{{'customEqDomains' | i18n}}

+ + + + + + +
+

{{'globalEqDomains' | i18n}}

+ + + + + + +
diff --git a/src/app/settings/domain-rules.component.ts b/src/app/settings/domain-rules.component.ts new file mode 100644 index 0000000000..ccee37614a --- /dev/null +++ b/src/app/settings/domain-rules.component.ts @@ -0,0 +1,36 @@ +import { + Component, + OnInit, +} from '@angular/core'; + +import { ToasterService } from 'angular2-toaster'; +import { Angulartics2 } from 'angulartics2'; + +import { ApiService } from 'jslib/abstractions/api.service'; +import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { I18nService } from 'jslib/abstractions/i18n.service'; +import { MessagingService } from 'jslib/abstractions/messaging.service'; + +@Component({ + selector: 'app-domain-rules', + templateUrl: 'domain-rules.component.html', +}) +export class DomainRulesComponent implements OnInit { + loading = true; + custom: string[] = []; + global: string[] = []; + formPromise: Promise; + + constructor(private apiService: ApiService, private i18nService: I18nService, + private analytics: Angulartics2, private toasterService: ToasterService, + private cryptoService: CryptoService, private messagingService: MessagingService) { } + + async ngOnInit() { + const response = await this.apiService.getSettingsDomains(); + this.loading = false; + } + + async submit() { + + } +} diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 11b2321681..23b2f6d6c7 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -914,5 +914,17 @@ }, "default": { "message": "Default" + }, + "domainRules": { + "message": "Domain Rules" + }, + "domainRulesDesc": { + "message": "If you have the same login across multiple different website domains, you can mark the website as \"equivalent\". \"Global\" domains are ones already created for you by Bitwarden." + }, + "globalEqRules": { + "message": "Global Equivalent Domains" + }, + "customEqRules": { + "message": "Custom Equivalent Domains" } }