From b2c7afb4826eeb84f15b37e5e87255d6677b4656 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Mon, 9 Nov 2020 12:43:31 +0100 Subject: [PATCH] fix: notify beta period end --- app/assets/javascripts/app.ts | 48 ++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts index 32529da33..a49e22c40 100644 --- a/app/assets/javascripts/app.ts +++ b/app/assets/javascripts/app.ts @@ -18,7 +18,7 @@ import { TagsView, NotesView, FooterView, - ChallengeModal + ChallengeModal, } from '@/views'; import { @@ -30,7 +30,7 @@ import { infiniteScroll, lowercase, selectOnFocus, - snEnter + snEnter, } from './directives/functional'; import { @@ -48,27 +48,23 @@ import { PrivilegesManagementModal, RevisionPreviewModal, HistoryMenu, - SyncResolutionMenu + SyncResolutionMenu, } from './directives/views'; import { trusted } from './filters'; import { isDev } from './utils'; import { Bridge, BrowserBridge } from './services/bridge'; import { startErrorReporting } from './services/errorReporting'; +import { alertDialog } from './services/alertService'; if (__WEB__) { - startApplication( - (window as any)._default_sync_server, - new BrowserBridge() - ); + startApplication((window as any)._default_sync_server, new BrowserBridge()); } else { (window as any).startApplication = startApplication; } -async function startApplication( - defaultSyncServerHost: string, - bridge: Bridge -) { +async function startApplication(defaultSyncServerHost: string, bridge: Bridge) { + notifyBetaPeriodEnd(); SNLog.onLog = console.log; startErrorReporting(); @@ -92,7 +88,7 @@ async function startApplication( .directive('editorView', () => new EditorView()) .directive('tagsView', () => new TagsView()) .directive('notesView', () => new NotesView()) - .directive('footerView', () => new FooterView()) + .directive('footerView', () => new FooterView()); // Directives - Functional angular @@ -123,15 +119,16 @@ async function startApplication( .directive('passwordWizard', () => new PasswordWizard()) .directive('permissionsModal', () => new PermissionsModal()) .directive('privilegesAuthModal', () => new PrivilegesAuthModal()) - .directive('privilegesManagementModal', () => new PrivilegesManagementModal()) + .directive( + 'privilegesManagementModal', + () => new PrivilegesManagementModal() + ) .directive('revisionPreviewModal', () => new RevisionPreviewModal()) .directive('historyMenu', () => new HistoryMenu()) .directive('syncResolutionMenu', () => new SyncResolutionMenu()); // Filters - angular - .module('app') - .filter('trusted', ['$sce', trusted]); + angular.module('app').filter('trusted', ['$sce', trusted]); // Services angular.module('app').service('mainApplicationGroup', ApplicationGroup); @@ -141,8 +138,10 @@ async function startApplication( Object.defineProperties(window, { application: { get: () => - (angular.element(document).injector().get('mainApplicationGroup') as any) - .primaryApplication + (angular + .element(document) + .injector() + .get('mainApplicationGroup') as any).primaryApplication, }, }); } @@ -151,3 +150,16 @@ async function startApplication( angular.bootstrap(document, ['app']); }); } + +function notifyBetaPeriodEnd() { + if (window.location.hostname === 'app-beta.standardnotes.org') { + alertDialog({ + title: 'Beta period has ended', + text: + 'Thank you for trying this beta version. Please sign out, then ' + + 'sign in to ' + + 'app.standardnotes.org ' + + 'to continue using Standard Notes.', + }); + } +}