From 07f5be39d80aad99dacf8a71d82c2e6e2b105476 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:43:31 -0600
Subject: [PATCH] [Send] Navigation Tab (#1591)
* Initial commit of send tab
* update jslib (9ddec9b -> 859f317)
* updated skeleton class/html
* removed added space
* cleaned up import groupings
* Updated to use flex container and removed unnecessary scss class
---
jslib | 2 +-
src/_locales/en/messages.json | 4 ++++
src/popup/app-routing.module.ts | 16 ++++++++++++--
src/popup/app.module.ts | 11 ++++++++--
src/popup/scss/base.scss | 11 ++--------
src/popup/send/send.component.html | 8 +++++++
src/popup/send/send.component.ts | 35 ++++++++++++++++++++++++++++++
src/popup/tabs.component.html | 7 +++++-
8 files changed, 79 insertions(+), 15 deletions(-)
create mode 100644 src/popup/send/send.component.html
create mode 100644 src/popup/send/send.component.ts
diff --git a/jslib b/jslib
index 9ddec9baf8..859f317d59 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 9ddec9baf8b6e7de58c00744eb371dc68e1b6383
+Subproject commit 859f317d59189d223072a406bc2d6924e1fb71bc
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 3b2d447c16..1760e002a6 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1470,5 +1470,9 @@
"example": "googlecom"
}
}
+ },
+ "send": {
+ "message": "Send",
+ "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
}
}
diff --git a/src/popup/app-routing.module.ts b/src/popup/app-routing.module.ts
index 96090c98f3..cf253b8d9f 100644
--- a/src/popup/app-routing.module.ts
+++ b/src/popup/app-routing.module.ts
@@ -20,9 +20,13 @@ import { SetPasswordComponent } from './accounts/set-password.component';
import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
import { TwoFactorComponent } from './accounts/two-factor.component';
import { SsoComponent } from './accounts/sso.component';
-import { PasswordGeneratorHistoryComponent } from './generator/password-generator-history.component';
+
import { PasswordGeneratorComponent } from './generator/password-generator.component';
+import { PasswordGeneratorHistoryComponent } from './generator/password-generator-history.component';
+
import { PrivateModeComponent } from './private-mode.component';
+import { TabsComponent } from './tabs.component';
+
import { ExcludedDomainsComponent } from './settings/excluded-domains.component';
import { ExportComponent } from './settings/export.component';
import { FolderAddEditComponent } from './settings/folder-add-edit.component';
@@ -31,7 +35,7 @@ import { OptionsComponent } from './settings/options.component';
import { PremiumComponent } from './settings/premium.component';
import { SettingsComponent } from './settings/settings.component';
import { SyncComponent } from './settings/sync.component';
-import { TabsComponent } from './tabs.component';
+
import { AddEditComponent } from './vault/add-edit.component';
import { AttachmentsComponent } from './vault/attachments.component';
import { CiphersComponent } from './vault/ciphers.component';
@@ -42,6 +46,8 @@ import { PasswordHistoryComponent } from './vault/password-history.component';
import { ShareComponent } from './vault/share.component';
import { ViewComponent } from './vault/view.component';
+import { SendComponent } from './send/send.component';
+
const routes: Routes = [
{
path: '',
@@ -265,6 +271,12 @@ const routes: Routes = [
canActivate: [AuthGuardService],
data: { state: 'tabs_settings' },
},
+ {
+ path: 'send',
+ component: SendComponent,
+ canActivate: [AuthGuardService],
+ data: { state: 'tabs_send' },
+ },
],
},
];
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index 63e8c92c32..b1a1efc800 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -25,10 +25,14 @@ import { SetPasswordComponent } from './accounts/set-password.component';
import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
import { TwoFactorComponent } from './accounts/two-factor.component';
import { SsoComponent } from './accounts/sso.component';
-import { AppComponent } from './app.component';
+
import { PasswordGeneratorHistoryComponent } from './generator/password-generator-history.component';
import { PasswordGeneratorComponent } from './generator/password-generator.component';
+
+import { AppComponent } from './app.component';
import { PrivateModeComponent } from './private-mode.component';
+import { TabsComponent } from './tabs.component';
+
import { ExcludedDomainsComponent } from './settings/excluded-domains.component';
import { ExportComponent } from './settings/export.component';
import { FolderAddEditComponent } from './settings/folder-add-edit.component';
@@ -37,7 +41,7 @@ import { OptionsComponent } from './settings/options.component';
import { PremiumComponent } from './settings/premium.component';
import { SettingsComponent } from './settings/settings.component';
import { SyncComponent } from './settings/sync.component';
-import { TabsComponent } from './tabs.component';
+
import { AddEditComponent } from './vault/add-edit.component';
import { AttachmentsComponent } from './vault/attachments.component';
import { CiphersComponent } from './vault/ciphers.component';
@@ -48,6 +52,8 @@ import { PasswordHistoryComponent } from './vault/password-history.component';
import { ShareComponent } from './vault/share.component';
import { ViewComponent } from './vault/view.component';
+import { SendComponent } from './send/send.component';
+
import { A11yTitleDirective } from 'jslib/angular/directives/a11y-title.directive';
import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive';
import { AutofocusDirective } from 'jslib/angular/directives/autofocus.directive';
@@ -205,6 +211,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
RegisterComponent,
SearchCiphersPipe,
SelectCopyDirective,
+ SendComponent,
SettingsComponent,
ShareComponent,
StopClickDirective,
diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss
index 000e4f23a3..7911b0acd4 100644
--- a/src/popup/scss/base.scss
+++ b/src/popup/scss/base.scss
@@ -281,14 +281,13 @@ header {
}
ul {
- width: 100%;
+ display: flex;
list-style: none;
padding: 0;
margin: 0;
li {
- width: 25%;
- float: left;
+ flex: 1;
display: inline-block;
padding: 0;
margin: 0;
@@ -329,12 +328,6 @@ header {
}
}
}
-
- &.tabs-3 {
- ul li {
- width: 33.33%;
- }
- }
}
app-root {
diff --git a/src/popup/send/send.component.html b/src/popup/send/send.component.html
new file mode 100644
index 0000000000..7c646071e9
--- /dev/null
+++ b/src/popup/send/send.component.html
@@ -0,0 +1,8 @@
+
+
+
+
diff --git a/src/popup/send/send.component.ts b/src/popup/send/send.component.ts
new file mode 100644
index 0000000000..540e3989d1
--- /dev/null
+++ b/src/popup/send/send.component.ts
@@ -0,0 +1,35 @@
+import {
+ Component,
+ NgZone,
+} from '@angular/core';
+
+import { SendView } from 'jslib/models/view/sendView';
+
+import { SendComponent as BaseSendComponent } from 'jslib/angular/components/send/send.component';
+
+import { EnvironmentService } from 'jslib/abstractions/environment.service';
+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';
+
+@Component({
+ selector: 'app-send',
+ templateUrl: 'send.component.html',
+})
+export class SendComponent extends BaseSendComponent {
+ constructor(sendService: SendService, i18nService: I18nService,
+ platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService,
+ broadcasterService: BroadcasterService, ngZone: NgZone) {
+ super(sendService, i18nService, platformUtilsService, environmentService, broadcasterService, ngZone);
+ }
+
+ addSend() {
+ // TODO
+ }
+
+ editSend(send: SendView) {
+ // TODO
+ }
+}
diff --git a/src/popup/tabs.component.html b/src/popup/tabs.component.html
index 71de2575bf..645bd2359e 100644
--- a/src/popup/tabs.component.html
+++ b/src/popup/tabs.component.html
@@ -1,6 +1,6 @@