The (Editor and Collection) Merge

[eviterin]

Context (Problem, Motivation, Solution)

Editor was added in my previous PR. This editor was based on the Collection view, and shared a lot of component and functionality. Instead of maintaining the two, I now combined them.

Merge Collection and Editor

Describe Your Changes

Both Collection and Editor had these two components: On the left: Search/Filter panel Middle: Card collection

In Collection: On the right: Player's completed decks

In Editor: On the right: Player's deck that is under construction

Each of these components have been factored out into their own component. Editor has been removed, and the Collection now keeps track on whether the player is in editing mode or not. Index file has been updated to remove the editor shortcut.

Additionally, variables within the collection view have been reordered and grouped by the functionality they support.

Checklist

• [x] I have performed a self-review of my code
• [x] I ran make check and fixed resulting issues
• [ ] I ran the relevant tests and they all pass
• [ ] I wrote tests for my new features, or added regression tests for the bug I fixed

Testing

Exploration testing to make sure there are is no regression within the Collection view.

[norswap]

Is this ready for review? Just tried it and seems to have quite a few problems (e.g. deck doesn't appear in list when you add a new deck) + unused functions in collections.tsx.

Tip: you can mark the PR as "draft" if it's not ready for review (that way other people can have a look if they want to, but they know it's not blocking!)

[eviterin]

I ran eslint and resolved all warnings. Sorry for that will try to do better in the future..

@norswap I tried cloning my PR fresh and still cannot reproduce the issue you're having with decks not appearing in the list. The following steps I take:

1. Navigate to http://localhost:3000/?index=1
2. Select Collection
3. Select New Deck
4. Add cards and a name and press Save
5. Assert that the deck I created is on the deck list.

Keeping this issue in draft until I know more.

[norswap]

Might be on my side, maybe I need to rerun make setup, will report back!

[norswap]

I can reprod, both on Chrome & Firefox, even if I clone fresh.

To be clear, after creating the deck, I expect it to show in the right sidebar, instead, only "New Deck" is shown.

[eviterin]

Thanks for the review @norswap. I have now added commits for each actionable comment (reacted with a 👍)

Edit: not ready for re-review. Make check is killing me

[eviterin]

Minor CSS issues now with Aritra's changes, but will be fixed in upcoming PR for onchaining decks.

[norswap]

Global feedback:

• behaviour much better now!
• kinda looks ugly
  • not enough vertical spacing between text field & button
  • would be good to set a default deck name so we don't start with the red border
    • like Deck #X where X is the number of existing decks + 1
  • buttons should probably look more like the starting page button
    • in particular, reduce border size
    • would be good to have a different color for accept and cancel? (not sure)
      • add space between tick mark / cross mark and text
      • add vertical spacing between "New Deck" and listed decks
      • same, reduce border width
      • make "New Deck" and listed deck more visually distinct
        • keep "New Deck" as button but make listed deck more visually similar to the cards in the deck card list
• bugs
  • when editing an existing deck, the border shows as red until edited (but deck can still be edited & saved correctly)
• enhancements
  • grey out "save" if nothing in the deck changed, or if something is invalid (rn only invalid deck name)
  • the two panels (deck list & card lists) are inconsistent: deck list shows a scrollbar when it gets too small, whereas the card list doesn't
    • we should probably do the scrollbar for both (but keep the buttons reflowing when reducing size though!)
    • NOTE: chrome doesn't actually display the scrollbar but the content is scrollable horizontally in decklist, not in the card list still
      • would be good to show the scroll bar on all browsers, but this is the least important item on this list

Still, this is pretty usable, so I'm going to merge this now, so we can enable prettier globally. Then I think the next priorities should be:

• implement contract interop
• redo the layout according to #93 (we don't need the filters atm and it looks jank) — tackle the above items at the same item if still relevant in the new layout