From ebba0a9e2361a0523118ef3e71dad3f9a49ada40 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 12 Apr 2018 17:28:33 -0400
Subject: [PATCH] settings help and about

---
 src/popup/settings/settings.component.html | 17 ++++++++++-------
 src/popup/settings/settings.component.ts   | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index a45ca42938..c3b41e5ede 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -11,11 +11,11 @@
     <div class="box">
         <div class="box-header">{{'manage' | i18n}}</div>
         <div class="box-content">
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" routerLink="/folders">
                 <div class="row-main">{{'folders' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" routerLink="/sync">
                 <div class="row-main">{{'sync' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
@@ -45,7 +45,7 @@
     <div class="box">
         <div class="box-header">{{'account' | i18n}}</div>
         <div class="box-content">
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default"  routerLink="/premium">
                 <div class="row-main">{{'premiumMembership' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
@@ -73,7 +73,8 @@
                 <div class="row-main">{{'exportVault' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" href="#"
+               appStopClick appBlurClick (click)="share()">
                 <div class="row-main">{{'shareVault' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
@@ -82,15 +83,17 @@
     <div class="box">
         <div class="box-header">{{'other' | i18n}}</div>
         <div class="box-content">
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default"  routerLink="/options">
                 <div class="row-main">{{'options' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" href="#"
+               appStopClick appBlurClick (click)="about()">
                 <div class="row-main">{{'about' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
-            <a class="box-content-row box-content-row-flex text-default" href="#">
+            <a class="box-content-row box-content-row-flex text-default" href="#"
+               appStopClick appBlurClick (click)="help()">
                 <div class="row-main">{{'helpFeedback' | i18n}}</div>
                 <i class="fa fa-chevron-right fa-lg row-sub-icon"></i>
             </a>
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts
index b06bdc0d02..2e42012616 100644
--- a/src/popup/settings/settings.component.ts
+++ b/src/popup/settings/settings.component.ts
@@ -1,4 +1,5 @@
 import { Angulartics2 } from 'angulartics2';
+import swal from 'sweetalert';
 
 import {
     Component,
@@ -127,6 +128,27 @@ export class SettingsComponent implements OnInit {
         BrowserApi.createNewTab('https://help.bitwarden.com/article/import-data/');
     }
 
+    help() {
+        this.analytics.eventTrack.next({ action: 'Clicked Help and Feedback' });
+        BrowserApi.createNewTab('https://help.bitwarden.com/');
+    }
+
+    about() {
+        this.analytics.eventTrack.next({ action: 'Clicked About' });
+
+        const versionText = document.createTextNode(
+            this.i18nService.t('version') + ': ' + BrowserApi.getApplicationVersion());
+        const div = document.createElement('div');
+        div.innerHTML = `<p><i class="fa fa-shield fa-3x"></i></p>
+            <p><strong>Bitwarden</strong><br>&copy; 8bit Solutions LLC 2015-` + (new Date()).getFullYear() + `</p>`;
+        div.appendChild(versionText);
+
+        swal({
+            content: { element: div },
+            buttons: [this.i18nService.t('close'), false],
+        });
+    }
+
     rate() {
         this.analytics.eventTrack.next({ action: 'Rate Extension' });
         BrowserApi.createNewTab((RateUrls as any)[this.platformUtilsService.getDevice()]);