[bug:euvr] Create Organization Updates (#1664)

This commit is contained in:
Vincent Salucci 2022-05-11 15:39:39 -04:00 committed by GitHub
parent 1dc9502676
commit f5245a280e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 22 additions and 16 deletions

View File

@ -74,7 +74,7 @@ export class LoginComponent extends BaseLoginComponent {
if (qParams.premium != null) { if (qParams.premium != null) {
this.routerService.setPreviousUrl("/settings/premium"); this.routerService.setPreviousUrl("/settings/premium");
} else if (qParams.org != null) { } else if (qParams.org != null) {
const route = this.router.createUrlTree(["settings/create-organization"], { const route = this.router.createUrlTree(["create-organization"], {
queryParams: { plan: qParams.org }, queryParams: { plan: qParams.org },
}); });
this.routerService.setPreviousUrl(route.toString()); this.routerService.setPreviousUrl(route.toString());

View File

@ -71,7 +71,7 @@ export class RegisterComponent extends BaseRegisterComponent {
} else if (qParams.org != null) { } else if (qParams.org != null) {
this.showCreateOrgMessage = true; this.showCreateOrgMessage = true;
this.referenceData.flow = qParams.org; this.referenceData.flow = qParams.org;
const route = this.router.createUrlTree(["settings/create-organization"], { const route = this.router.createUrlTree(["create-organization"], {
queryParams: { plan: qParams.org }, queryParams: { plan: qParams.org },
}); });
this.routerService.setPreviousUrl(route.toString()); this.routerService.setPreviousUrl(route.toString());

View File

@ -58,7 +58,7 @@
</li> </li>
<bit-menu-divider></bit-menu-divider> <bit-menu-divider></bit-menu-divider>
<li class="tw-list-none" role="none"> <li class="tw-list-none" role="none">
<a bit-menu-item routerLink="/settings/create-organization"> <a bit-menu-item routerLink="/create-organization">
<i class="bwi bwi-plus mr-2"></i> <i class="bwi bwi-plus mr-2"></i>
{{ "newOrganization" | i18n }}</a {{ "newOrganization" | i18n }}</a
> >

View File

@ -12,7 +12,7 @@
</li> </li>
<li class="filter-option"> <li class="filter-option">
<span class="filter-buttons"> <span class="filter-buttons">
<a href="#" routerLink="/settings/create-organization" class="filter-button"> <a href="#" routerLink="/create-organization" class="filter-button">
<i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i> <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
{{ "newOrganization" | i18n }} {{ "newOrganization" | i18n }}
</a> </a>
@ -47,7 +47,7 @@
</button> </button>
<a <a
href="#" href="#"
routerLink="/settings/create-organization" routerLink="/create-organization"
class="text-muted ml-auto create-organization-link" class="text-muted ml-auto create-organization-link"
appA11yTitle="{{ 'newOrganization' | i18n }}" appA11yTitle="{{ 'newOrganization' | i18n }}"
> >
@ -112,7 +112,7 @@
</button> </button>
<a <a
href="#" href="#"
routerLink="/settings/create-organization" routerLink="/create-organization"
class="text-muted ml-auto create-organization-link" class="text-muted ml-auto create-organization-link"
appA11yTitle="{{ 'newOrganization' | i18n }}" appA11yTitle="{{ 'newOrganization' | i18n }}"
> >

View File

@ -155,6 +155,11 @@ const routes: Routes = [
.IndividualVaultModule, .IndividualVaultModule,
}, },
{ path: "sends", component: SendComponent, data: { title: "Send" } }, { path: "sends", component: SendComponent, data: { title: "Send" } },
{
path: "create-organization",
component: CreateOrganizationComponent,
data: { titleId: "newOrganization" },
},
{ {
path: "settings", path: "settings",
component: SettingsComponent, component: SettingsComponent,
@ -181,11 +186,6 @@ const routes: Routes = [
loadChildren: async () => loadChildren: async () =>
(await import("./settings/subscription-routing.module")).SubscriptionRoutingModule, (await import("./settings/subscription-routing.module")).SubscriptionRoutingModule,
}, },
{
path: "create-organization",
component: CreateOrganizationComponent,
data: { titleId: "newOrganization" },
},
{ {
path: "emergency-access", path: "emergency-access",
children: [ children: [

View File

@ -1,5 +1,11 @@
<div class="page-header"> <div class="container page-content">
<h1>{{ "newOrganization" | i18n }}</h1> <div class="row">
<div class="col-12">
<div class="page-header">
<h1>{{ "newOrganization" | i18n }}</h1>
</div>
<p>{{ "newOrganizationDesc" | i18n }}</p>
<app-organization-plans></app-organization-plans>
</div>
</div>
</div> </div>
<p>{{ "newOrganizationDesc" | i18n }}</p>
<app-organization-plans></app-organization-plans>

View File

@ -77,7 +77,7 @@
</button> </button>
<a <a
href="#" href="#"
routerLink="/settings/create-organization" routerLink="/create-organization"
class="btn btn-primary" class="btn btn-primary"
*ngIf="!organizations || !organizations.length" *ngIf="!organizations || !organizations.length"
> >