livechat 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a69e5d589f17c732b4c31e2573167f337953219ef85e4cada2b0bb4167e3eab
-  data.tar.gz: 574dec08ba995fb9eb316cd8d2746f37cb09183044a835e4865220d57bf73661
+  metadata.gz: 1d79d2656f03388a1c60b6ae02e3135e592eda11b654bc55a48c1ed4326ff587
+  data.tar.gz: dc11d8cbe564080e185583a52e5ad2865654b2194224c6868e6453a4fb441126
 SHA512:
-  metadata.gz: 2ab3f33529a53f00312ba82d2e6aeef89e7b6f29903ec124e6f931f16871b34a35bd075a723db2eb7cf78e742bb9fec6bfc19dbaf7785dfa2750584e44ab082b
-  data.tar.gz: e5c98f7e43ad6d7628e1ad2b78e5cd3fbefdcb09a4bec1b040db901ef594c17446ccfe9c920989730069e745a182bf3bc5d305da8c097e734a037de5b913378c
+  metadata.gz: 10291e2d99e5250f9bc94967556870f159c3ca44d6b2f1e20f42f0b638b700f0ec0939e1c4d984abcff214881c7d817c1e3e975c8b23314e912fbe39d6d30f35
+  data.tar.gz: f34aa3e46605a7c431d62bae5355b8465f22d8d28ba1b32b6c21026f4c8b6ab7637dc622b0a7e3ab07f9b495c97a0fde7728219426c6a152e4352a4635adb6af

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.7
+
+- Added `config.agent_layout`, letting host apps render the Livechat inbox
+  inside their own admin layout while keeping the standalone gem layout as the
+  default.
+
 ## 0.6.6
 
 - Expanded the desktop visitor widget into a taller, wider panel with equal

data/app/controllers/livechat/application_controller.rb

@@ -6,6 +6,10 @@ module Livechat
 
     private
 
+    def livechat_agent_layout
+      Livechat.config.agent_layout
+    end
+
     def current_visitor
       return @current_visitor if defined?(@current_visitor)
 

data/app/controllers/livechat/conversations_controller.rb

@@ -7,7 +7,7 @@ module Livechat
   class ConversationsController < ApplicationController
     before_action :require_agent
     before_action :set_conversation, except: %i[index index_poll]
-    layout 'livechat/application'
+    layout :livechat_agent_layout
 
     PER_PAGE = 50
 

data/lib/generators/livechat/install/templates/initializer.rb

@@ -12,6 +12,10 @@ Livechat.configure do |config|
   # Who can answer at the mount path. Defaults to development only — override
   # before deploying.
   # config.authorize_agent = ->(request) { request.env["warden"]&.user&.admin? }
+  #
+  # Render the inbox inside your app's admin layout. Default: the gem's
+  # standalone inbox layout.
+  # config.agent_layout = "admin/application"
 
   # Resolve the current user (optional). Return an object responding to #id,
   # or nil. Signed-in visitors keep one conversation across devices; guests

data/lib/livechat/configuration.rb

@@ -18,6 +18,10 @@ module Livechat
     # so your team can answer from production even where the widget is off.
     attr_accessor :authorize_agent
 
+    # Layout used by the built-in inbox. Override this to render Livechat
+    # inside your app's admin shell, e.g. "admin/application".
+    attr_accessor :agent_layout
+
     # Resolve the current user (optional). Return an object responding to
     # #id, or nil. Receives the request. Signed-in users keep one conversation
     # across devices; guests are tracked with a cookie.
@@ -100,6 +104,7 @@ module Livechat
       @app_name = nil
       @enabled = ->(_request) { true }
       @authorize_agent = ->(_request) { Rails.env.development? }
+      @agent_layout = 'livechat/application'
       @current_user = ->(_request) {}
       @visitor_label = ->(user) { user.try(:name).presence || user.try(:email).presence || user.to_s }
       @agent_label = ->(user) { user.try(:name).presence || user.try(:email).presence || user.to_s }

data/lib/livechat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Livechat
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livechat
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Yaroslav Shmarov