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

Features/trip details #28

Merged
merged 45 commits into from
Mar 31, 2024
Merged

Features/trip details #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c4cee12
features create-travel
Baptiste-Ferrand Mar 26, 2024
c2bb1f2
Fix (merge Conflit)
Dercraker Mar 26, 2024
866c54a
Feat (Map) : Add Query
Dercraker Mar 27, 2024
59c7e6e
Feat M'ap : UpdateLocation
Dercraker Mar 27, 2024
b3211a6
add steps
Baptiste-Ferrand Mar 27, 2024
d3e4e1d
remove editTravel.tsx page
Baptiste-Ferrand Mar 27, 2024
4827cb4
add modal to MapStepEditor.tsx for create step
Baptiste-Ferrand Mar 27, 2024
8f83d88
update router
Baptiste-Ferrand Mar 27, 2024
1301674
Feat (Map) : [WIP] Add Card List
Dercraker Mar 28, 2024
12f6657
Merge branch 'features/add-steps' of https://github.com/FullStackMap/…
Dercraker Mar 28, 2024
ff95147
Feat (Map) : [WIP] DeleteStep
Dercraker Mar 28, 2024
1f843c3
update
Baptiste-Ferrand Mar 28, 2024
9ec50fa
Fix merge conflit
Dercraker Mar 28, 2024
51e04da
Feat (map) : [WIP] Add Travels between steps
Dercraker Mar 28, 2024
73a778e
edit docker-compose.yml
Baptiste-Ferrand Mar 28, 2024
32ea33d
update the CreateStepModal.tsx
Baptiste-Ferrand Mar 28, 2024
6a9630b
update useTripDetailsStore.ts
Baptiste-Ferrand Mar 28, 2024
53c9135
Fix Merge
Dercraker Mar 28, 2024
9cbbf40
feat (map) : Delete step and calculate new travel
Dercraker Mar 29, 2024
303401b
create setStore
Baptiste-Ferrand Mar 29, 2024
c80ce7a
create PlaceLocationDto.ts
Baptiste-Ferrand Mar 29, 2024
3b27795
update modal now modal use store for getting and update data, api cal…
Baptiste-Ferrand Mar 29, 2024
95a3bc1
Fix Merge
Dercraker Mar 29, 2024
eaf7d90
Feat (Map) : [WIP] Merge
Dercraker Mar 29, 2024
8d7ad7b
Feat (TripDetail) : [WIP] Delete & Add Travel
Dercraker Mar 30, 2024
787420e
feat (TripDetails) : [WIP] AddBefore And After
Dercraker Mar 30, 2024
4ad9f23
Feat (TripDetail) : Move Point
Dercraker Mar 30, 2024
2697f98
Feat (tripDetail) : [WIP] Add Detail Modal
Dercraker Mar 30, 2024
8853b82
Feat (EditStep) : Implement Detail/Update Modal
Dercraker Mar 30, 2024
eb922dd
Fix MergeConflict
Dercraker Mar 31, 2024
63cd6a8
feat (intégration) : [WIP] intégration du dashboard
Dercraker Mar 31, 2024
08e22e6
Feat (TripDetailRouter) : Implement id in route
Dercraker Mar 31, 2024
79165ba
Revert "Feat (TripDetailRouter) : Implement id in route"
Dercraker Mar 31, 2024
ec4d0bc
WIP
BaptisteLegat Mar 31, 2024
e591876
feat (TripsPage) : Add SetTripId when click on card
Dercraker Mar 31, 2024
317899d
Pull Origin features/TripDetails
Dercraker Mar 31, 2024
5fccaa6
GitRevert
Dercraker Mar 31, 2024
3636716
Merge branch 'features/TripDetails' of https://github.com/FullStackMa…
Dercraker Mar 31, 2024
8b448cb
Revert the Revert
Dercraker Mar 31, 2024
a2fe90a
Merge branch 'features/TripDetails' of https://github.com/FullStackMa…
Dercraker Mar 31, 2024
2b52872
features: design travel and step and somes fix
BaptisteLegat Mar 31, 2024
5c9e12a
feat (tripCard) : Add Prefetch
Dercraker Mar 31, 2024
dde6aa4
Merge branch 'features/TripDetails' into features/TripDetailDesing
Dercraker Mar 31, 2024
bf643d4
Merge pull request #27 from FullStackMap/features/TripDetailDesing
Dercraker Mar 31, 2024
333dedb
Fix PR
Dercraker Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ services:
ports:
- '3000:3000'
environment:
VITE_API_URL: http://api-dev.from-a2b.fr
VITE_API_URL: ${VITE_API_URL}
VITE_MAPBOX_TOKEN: ${VITE_MAPBOX_TOKEN}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"updateClientApi": "pnpm update @FullStackMap/from-a2b"
},
"dependencies": {
"@FullStackMap/from-a2b": "0.20.3-Alpha",
"@FullStackMap/from-a2b": "0.24.0-Beta",
"@mantine/carousel": "^7.6.2",
"@mantine/core": "^7.6.2",
"@mantine/form": "^7.6.2",
Expand Down
Loading
Loading