Skip to content

Basic Shops UI design#118

Merged
ECWireless merged 10 commits intomainfrom
feat/shops
Aug 30, 2024
Merged

Basic Shops UI design#118
ECWireless merged 10 commits intomainfrom
feat/shops

Conversation

@Fluffy9
Copy link
Copy Markdown
Collaborator

@Fluffy9 Fluffy9 commented Aug 27, 2024

I left some things commented out because I'm still using them

@Fluffy9 Fluffy9 requested a review from ECWireless August 27, 2024 13:50
@vercel
Copy link
Copy Markdown

vercel Bot commented Aug 27, 2024

@Fluffy9 is attempting to deploy a commit to the Raid Guild Team on Vercel.

To accomplish this, @Fluffy9 needs to request access to the Team.

Afterwards, an owner of the Team is required to accept their membership request.

If you're already a member of the respective Vercel Team, make sure that your Personal Vercel Account is connected to your GitHub account.

Copy link
Copy Markdown
Collaborator

@ECWireless ECWireless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good so far! Biggest request is to use the same component for each half of the shop (so the left side uses ShopHalf, and the right half uses the same ShopHalf component). That way we're not duplicating a bunch of logic and styles.

Comment thread packages/client/src/Routes.tsx Outdated
Comment thread pnpm-lock.yaml
Comment thread packages/client/src/pages/Shops.tsx Outdated
Comment thread packages/client/src/pages/Shops.tsx Outdated
Comment thread packages/client/src/pages/Shops.tsx Outdated
Comment thread packages/client/src/pages/Shops.tsx Outdated
Comment thread packages/client/src/pages/Shops.tsx Outdated
Comment thread packages/client/src/pages/ShopRow.tsx Outdated
@Fluffy9 Fluffy9 requested a review from ECWireless August 27, 2024 18:03
@vercel
Copy link
Copy Markdown

vercel Bot commented Aug 28, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ultimate-dominion ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 30, 2024 1:47am

Copy link
Copy Markdown
Collaborator

@ECWireless ECWireless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nearly there! Added a few more comments. Last thing it needs before merging is to use more accurate dummy data. I merged in main, so you should now be able to now pull all armor and/or weapon templates to use as dummy data by importing useItems from the contexts folder, and getting the templates with const { armorTemplates, weaponTemplates } = useItems();

Comment thread packages/client/src/pages/Shop.tsx Outdated
Comment thread packages/client/src/pages/Shop.tsx Outdated
Comment thread packages/client/src/pages/Shop.tsx Outdated
Comment thread packages/client/src/pages/Shop.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
Comment thread packages/client/src/components/ShopHalf.tsx Outdated
@Fluffy9 Fluffy9 requested a review from ECWireless August 29, 2024 22:19
@Fluffy9 Fluffy9 changed the title Basic UI design Basic Shops UI design Aug 30, 2024
@ECWireless ECWireless merged commit b53076d into main Aug 30, 2024
@ECWireless ECWireless deleted the feat/shops branch August 30, 2024 01:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants