avo 3.0.1.beta8 → 3.0.1.beta11

data/lib/avo/fields/external_image_field.rb

@@ -4,12 +4,12 @@ module Avo
       attr_reader :width
       attr_reader :height
       attr_reader :radius
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
 
         @width = args[:width].present? ? args[:width] : 40
         @height = args[:height].present? ? args[:height] : 40

data/lib/avo/fields/file_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class FileField < BaseField
-      attr_accessor :link_to_resource
+      attr_accessor :link_to_record
       attr_accessor :is_avatar
       attr_accessor :is_image
       attr_accessor :is_audio
@@ -12,7 +12,7 @@ module Avo
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
         @is_avatar = args[:is_avatar].present? ? args[:is_avatar] : false
         @is_image = args[:is_image].present? ? args[:is_image] : @is_avatar
         @is_audio = args[:is_audio].present? ? args[:is_audio] : false

data/lib/avo/fields/gravatar_field.rb

@@ -4,7 +4,7 @@ require "erb"
 module Avo
   module Fields
     class GravatarField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
       attr_reader :rounded
       attr_reader :size
       attr_reader :default
@@ -16,7 +16,7 @@ module Avo
 
         hide_on [:edit, :new]
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
         @rounded = args[:rounded].nil? ? true : args[:rounded]
         @size = args[:size].present? ? args[:size].to_i : 32
         @default = args[:default].present? ? ERB::Util.url_encode(args[:default]).to_s : ""

data/lib/avo/fields/heading_field.rb

@@ -4,35 +4,27 @@ module Avo
   module Fields
     class HeadingField < BaseField
       attr_reader :as_html
-      attr_reader :empty
-
-      def initialize(content, **args, &block)
-        # Mark the field as empty if there's no content passed
-        @empty = content.blank?
-        # Add dummy content
-        content ||= SecureRandom.hex
 
+      def initialize(id, **args, &block)
         args[:updatable] = false
+        @label = args[:label] || id.to_s.humanize
 
-        super(content, **args, &block)
+        super(id, **args, &block)
 
         # this field is not used to update anything
         @for_presentation_only = true
 
         hide_on :index
 
-        @as_html = args[:as_html].present? ? args[:as_html] : false
+        @as_html = args[:as_html].presence || false
       end
 
       def id
         "heading_#{name.to_s.parameterize.underscore}"
       end
 
-      # Override the value method if the field is empty
       def value
-        return nil if empty
-
-        super
+        block.present? ? execute_block : @label
       end
     end
   end

data/lib/avo/fields/id_field.rb

@@ -1,7 +1,7 @@
 module Avo
   module Fields
     class IdField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
 
       def initialize(id, **args, &block)
         args[:readonly] = true
@@ -12,7 +12,7 @@ module Avo
 
         add_boolean_prop args, :sortable, true
 
-        @link_to_resource = args[:link_to_resource].present? ? args[:link_to_resource] : false
+        @link_to_record = args[:link_to_record].present? ? args[:link_to_record] : false
       end
     end
   end

data/lib/avo/fields/text_field.rb

@@ -1,14 +1,14 @@
 module Avo
   module Fields
     class TextField < BaseField
-      attr_reader :link_to_resource
+      attr_reader :link_to_record
       attr_reader :as_html
       attr_reader :protocol
 
       def initialize(id, **args, &block)
         super(id, **args, &block)
 
-        add_boolean_prop args, :link_to_resource
+        add_boolean_prop args, :link_to_record
         add_boolean_prop args, :as_html
         add_string_prop args, :protocol
       end

data/lib/avo/resources/items/holder.rb

@@ -56,12 +56,6 @@ class Avo::Resources::Items::Holder
     add_item panel
   end
 
-  def heading(body = nil, **args, &block)
-    field = Avo::Fields::HeadingField.new(body, **args)
-
-    add_item field
-  end
-
   def sidebar(**args, &block)
     add_item Avo::Resources::Items::Sidebar::Builder.parse_block(**args, &block)
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.0.1.beta8" unless const_defined?(:VERSION)
+  VERSION = "3.0.1.beta11" unless const_defined?(:VERSION)
 end

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

@@ -31,7 +31,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", ["--partial", ":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_importmap_tags \"avo.custom\" %>"
@@ -48,7 +48,7 @@ module Generators
             end
 
             say "Ejecting the _head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":head", "--skip-avo-version"], {destination_root: Rails.root})
+            Rails::Generators.invoke("avo:eject", ["--partial", ":head", "--skip-avo-version"], {destination_root: Rails.root})
 
             say "Adding the JS asset to the partial"
             append_to_file Rails.root.join("app", "views", "avo", "partials", "_head.html.erb"), "<%= javascript_include_tag \"avo.custom\", \"data-turbo-track\": \"reload\", defer: true %>"

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

@@ -11,17 +11,30 @@ module Generators
 
         def create_files
           unless tailwindcss_installed?
+            say "Installing Tailwindcss"
             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"
+          unless (path = Rails.root.join("config", "avo", "tailwind.config.js")).exist?
+            say "Generating the Avo config file."
+            copy_file template_path("tailwind.config.js"), path
+          end
+
+          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo", "tailwindcss")).exist?
+            say "Generating the tailwindcss directory."
+            directory ::Avo::Engine.root.join("app", "assets", "stylesheets", "css", "tailwindcss"), path
+          end
+
+
+          unless (path = Rails.root.join("app", "assets", "stylesheets", "avo" ,"tailwind.css")).exist?
+            say "Add default tailwind.css"
+            copy_file template_path("avo.tailwind.css"), path
           end
 
           if Rails.root.join("Procfile.dev").exist?
-            append_to_file "Procfile.dev", "avo_css: yarn avo:tailwindcss --watch\n"
+            say "Add #{cmd = "avo_css: yarn avo:tailwindcss --watch"} to Procfile.dev"
+            append_to_file "Procfile.dev", "#{cmd}\n"
           else
             say "Add default Procfile.dev"
             copy_file template_path("Procfile.dev"), "Procfile.dev"
@@ -30,17 +43,50 @@ module Generators
             run "gem install foreman"
           end
 
-          # Ensure that the _pre_head.html.erb template is available
-          unless Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb").exist?
-            say "Ejecting the _pre_head.html.erb partial"
-            Rails::Generators.invoke("avo:eject", [":pre_head", "--skip-avo-version"], {destination_root: Rails.root})
+          script_name = "avo:tailwindcss"
+          script_command = "tailwindcss -i ./app/assets/stylesheets/avo/tailwind.css -o ./app/assets/builds/avo.tailwind.css -c ./config/avo/tailwind.config.js --minify"
+          pretty_script_command = "\"#{script_name}\": \"#{script_command}\""
+
+          if (path = Rails.root.join("package.json")).exist?
+            say "Add #{pretty_script_command} to package.json"
+            json_data = JSON.parse(File.read(path))
+            json_data["scripts"] ||= {}
+            json_data["scripts"][script_name] = script_command
+
+            File.open(path, 'w') do |file|
+              file.write(JSON.pretty_generate(json_data) + "\n")
+            end
+          else
+            say "package.json not found.", :yellow
+            say "Ensure you have the following script in your package.json file.", :yellow
+            say "\"scripts\": {\n" \
+              "  #{pretty_script_command}\n" \
+            "}", :green
           end
 
-          say "Adding the CSS asset to the partial"
-          prepend_to_file Rails.root.join("app", "views", "avo", "partials", "_pre_head.html.erb"), "<%= stylesheet_link_tag \"avo.tailwind.css\", media: \"all\" %>"
+          rake_enhance = <<~RUBY
 
-          say "Ensure you have the following script in your package.json file.", :yellow
-          say %("scripts": { "avo:tailwindcss": "tailwindcss -i ./app/assets/stylesheets/avo.tailwind.css -o ./app/assets/builds/avo.tailwind.css --minify" }), :green
+            Rake::Task["assets:precompile"].enhance(["avo:sym_link"])
+          RUBY
+
+          if (path = Rails.root.join("Rakefile")).exist?
+            say "Add #{rake_enhance.strip} to Rakefile"
+            append_to_file path, rake_enhance
+          else
+            say "Rakefile not found.", :yellow
+            say "Ensure you have the following code in your Rakefile file.", :yellow
+            say rake_enhance, :green
+          end
+
+          say "Make sure you run \"bundle exec rake avo:sym_link\" before compiling the assets with the \"#{script_name}\" task.", :green
+          if (path = Rails.root.join("bin", "dev")).exist?
+            lines = File.read(path).lines
+
+            # Insert the task after the shebang line (the first line)
+            lines.insert(1, "bundle exec rake avo:sym_link")
+
+            File.write(path, lines.join)
+          end
         end
 
         no_tasks do

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

@@ -1,6 +1,8 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import 'tailwindcss/base';
+# Have all of Avo's custom and plugins styles available.
+@import '../../../../tmp/avo/base.css';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
 
 /*
 

data/lib/generators/avo/templates/tailwindcss/tailwind.config.js

@@ -0,0 +1,11 @@
+const avoPreset = require('../../tmp/avo/tailwind.preset.js')
+
+module.exports = {
+  presets: [avoPreset],
+  content: [
+    ...avoPreset.content,
+    './app/views/**/*.html.erb',
+    './app/helpers/**/*.rb',
+    './app/javascript/**/*.js',
+  ]
+}

data/lib/tasks/avo_tasks.rake

@@ -1,8 +1,3 @@
-# desc 'Explaining what the task does'
-# task :avo do
-#   # Task goes here
-# end
-
 desc "Runs the update command for all Avo gems."
 task "avo:update" do
   system "bundle update avo avo-pro avo-advanced avo-dashboards avo_filters avo-menu avo_upgrade"
@@ -63,3 +58,36 @@ task "avo:gem_paths" do
   # avo:/Users/adrian/work/avocado/avo-3,avo_filters:/Users/adrian/work/avocado/advanced/avo_filters
   puts result
 end
+
+desc "Symlinks all Avo gems to tmp/avo/packages"
+task "avo:sym_link" do
+  base_path = Rails.root.join("tmp", "avo").to_s.gsub("/spec/dummy", "")
+  packages_path = "#{base_path}/packages"
+  if Dir.exist?(packages_path)
+    `rm -rf #{packages_path}/*`
+  else
+    `mkdir -p #{packages_path}`
+    `touch #{packages_path}/.keep`
+  end
+
+  ["avo", "avo-advanced", "avo-pro", "avo-dynamic_filters", "avo-dashboards", "avo-menu"].each do |gem|
+    path = `bundle show #{gem} 2> /dev/null`.chomp
+
+    unless path.empty?
+      puts "[Avo->] Linking #{gem} to #{path}"
+      `ln -s #{path} #{packages_path}/#{gem}`
+    end
+  end
+
+  base_css_path = Avo::Engine.root.join("app", "assets", "builds", "avo.base.css")
+  dest_css_path = "#{base_path}/base.css"
+  `rm #{dest_css_path}` if File.exist?("#{dest_css_path}")
+  puts "[Avo->] Linking avo.base.css to #{base_css_path}"
+  `ln -s #{base_css_path} #{dest_css_path}`
+
+  base_preset_path = Avo::Engine.root.join("tailwind.preset.js")
+  dest_preset_path = "#{base_path}/tailwind.preset.js"
+  `rm #{dest_preset_path}` if File.exist?("#{dest_preset_path}")
+  puts "[Avo->] Linking tailwind.preset.js to #{base_preset_path}"
+  `ln -s #{base_preset_path} #{dest_preset_path}`
+end