rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(web): add accepting subscription invites from UI

Browse Source
This commit is contained in:
Karol Sójko
2022-10-24 14:30:17 +02:00
parent a4245aee6f
commit 0c44ad6c8e
14 changed files with 218 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/javascripts/Controllers/PreferencesController.ts
View File

@@ -1,6 +1,6 @@
import { InternalEventBus } from '@standardnotes/snjs'
import { action, computed, makeObservable, observable } from 'mobx'
import { PreferenceId } from '@standardnotes/ui-services'
import { PreferenceId, RootQueryParam } from '@standardnotes/ui-services'
import { AbstractViewController } from './Abstract/AbstractViewController'
import { WebApplication } from '@/Application/Application'
@@ -34,7 +34,7 @@ export class PreferencesController extends AbstractViewController {
closePreferences = (): void => {
this._open = false
this.currentPane = DEFAULT_PANE
this.application.routeService.removeSettingsFromURLQueryParameters()
this.application.routeService.removeQueryParameterFromURL(RootQueryParam.Settings)
}
get isOpen(): boolean {

7
packages/web/src/javascripts/Controllers/ViewControllerManager.ts
View File

@@ -1,5 +1,5 @@
import { PaneController } from './PaneController'
import { storage, StorageKey } from '@standardnotes/ui-services'
import { storage, StorageKey, ToastService, ToastServiceInterface } from '@standardnotes/ui-services'
import { WebApplication } from '@/Application/Application'
import { AccountMenuController } from '@/Controllers/AccountMenu/AccountMenuController'
import { destroyAllObjectProperties } from '@/Utils'
@@ -71,6 +71,7 @@ export class ViewControllerManager implements InternalEventHandlerInterface {
private subscriptionManager: SubscriptionClientInterface
private persistenceService: PersistenceService
private applicationEventObserver: EventObserverInterface
private toastService: ToastServiceInterface
constructor(public application: WebApplication, private device: WebOrDesktopDeviceInterface) {
this.eventBus = new InternalEventBus()
@@ -146,6 +147,8 @@ export class ViewControllerManager implements InternalEventHandlerInterface {
this.historyModalController = new HistoryModalController(this.application, this.eventBus)
this.toastService = new ToastService()
this.applicationEventObserver = new ApplicationEventObserver(
application.routeService,
this.purchaseFlowController,
@@ -154,6 +157,8 @@ export class ViewControllerManager implements InternalEventHandlerInterface {
this.syncStatusController,
application.sync,
application.sessions,
application.subscriptions,
this.toastService,
)
this.addAppEventObserver()