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 a toggle to filter out ammo types you can't buy based on your trader levels #930

Merged
merged 7 commits into from
Apr 26, 2024

Conversation

brjens
Copy link
Contributor

@brjens brjens commented Apr 25, 2024

[Trader Ammo Filter]

I added a toggle below the graph that filters out all ammo types that the user can't buy.

Description πŸ—’οΈ

I added a toggle below the graph that filters out all ammo types that the user can't buy. It should work with both the API from the tracker as well as the settings page. It should cover the use case for the issue but I'm open to feedback if anyone has suggestions. I made sure it updates when the user changes their settings on the page but I haven't tested if I updated well if the tarkovtracker updates.
I also spotted a typo in the contributing.md when I was making sure I was following all the rules. It was just one word so I didn't think it warranted an entire Pull request. But I gave it a separate commit in case you guys wanted to drop it.

Examples πŸ“Έ

This is for level 1 traders
image

Related Issues πŸ”—

(#278)


Expand for Help

By submitting this pull request, you agree to our code of conduct

@brjens brjens requested a review from a team as a code owner April 25, 2024 20:46
@Blightbuster
Copy link
Member

.deploy to development

Copy link
Contributor

⚠️ Cannot claim deployment lock

Sorry Blightbuster, the development environment deployment lock is currently claimed by Razzmatazzz

Lock Details πŸ”’

  • Environment: development
  • Branch: 9ca6b94c352bc53fd4200fcd25c35301d95b0301
  • Created At: 2024-04-09T20:30:04.137Z
  • Created By: Razzmatazzz
  • Sticky: true
  • Global: false
  • Comment Link: click here
  • Lock Link: click here

The current lock has been active for 16d:7h:4m:34s

If you need to release the lock, please comment .unlock development

@Blightbuster
Copy link
Member

@Razzmatazzz πŸ™„

@Blightbuster
Copy link
Member

.deploy to development

Copy link
Contributor

⚠️ Cannot proceed with deployment

Your branch is behind the base branch and will need to be updated before deployments can continue.

  • mergeStateStatus: BEHIND
  • update_branch: warn

Please ensure your branch is up to date with the main branch and try again

@Blightbuster
Copy link
Member

.deploy to development

Copy link
Contributor

Deployment Triggered πŸš€

Blightbuster, started a branch deployment to development

You can watch the progress here πŸ”—

Branch: e8f6ead8ebcaf2efa00fb4f8f168e75a42f526e7

Copy link
Contributor

Deployment Results βœ…

Blightbuster successfully deployed branch e8f6ead8ebcaf2efa00fb4f8f168e75a42f526e7 to development

Show Results

https://7ba1a07c.tarkov-dev.pages.dev

Copy link
Member

@Blightbuster Blightbuster left a comment

Choose a reason for hiding this comment

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

Can you add the translation strings to src/translations/en/translation.json please.
For some reason I cant push my commit to the PR.

    "Trader Ammo": "Trader Ammo",
    "Only show ammo available from traders on your settings": "Only show ammo available from traders on your settings",

@brjens
Copy link
Contributor Author

brjens commented Apr 26, 2024

for sure! on it

@Blightbuster
Copy link
Member

.deploy to development

Copy link
Contributor

Deployment Triggered πŸš€

Blightbuster, started a branch deployment to development

You can watch the progress here πŸ”—

Branch: c65493ba870bd8110d324fefd507d6a4da1ef6f9

Copy link
Contributor

Deployment Results βœ…

Blightbuster successfully deployed branch c65493ba870bd8110d324fefd507d6a4da1ef6f9 to development

Show Results

https://789be879.tarkov-dev.pages.dev

@Blightbuster
Copy link
Member

.deploy

Copy link
Contributor

Deployment Triggered πŸš€

Blightbuster, started a branch deployment to production

You can watch the progress here πŸ”—

Branch: c65493ba870bd8110d324fefd507d6a4da1ef6f9

Copy link
Contributor

Deployment Results βœ…

Blightbuster successfully deployed branch c65493ba870bd8110d324fefd507d6a4da1ef6f9 to production

Environment URL: tarkov.dev

@Blightbuster Blightbuster merged commit e62e7af into the-hideout:main Apr 26, 2024
2 checks passed
@Blightbuster
Copy link
Member

Many thanks for the PR ❀️

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