diff --git a/src/components/DeckBuilder/CardPicker.vue b/src/components/DeckBuilder/CardPicker.vue
index ba7c123..b41827e 100644
--- a/src/components/DeckBuilder/CardPicker.vue
+++ b/src/components/DeckBuilder/CardPicker.vue
@@ -1,12 +1,52 @@
-
+
+
+
+
+
+
+
diff --git a/src/components/DeckBuilder/DeckList.vue b/src/components/DeckBuilder/DeckList.vue
index dcf20e7..a0cfe19 100644
--- a/src/components/DeckBuilder/DeckList.vue
+++ b/src/components/DeckBuilder/DeckList.vue
@@ -1,7 +1,7 @@
- {{fullname(card)}}
+ {{ cardFullName(card) }}
@@ -14,22 +14,13 @@
diff --git a/src/mlpccg/card.ts b/src/mlpccg/card.ts
index 00966da..19f0cba 100644
--- a/src/mlpccg/card.ts
+++ b/src/mlpccg/card.ts
@@ -1,5 +1,14 @@
+import { Card } from "./types";
+
const imgBaseURL = "https://mcg.zyg.ovh/images/cards/";
export function cardImageURL(cardid: string): string {
return `${imgBaseURL}${cardid}.webp`;
}
+
+export function cardFullName(card: Card): string {
+ if (card.Subname != "") {
+ return `${card.Name}, ${card.Subname}`;
+ }
+ return card.Name;
+}
diff --git a/src/mlpccg/index.ts b/src/mlpccg/index.ts
new file mode 100644
index 0000000..5c33687
--- /dev/null
+++ b/src/mlpccg/index.ts
@@ -0,0 +1,4 @@
+export * from "./card";
+export * from "./database";
+export * from "./set";
+export * from "./types";
diff --git a/src/views/DeckBuilder.vue b/src/views/DeckBuilder.vue
index e459a13..bff7f6f 100644
--- a/src/views/DeckBuilder.vue
+++ b/src/views/DeckBuilder.vue
@@ -3,7 +3,7 @@
@@ -24,7 +24,7 @@
.cardlist {
display: grid;
grid-column: 1;
- grid-template-rows: 50px 1fr;
+ grid-template-rows: 100px 1fr;
}
.decklist {
grid-column: 2;
@@ -37,10 +37,9 @@