From db7ff13f2e5bb663023be2bac4912e5b4706ad73 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 3 May 2017 10:30:11 -0400 Subject: [PATCH] Update 2017-05-03T14:30:05.647Z --- app/accounts/views/accountsLoginInfo.html | 12 +- .../views/accountsOrganizationAccept.html | 32 + app/accounts/views/accountsRegister.html | 10 +- .../views/organizationBilling.html | 161 + .../views/organizationBillingAdjustSeats.html | 46 + .../organizationBillingChangePayment.html | 364 ++ .../views/organizationBillingChangePlan.html | 13 + .../views/organizationCollections.html | 75 + .../views/organizationCollectionsAdd.html | 34 + .../views/organizationCollectionsEdit.html | 35 + .../views/organizationCollectionsGroups.html} | 4 +- .../views/organizationCollectionsUsers.html | 64 + .../views/organizationDashboard.html | 32 + .../views/organizationDelete.html | 34 + .../views/organizationGroups.html | 16 + .../views/organizationPeople.html | 85 + .../views/organizationPeopleEdit.html | 101 + .../views/organizationPeopleInvite.html | 109 + .../views/organizationSettings.html | 65 + app/organization/views/organizationVault.html | 78 + .../organizationVaultLoginCollections.html | 52 + app/settings/views/settings.html | 44 +- .../views/settingsCreateOrganization.html | 535 +++ app/settings/views/settingsDomains.html | 79 +- app/settings/views/settingsTwoFactor.html | 73 +- app/tools/views/tools.html | 27 +- app/tools/views/toolsImport.html | 22 +- app/vault/views/vault.html | 187 +- app/vault/views/vaultAddLogin.html | 4 +- app/vault/views/vaultEditLogin.html | 55 +- app/vault/views/vaultLoginCollections.html | 55 + app/vault/views/vaultShareLogin.html | 75 + app/vault/views/vaultShared.html | 90 + app/views/apps.html | 141 + app/views/backendLayout.html | 131 +- app/views/organizationLayout.html | 103 + app/views/userLayout.html | 122 + css/vault.min.css | 2 +- images/cards.png | Bin 0 -> 17093 bytes index.html | 25 +- js/app.min.js | 8 +- js/lib.min.js | 22 +- lib/angular/angular.min.js | 637 ++-- lib/bootstrap/css/bootstrap.min.css | 6 +- lib/bootstrap/js/bootstrap.min.js | 8 +- lib/font-awesome/css/font-awesome.min.css | 4 +- lib/font-awesome/fonts/FontAwesome.otf | Bin 124988 -> 134808 bytes .../fonts/fontawesome-webfont.eot | Bin 76518 -> 165742 bytes .../fonts/fontawesome-webfont.svg | 3350 +++++++++++++---- .../fonts/fontawesome-webfont.ttf | Bin 152796 -> 165548 bytes .../fonts/fontawesome-webfont.woff | Bin 90412 -> 98024 bytes .../fonts/fontawesome-webfont.woff2 | Bin 71896 -> 77160 bytes 52 files changed, 5931 insertions(+), 1296 deletions(-) create mode 100644 app/accounts/views/accountsOrganizationAccept.html create mode 100644 app/organization/views/organizationBilling.html create mode 100644 app/organization/views/organizationBillingAdjustSeats.html create mode 100644 app/organization/views/organizationBillingChangePayment.html create mode 100644 app/organization/views/organizationBillingChangePlan.html create mode 100644 app/organization/views/organizationCollections.html create mode 100644 app/organization/views/organizationCollectionsAdd.html create mode 100644 app/organization/views/organizationCollectionsEdit.html rename app/{tools/views/toolsAudits.html => organization/views/organizationCollectionsGroups.html} (65%) create mode 100644 app/organization/views/organizationCollectionsUsers.html create mode 100644 app/organization/views/organizationDashboard.html create mode 100644 app/organization/views/organizationDelete.html create mode 100644 app/organization/views/organizationGroups.html create mode 100644 app/organization/views/organizationPeople.html create mode 100644 app/organization/views/organizationPeopleEdit.html create mode 100644 app/organization/views/organizationPeopleInvite.html create mode 100644 app/organization/views/organizationSettings.html create mode 100644 app/organization/views/organizationVault.html create mode 100644 app/organization/views/organizationVaultLoginCollections.html create mode 100644 app/settings/views/settingsCreateOrganization.html create mode 100644 app/vault/views/vaultLoginCollections.html create mode 100644 app/vault/views/vaultShareLogin.html create mode 100644 app/vault/views/vaultShared.html create mode 100644 app/views/apps.html create mode 100644 app/views/organizationLayout.html create mode 100644 app/views/userLayout.html create mode 100644 images/cards.png diff --git a/app/accounts/views/accountsLoginInfo.html b/app/accounts/views/accountsLoginInfo.html index f0abe6d2..cef70feb 100644 --- a/app/accounts/views/accountsLoginInfo.html +++ b/app/accounts/views/accountsLoginInfo.html @@ -35,7 +35,15 @@
\ No newline at end of file diff --git a/app/accounts/views/accountsOrganizationAccept.html b/app/accounts/views/accountsOrganizationAccept.html new file mode 100644 index 00000000..ae151ddf --- /dev/null +++ b/app/accounts/views/accountsOrganizationAccept.html @@ -0,0 +1,32 @@ +
+ + +
diff --git a/app/accounts/views/accountsRegister.html b/app/accounts/views/accountsRegister.html index 5e3689f4..9dfae0a6 100644 --- a/app/accounts/views/accountsRegister.html +++ b/app/accounts/views/accountsRegister.html @@ -9,10 +9,14 @@

Account Created!

You may now log in to your new account.

- Ready to log in? + Ready to log in?
+
+

Create Organization, Step 1

+

Before creating your organization, you first need to create a free personal account.

+

Errors have occured

    @@ -22,7 +26,7 @@
    + ng-readonly="readOnlyEmail" required api-field />

    You'll use your email address to log in.

    @@ -60,7 +64,7 @@
+
+
+
+

Plan

+
+
+
+
+
+
Name
+
{{plan.name || '-'}}
+
Total Seats
+
{{plan.seats || '-'}}
+
+
+
+
+
Status
+
{{(subscription && subscription.status) || '-'}}
+
Next Charge
+
{{nextInvoice ? ((nextInvoice.date | date: format: mediumDate) + ', ' + (nextInvoice.amount | currency:'$')) : '-'}}
+
+
+
+
+
+ Details +
+ Loading... +
+
+ + + + + + + +
+ {{item.name}} {{item.qty > 1 ? '×' + item.qty : ''}} + @ {{item.amount | currency:'$'}} /{{item.interval}} + {{(item.qty * item.amount) | currency:'$'}} /{{item.interval}}
+
+
+
+
+ +
+
+
+

User Seats

+
+
+
+ Loading... +
+
+ You plan currently has a total of {{plan.seats}} seats. +
+
+ +
+
+
+

Payment Method

+
+
+
+ Loading... +
+
+ No payment method on file. +
+
+ + {{paymentSource.description}} +
+
+ +
+
+
+

Charges

+
+
+
+ Loading... +
+
+ No charges. +
+
+ + + + + + + + + +
+ {{charge.date | date: format: mediumDate}} + + {{charge.paymentSource}} + + {{charge.status}} + + {{charge.amount | currency:'$'}} +
+
+
+ +
+ diff --git a/app/organization/views/organizationBillingAdjustSeats.html b/app/organization/views/organizationBillingAdjustSeats.html new file mode 100644 index 00000000..7913cba7 --- /dev/null +++ b/app/organization/views/organizationBillingAdjustSeats.html @@ -0,0 +1,46 @@ + + + + + diff --git a/app/organization/views/organizationBillingChangePayment.html b/app/organization/views/organizationBillingChangePayment.html new file mode 100644 index 00000000..61317642 --- /dev/null +++ b/app/organization/views/organizationBillingChangePayment.html @@ -0,0 +1,364 @@ + +
+ + +
diff --git a/app/organization/views/organizationBillingChangePlan.html b/app/organization/views/organizationBillingChangePlan.html new file mode 100644 index 00000000..60c8e926 --- /dev/null +++ b/app/organization/views/organizationBillingChangePlan.html @@ -0,0 +1,13 @@ + +
+ + +
diff --git a/app/organization/views/organizationCollections.html b/app/organization/views/organizationCollections.html new file mode 100644 index 00000000..4ae2033a --- /dev/null +++ b/app/organization/views/organizationCollections.html @@ -0,0 +1,75 @@ +
+

+ Collections + control what you share +

+
+
+
+
+   + +
+ +
+
+
+
+ Loading... +
+
+ No collections to list. +
+
+

There are no collections yet for your organization.

+ +
+
+ + + + + + + +
+
+ + +
+
+ + {{collection.name}} + +
+
+
+
+
diff --git a/app/organization/views/organizationCollectionsAdd.html b/app/organization/views/organizationCollectionsAdd.html new file mode 100644 index 00000000..d0537d3c --- /dev/null +++ b/app/organization/views/organizationCollectionsAdd.html @@ -0,0 +1,34 @@ + +
+ + +
diff --git a/app/organization/views/organizationCollectionsEdit.html b/app/organization/views/organizationCollectionsEdit.html new file mode 100644 index 00000000..3a763420 --- /dev/null +++ b/app/organization/views/organizationCollectionsEdit.html @@ -0,0 +1,35 @@ + +
+ + +
diff --git a/app/tools/views/toolsAudits.html b/app/organization/views/organizationCollectionsGroups.html similarity index 65% rename from app/tools/views/toolsAudits.html rename to app/organization/views/organizationCollectionsGroups.html index 7c1b284d..0d5b5d88 100644 --- a/app/tools/views/toolsAudits.html +++ b/app/organization/views/organizationCollectionsGroups.html @@ -1,9 +1,9 @@
- - User Image - - Update Photo +
@@ -109,6 +106,41 @@ +
+
+

Organizations

+
+
+ No organizations yet for your account. +
+ + +

Danger Zone

diff --git a/app/settings/views/settingsCreateOrganization.html b/app/settings/views/settingsCreateOrganization.html new file mode 100644 index 00000000..6436964a --- /dev/null +++ b/app/settings/views/settingsCreateOrganization.html @@ -0,0 +1,535 @@ +
+

Create Organization

+
+
+

+ Organizations allow you to share parts of your vault with others as well as manage related users + for a specific entity (such as a family, small team, or large company). +

+
+
+
+

General Information

+
+
+
+

Errors have occured

+
    +
  • {{e}}
  • +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+

Choose Your Plan

+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+

Additional Users (Seats)

+
+
+

+ Your plan comes with {{plans[model.plan].baseSeats}} users (seats). You can add additional users + + (up to {{plans[model.plan].maxAdditionalSeats}} more) + + for {{plans[model.plan].seatPrice | currency:'$'}} per user /month. +

+
+
+
+ + +
+
+
+
+
+
+
+

Billing Summary

+
+
+
+ +
+
+ +
+
+ +
+
+
+

Payment Information

+
+
+
+
+
+ + +
+
+
+ +
    +
  • +
  • +
  • +
  • +
  • +
  • +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
diff --git a/app/settings/views/settingsDomains.html b/app/settings/views/settingsDomains.html index f2dc816a..b40f8d72 100644 --- a/app/settings/views/settingsDomains.html +++ b/app/settings/views/settingsDomains.html @@ -9,25 +9,36 @@
-

Custom Equivalent Domains

-
-
- +
- @@ -51,28 +62,40 @@
-

Global Equivalent Domains

+

Global

-
- - + +
+ + +
{{customDomain}}
+
- - + diff --git a/app/settings/views/settingsTwoFactor.html b/app/settings/views/settingsTwoFactor.html index 010dd672..67389751 100644 --- a/app/settings/views/settingsTwoFactor.html +++ b/app/settings/views/settingsTwoFactor.html @@ -2,9 +2,13 @@ - + - + -
-
-

Export

-
-
- Export all of your vault data in .csv format. -
-
@@ -36,12 +29,4 @@ Password generator is currently available in all other client applications. Coming soon to the web vault! -
-
-

Audits

-
-
- Coming soon! -
-
diff --git a/app/tools/views/toolsImport.html b/app/tools/views/toolsImport.html index af39fe68..e5474021 100644 --- a/app/tools/views/toolsImport.html +++ b/app/tools/views/toolsImport.html @@ -2,21 +2,33 @@ - +
- - - + +
+ + +
{{globalDomain.domains}}{{::globalDomain.domains}}
+ + + + + + +
+ + + {{login.name}} + +
{{login.username}}
+
+
+
+
+
+
+

+ + {{folder.name}} + +

+
+ +
-
-

Loading logins...

-
-
+

No logins in this folder.

- - - - - - - - +
NameUsername
- - + + - -
- - +
+ + + {{login.name}} + + +
{{login.username}}
{{login.name}} {{login.username}}
diff --git a/app/vault/views/vaultAddLogin.html b/app/vault/views/vaultAddLogin.html index 389c6e96..1c0b3749 100644 --- a/app/vault/views/vaultAddLogin.html +++ b/app/vault/views/vaultAddLogin.html @@ -17,7 +17,7 @@
-
+
-
+