avo 0.5.0.beta7 → 0.5.0.beta12

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

@@ -19,6 +19,7 @@
           <label class="flex items-center text-gray-700 text-sm">
             <%= check_box_tag filter.id, value, set_value[value.to_s],
               class: 'mr-2 text-lg h-4 w-4',
+              id: "avo_filters_#{filter.id.parameterize.underscore}",
               'data-filter-class': filter.class,
               'data-boolean-filter-target': 'option',
               'data-action': 'input->boolean-filter#changeFilter'

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

@@ -3,6 +3,7 @@
     <%= a_button class: 'focus:outline-none',
       color: 'blue-gray',
       title: t('avo.click_to_reveal_filters'),
+      'data-button': 'resource-filters',
       'data-action': 'click->toggle-panel#togglePanel',
       'data-tippy': 'tooltip' do
     %>

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

@@ -11,6 +11,7 @@
     <%= select_tag filter.id, options_for_select(filter.options.invert, set_value),
       class: input_classes('w-full mb-0'),
       include_blank: '—',
+      id: "avo_filters_#{filter.id.parameterize.underscore}",
       'data-filter-class': filter.class,
       'data-select-filter-target': 'selector',
       'data-action': "change->select-filter#changeFilter"

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

@@ -1,6 +1,11 @@
 <%
-  # @todo: add avo styling to paginator
-  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, @index_params[:per_page].to_i].sort.uniq
+  per_page_options = [*Avo.configuration.per_page_steps, Avo.configuration.per_page.to_i, @index_params[:per_page].to_i]
+
+  if @parent_resource.present?
+    per_page_options.prepend Avo.configuration.via_per_page
+  end
+
+  per_page_options = per_page_options.sort.uniq
 %>
 
 <div class="bg-white px-4 flex items-center justify-between aborder-t aborder-blue-gray-200 sm:px-6 rounded-xl">
@@ -11,11 +16,23 @@
 
         <div data-controller="per-page">
           <div class="flex items-center">
-            <%= select_tag 'per_page', options_for_select(per_page_options, @index_params[:per_page]), class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm', 'data-per-page-target': 'selector', 'data-action': 'change->per-page#reload' %> <%= t('avo.per_page').downcase %>
+            <%= select_tag 'per_page',
+              options_for_select(per_page_options, @index_params[:per_page]),
+              class: 'appearance-none inline-flex bg-blue-gray-100 disabled:bg-blue-gray-400 disabled:cursor-not-allowed focus:bg-white text-blue-gray-700 disabled:text-blue-gray-600 rounded-md py-1 px-2 leading-tight border border-blue-gray-300 outline-none focus:border-blue-gray-400 outline w-16 mr-1 text-sm',
+              data: {
+                'turbo-frame': turbo_frame,
+                'per-page-target': 'selector',
+                action: 'change->per-page#reload'
+              }
+            %> <%= t('avo.per_page').downcase %>
           </div>
 
           <% per_page_options.each do |option| %>
-            <%= link_to "Change to #{option} items per page", resources_path(@resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% if @parent_resource.present? %>
+              <%= link_to "Change to #{option} items per page", related_resources_path(@parent_resource.model, @resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% else %>
+              <%= link_to "Change to #{option} items per page", resources_path(@resource.model_class, per_page: option, keep_query_params: true), class: 'hidden', 'data-per-page-option': option, 'data-turbo-frame': turbo_frame %>
+            <% end %>
           <% end %>
         </div>
       </div>
@@ -24,7 +41,9 @@
   <div class="flex">
     <div class="flex-2 sm:flex sm:items-center sm:justify-between">
       <%# @todo: add first & last page. make the first and last buttons rounded %>
-      <%== pagy_nav @pagy %>
+      <% if @pagy.pages > 1 %>
+        <%== pagy_nav @pagy %>
+      <% end %>
     </div>
   </div>
 </div>

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

@@ -1,5 +1,9 @@
 <%= turbo_frame_tag 'attach_modal' do %>
-  <%= form_with scope: 'fields', url: "/avo/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/", data: {'turbo-frame': '_top'} do |form| %>
+  <%= form_with scope: 'fields',
+    url: "/avo/resources/#{params[:resource_name]}/#{params[:id]}/#{params[:related_name]}/",
+    data: {
+      'turbo-frame': '_top'
+    } do |form| %>
     <%= render Avo::ModalComponent.new do |c| %>
       <% c.with :heading do %>
         <%= t('avo.choose_item', { item: params[:related_name].downcase }) %>

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

@@ -8,11 +8,6 @@
 
   <%= render partial: 'avo/partials/javascript' %>
 
-  <%# if Avo::PACKED %>
-    <%#= stylesheet_link_tag 'application', media: 'all', "data-turbo-track": "reload" %>
-    <%#= javascript_include_tag 'avo-packs/application', "data-turbo-track": "reload" %>
-  <%# else %>
-  <%# end %>
   <%= javascript_pack_tag 'application' %>
   <%= stylesheet_pack_tag 'application', media: 'all' %>
 </head>

data/avo.gemspec

@@ -1,46 +1,47 @@
-$:.push File.expand_path('lib', __dir__)
+$:.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
-require 'avo/version'
+require "avo/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |spec|
-  spec.name        = 'avo'
-  spec.version     = Avo::VERSION
-  spec.authors     = ['Adrian Marin', 'Mihai Marin']
-  spec.email       = ['avo@avohq.io']
-  spec.homepage    = 'https://avohq.io'
-  spec.summary     = 'Configuration-based, no-maintenance, extendable Ruby on Rails admin.'
-  spec.description = 'Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow.'
-  spec.license     = 'Commercial'
+  spec.name = "avo"
+  spec.version = Avo::VERSION
+  spec.authors = ["Adrian Marin", "Mihai Marin"]
+  spec.email = ["avo@avohq.io"]
+  spec.homepage = "https://avohq.io"
+  spec.summary = "Configuration-based, no-maintenance, extendable Ruby on Rails admin."
+  spec.description = "Avo is a beautiful next-generation framework that empowers you, the developer, to create fantastic admin panels for your Ruby on Rails apps with the flexibility to fit your needs as you grow."
+  spec.license = "Commercial"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['bug_tracker_uri'] = 'https://github.com/avo-hq/avo/issues'
-    spec.metadata['changelog_uri'] = 'https://avohq.io/releases'
-    spec.metadata['documentation_uri'] = 'https://docs.avohq.io'
-    spec.metadata['homepage_uri'] = 'https://avohq.io'
-    spec.metadata['source_code_uri'] = 'https://github.com/avo-hq/avo'
+    spec.metadata["bug_tracker_uri"] = "https://github.com/avo-hq/avo/issues"
+    spec.metadata["changelog_uri"] = "https://avohq.io/releases"
+    spec.metadata["documentation_uri"] = "https://docs.avohq.io"
+    spec.metadata["homepage_uri"] = "https://avohq.io"
+    spec.metadata["source_code_uri"] = "https://github.com/avo-hq/avo"
   else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
   end
 
   spec.post_install_message = "Thank you for using Avo! Docs are available at https://docs.avohq.io"
 
-  spec.files = Dir['{bin,app,config,db,lib,public}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md', 'avo.gemspec', 'Gemfile', 'Gemfile.lock']
+  spec.files = Dir["{bin,app,config,db,lib,public}/**/*", "MIT-LICENSE", "Rakefile", "README.md", "avo.gemspec", "Gemfile", "Gemfile.lock"]
 
-  spec.add_dependency 'rails', '>= 6.0'
-  spec.add_dependency 'pagy'
-  spec.add_dependency 'zeitwerk'
-  spec.add_dependency 'inline_svg'
-  spec.add_dependency 'webpacker'
-  spec.add_dependency 'countries'
-  spec.add_dependency 'pundit'
-  spec.add_dependency 'httparty'
-  spec.add_dependency 'active_link_to'
-  spec.add_dependency 'image_processing'
-  spec.add_dependency 'view_component'
-  spec.add_dependency 'hotwire-rails'
+  spec.add_dependency "rails", ">= 6.0"
+  spec.add_dependency "pagy"
+  spec.add_dependency "zeitwerk"
+  spec.add_dependency "inline_svg"
+  spec.add_dependency "webpacker"
+  spec.add_dependency "countries"
+  spec.add_dependency "pundit"
+  spec.add_dependency "httparty"
+  spec.add_dependency "active_link_to"
+  spec.add_dependency "image_processing"
+  spec.add_dependency "view_component"
+  spec.add_dependency "hotwire-rails"
+  spec.add_dependency "addressable"
 end

data/bin/rspec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+
 begin
   load File.expand_path('../spring', __FILE__)
 rescue LoadError => e

data/bin/webpack

@@ -2,9 +2,11 @@
 
 ENV['RAILS_ENV'] ||= ENV['RACK_ENV'] || 'development'
 ENV['NODE_ENV']  ||= 'development'
+ENV['TAILWIND_MODE'] ||= 'build'
 
 require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
 require 'rubygems'
 require 'bundler/setup'

data/config/initializers/inline_svg.rb

@@ -25,7 +25,7 @@ module InlineSvg
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
       http.request(Net::HTTP::Get.new(file_path)).body
-    rescue StandardError => e
+    rescue => e
       Rails.logger.error "[inline_svg] Error fetching #{@filename} from webpack-dev-server: #{e}"
       raise
     end

data/config/initializers/pagy.rb

@@ -1 +1 @@
-require 'pagy/extras/trim'
+require "pagy/extras/trim"

data/config/routes.rb

@@ -1,27 +1,27 @@
 Avo::Engine.routes.draw do
-  root 'home#index'
+  root "home#index"
 
-  get 'resources', to: redirect('/avo')
+  get "resources", to: redirect("/avo")
 
-  scope 'resources', as: 'resources' do
+  scope "resources", as: "resources" do
     # Attachments
-    get    '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#show'
-    delete '/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id', to: 'attachments#destroy'
+    get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"
+    delete "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#destroy"
 
     # Actions
-    get  '/:resource_name(/:id)/actions/:action_id', to: 'actions#show'
-    post '/:resource_name(/:id)/actions/:action_id', to: 'actions#handle'
+    get "/:resource_name(/:id)/actions/:action_id", to: "actions#show"
+    post "/:resource_name(/:id)/actions/:action_id", to: "actions#handle"
 
     # Generate resource routes as below:
     # resources :posts
     instance_eval(&Avo::App.draw_routes)
 
     # Relations
-    get    '/:resource_name/:id/:related_name/new',         to: 'relations#new'
-    get    '/:resource_name/:id/:related_name/',            to: 'relations#index'
-    get    '/:resource_name/:id/:related_name/:related_id', to: 'relations#show'
-    post   '/:resource_name/:id/:related_name',             to: 'relations#create'
-    delete '/:resource_name/:id/:related_name/:related_id', to: 'relations#destroy'
+    get "/:resource_name/:id/:related_name/new", to: "relations#new"
+    get "/:resource_name/:id/:related_name/", to: "relations#index"
+    get "/:resource_name/:id/:related_name/:related_id", to: "relations#show"
+    post "/:resource_name/:id/:related_name", to: "relations#create"
+    delete "/:resource_name/:id/:related_name/:related_id", to: "relations#destroy"
   end
 
   # get '/avo-api/search',                  to: 'search#index'

data/config/spring.rb

@@ -1,7 +1,7 @@
-Spring.application_root = './spec/dummy'
+Spring.application_root = "./spec/dummy"
 Spring.watch(
-  '.ruby-version',
-  '.rbenv-vars',
-  'tmp/restart.txt',
-  'tmp/caching-dev.txt'
+  ".ruby-version",
+  ".rbenv-vars",
+  "tmp/restart.txt",
+  "tmp/caching-dev.txt"
 )

data/config/webpack/aliases.js

@@ -3,7 +3,7 @@ const path = require('path')
 module.exports = {
   resolve: {
     alias: {
-      '@': path.resolve(__dirname, '..', '..', 'app/frontend'),
+      '@': path.resolve(__dirname, '..', '..', 'app/packs'),
       '~': path.resolve(__dirname, '..', '..', 'node_modules'),
     },
   },

data/config/webpack/base.js

@@ -0,0 +1,14 @@
+const { webpackConfig, merge } = require('@rails/webpacker')
+const aliases = require('./aliases')
+
+const customConfig = {
+  resolve: {
+    extensions: ['.css'],
+  },
+}
+
+const config = merge(webpackConfig, aliases, customConfig)
+
+delete config.optimization
+
+module.exports = config

data/config/webpack/development.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpack/production.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'production'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpack/test.js

@@ -1,5 +1,5 @@
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
-const environment = require('./environment')
+const webpackConfig = require('./base')
 
-module.exports = environment.toWebpackConfig()
+module.exports = webpackConfig

data/config/webpacker.yml

@@ -1,66 +1,30 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/frontend
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_root_path: public
   cache_path: tmp/cache/webpacker
   check_yarn_integrity: false
   # use a different sub-folder name
   public_output_path: avo-packs
   webpack_compile_output: true
+  extract_css: true
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths: []
+  additional_paths_paths: []
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Extract and emit a css file
-  extract_css: true
-
-  static_assets_extensions:
-    - .jpg
-    - .jpeg
-    - .png
-    - .gif
-    - .tiff
-    - .ico
-    - .svg
-    - .eot
-    - .otf
-    - .ttf
-    - .woff
-    - .woff2
-
-  extensions:
-    - .ts
-    - .vue
-    - .mjs
-    - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-
 # We override the development env. when packed.
 # Avo needs to be packed and compiled for when the dev uses it in his development env.
 development:
   <<: *default
 
   # Production depends on precompilation of packs prior to booting for performance.
-  compile: false
-
-  # Extract and emit a css file
-  extract_css: true
+  compile: true
 
   # Cache manifest.json for performance
   cache_manifest: true
@@ -79,8 +43,5 @@ production:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
-  # Extract and emit a css file
-  extract_css: true
-
   # Cache manifest.json for performance
   cache_manifest: true

data/db/factories.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
     last_name { Faker::Name.last_name }
     email { Faker::Internet.email }
     password { Faker::Internet.password }
-    roles { { admin: false, manager: [true, false].sample, writer: [true, false].sample } }
+    roles { {admin: false, manager: [true, false].sample, writer: [true, false].sample} }
     birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
     custom_css { ".header {\n  color: red;\n}" }
   end
@@ -12,6 +12,7 @@ FactoryBot.define do
   factory :team do
     name { Faker::Company.name }
     description { Faker::Lorem.paragraph(sentence_count: 4) }
+    url { Faker::Internet.url }
   end
 
   factory :post do
@@ -21,8 +22,6 @@ FactoryBot.define do
     published_at do
       if [false, true].sample
         Time.now - rand(10...365).days
-      else
-        nil
       end
     end
   end
@@ -30,12 +29,12 @@ FactoryBot.define do
   factory :project do
     name { Faker::App.name }
     status { [:closed, :rejected, :failed, :loading, :running, :waiting].sample }
-    stage { ['Discovery', 'Idea', 'Done', 'On hold', 'Cancelled'].sample }
+    stage { ["Discovery", "Idea", "Done", "On hold", "Cancelled"].sample }
     budget { Faker::Number.decimal(l_digits: 4) }
     country { Faker::Address.country_code }
     description { Faker::Markdown.sandwich(sentences: 5) }
     users_required { Faker::Number.between(from: 10, to: 100) }
     started_at { Time.now - rand(10...365).days }
-    meta { [{ foo: 'bar', hey: 'hi' }, { bar: 'baz' }, { hoho: 'hohoho' }].sample }
+    meta { [{foo: "bar", hey: "hi"}, {bar: "baz"}, {hoho: "hohoho"}].sample }
   end
 end