avo 2.14.3.pre.7.polytranslations1 → 2.15.0

data/app/views/avo/actions/show.html.erb

@@ -32,11 +32,11 @@
       <% c.controls do %>
         <%= a_button data: { action: 'click->modal#close' },
           size: :sm,
-          color: :primary do %>
+          color: :gray do %>
           <%= @action.cancel_button_label %>
         <% end %>
         <%= a_button type: :submit,
-            color: :primary,
+            color: :green,
             style: :primary,
             size: :sm,
             data: @action.class.submit_button_data_attributes do %>

data/app/views/avo/associations/new.html.erb

@@ -35,10 +35,10 @@
       </div>
 
       <% c.controls do %>
-        <%= a_button 'data-action': 'click->modal#close', size: :sm do %>
+        <%= a_button 'data-action': 'click->modal#close', size: :sm, style: :outline, color: :gray do %>
           <%= t('avo.cancel') %>
         <% end %>
-        <%= a_button type: :submit, color: :green, size: :sm do %>
+        <%= a_button type: :submit, style: :primary, color: :green, size: :sm do %>
           <%= t('avo.attach') %>
         <% end %>
       <% end %>

data/app/views/avo/base/_multiple_select_filter.html.erb

@@ -12,7 +12,7 @@
       'data-multiple-select-filter-target': 'selector'
     %>
     <div class="flex justify-end">
-      <%= a_button class: 'mt-4', color: :blue, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
+      <%= a_button class: 'mt-4', color: :primary, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
         Filter by <%=filter.name %>
       <% end %>
     </div>

data/app/views/avo/base/_text_filter.html.erb

@@ -13,7 +13,7 @@
       'data-action': 'keypress->text-filter#tryToSubmit'
     %>
     <div class="flex justify-end">
-      <%= a_button class: 'mt-4', color: :blue, data: { action: "text-filter#changeFilter" }, size: :xs do %>
+      <%= a_button class: 'mt-4', color: :primary, data: { action: "text-filter#changeFilter" }, size: :xs do %>
         <%= filter.button_label || "Filter by #{filter.name}" %>
       <% end %>
     </div>

data/app/views/avo/partials/_branding.html.erb

@@ -0,0 +1,5 @@
+<style>
+  :root {
+    <%= Avo.configuration.branding.css_colors %>
+  }
+</style>

data/app/views/avo/partials/_header.html.erb

@@ -1 +1 @@
-<%= link_to Avo.configuration.app_name, '/', class: 'text-blue-500 font-semibold', target: :_blank %>
+<%= link_to Avo.configuration.app_name, '/', class: 'text-primary-500 font-semibold', target: :_blank %>

data/app/views/avo/partials/_logo.html.erb

@@ -1,4 +1,4 @@
 <%= link_to root_path, class: 'logo-placeholder h-full w-full flex justify-start' do %>
-  <%= image_tag '/avo-assets/logo.png', class: 'hidden sm:block object-contain', title: 'Avo' %>
-  <%= image_tag '/avo-assets/logomark.png', class: 'sm:hidden object-contain', title: 'Avo' %>
+  <%= image_tag Avo.configuration.branding.logo, class: 'hidden sm:block object-contain', title: 'Avo' %>
+  <%= image_tag Avo.configuration.branding.logomark, class: 'sm:hidden object-contain', title: 'Avo' %>
 <% end %>

data/app/views/avo/private/_links_and_buttons.html.erb

@@ -2,7 +2,7 @@
   entities = [:button, :link]
   sizes = [:xl, :lg, :md, :sm, :xs].reverse
   styles = [:primary, :outline, :text]
-  colors = [:primary, :gray, :red, :orange, :green]
+  colors = [:primary, :blue, :gray, :red, :orange, :green]
   states = [:regular, :hover, :disabled, :active]
 %>
 <div class="px-6 space-y-4">

data/app/views/avo/private/design.html.erb

@@ -6,15 +6,15 @@
       <% end %>
 
       <%= a_link('/admin', icon: 'arrow-left', style: :outline, is_link: true) do %>
-        Secondary
+        Outline
       <% end %>
 
       <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :red, is_link: true) do %>
         Red
       <% end %>
 
-      <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :orange, is_link: true) do %>
-        Red
+      <%= a_link('/admin', icon: 'arrow-left', style: :text, color: :orange, is_link: true) do %>
+        Text
       <% end %>
     <% end %>
 

data/app/views/layouts/avo/application.html.erb

@@ -6,6 +6,8 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
     <%= render partial: 'avo/partials/javascript' %>
+    <%= render partial: 'avo/partials/head' %>
+    <%= render partial: 'avo/partials/branding' %>
     <% if Avo::PACKED %>
       <%= javascript_include_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>
       <%= stylesheet_link_tag "/avo-assets/avo.base", "data-turbo-track": "reload", defer: true %>

data/lib/avo/configuration/branding.rb

@@ -0,0 +1,70 @@
+class Avo::Configuration::Branding
+  def initialize(colors: nil, chart_colors: nil, logo: nil, logomark: nil)
+    @colors = colors
+    @chart_colors = chart_colors
+    @logo = logo
+    @logomark = logomark
+
+    @default_colors = {
+      background: "#F6F6F7",
+      100 => "206 231 248",
+      400 => "57 158 229",
+      500 => "8 134 222",
+      600 => "6 107 178"
+    }
+    @default_chart_colors = ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"]
+    @default_logo = "/avo-assets/logo.png"
+    @default_logomark = "/avo-assets/logomark.png"
+  end
+
+  def css_colors
+    rgb_colors.map do |color, value|
+      if color == :background
+        "--color-application-#{color}: #{value};"
+      else
+        "--color-primary-#{color}: #{value};"
+      end
+    end.join("\n")
+  end
+
+  def logo
+    return @default_logo if Avo::App.license.lacks_with_trial(:branding)
+
+    @logo || @default_logo
+  end
+
+  def logomark
+    return @default_logomark if Avo::App.license.lacks_with_trial(:branding)
+
+    @logomark || @default_logomark
+  end
+
+  def chart_colors
+    return @default_chart_colors if Avo::App.license.lacks_with_trial(:branding)
+
+    @chart_colors || @default_chart_colors
+  end
+
+  private
+
+  def colors
+    return @default_colors if Avo::App.license.lacks_with_trial(:branding)
+
+    @default_colors.merge(@colors) || @default_colors
+  end
+
+  def rgb_colors
+    colors.map do |key, value|
+      rgb_value = is_hex?(value) ? hex_to_rgb(value) : value
+      [key, rgb_value]
+    end.to_h
+  end
+
+  def is_hex?(value)
+    value.include? "#"
+  end
+
+  def hex_to_rgb(value)
+    value.to_s.match(/^#(..)(..)(..)$/).captures.map(&:hex).join(" ")
+  end
+end

data/lib/avo/configuration.rb

@@ -36,6 +36,7 @@ module Avo
     attr_accessor :profile_menu
     attr_accessor :model_resource_mapping
     attr_accessor :tabs_style
+    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -125,6 +126,10 @@ module Avo
     def feature_enabled?(feature)
       !@disabled_features.map(&:to_sym).include?(feature.to_sym)
     end
+
+    def branding
+      Avo::Configuration::Branding.new(**@branding || {})
+    end
   end
 
   def self.configuration

data/lib/avo/dashboards/chartkick_card.rb

@@ -29,7 +29,7 @@ module Avo
         default = {
           # figure our the available height for the chart
           height: "#{(rows * card_height) - card_heading}px",
-          colors: %w[#0B8AE2 #34C683 #2AB1EE #34C6A8],
+          colors: ::Avo.configuration.branding.chart_colors,
           library: {
             discrete: false,
             points: false,

data/lib/avo/licensing/pro_license.rb

@@ -16,6 +16,7 @@ module Avo
           :menu_editor,
           :stimulus_js_integration,
           :resource_show_controls,
+          :branding,
           :advanced_fields
         ]
       end

data/lib/avo/services/encryption_service.rb

@@ -40,7 +40,7 @@ module Avo
       end
 
       def secret_key_base
-        Rails.application.secrets.secret_key_base || ENV['SECRET_KEY_BASE']
+        ENV['SECRET_KEY_BASE'] || Rails.application.credentials.secret_key_base || Rails.application.secrets.secret_key_base
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.14.3.pre.7.polytranslations1" unless const_defined?(:VERSION)
+  VERSION = "2.15.0" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/templates/initializer/avo.tt

@@ -57,6 +57,21 @@ Avo.configure do |config|
   # config.disabled_features = []
   # config.resource_controls = :right
   # config.tabs_style = :tabs # can be :tabs or :pills
+  # config.buttons_on_form_footers = true
+
+  ## == Branding ==
+  # config.branding = {
+  #   colors: {
+  #     background => "248 246 242",
+  #     100 => "#CEE7F8",
+  #     400 => "#399EE5",
+  #     500 => "#0886DE",
+  #     600 => "#066BB2",
+  #   },
+  #   chart_colors: ["#0B8AE2", "#34C683", "#2AB1EE", "#34C6A8"],
+  #   logo: "/avo-assets/logo.png",
+  #   logomark: "/avo-assets/logomark.png"
+  # }
 
   ## == Breadcrumbs ==
   # config.display_breadcrumbs = true