avo 2.14.3.pre.1.branding → 2.14.3.pre.2.tailwindcss

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, style: :outline, color: :gray do %>
+        <%= a_button 'data-action': 'click->modal#close', size: :sm do %>
           <%= t('avo.cancel') %>
         <% end %>
-        <%= a_button type: :submit, style: :primary, color: :green, size: :sm do %>
+        <%= a_button type: :submit, 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: :primary, size: :xs, data: { action: "multiple-select-filter#changeFilter" } do %>
+      <%= a_button class: 'mt-4', color: :blue, 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: :primary, data: { action: "text-filter#changeFilter" }, size: :xs do %>
+      <%= a_button class: 'mt-4', color: :blue, data: { action: "text-filter#changeFilter" }, size: :xs do %>
         <%= filter.button_label || "Filter by #{filter.name}" %>
       <% end %>
     </div>

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

@@ -1 +1 @@
-<%= link_to Avo.configuration.app_name, '/', class: 'text-primary-500 font-semibold', target: :_blank %>
+<%= link_to Avo.configuration.app_name, '/', class: 'text-blue-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.configuration.branding.logo, class: 'hidden sm:block object-contain', title: 'Avo' %>
-  <%= image_tag Avo.configuration.branding.logomark, class: 'sm:hidden object-contain', title: 'Avo' %>
+  <%= 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' %>
 <% 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, :blue, :gray, :red, :orange, :green]
+  colors = [:primary, :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 %>
-        Outline
+        Secondary
       <% end %>
 
       <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :red, is_link: true) do %>
         Red
       <% end %>
 
-      <%= a_link('/admin', icon: 'arrow-left', style: :text, color: :orange, is_link: true) do %>
-        Text
+      <%= a_link('/admin', icon: 'arrow-left', style: :outline, color: :orange, is_link: true) do %>
+        Red
       <% end %>
     <% end %>
 

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,3 @@
+<span class="first">
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote, class: 'relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm leading-5 font-medium rounded-md text-gray-700 bg-white hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150' %>
+</span>

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,3 @@
+<span class="last">
+  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote, class: 'ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm leading-5 font-medium rounded-md text-gray-700 bg-white hover:text-gray-500 focus:outline-none focus:shadow-outline-blue focus:border-blue-300 active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150' %>
+</span>

data/app/views/kaminari/_next_page.html.erb

@@ -0,0 +1,9 @@
+<% if !current_page.last? %>
+  <%= link_to url, :id => 'pnnext',:remote => remote do %>
+    <button type="button" class="-ml-px relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm leading-5 font-medium text-gray-500 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150">
+      <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
+        <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd"/>
+      </svg>
+    </button>
+  <% end %>
+<% end %>

data/app/views/kaminari/_page.html.erb

@@ -0,0 +1,12 @@
+<% url = resources_path(resource: @resource, page: page, keep_query_params: true) %>
+<% if page.current? %>
+  <button type="button" class="hidden md:inline-flex -ml-px relative items-center px-4 py-2 border bg-gray-100 text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 z-10 outline-none border-primary-300 active:bg-gray-100 transition ease-in-out duration-150">
+    <%= page %>
+  </button>
+<% else %>
+  <%= link_to url, :remote => remote  do %>
+    <button type="button" class="hidden md:inline-flex -ml-px relative items-center px-4 py-2 border border-gray-300 bg-white text-sm leading-5 font-medium text-gray-700 hover:text-gray-500 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-700 transition ease-in-out duration-150">
+      <%= page %>
+    </button>
+  <% end %>
+<% end %>

data/app/views/kaminari/_prev_page.html.erb

@@ -0,0 +1,9 @@
+<% if !current_page.first? %>
+  <%= link_to url, :id => 'pnprev', :remote => remote  do %>
+    <button type="button" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm leading-5 font-medium text-gray-500 hover:text-gray-400 focus:z-10 focus:outline-none focus:border-blue-300 focus:shadow-outline-blue active:bg-gray-100 active:text-gray-500 transition ease-in-out duration-150">
+  	  <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
+        <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd"/>
+  	  </svg>
+	</button>
+  <% end %>
+<% end %>

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

@@ -7,13 +7,12 @@
     <%= 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", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "/avo-assets/avo", "data-turbo-track": "reload", defer: true %>
+      <%= 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 %>
     <% else %>
-      <%= javascript_include_tag "avo", "data-turbo-track": "reload", defer: true %>
-      <%= stylesheet_link_tag "avo", "data-turbo-track": "reload", defer: true %>
+      <%= javascript_include_tag "avo.base", "data-turbo-track": "reload", defer: true %>
+      <%= stylesheet_link_tag "avo.base", "data-turbo-track": "reload", defer: true %>
       <% if Rails.env.development? %>
         <%= javascript_include_tag "hotwire-livereload", defer: true %>
       <% end %>

data/lib/avo/configuration.rb

@@ -35,7 +35,6 @@ module Avo
     attr_accessor :main_menu
     attr_accessor :profile_menu
     attr_accessor :tabs_style
-    attr_writer :branding
 
     def initialize
       @root_path = "/avo"
@@ -124,10 +123,6 @@ 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: ::Avo.configuration.branding.chart_colors,
+          colors: %w[#0B8AE2 #34C683 #2AB1EE #34C6A8],
           library: {
             discrete: false,
             points: false,

data/lib/avo/licensing/pro_license.rb

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

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.14.3.pre.1.branding" unless const_defined?(:VERSION)
+  VERSION = "2.14.3.pre.2.tailwindcss" unless const_defined?(:VERSION)
 end

data/lib/generators/avo/base_generator.rb

@@ -7,7 +7,11 @@ module Generators
 
       def initialize(*args)
         super(*args)
-        invoke "avo:version", *args
+
+        # Don't output the version if requested so
+        unless args.include?(["--no-avo-version"])
+          invoke "avo:version", *args
+        end
       end
     end
   end

data/lib/generators/avo/tailwindcss/install_generator.rb

@@ -0,0 +1,54 @@
+require_relative "../base_generator"
+
+module Generators
+  module Avo
+    module Tailwindcss
+      class InstallGenerator < BaseGenerator
+        source_root File.expand_path("../templates", __dir__)
+
+        namespace "avo:tailwindcss:install"
+        desc "Add Tailwindcss to your Avo project."
+
+        def create_files
+          unless tailwindcss_installed?
+            system "./bin/bundle add tailwindcss-rails"
+            system "./bin/rails tailwindcss:install"
+          end
+
+          unless Rails.root.join("app", "assets", "stylesheets", "avo.tailwind.css").exist?
+            say "Add default app/assets/stylesheets/avo.tailwind.css"
+            copy_file template_path("avo.tailwind.css"), "app/assets/stylesheets/avo.tailwind.css"
+          end
+
+          if Rails.root.join("Procfile.dev").exist?
+            append_to_file "Procfile.dev", "css: bin/rails avo:tailwindcss:watch\n"
+          else
+            say "Add default Procfile.dev"
+            copy_file template_path("Procfile.dev"), "Procfile.dev"
+
+            say "Ensure foreman is installed"
+            run "gem install foreman"
+          end
+
+          append_to_file "Procfile.dev", "avo_css: bin/rails tailwindcss:watch\n"
+
+          say "Ejecting the _head.html.erb partial"
+          Rails::Generators.invoke("avo:eject", [":head", "--no-avo-version"], {destination_root: Rails.root})
+
+          say "Adding the CSS asset to the partial"
+          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+        end
+
+        no_tasks do
+          def template_path(filename)
+            Pathname.new(__dir__).join("..", "templates", "tailwindcss", filename).to_s
+          end
+
+          def tailwindcss_installed?
+            Rails.root.join("config", "tailwind.config.js").exist? || Rails.root.join("tailwind.config.js").exist?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -53,21 +53,6 @@ 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 ==

data/lib/generators/avo/templates/tailwindcss/Procfile.dev

@@ -0,0 +1,2 @@
+web: bin/rails server -p 3000
+css: bin/rails avo:tailwindcss:watch

data/lib/generators/avo/templates/tailwindcss/avo.tailwind.css

@@ -0,0 +1,13 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+/*
+
+@layer components {
+  .btn-primary {
+    @apply py-2 px-4 bg-blue-200;
+  }
+}
+
+*/

data/lib/tasks/avo_tasks.rake

@@ -3,9 +3,9 @@
 #   # Task goes here
 # end
 
-desc 'Installs Avo assets and bundles them for when you want to use the GitHub repo in your app'
-task 'avo:build-assets' do
-  spec = get_gem_spec 'avo'
+desc "Installs Avo assets and bundles them for when you want to use the GitHub repo in your app"
+task "avo:build-assets" do
+  spec = get_gem_spec "avo"
   # Uncomment to enable only when the source is github.com
   # enabled = spec.source.to_s.include?('https://github.com/avo-hq/avo')
   enabled = true
@@ -15,8 +15,8 @@ task 'avo:build-assets' do
     path = spec.full_gem_path
 
     Dir.chdir(path) do
-      system 'yarn'
-      system 'yarn prod:build'
+      system "yarn"
+      system "yarn prod:build"
     end
 
     puts "Done"
@@ -28,10 +28,10 @@ end
 # From
 # https://stackoverflow.com/questions/9322078/programmatically-determine-gems-path-using-bundler
 def get_gem_spec(name)
-  spec = Bundler.load.specs.find{|s| s.name == name }
+  spec = Bundler.load.specs.find { |s| s.name == name }
   raise GemNotFound, "Could not find gem '#{name}' in the current bundle." unless spec
-  if spec.name == 'bundler'
-    return File.expand_path('../../../', __FILE__)
+  if spec.name == "bundler"
+    return File.expand_path("../../../", __FILE__)
   end
 
   spec

data/lib/tasks/tailwindcss_rails.rake

@@ -0,0 +1,24 @@
+# Use the user provided asset or use the default
+ASSET_FILE = ARGV[0] || "app/assets/builds/avo.tailwind.css"
+# Se the tailwindcss-rails package name
+TAILWINDCSS_RAILS = "tailwindcss-rails"
+
+# Check if tailwindcss-rails is being used
+if Gem.loaded_specs.key? TAILWINDCSS_RAILS
+  # Get the path
+  GEM_PATH = Gem.loaded_specs[TAILWINDCSS_RAILS].full_gem_path
+  # Compose the compile command
+  AVO_TAILWIND_COMPILE_COMMAND = "#{RbConfig.ruby} #{Pathname.new(GEM_PATH)}/exe/tailwindcss -i '#{Rails.root.join("app/assets/stylesheets/avo.css")}' -o '#{Rails.root.join(ASSET_FILE)}' -c '#{Rails.root.join("config/tailwind.config.js")}' --minify"
+
+  namespace "avo:tailwindcss" do
+    desc "Build your Tailwind CSS"
+    task :build do
+      system(AVO_TAILWIND_COMPILE_COMMAND, exception: true)
+    end
+
+    desc "Watch and build your Tailwind CSS on file changes"
+    task :watch do
+      system "#{AVO_TAILWIND_COMPILE_COMMAND} -w"
+    end
+  end
+end