Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added shop details #1044

Merged
merged 9 commits into from
Jan 12, 2025
Merged

Added shop details #1044

merged 9 commits into from
Jan 12, 2025

Conversation

BudzioT
Copy link
Collaborator

@BudzioT BudzioT commented Dec 26, 2024

Many people are confused about details of items, with this we can change that. I know Nora was working on it, but even if she began, we can temporarely merge that or for a longer time (depending on how well it is made).
Just click on an item and you can see its details (it doesn't affect buy and favourite button!)
I can manually edit more descriptions of items, if you feel like this isn't too fun, or we can wait for Nora to do it.
It works on different regions and gives accurate links based on them, also doesn't show info about customs if US is selected.

Some examples of items are here:
image
image
image

Copy link

vercel bot commented Dec 26, 2024

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

Name Status Preview Comments Updated (UTC)
high-seas ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 10, 2025 6:22pm

@BudzioT
Copy link
Collaborator Author

BudzioT commented Dec 26, 2024

Also made project shipping confirmation a little bigger, it depends on vh now instead of strict pixels

@BudzioT BudzioT linked an issue Dec 27, 2024 that may be closed by this pull request
@BudzioT
Copy link
Collaborator Author

BudzioT commented Dec 30, 2024

Approved by Nora on Slack, so @malted or @maxwofford feel free to merge it if you want

@maxwofford
Copy link
Member

Hey! Sorry for missing this. Happy to merge if you resolve the conflicts @BudzioT

@BudzioT
Copy link
Collaborator Author

BudzioT commented Jan 9, 2025

@maxwofford
I hate merge conflicts, done though!
Cause of shopkeeper, changed it to show details once user has clicked anywhere else than buttons and item's images

@@ -116,7 +196,7 @@ export const ShopItemComponent = ({
height={20}
className="mr-1"
/>
{localPrice}
Copy link
Member

Choose a reason for hiding this comment

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

Did you mean to remove this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Changed it earlier to {filterIndex == 1 ? item.priceUs : item.priceGlobal} idk why, but reverted now

@@ -10,10 +10,12 @@ import {
CardTitle,
} from '@/components/ui/card'
import { Button } from '@/components/ui/button'
import { useMemo } from 'react'
import React, { useMemo, useState } from 'react'
Copy link
Member

Choose a reason for hiding this comment

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

Do we need the React import?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Webstorm playing tricks again... fixed

@BudzioT
Copy link
Collaborator Author

BudzioT commented Jan 10, 2025

@maxwofford should be better now

@maxwofford maxwofford merged commit 630d667 into main Jan 12, 2025
3 checks passed
@maxwofford maxwofford deleted the shop_temp_details branch January 12, 2025 14:53
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.

Shop Shipping Details
2 participants