avo 1.3.0.pre.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a62f55a2092f0dd2716cdaacc87e2eea086745d164d032ff8024757748830e54
-  data.tar.gz: a104302aecf8c7f57ac9915fe61eaf26866d3ac25678f40eee2b2244de5d3664
+  metadata.gz: f417048179aae7840d2571ab56e787c9eb6c7dd437f07e90221beeded482f5ce
+  data.tar.gz: 74c2a021008367b695973a98f1ee69eb6711d943675254925f0573c788d5be75
 SHA512:
-  metadata.gz: 88e0ca48ccbc7ff735cbf14178e8bfce1085b34996ed3cad80238e3a625adc0eeab918092b5fee304a3fc31ab9d2465a5f0b5580aac6b5efd308b09218f340cd
-  data.tar.gz: 8b1847c9083ef9998ee2e6a49202addcb9e670c2b5fa1904672287bfa902dd886df4ed5a6ba21de1f5db9020a3a1bc1e5e868765d672677928840d9c14ad83e1
+  metadata.gz: 51bdf61a474220a6d743c81da789dc07b9b54b7c8c6aad0e046b2f576fb0d296145b93e05ce77b73fc57d02b8c8c0692e997faf02da6b76b67b1442a80884602
+  data.tar.gz: 3faa5c7e35d64499f160a7aca161d6b0b15eccc6cbaceb8dc42bbe5832d063a0c0b39ea951543802599f1ee3c55d358ae64706d1390719a82e9ff49d5dcdbb6f

data/Gemfile

@@ -123,3 +123,5 @@ gem "appraisal"
 gem 'meta-tags'
 
 gem 'breadcrumbs_on_rails'
+
+gem 'manifester'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.3.0.pre.1)
+    avo (1.3.0)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -9,12 +9,12 @@ PATH
       hotwire-rails
       httparty
       image_processing
+      manifester
       meta-tags
       pagy
       pundit
       rails (>= 6.0)
       view_component
-      webpacker
       zeitwerk
 
 GEM
@@ -159,12 +159,15 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.0)
+    manifester (0.1.7)
+      rails (>= 6.0)
+      zeitwerk
+    marcel (1.0.1)
     meta-tags (2.14.0)
       actionpack (>= 3.2.0, < 6.2)
     method_source (1.0.0)
@@ -172,16 +175,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
-    mini_mime (1.0.3)
+    mini_mime (1.1.0)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
     msgpack (1.3.3)
     multi_xml (0.6.0)
     nio4r (2.5.7)
-    nokogiri (1.11.2)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.2-x86_64-linux)
+    nokogiri (1.11.3-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     pagy (3.12.0)
@@ -380,6 +383,7 @@ DEPENDENCIES
   iso
   jbuilder (~> 2.7)
   listen (>= 3.5.1)
+  manifester
   meta-tags
   pg (>= 0.18, < 2.0)
   puma (~> 4.3.5)
@@ -405,4 +409,4 @@ DEPENDENCIES
   zeitwerk (~> 2.3)
 
 BUNDLED WITH
-   2.2.5
+   2.2.11

data/README.md

@@ -30,12 +30,13 @@ Avo is a beautiful next-generation framework that empowers you, the developer, t
   - **Keeps your app clean** - You don't need to change your app to use Avo. Drop it in your existing app or add it to a new one and you're done 🙌
   - **Custom fields***- No worries if we missed a field you need. Generate a custom field in a jiffy.
   - **Dashboard widgets and metrics*** - Customize your dashboard with the tools and analytics you need.
-  - **Custom tools*** - You need to add a page with something completely new, you've got it!
+  - **Custom tools** - You need to add a page with something completely new, you've got it!
   - **Authorization** - Leverage Pundit policies to build a robust and scalable authorization system.
   - **Themable*** - Dress it up into your own colors.
   - **Localization*** - Have it available in any language you need.
+  - **No asset pipeline pollution** - Bring your own asset pipeline.
 
-  *Some features are still under development
+*Features are still under development
 
 # Installation
 Add this line to your application's `Gemfile`:

data/app/controllers/avo/application_controller.rb

@@ -4,6 +4,7 @@ module Avo
     include Pagy::Backend
     protect_from_forgery with: :exception
     before_action :init_app
+    before_action :check_avo_license
     before_action :set_authorization
     before_action :_authenticate!
     before_action :set_container_classes
@@ -34,6 +35,24 @@ module Avo
       end
     end
 
+    def render(*args)
+      raise Avo::LicenseVerificationTemperedError, "License verification mechanism tempered with." unless method(:check_avo_license).source_location.first.match?(/.*\/app\/controllers\/avo\/application_controller\.rb/)
+
+      super(*args)
+    end
+
+    def check_avo_license
+      unless on_root_path || on_resources_path
+        if @license.invalid? || @license.lacks(:custom_tools)
+          if Rails.env.development?
+            @custom_tools_alert_visible = true
+          else
+            raise Avo::LicenseInvalidError, "Your license is invalid or doesn't support custom tools."
+          end
+        end
+      end
+    end
+
     def _current_user
       instance_eval(&Avo.configuration.current_user)
     end
@@ -245,5 +264,13 @@ module Avo
     def add_initial_breadcrumbs
       instance_eval(&Avo.configuration.initial_breadcrumbs) if Avo.configuration.initial_breadcrumbs.present?
     end
+
+    def on_root_path
+      [Avo.configuration.root_path, "#{Avo.configuration.root_path}/"].include?(request.original_fullpath)
+    end
+
+    def on_resources_path
+      request.original_url.match?(/.*\/#{Avo.configuration.namespace}\/resources\/.*/)
+    end
   end
 end

data/app/controllers/avo/home_controller.rb

@@ -3,9 +3,10 @@ require_dependency "avo/application_controller"
 module Avo
   class HomeController < ApplicationController
     def index
-      @page_title = "Get started"
-
-      unless Rails.env.development?
+      if Avo.configuration.home_path.present?
+        redirect_to Avo.configuration.home_path
+      elsif !Rails.env.development?
+        @page_title = "Get started"
         redirect_to resources_path Avo::App.get_resources.min_by { |resource| resource.route_key }.model_class
       end
     end

data/app/helpers/avo/application_helper.rb

@@ -1,10 +1,16 @@
 module Avo
   module ApplicationHelper
-    include ::Webpacker::Helper
+    include ::Manifester::Helper
     include ::Pagy::Frontend
 
     def current_webpacker_instance
-      Avo.webpacker
+      return Avo.webpacker if Avo::IN_DEVELOPMENT || Rails.env.test?
+
+      super
+    end
+
+    def current_manifester_instance
+      Avo.manifester
     end
 
     def render_license_warnings

data/app/packs/entrypoints/application.js

@@ -19,19 +19,6 @@ window.Turbolinks = Turbo
 
 Mousetrap.bind('r r r', () => Turbo.visit(window.location.href, { action: 'replace' }))
 
-function initTippy() {
-  tippy('[data-tippy="tooltip"]', {
-    theme: 'light',
-    content(reference) {
-      const title = reference.getAttribute('title')
-      reference.removeAttribute('title')
-
-      return title
-    },
-  })
-}
-window.initTippy = initTippy
-
 const application = Application.start()
 
 const context = require.context('./../js/controllers', true, /\.js$/)
@@ -42,7 +29,16 @@ application.load(definitionsFromContext(fieldsContext))
 
 document.addEventListener('turbo:load', () => {
   document.body.classList.remove('turbo-loading')
-  initTippy()
+
+  tippy('[data-tippy="tooltip"]', {
+    theme: 'light',
+    content(reference) {
+      const title = reference.getAttribute('title')
+      reference.removeAttribute('title')
+
+      return title
+    },
+  })
 })
 document.addEventListener('turbo:visit', () => document.body.classList.add('turbo-loading'))
 document.addEventListener('turbo:submit-start', () => document.body.classList.add('turbo-loading'))

data/app/packs/js/controllers/fields/code_field_controller.js

@@ -12,6 +12,7 @@ import 'codemirror/mode/shell/shell'
 import 'codemirror/mode/sql/sql'
 import 'codemirror/mode/vue/vue'
 import 'codemirror/mode/xml/xml'
+
 import { Controller } from 'stimulus'
 import { castBoolean } from '@/js/helpers/cast_boolean'
 import CodeMirror from 'codemirror'
@@ -30,6 +31,8 @@ export default class extends Controller {
       lineNumbers: true,
     }
 
-    CodeMirror.fromTextArea(this.elementTarget, options)
+    setTimeout(() => {
+      CodeMirror.fromTextArea(this.elementTarget, options)
+    }, 1)
   }
 }

data/app/packs/stylesheets/components/code.css

@@ -9,3 +9,8 @@
   height: var(--height) !important;
   min-height: auto;
 }
+
+/* overlay CodeMirror fullscreen & Preview on small screens */
+.CodeMirror-fullscreen, .editor-preview-active-side {
+  z-index: 50;
+}

data/app/views/avo/home/_actions.html.erb

@@ -1,16 +1,16 @@
 <div>
   <h3>Actions</h3>
 
-  <div class="mt-2" data-controller="hidden-input">
+  <div class="mt-2">
     Avo actions allow you to perform specific tasks on one or more of your records. For example, you might want to mark a user as inactive and optionally send a message that may be customized by the person that wants to run the action.
 
-    <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate action 👇</strong>
-
-    <div class="mt-2 hidden" data-hidden-input-target="content">
+    <div class="mt-2">
       <code class="text-lg">Toggle published</code>
-      <div>
+      <div class="mt-1">
         <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:action toggle_published</code>
       </div>
     </div>
+
+    <a href="https://docs.avohq.io/1.0/actions.html" target="_blank" title="Avo Actions documentation" class="text-bold cursor-pointer block mt-2">Actions in the docs 👉</a>
   </div>
 </div>

data/app/views/avo/home/_docs.html.erb

@@ -4,6 +4,6 @@
   <div class="mt-2">
     We take pride in our documentation. Please check it out to see what you can build with Avo
 
-    <a href="https://docs.avohq.io" class="text-bold cursor-pointer block mt-2">Check out the docs 👉</a>
+    <a href="https://docs.avohq.io" target="_blank" title="Avo documentation" class="text-bold cursor-pointer block mt-2">Check out the docs 👉</a>
   </div>
 </div>

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

@@ -4,13 +4,13 @@
   <div class="mt-2" data-controller="hidden-input">
     Filters allow you to better scope the index queries for records you are looking for.
 
-    <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate filter 👇</strong>
-
-    <div class="mt-2 hidden" data-hidden-input-target="content">
+    <div class="mt-2">
       <code class="text-lg">Published filter</code>
-      <div>
+      <div class="mt-1">
         <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:filter published_filter</code>
       </div>
     </div>
+
+    <a href="https://docs.avohq.io/1.0/filters.html" target="_blank" title="Avo Filters documentation" class="text-bold cursor-pointer block mt-2">Filters in the docs 👉</a>
   </div>
 </div>

data/app/views/avo/home/_resources.html.erb

@@ -1,5 +1,9 @@
 <%
-  models = ApplicationRecord.descendants
+  models = begin
+    ApplicationRecord.descendants
+  rescue => exception
+    []
+  end
 %>
 <div>
   <h3>Resources</h3>
@@ -10,7 +14,7 @@
     <div class="mt-2" data-controller="hidden-input">
       It seems you already have <%= models.count %> <%= 'model'.pluralize models.count %> in your app. You can generate resources for each one with the following commands.
 
-      <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate resources 👇</strong>
+      <strong class="cursor-pointer block mt-2" data-action="click->hidden-input#showContent">Generate resources 👇 (click to reveal)</strong>
 
       <div class="mt-2 hidden" data-hidden-input-target="content">
         <% models.each do |model| %>
@@ -22,7 +26,16 @@
       </div>
     </div>
   <% else %>
+    <div class="mt-2" data-controller="hidden-input">
+      You may generate a resource using the following command:
+      <br>
 
+      <code class="p-1 rounded bg-light-blue-500 text-white">bin/rails generate avo:resource post</code>
+    </div>
   <% end %>
+
+  <p>
+    <a href="https://docs.avohq.io/1.0/resources.html" target="_blank" title="Avo Resources documentation">Docs</a>
+  </p>
 </div>
 

data/app/views/avo/home/index.html.erb

@@ -27,7 +27,7 @@
               <li><span class="mr-2">👍</span> Grid view</li>
               <li><span class="mr-2">👍</span> Authorization</li>
               <li><span class="mr-2">👍</span> Localization</li>
-              <li><span class="mr-2">⏳</span> Custom tools</li>
+              <li><span class="mr-2">👍</span> Custom tools</li>
               <li><span class="mr-2">⏳</span> Custom fields</li>
               <li><span class="mr-2">⏳</span> Search</li>
               <li><span class="mr-2">🕐</span> Dashboards</li>

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

@@ -0,0 +1,6 @@
+<div class="w-full inset-auto bottom-0 z-50 mb-4 opacity-75 hover:opacity-100 transition-opacity duration-150">
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block items-center flex leading-tight">
+    <%= svg "exclamation", class: "h-6 inline mr-2 text-bold flex-shrink-0" %> Warning. Your license is invalid or doesn't support custom tools. This page will not be visible in a production environment.
+  </a>
+</div>
+

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

@@ -1 +1 @@
-<%= image_pack_tag 'logo.png', class: 'h-full', title: 'Avo' %>
+<%= image_manifest_tag 'logo.png', class: 'h-full', title: 'Avo' %>

data/app/views/avo/sidebar/_license_warning.html.erb

@@ -1,12 +1,8 @@
 <div class="w-10/12 ml-1/12 inset-auto bottom-0 z-50 my-4 opacity-50 hover:opacity-100 transition-opacity duration-150 group">
-  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-teal-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
-    <% if icon.present? %>
-      <div class="h-6 inline mr-1 text-bold" :is="iconElement" v-if="icon">
-        <%= title %>
-      </div>
-    <% end %>
+  <a href="https://avohq.io/pricing" target="_blank" class="rounded bg-green-700 text-white py-2 px-4 text-sm block group-hover:pt-4">
+    <%= svg 'exclamation', class: 'h-6 inline mr-1 text-bold' %> <%= title %>
     <div class="group-hover:block hidden py-2">
-      <%= message %> <arrow-circle-right-icon class="h-6 inline float-right"></arrow-circle-right-icon>
+      <%= message %> <%= svg 'arrow-circle-right', class: "h-6 inline float-right" %>
     </div>
   </a>
 </div>

data/app/views/avo/sidebar/_sidebar.html.erb

@@ -6,7 +6,8 @@
 
     <div class="flex-1 flex flex-col justify-between">
       <div class="tools py-4">
-        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: '/avo', active: :exclusive if Rails.env.development? %>
+        <%= render Avo::NavigationLinkComponent.new label: 'Get started', path: Avo.configuration.root_path, active: :exclusive if Rails.env.development? && Avo.configuration.home_path.nil?  %>
+
         <%= render Avo::NavigationHeadingComponent.new label: t('avo.resources') %>
 
         <div class="w-full">

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

@@ -7,9 +7,10 @@
   <%= csp_meta_tag %>
 
   <%= render partial: 'avo/partials/javascript' %>
+  <%= render partial: 'avo/partials/head' %>
 
-  <%= javascript_pack_tag 'application' %>
-  <%= stylesheet_pack_tag 'application', media: 'all' %>
+  <%= javascript_manifest_tag 'application' %>
+  <%= stylesheet_manifest_tag 'application', media: 'all' %>
 </head>
 <body class="bg-blue-gray-200">
 
@@ -30,8 +31,12 @@
       </div>
 
       <div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
-        <%= yield %>
-        <%= render partial: "avo/partials/footer" %>
+        <%= render partial: "avo/partials/custom_tools_alert" if @custom_tools_alert_visible %>
+
+        <div class="flex flex-1 flex-col justify-between items-stretch">
+          <%= yield %>
+          <%= render partial: "avo/partials/footer" %>
+        </div>
       </div>
     </div>
   </div>

data/avo.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rails", ">= 6.0"
   spec.add_dependency "pagy"
   spec.add_dependency "zeitwerk"
-  spec.add_dependency "webpacker"
   spec.add_dependency "countries"
   spec.add_dependency "pundit"
   spec.add_dependency "httparty"
@@ -45,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "meta-tags"
   spec.add_dependency "breadcrumbs_on_rails"
+  spec.add_dependency "manifester"
 end

data/bin/helpers.rb

@@ -23,7 +23,7 @@ end
 def ask(question:, valid_answers: [])
   puts "\n#{question} (#{valid_answers.join('/')})"
 
-  input = gets.downcase.chomp
+  input = gets.chomp
 
   while !valid_answers.include?(input)
     puts 'Invalid input, please try again.'