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.

Sign up for GitHub

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

Jump to bottom

Interactive maps #555

Merged
merged 119 commits into from
Aug 8, 2023
Merged

Interactive maps #555

merged 119 commits into from
Aug 8, 2023

Conversation

Razzmatazzz
Copy link
Member

@Razzmatazzz Razzmatazzz commented Jun 27, 2023 •
edited by Shebuka
Loading

Partial implementation of interactive maps. For the map images themselves, we currently have Customs, Lighthouse, Reserve, Streets, and Woods. Spawn locations are provided by the API. The other markers are just hard-coded examples of item locations (which should be disabled before a production deployment). We currently have the ability to provide locations for quest items via the API, but can't yet get locations for other quest objectives (e.g., visit and plant/mark locations, kill zones, etc.). Waiting on quest item location implementation until other locations are available so it can all be implemented in a smart way.

To do:

  • Get maps for Factory, Interchange, Shoreline, and Labs.
  • Get extract locations, provide them via the API, and display them
  • Get other quest locations, provide them via the API, and display them

Preview:
https://preview.tarkov-dev.pages.dev/map/reserve

https://preview.tarkov-dev.pages.dev/map/customs

Screenshot 2023-07-26 at 17 40 58

@Razzmatazzz Razzmatazzz requested a review from a team as a code owner June 27, 2023 03:30
@github-actions
Copy link
Contributor

👋 Thanks for opening a pull request!

If you are new, please check out the trimmed down summary of our deployment process below:

  1. 👀 Observe the CI jobs and tests to ensure they are passing

  2. ✔️ Obtain an approval/review on this pull request

  3. 🚀 Deploy your pull request to the development environment with .deploy to development

  4. 🚀 Deploy your pull request to the production environment with .deploy

    If anything goes wrong, rollback with .deploy main

  5. 🎉 Merge!

Note: If you have a larger change and want to block deployments, you can run .lock --reason <reason> to lock all other deployments (remove with .unlock)

You can view the branch deploy usage guide for additional information

@Razzmatazzz
Copy link
Member Author

.deploy to development

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to development June 27, 2023 03:32 Inactive
@github-actions
Copy link
Contributor

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to development

Show Results

https://da31c32b.tarkov-dev.pages.dev

@Razzmatazzz
Copy link
Member Author

.deploy to development

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to development June 27, 2023 14:36 Inactive
@github-actions
Copy link
Contributor

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to development

Show Results

https://cd426158.tarkov-dev.pages.dev

@GrantBirki
Copy link
Member

I made a painful merge conflict so I resolved it for ya

@GrantBirki
Copy link
Member

Oh I borked something

@GrantBirki
Copy link
Member

.deploy to development

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

GrantBirki, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to development June 28, 2023 05:12 Inactive
@github-actions
Copy link
Contributor

Deployment Results ✅

GrantBirki successfully deployed branch interactive-maps to development

Show Results

https://8a568363.tarkov-dev.pages.dev

@Razzmatazzz
Copy link
Member Author

.deploy to development

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to development June 28, 2023 12:20 Inactive
@github-actions
Copy link
Contributor

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to development

Show Results

https://60efd59c.tarkov-dev.pages.dev

@Razzmatazzz
Copy link
Member Author

.deploy to development

@github-actions
Copy link
Contributor

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to development

Show Results

https://21755d78.tarkov-dev.pages.dev

@Razzmatazzz
Copy link
Member Author

.deploy

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to production August 8, 2023 16:46 Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to production

Environment URL: tarkov.dev

@Razzmatazzz
Copy link
Member Author

.deploy main

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production

You can watch the progress here 🔗

Branch: main

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch main to production

Environment URL: tarkov.dev

@Razzmatazzz
Copy link
Member Author

.deploy to development

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to development

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to development August 8, 2023 18:05 Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to development

Show Results

https://b7ecf94b.tarkov-dev.pages.dev

@Razzmatazzz
Copy link
Member Author

.deploy

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to production August 8, 2023 18:11 Inactive
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to production

Environment URL: tarkov.dev

@Razzmatazzz
Copy link
Member Author

.deploy

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

⚠️ Cannot proceed with deployment

Sorry Razzmatazzz, the production environment deployment lock is currently claimed by GrantBirki

Lock Details 🔒

  • Reason: deployment
  • Environment: production
  • Branch: bump-wrangler
  • Created At: 2023-08-08T18:22:15.119Z
  • Created By: GrantBirki
  • Sticky: false
  • Global: false
  • Comment Link: click here
  • Lock Link: click here

The current lock has been active for 0d:0h:1m:30s

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

@Razzmatazzz
Copy link
Member Author

.deploy

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Triggered 🚀

Razzmatazzz, started a branch deployment to production

You can watch the progress here 🔗

Branch: interactive-maps

@github-actions github-actions bot temporarily deployed to production August 8, 2023 18:27 Inactive
@github-actions github-actions bot mentioned this pull request Aug 8, 2023
Closed
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Deployment Results ✅

Razzmatazzz successfully deployed branch interactive-maps to production

Environment URL: tarkov.dev

@Razzmatazzz Razzmatazzz merged commit 05c430c into main Aug 8, 2023
2 checks passed
@Razzmatazzz Razzmatazzz deleted the interactive-maps branch August 8, 2023 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrantBirki GrantBirki GrantBirki approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request javascript Pull requests that update Javascript code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Razzmatazzz @GrantBirki @Shebuka