kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 01:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly provide default distance unit in user settings

Browse source
This commit is contained in:
Eugene Burmakin 2025-10-20 19:42:24 +02:00
parent 84f8ec0d04
commit e7884b1f4f
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -17,6 +17,7 @@ In this release we're introducing family features that allow users to create fam
## Fixed ## Fixed
- Sign out button works again. #1844 - Sign out button works again. #1844
- Users always have default distance unit set to kilometers. #1832
## Changed ## Changed

6
app/javascript/controllers/family_members_controller.js
View file

@ -239,7 +239,7 @@ export default class extends Controller {
} }
createTooltipContent(lastSeen) { createTooltipContent(lastSeen) {
return `Last updated: ${lastSeen}`; return `Last seen: ${lastSeen}`;
} }
createPopupContent(location, lastSeen) { createPopupContent(location, lastSeen) {
@ -264,7 +264,7 @@ export default class extends Controller {
${location.latitude.toFixed(6)}, ${location.longitude.toFixed(6)} ${location.latitude.toFixed(6)}, ${location.longitude.toFixed(6)}
</p> </p>
<p style="margin: 0; font-size: 12px; color: ${mutedColor}; padding-top: 8px; border-top: 1px solid ${isDark ? '#374151' : '#e5e7eb'};"> <p style="margin: 0; font-size: 12px; color: ${mutedColor}; padding-top: 8px; border-top: 1px solid ${isDark ? '#374151' : '#e5e7eb'};">
<strong>Last updated:</strong> ${lastSeen} <strong>Last seen:</strong> ${lastSeen}
</p> </p>
</div> </div>
`; `;
@ -483,4 +483,4 @@ export default class extends Controller {
getFamilyMemberCount() { getFamilyMemberCount() {
return this.familyMemberLocations ? Object.keys(this.familyMemberLocations).length : 0; return this.familyMemberLocations ? Object.keys(this.familyMemberLocations).length : 0;
} }
} }

2
app/views/map/index.html.erb
View file

@ -67,7 +67,7 @@
data-points-target="map" data-points-target="map"
data-api_key="<%= current_user.api_key %>" data-api_key="<%= current_user.api_key %>"
data-self_hosted="<%= @self_hosted %>" data-self_hosted="<%= @self_hosted %>"
data-user_settings='<%= (current_user.settings || {}).to_json.html_safe %>' data-user_settings='<%= current_user.safe_settings.settings.to_json.html_safe %>'
data-user_theme="<%= current_user&.theme || 'dark' %>" data-user_theme="<%= current_user&.theme || 'dark' %>"
data-coordinates='<%= @coordinates.to_json.html_safe %>' data-coordinates='<%= @coordinates.to_json.html_safe %>'
data-tracks='<%= @tracks.to_json.html_safe %>' data-tracks='<%= @tracks.to_json.html_safe %>'

2
app/views/trips/_form.html.erb
View file

@ -18,7 +18,7 @@
class="w-full h-full rounded-lg" class="w-full h-full rounded-lg"
data-trips-target="container" data-trips-target="container"
data-api_key="<%= current_user.api_key %>" data-api_key="<%= current_user.api_key %>"
data-user_settings="<%= current_user.settings.to_json %>" data-user_settings="<%= current_user.safe_settings.settings.to_json %>"
data-path="<%= trip.path.to_json %>" data-path="<%= trip.path.to_json %>"
data-started_at="<%= trip.started_at %>" data-started_at="<%= trip.started_at %>"
data-ended_at="<%= trip.ended_at %>" data-ended_at="<%= trip.ended_at %>"

2
app/views/trips/_path.html.erb
View file

@ -5,7 +5,7 @@
data-controller="trips" data-controller="trips"
data-trips-target="container" data-trips-target="container"
data-api_key="<%= trip.user.api_key %>" data-api_key="<%= trip.user.api_key %>"
data-user_settings="<%= trip.user.settings.to_json %>" data-user_settings="<%= trip.user.safe_settings.settings.to_json %>"
data-path="<%= trip.path.coordinates.to_json %>" data-path="<%= trip.path.coordinates.to_json %>"
data-started_at="<%= trip.started_at %>" data-started_at="<%= trip.started_at %>"
data-ended_at="<%= trip.ended_at %>" data-ended_at="<%= trip.ended_at %>"

2
app/views/trips/_trip.html.erb
View file

@ -15,7 +15,7 @@
data-trip-map-trip-id-value="<%= trip.id %>" data-trip-map-trip-id-value="<%= trip.id %>"
data-trip-map-path-value="<%= trip.path.coordinates.to_json %>" data-trip-map-path-value="<%= trip.path.coordinates.to_json %>"
data-trip-map-api-key-value="<%= current_user.api_key %>" data-trip-map-api-key-value="<%= current_user.api_key %>"
data-trip-map-user-settings-value="<%= current_user.settings.to_json %>" data-trip-map-user-settings-value="<%= current_user.safe_settings.settings.to_json %>"
data-trip-map-timezone-value="<%= Rails.configuration.time_zone %>"> data-trip-map-timezone-value="<%= Rails.configuration.time_zone %>">
</div> </div>
</div> </div>