feat(.com): add public block alert for .com migration

blockchain · Jun 18, 2018 · b03d457 · b03d457
1 parent 5280349
commit b03d457
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/app/partials/public.pug b/app/partials/public.pug
@@ -1,6 +1,8 @@
 .login-pg(ng-class="{'display-block': isUIOverflow}")
   include ./bc-logo-header
-  testnet-warning
+  .banners-container
+    testnet-warning
+    block-alert.public-block-alert-overrides(ng-if="showPublicBanner" config="publicBannerConfig")
   .overflow-scroll.flex-justify.flex-center
     .flex-center.flex-justify.flex-column
       .flex.flex-justify

diff --git a/assets/css/modules/_signin.scss b/assets/css/modules/_signin.scss
@@ -13,10 +13,23 @@ div.login-form {
   height: 100%;
   position: relative;
   background-color: $blue;
-  testnet-warning {
+  .banners-container {
     top: 100px;
     position: relative;
   }
+  .public-block-alert-overrides {
+    .block-alert {
+      border: none;
+      padding: 10px 40px;
+    }
+    * {
+      margin: 0px !important;
+    }
+    span, p {
+      font-weight: 300 !important;
+      margin-bottom: 10px !important;
+    }
+  }
   nav {
     position: fixed;
     width: 100%;

diff --git a/assets/js/routes.js b/assets/js/routes.js
@@ -104,6 +104,11 @@ function AppRouter ($stateProvider, $urlRouterProvider) {
               $scope.rootURL = env.rootURL;
               $scope.versionMyWallet = env.versionMyWallet;
               $scope.versionFrontend = env.versionFrontend;
+
+              $scope.publicBannerConfig = ComMigration.isOnDotCom()
+                ? env.web.serviceAlert.publicDotCom
+                : env.web.serviceAlert.publicDotInfo
+              $scope.showPublicBanner = $scope.publicBannerConfig != null
             });
 
             let overflows = ['/reset-2fa'];

diff --git a/rootApp/Resources/wallet-options.json b/rootApp/Resources/wallet-options.json
@@ -95,6 +95,25 @@
   },
   "web": {
     "serviceAlert": {
+      "__publicDotInfo": {
+        "type": "info",
+        "header": {
+          "en": "We’re packing our bags and preparing to move…domains!"
+        },
+        "sections": [
+          {
+            "body": {
+              "en": "To make way for our new and exciting products coming this year, we’re saying hello to our new home. Your Blockchain Wallet will soon be changing URLs as it's combined with our company site, blockchain.com."
+            }
+          }
+        ],
+        "action": {
+          "title": {
+            "en": "Read more about what to expect here."
+          },
+          "link": "https://www.example.com/"
+        }
+      },
       "__global": {
         "type": "warning",
         "hideType": "collapse",