Current.user in cafe_car

craft-concept · Nov 21, 2024 · af4183e · af4183e
1 parent cdf8a18
commit af4183e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/app/views/application/_head.html.haml b/app/views/application/_head.html.haml
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,16 +1,21 @@
 !!!
 %html{lang: I18n.locale}
   %head
-    %title= @title
+    %title= @title || content_for(:title)
     %meta{name: "viewport", content: "width=device-width,initial-scale=1"}
-    %meta{name: "turbo-prefetch", content: "true"}
-    %meta{name: "turbo-refresh-method", content: "morph"}
+    %meta{name: "apple-mobile-web-app-capable", content:"yes"}
+    %meta{name: "mobile-web-app-capable",       content:"yes"}
+    %meta{name: "turbo-prefetch",               content: "true"}
+    %meta{name: "turbo-refresh-method",         content: "morph"}
     = csrf_meta_tags
     = csp_meta_tag
+    -# = javascript_include_tag "cafe_car", type: :module
+
+    = render "head"
+    = yield :head
+
     = stylesheet_link_tag "cafe_car", "data-turbo-track": "reload"
     = javascript_importmap_tags
-    -# = javascript_include_tag "cafe_car", type: :module
-    = yield(:head)
 
   %body
     = render "nav"

diff --git a/lib/cafe_car/current.rb b/lib/cafe_car/current.rb
@@ -1,5 +1,6 @@
 module CafeCar
   class Current < ActiveSupport::CurrentAttributes
     attribute :request_id, :user_agent, :ip_address
+    attribute :user
   end
 end
diff --git a/test/dummy/app/models/current.rb b/test/dummy/app/models/current.rb
@@ -1,3 +1,2 @@
 class Current < CafeCar::Current
-  attribute :user
 end