Code

The (Editor and Collection) Merge#108

Code

Merged

norswap merged 52 commits into0xFableOrg:master0xFableOrg/0xFable:masterfrom eviterin:TheMergeeviterin/0xFable:TheMergeCopy head branch name to clipboardMar 1, 2024

+465-494

Commits

Commits on Feb 27, 2024

• factored out components used in editor and collection. preparing to remove editor

  

  eviterin

  authored and

  norswap

  committed
  cc89c49

• Moved more save and cancel logic from editor to collection

  

  eviterin

  authored and

  norswap

  committed
  1a23a29

• Migrated save and load functionality from editor.

  

  eviterin

  authored and

  norswap

  committed
  6dfca99

• Deleted 'editor.tsx'

  

  eviterin

  authored and

  norswap

  committed
  d66d902

• Renamed components for sanity

  

  eviterin

  authored and

  norswap

  committed
  69ef672

• Grouped state variables by their function

  

  eviterin

  authored and

  norswap

  committed
  0ff3fc6

• refactored variable names

  

  eviterin

  authored and

  norswap

  committed
  a368f86

• consistent css

  

  eviterin

  authored and

  norswap

  committed
  e711cea

• Fixed all warnings with eslint and removed semicolons.

  

  eviterin

  authored and

  norswap

  committed
  d2f0de7

• Renamed dir 'editor' to 'collection'

  

  eviterin

  authored and

  norswap

  committed
  b6cb6a3

• renamed import to reflect directory name update

  

  eviterin

  authored and

  norswap

  committed
  67636a1

• Allow player to save empty deck

  

  eviterin

  authored and

  norswap

  committed
  e7fa296

• Component wrapping 'Link' added to carry the '?index=' parameter used for testing.

  

  eviterin

  authored and

  norswap

  committed
  c85e050

• Removed unused css

  

  eviterin

  authored and

  norswap

  committed
  da488da

• renamed queryParamLink to just link.

  

  eviterin

  authored and

  norswap

  committed
  9fd6a0b

• updated comment on how to carry over the index query param

  

  eviterin

  authored and

  norswap

  committed
  36e70d5

• minor typo

  

  eviterin

  authored and

  norswap

  committed
  05d0817

• minor typo

  

  eviterin

  authored and

  norswap

  committed
  8b21444

• file renames and import updates

  

  eviterin

  authored and

  norswap

  committed
  d4f508b

• readded the props to to keep css.

  

  eviterin

  authored and

  norswap

  committed
  109500a

• added deck name validity check for just spaces

  

  eviterin

  authored and

  norswap

  committed
  168087a

• added trim and set deck name to be valid as an initial state

  

  eviterin

  authored and

  norswap

  committed
  3080773

• removed unneeded default props

  

  eviterin

  authored and

  norswap

  committed
  b1ce4ba

• Added custom tailwind box shadow

  

  eviterin

  authored and

  norswap

  committed
  de6fc70

• Dynamic card resize in collectionDisplay as per Norswap's recipe

  

  eviterin

  authored and

  norswap

  committed
  474592a

• remove semicolons

  

  eviterin

  authored and

  norswap

  committed
  0c01ce5

• extended FablePage type for the Collection Component props ot prevent warnings

  

  eviterin

  authored and

  norswap

  committed
  f431eba

• decks stored in collection instead of _app

  

  eviterin

  authored and

  norswap

  committed
  c141bd0

• use Deck type instead of card[]

  

  eviterin

  authored and

  norswap

  committed
  3d2223b

• made explicit types

  

  eviterin

  authored and

  norswap

  committed
  99c3b1e

• made sure the index param stays

  

  eviterin

  authored and

  norswap

  committed
  46956eb

• corrected error message

  

  eviterin

  authored and

  norswap

  committed
  102fc6d

• add queryParamLink

  

  eviterin

  authored and

  norswap

  committed
  634a867

• remove extra import

  

  eviterin

  authored and

  norswap

  committed
  f029ccd

• better card art selection

  

  eviterin

  authored and

  norswap

  committed
  a270ef7

• Removed redundant comments

  

  eviterin

  authored and

  norswap

  committed
  2661a57

• deck names...

  

  eviterin

  authored and

  norswap

  committed
  70c9423

• Use our own button components and moved them down to their own row

  

  eviterin

  authored and

  norswap

  committed
  7705e70

• flex the deck panel

  

  eviterin

  authored and

  norswap

  committed
  aa8b578

• made text readable by humans

  

  eviterin

  authored and

  norswap

  committed
  f859439

• use our own buttons

  

  eviterin

  authored and

  norswap

  committed
  9a8eaf9

• Made deck name buttons scale to daddy component width

  

  eviterin

  authored and

  norswap

  committed
  345996f

• fixes

  

  eviterin

  authored and

  norswap

  committed
  3294eab

• add .vs and .vscode to gitignore

  

  eviterin

  authored and

  norswap

  committed
  661c69f

• removed fallback art for cards

  

  eviterin

  authored and

  norswap

  committed
  1c06d68

• quick fix starting index is 1

  

  eviterin

  authored and

  norswap

  committed
  3a83806

• Improved flexing the deck panel

  

  eviterin

  authored and

  norswap

  committed
  36e35ae

• Fix bug where deck was not editable

  

  eviterin

  authored and

  norswap

  committed
  42f25f7

• make check

  norswap

  committed
  928aded

• Deck display no longer crashes if the player does not own any decks

  eviterin

  committed
  60aff3f

• Removed unnessecarily complex props from collection and resolved a bug when saving an existing deck

  eviterin

  committed
  3cf1f44

• Removed unused imports

  eviterin

  committed
  0f1f0aa