diff --git a/.app_version b/.app_version index be14282b..a918a2aa 100644 --- a/.app_version +++ b/.app_version @@ -1 +1 @@ -0.5.3 +0.6.0 diff --git a/README.md b/README.md index 2694842a..c6effece 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,8 @@ You can see the number of countries and cities visited, the distance traveled, a You can import your Google Maps Timeline data into Dawarich as well as Owntracks data. +⚠️ **Note**: Import of huge Google Maps Timeline files may take a long time and consume a lot of memory. It also might temporarily consume a lot of disk space due to logs. Please make sure you have enough resources before starting the import. After import is completed, you can restart your docker container and logs will be removed. + ## How to start the app locally `docker-compose up` to start the app. The app will be available at `http://localhost:3000`. diff --git a/app/controllers/exports_controller.rb b/app/controllers/exports_controller.rb index 64957778..5a89eafb 100644 --- a/app/controllers/exports_controller.rb +++ b/app/controllers/exports_controller.rb @@ -33,7 +33,6 @@ class ExportsController < ApplicationController @export = current_user.exports.find(params[:id]) end - # Only allow a list of trusted parameters through. def export_params params.require(:export).permit(:name, :url, :status) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8d4cdb6b..c5515349 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -104,4 +104,9 @@ module ApplicationHelper def active_class?(link_path) 'btn-active' if current_page?(link_path) end + + def full_title(page_title = '') + base_title = 'Dawarich' + page_title.empty? ? base_title : "#{page_title} | #{base_title}" + end end diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb index 54e4ca37..734b07cd 100644 --- a/app/views/imports/index.html.erb +++ b/app/views/imports/index.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, 'Imports' %> +

Imports

diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb index 2253e034..1844d239 100644 --- a/app/views/imports/new.html.erb +++ b/app/views/imports/new.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, 'New Import' %> +

New import

diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb index e6188ad2..41fe784c 100644 --- a/app/views/imports/show.html.erb +++ b/app/views/imports/show.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, 'Import' %> +
<% if notice.present? %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b7f37b57..5d8d385a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - DaWarIch + <%= full_title(yield(:title)) %> <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/map/index.html.erb b/app/views/map/index.html.erb index 0b172602..a7dc8a0a 100644 --- a/app/views/map/index.html.erb +++ b/app/views/map/index.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, 'Map' %> +
<%= form_with url: map_path, method: :get do |f| %> diff --git a/app/views/points/index.html.erb b/app/views/points/index.html.erb index 3a4f4643..557be8cd 100644 --- a/app/views/points/index.html.erb +++ b/app/views/points/index.html.erb @@ -1,4 +1,4 @@ -<% content_for :title, "Points" %> +<% content_for :title, 'Points' %>
<%= form_with url: points_path, method: :get do |f| %> diff --git a/app/views/stats/index.html.erb b/app/views/stats/index.html.erb index 9aeafb4c..e1fa8699 100644 --- a/app/views/stats/index.html.erb +++ b/app/views/stats/index.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, 'Statistics' %> +
diff --git a/app/views/stats/show.html.erb b/app/views/stats/show.html.erb index d7c98de5..7d7e6a7c 100644 --- a/app/views/stats/show.html.erb +++ b/app/views/stats/show.html.erb @@ -1,3 +1,5 @@ +<% content_for :title, "Statistics for #{@year} year" %> +
<%= render partial: 'stats/year', locals: { year: @year, stats: @stats } %>
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml index c6761d01..5241a62c 100644 --- a/swagger/v1/swagger.yaml +++ b/swagger/v1/swagger.yaml @@ -180,7 +180,7 @@ paths: lat: 52.502397 lon: 13.356718 tid: Swagger - tst: 1718216894 + tst: 1718219019 servers: - url: http://{defaultHost} variables: