Browse Source

Send Sync Notifications (#799)

* enabled send and added send sync notifications

* updated jslib
pull/804/head
Addison Beck 5 years ago committed by GitHub
parent
commit
6b29bb8468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      jslib
  2. 4
      src/app/app-routing.module.ts
  3. 4
      src/app/layouts/navbar.component.html
  4. 25
      src/app/send/send.component.ts

2
jslib

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 6ac6df75d7a9bd5ea58f5d8310f1b3e34abd2bde
Subproject commit 68bd93e45bd9acb9df18cf7806d51710f1986237

4
src/app/app-routing.module.ts

@ -153,11 +153,11 @@ const routes: Routes = [ @@ -153,11 +153,11 @@ const routes: Routes = [
canActivate: [UnauthGuardService],
data: { titleId: 'deleteAccount' },
},
/*{
{
path: 'send/:sendId/:key',
component: AccessComponent,
data: { title: 'Bitwarden Send' },
},*/
},
],
},
{

4
src/app/layouts/navbar.component.html

@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@
<li class="nav-item" routerLinkActive="active">
<a class="nav-link" routerLink="/vault">{{'myVault' | i18n}}</a>
</li>
<!--<li class="nav-item" routerLinkActive="active">
<li class="nav-item" routerLinkActive="active">
<a class="nav-link" routerLink="/sends">Send</a>
</li>-->
</li>
<li class="nav-item" routerLinkActive="active">
<a class="nav-link" routerLink="/tools">{{'tools' | i18n}}</a>
</li>

25
src/app/send/send.component.ts

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
import {
Component,
ComponentFactoryResolver,
NgZone,
OnInit,
ViewChild,
ViewContainerRef,
@ -20,6 +21,10 @@ import { I18nService } from 'jslib/abstractions/i18n.service'; @@ -20,6 +21,10 @@ import { I18nService } from 'jslib/abstractions/i18n.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { SendService } from 'jslib/abstractions/send.service';
import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
const BroadcasterSubscriptionId = 'SendComponent';
@Component({
selector: 'app-send',
templateUrl: 'send.component.html',
@ -49,11 +54,29 @@ export class SendComponent implements OnInit { @@ -49,11 +54,29 @@ export class SendComponent implements OnInit {
constructor(private apiService: ApiService, private sendService: SendService,
private i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver,
private platformUtilsService: PlatformUtilsService, private environmentService: EnvironmentService) { }
private platformUtilsService: PlatformUtilsService, private environmentService: EnvironmentService,
private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
async ngOnInit() {
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
this.ngZone.run(async () => {
switch (message.command) {
case 'syncCompleted':
if (message.successfully) {
await this.load();
}
break;
}
});
});
await this.load();
}
ngOnDestroy() {
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
}
async load(filter: (send: SendView) => boolean = null) {
this.loading = true;
const sends = await this.sendService.getAllDecrypted();

Loading…
Cancel
Save