diff --git a/jslib b/jslib index 89c23522d5..8e377050e9 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 89c23522d5697c722dcbe7d074cd12ebb6dc8783 +Subproject commit 8e377050e9bfddae46fa0a167771b670593eca16 diff --git a/src/popup/app-routing.animations.ts b/src/popup/app-routing.animations.ts index a1baf4535e..dea56a1819 100644 --- a/src/popup/app-routing.animations.ts +++ b/src/popup/app-routing.animations.ts @@ -123,8 +123,8 @@ export const routerTransition = trigger('routerTransition', [ transition('edit-cipher => share-cipher', inSlideUp), transition('share-cipher => edit-cipher', outSlideDown), - transition('edit-cipher => attachments', inSlideLeft), - transition('attachments => edit-cipher', outSlideRight), + transition('edit-cipher => attachments, edit-cipher => collections', inSlideLeft), + transition('attachments => edit-cipher, collections => edit-cipher', outSlideRight), transition('tabs => export', inSlideLeft), transition('export => tabs', outSlideRight), diff --git a/src/popup/app-routing.module.ts b/src/popup/app-routing.module.ts index 83fa66939c..4b0b2c7ea2 100644 --- a/src/popup/app-routing.module.ts +++ b/src/popup/app-routing.module.ts @@ -30,6 +30,7 @@ import { TabsComponent } from './tabs.component'; import { AddEditComponent } from './vault/add-edit.component'; import { AttachmentsComponent } from './vault/attachments.component'; import { CiphersComponent } from './vault/ciphers.component'; +import { CollectionsComponent } from './vault/collections.component'; import { CurrentTabComponent } from './vault/current-tab.component'; import { GroupingsComponent } from './vault/groupings.component'; import { PasswordHistoryComponent } from './vault/password-history.component'; @@ -130,6 +131,12 @@ const routes: Routes = [ canActivate: [AuthGuardService], data: { state: 'share-cipher' }, }, + { + path: 'collections', + component: CollectionsComponent, + canActivate: [AuthGuardService], + data: { state: 'collections' }, + }, { path: 'attachments', component: AttachmentsComponent, diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts index b83b3c27f3..398165161d 100644 --- a/src/popup/app.module.ts +++ b/src/popup/app.module.ts @@ -37,6 +37,7 @@ import { TabsComponent } from './tabs.component'; import { AddEditComponent } from './vault/add-edit.component'; import { AttachmentsComponent } from './vault/attachments.component'; import { CiphersComponent } from './vault/ciphers.component'; +import { CollectionsComponent } from './vault/collections.component'; import { CurrentTabComponent } from './vault/current-tab.component'; import { GroupingsComponent } from './vault/groupings.component'; import { PasswordHistoryComponent } from './vault/password-history.component'; @@ -154,6 +155,7 @@ registerLocaleData(localeZhTw, 'zh-TW'); BoxRowDirective, CiphersComponent, CiphersListComponent, + CollectionsComponent, CurrentTabComponent, EnvironmentComponent, ExportComponent, diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html index db285d8527..df10f4d322 100644 --- a/src/popup/vault/add-edit.component.html +++ b/src/popup/vault/add-edit.component.html @@ -258,6 +258,11 @@