From 931f67337eabc249593b9846d45b61a66fa6fee5 Mon Sep 17 00:00:00 2001 From: 96RadhikaJadhav Date: Thu, 11 Feb 2021 21:12:46 +0530 Subject: [PATCH 1/2] Changed webmail to mail --- README.md | 4 ++-- e2e/cypress/integration/login.ts | 6 +++--- src/app/app-settings.ts | 4 ++-- src/app/app.component.html | 2 +- src/app/app.component.ts | 2 +- src/app/changelog/changes.ts | 20 +++++++++---------- src/app/contacts-app/contacts.service.spec.ts | 8 ++++---- src/index.html | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ec5ee7572..870c49b0b 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@


Runbox 7 -
Building the fastest webmail app on the planet

+
Building the fastest mail app on the planet

Welcome to the Runbox 7 project! -Runbox 7 is a next generation webmail app that combines the instant experience of email clients with the versatility of web browsers. +Runbox 7 is a next generation mail app that combines the instant experience of email clients with the versatility of web browsers. The app is written in Angular 2+ and HTML5 Canvas, using a Perl backend with MySQL storage. This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.8. diff --git a/e2e/cypress/integration/login.ts b/e2e/cypress/integration/login.ts index 4d9251e0c..6e8211e04 100644 --- a/e2e/cypress/integration/login.ts +++ b/e2e/cypress/integration/login.ts @@ -16,7 +16,7 @@ describe('Login', () => { cy.get('div.loginSection mat-progress-bar').should('exist'); } - function expectWebmail() { + function expectmail() { cy.get('#sidenavGreeting').should('contain', 'test@runbox.com'); cy.get('confirm-dialog').should('contain', 'Welcome to Runbox 7'); cy.get('confirm-dialog .mat-dialog-actions button mat-icon[svgIcon="cancel"]').click().should(() => { @@ -32,7 +32,7 @@ describe('Login', () => { enterCredentials(); clickLogin(); - expectWebmail(); + expectmail(); }); it('should log in with 2fa', () => { @@ -47,6 +47,6 @@ describe('Login', () => { cy.get('input[data-placeholder="Timed one-time password"]').type('123456'); clickLogin(); - expectWebmail(); + expectmail(); }); }); diff --git a/src/app/app-settings.ts b/src/app/app-settings.ts index fd0df6540..4d79fa4f4 100644 --- a/src/app/app-settings.ts +++ b/src/app/app-settings.ts @@ -54,7 +54,7 @@ export class AppSettingsService { constructor( private storage: StorageService, ) { - this.storage.getSubject('webmailSettings').pipe(filter(s => s)).subscribe( + this.storage.getSubject('mailSettings').pipe(filter(s => s)).subscribe( (settings: any) => this.settingsSubject.next( this.settings = AppSettings.load(settings) ) @@ -62,6 +62,6 @@ export class AppSettingsService { } public store(): void { - this.storage.set('webmailSettings', this.settings); + this.storage.set('mailSettings', this.settings); } } diff --git a/src/app/app.component.html b/src/app/app.component.html index 6e6cf8408..191d85ae9 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -45,7 +45,7 @@

-
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dc4c74cb3..40107b627 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1127,7 +1127,7 @@ export class AppComponent implements OnInit, AfterViewInit, CanvasTableSelectLis const dialogRef = this.dialog.open(ConfirmDialog); dialogRef.componentInstance.title = 'Welcome to Runbox 7!'; dialogRef.componentInstance.question = - `Runbox 7 will now synchronize with your device to give you an optimal webmail experience. + `Runbox 7 will now synchronize with your device to give you an optimal mail experience. If you'd later like to remove the data from your device, use the synchronization controls at the bottom of the folder pane.`; dialogRef.componentInstance.yesOptionTitle = `Sounds good, let's go!`; dialogRef.componentInstance.noOptionTitle = `Don't synchronize with this device.`; diff --git a/src/app/changelog/changes.ts b/src/app/changelog/changes.ts index a84f2aaef..c443d658f 100644 --- a/src/app/changelog/changes.ts +++ b/src/app/changelog/changes.ts @@ -1296,7 +1296,7 @@ const changes = [ "fe0693f", "1574956692", "refactor", - "webmail", + "mail", "remove unused column widths code from AppComponent" ], [ @@ -1387,7 +1387,7 @@ const changes = [ "163d88f", "1574346008", "style", - "webmail", + "mail", "Hide nav submenu in mobile view" ], [ @@ -1464,7 +1464,7 @@ const changes = [ "f69af60", "1573848492", "style", - "webmail", + "mail", "Omit \"Deleting...\" feedback message when deleting messages." ], [ @@ -1549,7 +1549,7 @@ const changes = [ "1573486468", "feat", "menu", - "Add buttons to navigate between calendar and webmail" + "Add buttons to navigate between calendar and mail" ], [ "85ea2fa", @@ -1751,35 +1751,35 @@ const changes = [ "1a21270", "1572351944", "fix", - "webmail", + "mail", "don't keep the message pane open when in mobile view" ], [ "d2969db", "1572351280", "style", - "webmail", + "mail", "adjust preview pane wording" ], [ "9c4e9b6", "1572280164", "fix", - "webmail", + "mail", "Display viewMode menu even when no local index exists" ], [ "5a30155", "1572279479", "feat", - "webmail", + "mail", "add an option to toggle the message pane openness" ], [ "09a3fa1", "1572277440", "feat", - "webmail", + "mail", "Add an option to hide the message pane" ], [ @@ -2010,7 +2010,7 @@ const changes = [ "4670c0a", "1569425925", "refactor", - "webmail", + "mail", "remove deprecated MediaQueryList APIs" ], [ diff --git a/src/app/contacts-app/contacts.service.spec.ts b/src/app/contacts-app/contacts.service.spec.ts index 72873f133..f1709ca24 100644 --- a/src/app/contacts-app/contacts.service.spec.ts +++ b/src/app/contacts-app/contacts.service.spec.ts @@ -37,7 +37,7 @@ describe('ContactsService', () => { it('should allow looking up avatars according to settings', async () => { const storage = new StorageService(rmmapi); - storage.set('webmailSettings', { avatars: 'remote' }); + storage.set('mailSettings', { avatars: 'remote' }); const sut = new ContactsService(rmmapi, new AppSettingsService(storage), storage); await new Promise(resolve => setTimeout(resolve, 0)); @@ -52,7 +52,7 @@ describe('ContactsService', () => { avatarUrl = await sut.lookupAvatar('test+no+gravatar@runbox.com'); expect(avatarUrl).toBeFalsy(); - storage.set('webmailSettings', { avatars: 'local' }); + storage.set('mailSettings', { avatars: 'local' }); await new Promise(resolve => setTimeout(resolve, 0)); avatarUrl = await sut.lookupAvatar('test@runbox.com'); @@ -61,14 +61,14 @@ describe('ContactsService', () => { avatarUrl = await sut.lookupAvatar('test+gravatar@runbox.com'); expect(avatarUrl).toBeFalsy(); - storage.set('webmailSettings', { avatars: 'none' }); + storage.set('mailSettings', { avatars: 'none' }); await new Promise(resolve => setTimeout(resolve, 0)); avatarUrl = await sut.lookupAvatar('test@runbox.com'); expect(avatarUrl).toBeFalsy(); // can enable it back again - storage.set('webmailSettings', { avatars: 'remote' }); + storage.set('mailSettings', { avatars: 'remote' }); await new Promise(resolve => setTimeout(resolve, 0)); avatarUrl = await sut.lookupAvatar('test+gravatar@runbox.com'); expect(avatarUrl).toMatch(/gravatar/); diff --git a/src/index.html b/src/index.html index dc5abc62d..273080271 100644 --- a/src/index.html +++ b/src/index.html @@ -12,7 +12,7 @@ - + From dd2663d042d4f6e451f1d703ff3f2a51b9f262e6 Mon Sep 17 00:00:00 2001 From: 96RadhikaJadhav Date: Sat, 27 Mar 2021 21:14:56 +0530 Subject: [PATCH 2/2] fixed changes --- src/app/app-settings.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app-settings.ts b/src/app/app-settings.ts index 4d79fa4f4..9dbff0459 100644 --- a/src/app/app-settings.ts +++ b/src/app/app-settings.ts @@ -54,7 +54,7 @@ export class AppSettingsService { constructor( private storage: StorageService, ) { - this.storage.getSubject('mailSettings').pipe(filter(s => s)).subscribe( + this.storage.getSubject('webmailSettings').pipe(filter(s => s)).subscribe( (settings: any) => this.settingsSubject.next( this.settings = AppSettings.load(settings) )