LabLab/Acampatopia
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

feat(mapa): implementar mapa interativo com espaços e atividades #1

Open
joao wants to merge 1 commit from mapa into main
pull from: mapa
merge into: LabLab:main
Conversation 1 Commits 1 Files changed 8 +363 -17
joao commented 2026-03-06 15:59:37 -03:00
Collaborator
Copy link
No description provided.
joao commented 2026-03-06 16:00:39 -03:00
Author
Collaborator
Copy link

@victor o que você acha de que como está a funcionalidade? Se já estiver bom eu faço o rebase com a main, se não eu reimplemento baseado no placeholder.

@victor o que você acha de que como está a funcionalidade? Se já estiver bom eu faço o rebase com a main, se não eu reimplemento baseado no placeholder.
This pull request has changes conflicting with the target branch.
  • client/src/pages/Atividade.jsx
  • client/src/pages/Mapa.jsx
  • client/src/pages/Mapa.module.css
  • client/vite.config.js
  • scripts/seed-activities.js
  • tools/scenario-sim/scenario-build.js
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin mapa:mapa
git switch mapa

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff mapa
git switch mapa
git rebase main
git switch main
git merge --ff-only mapa
git switch mapa
git rebase main
git switch main
git merge --no-ff mapa
git switch main
git merge --squash mapa
git switch main
git merge --ff-only mapa
git switch main
git merge mapa
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
LabLab/Acampatopia!1
No description provided.