diff --git a/app/services/immich/request_photos.rb b/app/services/immich/request_photos.rb index 3ab8a246..c60dbcec 100644 --- a/app/services/immich/request_photos.rb +++ b/app/services/immich/request_photos.rb @@ -39,6 +39,8 @@ class Immich::RequestPhotos if items.blank? Rails.logger.debug('==== IMMICH RESPONSE WITH NO ITEMS ====') + Rails.logger.debug("START_DATE: #{start_date}") + Rails.logger.debug("END_DATE: #{end_date}") Rails.logger.debug(response) Rails.logger.debug('==== IMMICH RESPONSE WITH NO ITEMS ====') diff --git a/app/views/exports/index.html.erb b/app/views/exports/index.html.erb index 926427f9..33888a94 100644 --- a/app/views/exports/index.html.erb +++ b/app/views/exports/index.html.erb @@ -1,7 +1,7 @@ <% content_for :title, "Exports" %> -
-
+
+

Exports

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index a4274980..606d4c0d 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,4 +1,4 @@ -
+
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb index 134a8f26..32ab69ff 100644 --- a/app/views/imports/index.html.erb +++ b/app/views/imports/index.html.erb @@ -1,7 +1,7 @@ <% content_for :title, 'Imports' %> -
-
+
+

Imports

<%= link_to "New import", new_import_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %> diff --git a/app/views/map/index.html.erb b/app/views/map/index.html.erb index e577155f..dd1a0d17 100644 --- a/app/views/map/index.html.erb +++ b/app/views/map/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, 'Map' %> -
+
<%= form_with url: map_path(import_id: params[:import_id]), method: :get do |f| %> diff --git a/app/views/places/index.html.erb b/app/views/places/index.html.erb index 649abed5..4d93a744 100644 --- a/app/views/places/index.html.erb +++ b/app/views/places/index.html.erb @@ -1,7 +1,7 @@ <% content_for :title, "Places" %> -
-
+
+

Places

diff --git a/app/views/points/index.html.erb b/app/views/points/index.html.erb index 3c951838..f3fa0f1d 100644 --- a/app/views/points/index.html.erb +++ b/app/views/points/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, 'Points' %> -
+
<%= form_with url: points_path(import_id: params[:import_id]), data: { turbo_method: :get }, method: :get do |f| %>
diff --git a/app/views/settings/background_jobs/index.html.erb b/app/views/settings/background_jobs/index.html.erb index 3b216c76..5af212dc 100644 --- a/app/views/settings/background_jobs/index.html.erb +++ b/app/views/settings/background_jobs/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, "Background jobs" %> -
+
<%= render 'settings/navigation' %>
diff --git a/app/views/settings/index.html.erb b/app/views/settings/index.html.erb index b0553d94..eb8e605f 100644 --- a/app/views/settings/index.html.erb +++ b/app/views/settings/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, 'Settings' %> -
+
<%= render 'settings/navigation' %>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index edd241de..71754a47 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -8,9 +8,9 @@
  • <%= link_to 'Map', map_url, class: "#{active_class?(map_url)}" %>
  • <%= link_to 'Points', points_url, class: "#{active_class?(points_url)}" %>
  • <%= link_to 'Stats', stats_url, class: "#{active_class?(stats_url)}" %>
    • -
  • <%= link_to 'Visitsβ'.html_safe, visits_url(status: :confirmed), class: "#{active_class?(visits_url)}" %>
    • -
  • <%= link_to 'Placesβ'.html_safe, places_url, class: "#{active_class?(places_url)}" %>
    • -
  • <%= link_to 'Tripsβ'.html_safe, trips_url, class: "#{active_class?(trips_url)}" %>
    • +
  • <%= link_to 'Visitsα'.html_safe, visits_url(status: :confirmed), class: "#{active_class?(visits_url)}" %>
    • +
  • <%= link_to 'Placesα'.html_safe, places_url, class: "#{active_class?(places_url)}" %>
    • +
  • <%= link_to 'Tripsα'.html_safe, trips_url, class: "#{active_class?(trips_url)}" %>
  • <%= link_to 'Imports', imports_url, class: "#{active_class?(imports_url)}" %>
  • <%= link_to 'Exports', exports_url, class: "#{active_class?(exports_url)}" %>
    • @@ -45,9 +45,9 @@
  • <%= link_to 'Map', map_url, class: "#{active_class?(map_url)}" %>
  • <%= link_to 'Points', points_url, class: "#{active_class?(points_url)}" %>
  • <%= link_to 'Stats', stats_url, class: "#{active_class?(stats_url)}" %>
    • -
  • <%= link_to 'Visitsβ'.html_safe, visits_url(status: :confirmed), class: "#{active_class?(visits_url)}" %>
    • -
  • <%= link_to 'Placesβ'.html_safe, places_url, class: "#{active_class?(places_url)}" %>
    • -
  • <%= link_to 'Trips', trips_url, class: "#{active_class?(trips_url)}" %>
    • +
  • <%= link_to 'Visitsα'.html_safe, visits_url(status: :confirmed), class: "#{active_class?(visits_url)}" %>
    • +
  • <%= link_to 'Placesα'.html_safe, places_url, class: "#{active_class?(places_url)}" %>
    • +
  • <%= link_to 'Tripsα'.html_safe, trips_url, class: "#{active_class?(trips_url)}" %>
  • <%= link_to 'Imports', imports_url, class: "#{active_class?(imports_url)}" %>
  • <%= link_to 'Exports', exports_url, class: "#{active_class?(exports_url)}" %>
    • diff --git a/app/views/stats/index.html.erb b/app/views/stats/index.html.erb index 3dce46c4..34911306 100644 --- a/app/views/stats/index.html.erb +++ b/app/views/stats/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, 'Statistics' %> -
    +
    diff --git a/app/views/stats/show.html.erb b/app/views/stats/show.html.erb index 7d7e6a7c..4b85a66d 100644 --- a/app/views/stats/show.html.erb +++ b/app/views/stats/show.html.erb @@ -1,5 +1,5 @@ <% content_for :title, "Statistics for #{@year} year" %> -
    +
    <%= render partial: 'stats/year', locals: { year: @year, stats: @stats } %>
    diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb index c55fbe26..0fd4f3bc 100644 --- a/app/views/trips/edit.html.erb +++ b/app/views/trips/edit.html.erb @@ -1,8 +1,13 @@ -
    +

    Editing trip

    <%= render "form", trip: @trip %> - <%= link_to "Show this trip", @trip, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> - <%= link_to "Back to trips", trips_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + +
    +
    + <%= link_to "Show this trip", @trip, class: "btn" %> + <%= link_to "Back to trips", trips_path, class: "btn" %> +
    +
    diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb index bc1bec31..46218299 100644 --- a/app/views/trips/index.html.erb +++ b/app/views/trips/index.html.erb @@ -1,9 +1,9 @@ <% content_for :title, 'Trips' %> -
    +
    -

    Trips

    +

    Trips

    <%= link_to 'New trip', new_trip_path, class: 'btn btn-primary' %>
    diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb index cd64bfac..defd29c2 100644 --- a/app/views/trips/new.html.erb +++ b/app/views/trips/new.html.erb @@ -1,6 +1,6 @@ <% content_for :title, 'New trip' %> -
    +

    New trip

    <%= render "form", trip: @trip %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 8339c7ad..1522f356 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,6 +1,6 @@ <% content_for :title, @trip.name %> -
    +

    <%= @trip.name %>

    diff --git a/app/views/visits/index.html.erb b/app/views/visits/index.html.erb index 556a7fd3..cec01276 100644 --- a/app/views/visits/index.html.erb +++ b/app/views/visits/index.html.erb @@ -1,7 +1,8 @@ -
    - <% content_for :title, "Visits" %> +<% content_for :title, "Visits" %> -
    +
    + +

    Visits

    <%= link_to 'Confirmed', visits_path(status: :confirmed), role: 'tab',