diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5c65af88..da5ee012 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -14,6 +14,12 @@ import { LoginComponent } from './accounts/login.component'; import { RegisterComponent } from './accounts/register.component'; import { TwoFactorComponent } from './accounts/two-factor.component'; +import { CollectionsComponent as OrgManageCollectionsComponent } from './organizations/manage/collections.component'; +import { EventsComponent as OrgEventsComponent } from './organizations/manage/events.component'; +import { GroupsComponent as OrgGroupsComponent } from './organizations/manage/groups.component'; +import { ManageComponent as OrgManageComponent } from './organizations/manage/manage.component'; +import { PeopleComponent as OrgPeopleComponent } from './organizations/manage/people.component'; + import { ExportComponent as OrgExportComponent } from './organizations/tools/export.component'; import { ImportComponent as OrgImportComponent } from './organizations/tools/import.component'; import { ToolsComponent as OrgToolsComponent } from './organizations/tools/tools.component'; @@ -127,6 +133,19 @@ const routes: Routes = [ { path: 'export', component: OrgExportComponent, data: { titleId: 'exportVault' } }, ], }, + { + path: 'manage', + component: OrgManageComponent, + canActivate: [OrganizationTypeGuardService], + data: { allowedTypes: [OrganizationUserType.Owner, OrganizationUserType.Admin] }, + children: [ + { path: '', pathMatch: 'full', redirectTo: 'people' }, + { path: 'collections', component: OrgManageCollectionsComponent, data: { titleId: 'collections' } }, + { path: 'events', component: OrgEventsComponent, data: { titleId: 'eventLogs' } }, + { path: 'groups', component: OrgGroupsComponent, data: { titleId: 'groups' } }, + { path: 'people', component: OrgPeopleComponent, data: { titleId: 'people' } }, + ], + }, ], }, { path: '**', redirectTo: '' }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7676a10a..763ee9d9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,6 +32,12 @@ import { RegisterComponent } from './accounts/register.component'; import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component'; import { TwoFactorComponent } from './accounts/two-factor.component'; +import { CollectionsComponent as OrgManageCollectionsComponent } from './organizations/manage/collections.component'; +import { EventsComponent as OrgEventsComponent } from './organizations/manage/events.component'; +import { GroupsComponent as OrgGroupsComponent } from './organizations/manage/groups.component'; +import { ManageComponent as OrgManageComponent } from './organizations/manage/manage.component'; +import { PeopleComponent as OrgPeopleComponent } from './organizations/manage/people.component'; + import { ExportComponent as OrgExportComponent } from './organizations/tools/export.component'; import { ImportComponent as OrgImportComponent } from './organizations/tools/import.component'; import { ToolsComponent as OrgToolsComponent } from './organizations/tools/tools.component'; @@ -163,9 +169,14 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; OrgAttachmentsComponent, OrgCiphersComponent, OrgCollectionsComponent, + OrgEventsComponent, OrgExportComponent, OrgImportComponent, OrgGroupingsComponent, + OrgGroupsComponent, + OrgManageCollectionsComponent, + OrgManageComponent, + OrgPeopleComponent, OrgToolsComponent, OrganizationsComponent, OrganizationLayoutComponent, diff --git a/src/app/organizations/manage/collections.component.html b/src/app/organizations/manage/collections.component.html new file mode 100644 index 00000000..a3a5fcb7 --- /dev/null +++ b/src/app/organizations/manage/collections.component.html @@ -0,0 +1,3 @@ + diff --git a/src/app/organizations/manage/collections.component.ts b/src/app/organizations/manage/collections.component.ts new file mode 100644 index 00000000..a8396385 --- /dev/null +++ b/src/app/organizations/manage/collections.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-org-manage-collections', + templateUrl: 'collections.component.html', +}) +export class CollectionsComponent { } diff --git a/src/app/organizations/manage/events.component.html b/src/app/organizations/manage/events.component.html new file mode 100644 index 00000000..3d3b51eb --- /dev/null +++ b/src/app/organizations/manage/events.component.html @@ -0,0 +1,3 @@ + diff --git a/src/app/organizations/manage/events.component.ts b/src/app/organizations/manage/events.component.ts new file mode 100644 index 00000000..07acaf17 --- /dev/null +++ b/src/app/organizations/manage/events.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-org-events', + templateUrl: 'events.component.html', +}) +export class EventsComponent { } diff --git a/src/app/organizations/manage/groups.component.html b/src/app/organizations/manage/groups.component.html new file mode 100644 index 00000000..672802b5 --- /dev/null +++ b/src/app/organizations/manage/groups.component.html @@ -0,0 +1,3 @@ + diff --git a/src/app/organizations/manage/groups.component.ts b/src/app/organizations/manage/groups.component.ts new file mode 100644 index 00000000..f8140489 --- /dev/null +++ b/src/app/organizations/manage/groups.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-org-groups', + templateUrl: 'groups.component.html', +}) +export class GroupsComponent { } diff --git a/src/app/organizations/manage/manage.component.html b/src/app/organizations/manage/manage.component.html new file mode 100644 index 00000000..786bff8e --- /dev/null +++ b/src/app/organizations/manage/manage.component.html @@ -0,0 +1,26 @@ +
+
+ +
+ +
+
+
diff --git a/src/app/organizations/manage/manage.component.ts b/src/app/organizations/manage/manage.component.ts new file mode 100644 index 00000000..1d2f36c9 --- /dev/null +++ b/src/app/organizations/manage/manage.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-org-manage', + templateUrl: 'manage.component.html', +}) +export class ManageComponent { } diff --git a/src/app/organizations/manage/people.component.html b/src/app/organizations/manage/people.component.html new file mode 100644 index 00000000..508d2db8 --- /dev/null +++ b/src/app/organizations/manage/people.component.html @@ -0,0 +1,3 @@ + diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts new file mode 100644 index 00000000..bdfc5498 --- /dev/null +++ b/src/app/organizations/manage/people.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-org-people', + templateUrl: 'people.component.html', +}) +export class PeopleComponent { } diff --git a/src/app/organizations/tools/tools.component.ts b/src/app/organizations/tools/tools.component.ts index 7b82b70f..3aa3be4b 100644 --- a/src/app/organizations/tools/tools.component.ts +++ b/src/app/organizations/tools/tools.component.ts @@ -1,6 +1,4 @@ -import { - Component, -} from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'app-org-tools', diff --git a/src/app/tools/tools.component.ts b/src/app/tools/tools.component.ts index 3021a401..d5ffd9f3 100644 --- a/src/app/tools/tools.component.ts +++ b/src/app/tools/tools.component.ts @@ -1,6 +1,4 @@ -import { - Component, -} from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'app-tools', diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index a1e60bf6..df1731f7 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -1690,5 +1690,14 @@ }, "loggedInAs": { "message": "Logged in as" + }, + "eventLogs": { + "message": "Event Logs" + }, + "people": { + "message": "People" + }, + "groups": { + "message": "Groups" } }