Select an image to display for credit cards based on the brand. (#537)

Co-authored-by: Hinton <oscar@oscarhinton.com>
bitwarden · Dec 16, 2021 · e966645 · e966645
1 parent 36b3aea
commit e966645
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 0 deletions.
diff --git a/angular/src/components/icon.component.ts b/angular/src/components/icon.component.ts
@@ -18,6 +18,21 @@ const IconMap: any = {
   "fa-apple": String.fromCharCode(0xf179),
 };
 
+/**
+ * Provides a mapping from supported card brands to
+ * the filenames of icon that should be present in images/cards folder of clients.
+ */
+const cardIcons: Record<string, string> = {
+  Visa: "card-visa",
+  Mastercard: "card-mastercard",
+  Amex: "card-amex",
+  Discover: "card-discover",
+  "Diners Club": "card-diners-club",
+  JCB: "card-jcb",
+  Maestro: "card-maestro",
+  UnionPay: "card-union-pay",
+};
+
 @Component({
   selector: "app-vault-icon",
   templateUrl: "icon.component.html",
@@ -59,6 +74,7 @@ export class IconComponent implements OnChanges {
         break;
       case CipherType.Card:
         this.icon = "fa-credit-card";
+        this.setCardIcon();
         break;
       case CipherType.Identity:
         this.icon = "fa-id-card-o";
@@ -102,4 +118,11 @@ export class IconComponent implements OnChanges {
       this.image = null;
     }
   }
+
+  private setCardIcon() {
+    const brand = this.cipher.card.brand;
+    if (this.imageEnabled && brand in cardIcons) {
+      this.icon = "credit-card-icon " + cardIcons[brand];
+    }
+  }
 }
diff --git a/angular/src/images/cards/amex-dark.png b/angular/src/images/cards/amex-dark.png
diff --git a/angular/src/images/cards/amex-light.png b/angular/src/images/cards/amex-light.png
diff --git a/angular/src/images/cards/diners_club-dark.png b/angular/src/images/cards/diners_club-dark.png
diff --git a/angular/src/images/cards/diners_club-light.png b/angular/src/images/cards/diners_club-light.png
diff --git a/angular/src/images/cards/discover-dark.png b/angular/src/images/cards/discover-dark.png
diff --git a/angular/src/images/cards/discover-light.png b/angular/src/images/cards/discover-light.png
diff --git a/angular/src/images/cards/jcb-dark.png b/angular/src/images/cards/jcb-dark.png
diff --git a/angular/src/images/cards/jcb-light.png b/angular/src/images/cards/jcb-light.png
diff --git a/angular/src/images/cards/maestro-dark.png b/angular/src/images/cards/maestro-dark.png
diff --git a/angular/src/images/cards/maestro-light.png b/angular/src/images/cards/maestro-light.png
diff --git a/angular/src/images/cards/mastercard-dark.png b/angular/src/images/cards/mastercard-dark.png
diff --git a/angular/src/images/cards/mastercard-light.png b/angular/src/images/cards/mastercard-light.png
diff --git a/angular/src/images/cards/union_pay-dark.png b/angular/src/images/cards/union_pay-dark.png
diff --git a/angular/src/images/cards/union_pay-light.png b/angular/src/images/cards/union_pay-light.png
diff --git a/angular/src/images/cards/visa-dark.png b/angular/src/images/cards/visa-dark.png
diff --git a/angular/src/images/cards/visa-light.png b/angular/src/images/cards/visa-light.png
diff --git a/angular/src/scss/icons.scss b/angular/src/scss/icons.scss
@@ -0,0 +1,44 @@
+$card-icons-base: "~@bitwarden/jslib-angular/src/images/cards/";
+$card-icons: (
+  "visa": $card-icons-base + "visa-light.png",
+  "amex": $card-icons-base + "amex-light.png",
+  "diners-club": $card-icons-base + "diners_club-light.png",
+  "discover": $card-icons-base + "discover-light.png",
+  "jcb": $card-icons-base + "jcb-light.png",
+  "maestro": $card-icons-base + "maestro-light.png",
+  "mastercard": $card-icons-base + "mastercard-light.png",
+  "union-pay": $card-icons-base + "union_pay-light.png",
+);
+
+$card-icons-dark: (
+  "visa": $card-icons-base + "visa-dark.png",
+  "amex": $card-icons-base + "amex-dark.png",
+  "diners-club": $card-icons-base + "diners_club-dark.png",
+  "discover": $card-icons-base + "discover-dark.png",
+  "jcb": $card-icons-base + "jcb-dark.png",
+  "maestro": $card-icons-base + "maestro-dark.png",
+  "mastercard": $card-icons-base + "mastercard-dark.png",
+  "union-pay": $card-icons-base + "union_pay-dark.png",
+);
+
+.credit-card-icon {
+  display: block; // Resolves the parent container being slighly to big
+  height: 19px;
+  width: 24px;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+
+@each $name, $url in $card-icons {
+  .card-#{$name} {
+    background-image: url("#{$url}");
+  }
+}
+
+@each $theme in $dark-icon-themes {
+  @each $name, $url in $card-icons-dark {
+    .#{$theme} .card-#{$name} {
+      background-image: url("#{$url}");
+    }
+  }
+}