potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +10 -1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 844642aff5 - Show all commits

2
src/components/Local/CloseEvents.vue
View file

@ -123,7 +123,7 @@ const eventsQuery = useQuery<{
orderBy: EventSortField.BEGINS_ON, orderBy: EventSortField.BEGINS_ON,
direction: SortDirection.ASC, direction: SortDirection.ASC,
longevents: false, longevents: false,
location: geoHash.value, location: geoHash.value ?? "",
radius: distance.value, radius: distance.value,
limit: 93, limit: 93,
})); }));

9
src/views/HomeView.vue
View file

@ -411,6 +411,11 @@ const { result: reverseGeocodeResult } = useQuery<{
const userSettingsLocation = computed(() => { const userSettingsLocation = computed(() => {
const location = reverseGeocodeResult.value?.reverseGeocode[0]; const location = reverseGeocodeResult.value?.reverseGeocode[0];
const placeName = location?.locality ?? location?.region ?? location?.country; const placeName = location?.locality ?? location?.region ?? location?.country;
console.debug(
"userSettingsLocation from reverseGeocode",
location,
placeName
);
return { return {
lat: coords.value?.latitude, lat: coords.value?.latitude,
lon: coords.value?.longitude, lon: coords.value?.longitude,
@ -426,6 +431,10 @@ const { result: currentUserLocationResult } = useQuery<{
// The user's location currently in the Apollo cache // The user's location currently in the Apollo cache
const currentUserLocation = computed(() => { const currentUserLocation = computed(() => {
console.debug(
"currentUserLocation from LocationType",
currentUserLocationResult.value
);
return { return {
...(currentUserLocationResult.value?.currentUserLocation ?? { ...(currentUserLocationResult.value?.currentUserLocation ?? {
lat: undefined, lat: undefined,