make card sorting simpler

RivalsDB · Nov 7, 2021 · 569ddbb · 569ddbb
1 parent d1a8a1d
commit 569ddbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/client/src/Pages/Deck/Edit/Id_.elm b/client/src/Pages/Deck/Edit/Id_.elm
@@ -468,12 +468,7 @@ cardSort a b =
     in
     case compare (stack a) (stack b) of
         EQ ->
-            case compare (Cards.bloodPotency a) (Cards.bloodPotency b) of
-                EQ ->
-                    compare (Cards.name a) (Cards.name b)
-
-                ord ->
-                    ord
+            compare (Cards.name a) (Cards.name b)
 
         ord ->
             ord
diff --git a/client/src/Pages/Deck/New.elm b/client/src/Pages/Deck/New.elm
@@ -445,12 +445,7 @@ cardSort a b =
     in
     case compare (stack a) (stack b) of
         EQ ->
-            case compare (Cards.bloodPotency a) (Cards.bloodPotency b) of
-                EQ ->
-                    compare (Cards.name a) (Cards.name b)
-
-                ord ->
-                    ord
+            compare (Cards.name a) (Cards.name b)
 
         ord ->
             ord
diff --git a/client/src/UI/Decklist.elm b/client/src/UI/Decklist.elm
@@ -289,12 +289,14 @@ viewLibraryGroup name group =
             ]
         , ul []
             (group
+                |> List.sortBy (Tuple.first >> .name)
                 |> List.map
-                    (\( c, n ) ->
+                    (\( card, n ) ->
                         li [ class "deck-library__entry" ]
                             [ span [] [ text (String.fromInt n) ]
                             , span [] [ text "× " ]
-                            , UI.CardName.withOverlay (Cards.LibraryCard c)
+                            , UI.CardName.withOverlay (Cards.LibraryCard card)
+                            , span [] [ Maybe.map Icon.clan card.clan |> Maybe.withDefault (text "") ]
                             ]
                     )
             )