diff --git a/backend/cache.go b/backend/cache.go index 1f3ef15..3a99c0c 100644 --- a/backend/cache.go +++ b/backend/cache.go @@ -31,6 +31,7 @@ type CacheCarteListItem struct { NumberOfPossibleDecks int PercentageOfDecks float64 Synergy float64 + Banned bool } type CacheCarteListItemWithSynergy struct { @@ -307,5 +308,6 @@ func CreateCardData(c Carte, decksByBset map[string][]Deck, numberOfDecksPerColo NumberOfDecks: numberOfDecksPerCard[c.ID], NumberOfPossibleDecks: numberOfPossibleDecks, PercentageOfDecks: percentageOfDecks, + Banned: c.Banned, } } diff --git a/backend/custom_pocketbase b/backend/custom_pocketbase index bbd29d0..80376dc 100755 Binary files a/backend/custom_pocketbase and b/backend/custom_pocketbase differ diff --git a/backend/types.go b/backend/types.go index 8bab927..b60e3c8 100644 --- a/backend/types.go +++ b/backend/types.go @@ -38,6 +38,7 @@ type Carte struct { Price string `db:"price" json:"price"` CardmarketUri string `db:"cardmarket_url" json:"cardmarket_url"` CanBeCommander bool `db:"can_be_commander" json:"can_be_commander"` + Banned bool `db:"banned" json:"banned"` } type DeckCard struct { diff --git a/frontend/src/lib/components/Card.svelte b/frontend/src/lib/components/Card.svelte index 36b47e3..7a65829 100644 --- a/frontend/src/lib/components/Card.svelte +++ b/frontend/src/lib/components/Card.svelte @@ -1,17 +1,31 @@
- {"Scan - {price}€ - {name} - {#if numberOfPossibleDecks == undefined} - {numberOfDecks} Decks + {#if showUrl} + + {#if card.Banned} + banned card icon + {/if} + {"Scan + {:else} - {numberOfDecks} Decks sur {numberOfPossibleDecks} ({numberOfPossibleDecks != 0 ? Math.round(100 * (numberOfDecks / numberOfPossibleDecks)) : 0}%) +
+ {#if card.Banned} + banned card icon + {/if} + {"Scan +
{/if} - {#if synergy != undefined} - Synergy {synergy > 0 ? "+" + Math.round(100*synergy).toString() : Math.round(100*synergy).toString()}% + {card.Price}€ + {card.Name} + {#if isCommander} + {card.NumberOfDecks} Decks + {:else} + {card.NumberOfDecks} Decks sur {card.NumberOfPossibleDecks} ({card.NumberOfPossibleDecks != 0 ? Math.round(100 * (card.NumberOfDecks / card.NumberOfPossibleDecks)) : 0}%) + {/if} + {#if showSynergy} + Synergy {card.Synergy > 0 ? "+" + Math.round(100*card.Synergy).toString() : Math.round(100*card.Synergy).toString()}% {/if}
diff --git a/frontend/src/routes/bset/[slug]/+page.svelte b/frontend/src/routes/bset/[slug]/+page.svelte index b7354f8..89b2c9f 100644 --- a/frontend/src/routes/bset/[slug]/+page.svelte +++ b/frontend/src/routes/bset/[slug]/+page.svelte @@ -40,56 +40,56 @@

Commandants

{#each commander as card} - + {/each}

Planeswalker

{#each planeswalker as card} - + {/each}

Creature

{#each creature as card} - + {/each}

Rituels

{#each sorcery as card} - + {/each}

Artefacts

{#each artifact as card} - + {/each}

Éphémères

{#each instant as card} - + {/each}

Enchantements

{#each enchantment as card} - + {/each}

Terrains

{#each land as card} - + {/each} diff --git a/frontend/src/routes/commander/[slug]/+page.svelte b/frontend/src/routes/commander/[slug]/+page.svelte index c0d66fe..0945f5c 100644 --- a/frontend/src/routes/commander/[slug]/+page.svelte +++ b/frontend/src/routes/commander/[slug]/+page.svelte @@ -36,55 +36,55 @@
- +

Planeswalker

{#each planeswalker as card} - + {/each}

Creature

{#each creature as card} - + {/each}

Rituels

{#each sorcery as card} - + {/each}

Artefacts

{#each artifact as card} - + {/each}

Éphémères

{#each instant as card} - + {/each}

Enchantements

{#each enchantment as card} - + {/each}

Terrains

{#each land as card} - + {/each}
diff --git a/frontend/static/assets/banned.png b/frontend/static/assets/banned.png new file mode 100644 index 0000000..979e9ae Binary files /dev/null and b/frontend/static/assets/banned.png differ