RubyGems - plutonium - Versions diffs - 0.10.3 → 0.11.0 - Mend

plutonium 0.10.3 → 0.11.0

Files changed (185) hide show

data/app/views/layouts/resource.html.erb CHANGED Viewed

@@ -1,49 +1,33 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title><%= page_title @page_title %></title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
+<%= render_component :resource_layout, page_title: make_page_title(@page_title), lang: "en" do |layout| %>
+  <% layout.with_meta do %>
     <meta name="turbo-cache-control" content="no-cache">
     <meta name="turbo-refresh-method" content="morph">
     <meta name="turbo-refresh-scroll" content="preserve">
-    <%= Plutonium::Config.favicon_tag.call self %>
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-    <%= yield(:meta) %>
+  <% end %>
+  <% layout.with_favicon do %>
+    <%= favicon_link_tag "plutonium.ico" %>
+  <% end %>
+  <% layout.with_fonts do %>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
+  <% end %>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.7/quill.snow.min.css" integrity="sha512-/FHUK/LsH78K9XTqsR9hbzr21J8B8RwHR/r8Jv9fzry6NVAOVIGFKQCNINsbhK7a1xubVu2r5QZcz2T9cKpubw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.7/quill.min.js" integrity="sha512-P2W2rr8ikUPfa31PLBo5bcBQrsa+TNj8jiKadtaIrHQGMo6hQM6RdPjQYxlNguwHz8AwSQ28VkBK6kHBLgd/8g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slim-select/2.6.0/slimselect.min.css" integrity="sha512-GvqWM4KWH8mbgWIyvwdH8HgjUbyZTXrCq0sjGij9fDNiXz3vJoy3jCcAaWNekH2rJe4hXVWCJKN+bEW8V7AAEQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/slim-select/2.6.0/slimselect.min.js" integrity="sha512-0E8oaoA2v32h26IycsmRDShtQ8kMgD91zWVBxdIvUCjU3xBw81PV61QBsBqNQpWkp/zYJZip8Ag3ifmzz1wCKQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <%= yield(:assets) %>
-    <%= Plutonium::Config.stylesheet_tag.call self %>
-    <%= Plutonium::Config.script_tag.call self %>
+  <% layout.with_assets do %>
+    <%= plutonium_stylesheet_tag %>
+    <%= plutonium_script_tag %>
+  <% end %>
-    <%= yield(:head) %>
-  </head>
-  <body class="antialiased bg-gray-50 dark:bg-gray-900">
+  <% layout.with_header do %>
     <%= render("resource_header") %>
-    <%= render("resource_sidebar") %>
-    <main class="p-4 lg:ml-64 h-auto pt-20">
-      <%= render "flash" %>
-      <%= yield %>
-    </main>
-  </body>
-</html>
+  <% end %>
-<!--
-    <%= modal_frame_tag do %>
-      <%= yield(:modal) %>
-    <% end %>
+  <% layout.with_sidebar do %>
+    <%= render("resource_sidebar") %>
+  <% end %>
--->
+  <%= yield %>
+<% end %>

data/app/views/layouts/rodauth.html.erb CHANGED Viewed

@@ -1,36 +1,38 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title><%= @page_title %></title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
+<%= render_component :resource_layout, page_title: @page_title,
+                                       lang: "en",
+                                       main_classname: "flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0" do |layout| %>
+  <% layout.with_meta do %>
     <meta name="turbo-cache-control" content="no-cache">
     <meta name="turbo-refresh-method" content="morph">
     <meta name="turbo-refresh-scroll" content="preserve">
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
+  <% end %>
+  <% layout.with_favicon do %>
+    <%= favicon_link_tag "plutonium.ico" %>
+  <% end %>
+  <% layout.with_fonts do %>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet">
-    <%= Plutonium::Config.stylesheet_tag.call self %>
-    <%= Plutonium::Config.script_tag.call self %>
-  </head>
-  <body class="antialiased bg-gray-50 dark:bg-gray-900">
-    <main div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
-      <%= render "flash" %>
-      <p class="flex items-center mb-6 text-2xl font-semibold text-gray-900 dark:text-white">
-        <img class="w-16 h-16 mr-2" src="<%= Plutonium.logo_link %>" alt="logo">
-        <%= application_name %>
-      </p>
-      <div class="w-full max-w-md bg-white rounded-lg shadow dark:border md:mt-0 xl:p-0 dark:bg-gray-800 dark:border-gray-700">
-        <div class="w-full p-6 space-y-4 md:space-y-6 sm:p-8">
-          <%= yield %>
-        </div>
-      </div>
-      <div class="mt-4 flex items-center font-medium text-blue-600 dark:text-blue-500 hover:underline">
-        <%= Plutonium::Icons.render "outline/home" %>
-        <%= link_to "Home", root_path, class: "font-medium text-blue-600 dark:text-blue-500" %>
-      </div>
-    </main>
-  </body>
-</html>
+  <% end %>
+  <% layout.with_assets do %>
+    <%= plutonium_stylesheet_tag %>
+    <%= plutonium_script_tag %>
+  <% end %>
+  <p class="flex items-center mb-6 text-2xl font-semibold text-gray-900 dark:text-white">
+    <%= logo_tag classname: "w-24 h-24 mr-2" %>
+  </p>
+  <div class="w-full max-w-md bg-white rounded-lg shadow dark:border md:mt-0 xl:p-0 dark:bg-gray-800 dark:border-gray-700">
+    <div class="w-full p-6 space-y-4 md:space-y-6 sm:p-8">
+      <%= yield %>
+    </div>
+  </div>
+  <div class="mt-4 flex items-center font-medium text-blue-600 dark:text-blue-500 hover:underline">
+    <%= Plutonium::Icons.render "outline/home" %>
+    <%= link_to "Home", root_path, class: "font-medium text-blue-600 dark:text-blue-500" %>
+  </div>
+<% end %>

data/app/views/resource/_interactive_resource_action_form.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
 <% if current_turbo_frame == 'modal' %>
   <%= turbo_frame_tag "modal" do %>
-    <div class="modal " tabindex="-1" data-controller="modal">
+    <div class="modal" tabindex="-1" data-controller="modal">
       <div class="modal-dialog modal-dialog-scrollable modal-lg">
         <%= resource_form_for @interaction, as: :interaction,
                                           method: :post,

data/app/views/resource/_resource_details.html.erb CHANGED Viewed

@@ -5,22 +5,25 @@
                              actions: details.actions.record_actions.permitted_for(policy(details.record))
 %>
 <%= render_component :block, rounded: :all do %>
   <div class="p-4">
     <dl class="divide-y divide-gray-100">
-      <% details.fields.each do |name, field| %>
+      <% details.fields.each do |name, renderer| %>
         <div class="py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
           <dt class="text-sm font-medium leading-6 text-gray-900 dark:text-gray-300">
-            <%= field.label %>
+            <%= renderer.label %>
           </dt>
           <dd class="mt-1 text-sm leading-6 text-gray-700 dark:text-gray-200 sm:col-span-2 sm:mt-0">
-            <%= field.render self, details.record %>
+            <%= renderer.render self, details.record %>
           </dd>
         </div>
       <% end %>
     </dl>
   </div>
+<% end %>
+<% if present_associations? %>
+  <% details.associations.each do |name, renderer| %>
+    <%= renderer.render self, details.record %>
+  <% end %>
 <% end %>

data/app/views/resource/_resource_table.html.erb CHANGED Viewed

@@ -8,8 +8,77 @@
   fields = collection.fields
   pager = collection.pager
   collection_actions = @collection.actions.collection_actions.permitted_for(current_policy)
+  table_rounding = search_object.scope_definitions.present? ? :bottom : :all
 -%>
 <%= render_component :table_toolbar, resource_class:, search_object:, actions: collection_actions %>
-<%= render_component :table, resource_class:, resources:, record_actions:, search_object:, fields:, pager:  %>
+<% if search_object.scope_definitions.present?  %>
+  <%
+    name = name.to_s
+    current_scope = resource_query_params[:scope]
+  %>
+  <%= render_component :block, rounded: :top do %>
+    <ul class="text-sm font-medium flex flex-wrap -mb-px">
+        <li class="me-2">
+          <% if current_scope.blank? %>
+            <a class="inline-block p-4 text-primary-600 border-b-2 border-primary-600 rounded-t-lg active dark:text-primary-500 dark:border-primary-500" aria-current="page" href="?<%= search_object.build_url(scope: nil) %>">All</a>
+          <% else %>
+            <a class="inline-block p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 dark:text-gray-500" href="<%= search_object.build_url(scope: nil) %>">All</a>
+          <% end %>
+        </li>
+        <% search_object.scope_definitions.each do |name, definition| %>
+          <li class="me-2">
+            <% if name == current_scope %>
+              <a class="inline-block p-4 text-primary-600 border-b-2 border-primary-600 rounded-t-lg active dark:text-primary-500 dark:border-primary-500" aria-current="page" href="?<%= search_object.build_url(scope: name) %>"><%= name.humanize %></a>
+            <% else %>
+              <a class="inline-block p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 dark:text-gray-500" href="<%= search_object.build_url(scope: name) %>"><%= name.humanize %></a>
+            <% end %>
+          </li>
+        <% end %>
+    </ul>
+  <% end %>
+<% end %>
+<%= render_component :block, id: "resource-table-container",
+                             scroll: :x,
+                             rounded: table_rounding,
+                             data: {
+                              controller:"scroll-preserver",
+                              action: "scroll->scroll-preserver#scrolled"
+                             } do %>
+  <% unless resources.any? %>
+    <%# empty card %>
+    <div class="col-12">
+      <%=
+        render_component :empty_card, message: "No #{resource_name_plural(resource_class).downcase} match your query" do
+          if current_policy.create?
+            render_component :button, label: "Create #{resource_name(resource_class)}",
+                                        to: resource_url_for(resource_class, action: :new),
+                                        color: :primary
+          end
+        end
+      %>
+    </div>
+  <% else %>
+    <%# table %>
+    <%= render_component :table, rows: resources do |table| %>
+      <% table.with_actions do |resource| %>
+        <% record_actions.permitted_for(policy(resource)).values.each do |action| %>
+          <%= table_action_button resource, action %>
+        <% end %>
+      <% end %>
+      <% fields.each do |name, field| %>
+        <% table.column(name:, label: field.label, search_object: search_object) do |resource| %>
+          <%= field.render self, resource %>
+        <% end %>
+      <% end %>
+    <% end %>
+    <%# pagination %>
+    <% if pager.present? %>
+      <%= render_component :pagination, pager: pager %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/resource/interactive_resource_collection_action.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
 <%= render_component :breadcrumbs, resource_class:, parent: current_parent, resource: resource_record %>
 <%= render_component :dyna_frame_content do %>
   <%= render "interactive_resource_action_form", interactive_action: current_interactive_action %>
 <% end %>

data/app/views/resource/interactive_resource_record_action.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
 <%= render_component :breadcrumbs, resource_class:, parent: current_parent, resource: resource_record %>
 <%= render_component :dyna_frame_content do %>
   <%= render "interactive_resource_action_form", interactive_action: current_interactive_action %>
 <% end %>

data/app/views/resource/interactive_resource_recordless_action.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
 <%= render_component :breadcrumbs, resource_class:, parent: current_parent, resource: resource_record %>
 <%= render_component :dyna_frame_content do %>
   <%= render "interactive_resource_action_form", interactive_action: current_interactive_action %>
 <% end %>

data/app/views/resource/new.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
 <%= render_component :breadcrumbs, resource_class:, parent: current_parent, resource: @form.record %>
 <%= render_component :dyna_frame_content do %>
   <%= render "resource_form", form: @form %>
 <% end %>

data/config/initializers/simple_form.rb CHANGED Viewed

@@ -21,7 +21,7 @@ SimpleForm.setup do |config|
     b.use :label, class: "md:w-1/6 mt-2 text-sm font-medium"
     b.wrapper tag: :div, html: {class: "md:w-5/6 w-full"} do |ba|
-      ba.use :input, class: "w-full p-2 border border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 font-medium text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white ",
+      ba.use :input, class: "w-full p-2 border border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 font-medium text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white",
         error_class: "bg-red-50 border border-red-500 text-red-900 placeholder-red-700 rounded-lg focus:ring-red-500 dark:bg-gray-700 focus:border-red-500 dark:text-red-500 dark:placeholder-red-500 dark:border-red-500",
         valid_class: "bg-green-50 border border-green-500 text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 rounded-lg focus:ring-green-500 focus:border-green-500 dark:bg-gray-700 dark:border-green-500"
       ba.use :full_error, wrap_with: {tag: "p", class: "mt-2 text-sm text-red-600 dark:text-red-500"}
@@ -43,7 +43,7 @@ SimpleForm.setup do |config|
     b.wrapper tag: :div, html: {class: "md:w-5/6 w-full"} do |ba|
       ba.wrapper tag: :div, html: {class: "flex gap-2 flex-col md:flex-row items-center"} do |bc|
-        bc.use :input, class: "w-full p-2 border border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 font-medium text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white ",
+        bc.use :input, class: "w-full p-2 border border-gray-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 font-medium text-sm dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white",
           error_class: "bg-red-50 border border-red-500 text-red-900 placeholder-red-700 rounded-lg focus:ring-red-500 dark:bg-gray-700 focus:border-red-500 dark:text-red-500 dark:placeholder-red-500 dark:border-red-500",
           valid_class: "bg-green-50 border border-green-500 text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 rounded-lg focus:ring-green-500 focus:border-green-500 dark:bg-gray-700 dark:border-green-500"
       end
@@ -51,4 +51,24 @@ SimpleForm.setup do |config|
       ba.use :hint, wrap_with: {tag: "p", class: "mt-2 text-sm text-gray-500 dark:text-gray-200"}
     end
   end
+  config.wrappers :resource_checkbox, class: "flex flex-col md:flex-row items-start space-y-2 md:space-y-0 md:space-x-2 mb-4" do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :maxlength
+    b.use :minlength
+    b.optional :pattern
+    b.use :min_max
+    b.optional :readonly
+    b.use :label, class: "md:w-1/6 mt-2 text-sm font-medium"
+    b.wrapper tag: :div, html: {class: "md:w-5/6 w-full"} do |ba|
+      ba.use :input, class: "w-4 h-4 text-primary-600 bg-gray-100 border-gray-300 rounded focus:ring-primary-500 focus:ring-2 dark:bg-gray-700 dark:border-gray-600",
+        error_class: "bg-red-50 border border-red-500 text-red-900 placeholder-red-700 rounded focus:ring-red-500 dark:bg-gray-700 focus:border-red-500 dark:text-red-500 dark:placeholder-red-500 dark:border-red-500",
+        valid_class: "bg-green-50 border border-green-500 text-green-900 dark:text-green-400 placeholder-green-700 dark:placeholder-green-500 rounded focus:ring-green-500 focus:border-green-500 dark:bg-gray-700 dark:border-green-500"
+      ba.use :full_error, wrap_with: {tag: "p", class: "mt-2 text-sm text-red-600 dark:text-red-500"}
+      ba.use :hint, wrap_with: {tag: "p", class: "mt-2 text-sm text-gray-500 dark:text-gray-200"}
+    end
+  end
 end

data/esbuild.config.js CHANGED Viewed

@@ -1,44 +1,48 @@
-const esbuild = require('esbuild');
-const manifestPlugin = require('esbuild-plugin-manifest')
+import { context as _context, build as _build } from 'esbuild';
+import manifestPlugin from 'esbuild-plugin-manifest';
-if (process.argv.includes("--prod")) {
-  esbuild.build({
-    outdir: "public/plutonium-assets",
+if (process.argv.includes("--dev")) {
+  _context({
+    outdir: "src/build",
     entryPoints: [
-      "app/assets/javascripts/plutonium-app.js"
+      "src/js/plutonium.js"
     ],
     plugins: [
       manifestPlugin({
-        filename: `${__dirname}/js.manifest`,
+        filename: `js.manifest`,
         shortNames: true,
       })
     ],
-    minify: true,
-    sourcemap: true,
     bundle: true,
-  })
-  esbuild.build({
-    outdir: "app/assets/build",
-    entryPoints: [
-      "app/assets/javascripts/plutonium.js"
-    ],
-    bundle: true,
-  })
+  }).then((context) => context.watch().catch((e) => console.error(e.message)))
 }
 else {
-  esbuild.context({
-    outdir: "public/plutonium-assets/build",
-    entryPoints: [
-      "app/assets/javascripts/plutonium-app.js"
-    ],
-    plugins: [
-      manifestPlugin({
-        filename: `${__dirname}/js.dev.manifest`,
-        shortNames: true,
-      })
-    ],
-    bundle: true,
-  }).then((context) => context.watch().catch((e) => console.error(e.message)))
+  function build(minify) {
+    const outExtension = minify ? { '.js': '.min.js' } : { '.js': '.js' }
+    _build({
+      outdir: "src/dist/js",
+      entryPoints: [
+        "src/js/plutonium.js",
+      ],
+      minify,
+      sourcemap: true,
+      bundle: true,
+      outExtension
+    }).catch(() => process.exit(1));
+    _build({
+      outdir: "app/assets",
+      entryPoints: [
+        "src/js/plutonium.js"
+      ],
+      minify,
+      sourcemap: true,
+      bundle: true,
+      outExtension
+    }).catch(() => process.exit(1));
+  }
+  build(true)
+  build(false)
 }

data/lib/generators/pu/core/assets/assets_generator.rb ADDED Viewed

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require_relative "../../lib/plutonium_generators"
+module Pu
+  module Core
+    class AssetsGenerator < Rails::Generators::Base
+      include PlutoniumGenerators::Generator
+      source_root File.expand_path("templates", __dir__)
+      desc "Setup plutonium assets"
+      def start
+        install_dependencies
+        copy_tailwind_config
+        configure_application
+      rescue => e
+        exception "#{self.class} failed:", e
+      end
+      private
+      def copy_tailwind_config
+        copy_file "tailwind.config.js"
+      end
+      def install_dependencies
+        `yarn add @radioactive-labs/plutonium`
+      end
+      def configure_application
+        insert_into_file "app/javascript/controllers/index.js", <<~EOT
+          import { registerControllers } from "@radioactive-labs/plutonium"
+          registerControllers(application)
+        EOT
+      end
+    end
+  end
+end

data/lib/generators/pu/core/assets/templates/tailwind.config.js ADDED Viewed

@@ -0,0 +1,18 @@
+const { execSync } = require('child_process');
+const plutoniumGemPath = execSync("bundle show plutonium").toString().trim();
+const plutoniumTailwindConfig = require(`${plutoniumGemPath}/tailwind.config.js`)
+module.exports = {
+  darkMode: plutoniumTailwindConfig.darkMode,
+  plugins: [
+    // add plugins here
+  ].concat(plutoniumTailwindConfig.plugins),
+  theme: plutoniumTailwindConfig.theme,
+  content: [
+    `${__dirname}/app/views/**/*.html.erb`,
+    `${__dirname}/app/helpers/**/*.rb`,
+    `${__dirname}/app/assets/stylesheets/**/*.css`,
+    `${__dirname}/app/javascript/**/*.js`,
+    `${__dirname}/packages/**/app/views/**/*.html.erb`,
+  ].concat(plutoniumTailwindConfig.content),
+}

data/lib/generators/pu/core/install/templates/config/initializers/plutonium.rb CHANGED Viewed

@@ -1 +1,4 @@
 # Configure plutonium
+# # set a custom global logo
+# Plutonium::Config.logo = "custom-logo.png"

data/lib/generators/pu/gem/dotenv/templates/config/initializers/001_ensure_required_env.rb CHANGED Viewed

@@ -1,6 +1,12 @@
+return if ENV["SECRET_KEY_BASE_DUMMY"].present?
 # Add required env vars to this list
 required_env_vars = %w[]
+if Rails.env.production?
+  required_env_vars += %w[RAILS_MASTER_KEY DATABASE_URL]
+end
 # Add additional env vars here
 # Check required env vars

data/lib/generators/pu/gen/component/component_generator.rb CHANGED Viewed

@@ -20,10 +20,9 @@ module Pu
         template "component.html.erb", "#{component_path}.html.erb"
         template "controller.js", controller_path
-        controllers_index_file = File.join __dir__, "../../../../../app/assets/javascripts/controllers/index.js"
+        controllers_index_file = File.join __dir__, "../../../../../src/js/controllers/register_controllers.js"
         insert_into_file controllers_index_file, controller_import, after: /.*Import controllers here*\n/
         insert_into_file controllers_index_file, controller_registration, after: /.*Register controllers here*\n/
-        insert_into_file controllers_index_file, controller_export, after: /.*Export controllers here*\n/
       end
       protected
@@ -45,7 +44,7 @@ module Pu
       end
       def component_namespace
-        ["Plutonium::Ui", component_module].compact.join "::"
+        ["PlutoniumUi", component_module].compact.join "::"
       end
       def component_reference
@@ -68,8 +67,16 @@ module Pu
         [component_module, component_name].compact.join("::").gsub("::", "__").underscore
       end
+      def controller_filename
+        "#{[component_module, component_name].compact.join("::").underscore}_controller.js"
+      end
+      def controllers_dir
+        File.join "src", "js", "controllers"
+      end
       def controller_path
-        "#{component_base_path}_controller.js"
+        File.join controllers_dir, controller_filename
       end
       def controller_identifier
@@ -77,20 +84,16 @@ module Pu
       end
       def controller_reference
-        [component_module, "#{component_name}Controller"].compact.join("::").gsub("::", "_")
+        [component_module, "#{component_name}Controller"].compact.join("")
       end
       def controller_import
-        "import #{controller_reference} from \"../../../../#{controller_path}\"\n"
+        "import #{controller_reference} from \"./#{controller_filename}\"\n"
       end
       def controller_registration
         "  application.register(\"#{controller_identifier}\", #{controller_reference})\n"
       end
-      def controller_export
-        "export { #{controller_reference} }\n"
-      end
     end
   end
 end

data/lib/generators/pu/gen/component/templates/component.html.erb.tt CHANGED Viewed

@@ -1,3 +1,3 @@
-<div data-controller="<%= controller_identifier %>" <%%= render_component_attributes %>>
+<div <%%= attributes_html %>>
   <%%= content %>
 </div>

data/lib/generators/pu/gen/component/templates/component.rb.tt CHANGED Viewed

@@ -1,8 +1,14 @@
 module <%= component_namespace %>
-  class <%= component_classname %> < Plutonium::Ui::Base
-    # def base_classname
-    #   "base classnames here"
-    # end
+  class <%= component_classname %> < PlutoniumUi::Base
+    private
+    def base_attributes
+      # base attributes go here
+      {
+        classname: "<%= controller_identifier %>",
+        controller: "<%= controller_identifier %>"
+      }
+    end
   end
 end

data/lib/generators/pu/pkg/app/app_generator.rb CHANGED Viewed

@@ -28,10 +28,10 @@ module Pu
         template "lib/engine.rb", "packages/#{package_namespace}/lib/engine.rb"
         template "config/routes.rb", "packages/#{package_namespace}/config/routes.rb"
-        template "app/controllers/package_controller.rb",
-          "packages/#{package_namespace}/app/controllers/#{package_namespace}/#{package_namespace}_controller.rb"
-        template "app/controllers/app_controller.rb",
-          "packages/#{package_namespace}/app/controllers/#{package_namespace}/app_controller.rb"
+        template "app/controllers/concerns/controller.rb",
+          "packages/#{package_namespace}/app/controllers/#{package_namespace}/concerns/controller.rb"
+        template "app/controllers/controller.rb",
+          "packages/#{package_namespace}/app/controllers/#{package_namespace}/controller.rb"
         template "app/controllers/dashboard_controller.rb",
           "packages/#{package_namespace}/app/controllers/#{package_namespace}/dashboard_controller.rb"

data/lib/generators/pu/pkg/app/templates/app/controllers/concerns/controller.rb.tt ADDED Viewed

@@ -0,0 +1,28 @@
+module <%= package_name %>
+  module Concerns
+    module Controller
+      extend ActiveSupport::Concern
+      include Plutonium::Application::Controller
+      <%- if rodauth_account.present? -%>
+      include Plutonium::Auth.rodauth(:<%= rodauth_account %>)
+      <%- elsif public_access? -%>
+      include Plutonium::Auth::Public
+      <%- end -%>
+      # add concerns above.
+      included do
+        boot <%= package_name %>
+        <%- if bring_your_own_auth? -%>
+        helper_method :current_user
+        <%- end -%>
+      end
+      <%- if bring_your_own_auth? -%>
+      def current_user
+        raise NotImplementedError, "#{self.class}#current_user must return a non nil value"
+      end
+      <%- end -%>
+    end
+  end
+end

data/lib/generators/pu/pkg/app/templates/app/controllers/controller.rb.tt ADDED Viewed

@@ -0,0 +1,5 @@
+module <%= package_name %>
+  class Controller < ::ApplicationController
+    include <%= package_name %>::Concerns::Controller
+  end
+end

data/lib/generators/pu/pkg/app/templates/app/controllers/dashboard_controller.rb.tt CHANGED Viewed

@@ -1,5 +1,5 @@
 module <%= package_name %>
-  class DashboardController < AppController
+  class DashboardController < Controller
     def index
     end
   end