plutonium 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd810654b7f478348594edd4972ff72e3f0528adbc35feedf4c6da74b29964b
-  data.tar.gz: e1e734d466dafd92710104ef714ff6b7f225a9813b3c5315d3ea8bbf9b47edb2
+  metadata.gz: 13471e736d83c0f9cb32571c6a65d3c88d0085c2281386bf831736bf7bb12daa
+  data.tar.gz: 880a7edcc4fe4abc6507d6f701997c9d9e5a4e5f090bfb76f518bcdf6dd11652
 SHA512:
-  metadata.gz: 94ee927e45efaa80f88d32e94ccfe6225b815bb6674b59a217f5a4f87b4a40a64efc7599968f894a7dc059bbd28672260f40d32db93a6f0d7cc4115313458db1
-  data.tar.gz: 648290295c54d176fbad95ee7c495e091d9d3f6704c55c00f06dd4ac2b37fd9a14d87b64075bb175292648c2c3bceba37151f1f58c03410beb5b8cd2ca78b9bc
+  metadata.gz: a44f71032bc167846977f7f1a784e3671fc3e06c7a2db8c6fe4e1caa1517f55bea93fa7f5bff81d396b0ccbc92e86fb2e73c87989f5be55f5c2adfb18b6da99c
+  data.tar.gz: ff20cdacd085bb0dcdfe9151ec6643cba9a961f5b63562402d23c3be295345a2c881c8faeff4cdf4c36af38db3cacc63b212aa297961315b2a2874140fd37ccb

data/app/views/application/_resource_header.html.erb

@@ -1,8 +1,6 @@
-<%= render_component :resource_header, brand_name: nil do |header| %>
-  <% header.with_brand_logo do %>
-    <%= logo_tag classname: "mr-3 h-10" %>
-  <% end %>
+<%# locals: (sidebar_toggle:) %>
 
+<%= render_component :resource_header, sidebar_toggle: do |header| %>
   <% header.with_action do %>
     <%=
       render_component :nav_grid_menu, label: "Apps" do |menu|

data/app/views/components/resource_header/resource_header_component.html.erb

@@ -1,36 +1,38 @@
 <nav <%= attributes_html %>>
   <div class="flex flex-wrap justify-between items-center">
     <div class="flex justify-start items-center">
-      <button
-        data-drawer-target="drawer-navigation"
-        data-drawer-toggle="drawer-navigation"
-        aria-controls="drawer-navigation"
-        class="p-2 mr-2 text-gray-600 rounded-lg cursor-pointer lg:hidden hover:text-gray-900 hover:bg-gray-100 focus:bg-gray-100 dark:focus:bg-gray-700 focus:ring-2 focus:ring-gray-100 dark:focus:ring-gray-700 dark:text-gray-200 dark:hover:bg-gray-700 dark:hover:text-white">
-        <svg
-          aria-hidden="true"
-          class="w-6 h-6"
-          fill="currentColor"
-          viewBox="0 0 20 20"
-          xmlns="http://www.w3.org/2000/svg">
-          <path
-            fill-rule="evenodd"
-            d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h6a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
-            clip-rule="evenodd"
-          ></path>
-        </svg>
-        <svg
-          aria-hidden="true"
-          class="hidden w-6 h-6"
-          fill="currentColor"
-          viewBox="0 0 20 20"
-          xmlns="http://www.w3.org/2000/svg">
-          <path
-            fill-rule="evenodd"
-            d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
-            clip-rule="evenodd"></path>
-        </svg>
-        <span class="sr-only">Toggle sidebar</span>
-      </button>
+      <% if sidebar_toggle %>
+        <button
+          data-drawer-target="drawer-navigation"
+          data-drawer-toggle="drawer-navigation"
+          aria-controls="drawer-navigation"
+          class="p-2 mr-2 text-gray-600 rounded-lg cursor-pointer lg:hidden hover:text-gray-900 hover:bg-gray-100 focus:bg-gray-100 dark:focus:bg-gray-700 focus:ring-2 focus:ring-gray-100 dark:focus:ring-gray-700 dark:text-gray-200 dark:hover:bg-gray-700 dark:hover:text-white">
+          <svg
+            aria-hidden="true"
+            class="w-6 h-6"
+            fill="currentColor"
+            viewBox="0 0 20 20"
+            xmlns="http://www.w3.org/2000/svg">
+            <path
+              fill-rule="evenodd"
+              d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zM3 10a1 1 0 011-1h6a1 1 0 110 2H4a1 1 0 01-1-1zM3 15a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
+              clip-rule="evenodd"
+            ></path>
+          </svg>
+          <svg
+            aria-hidden="true"
+            class="hidden w-6 h-6"
+            fill="currentColor"
+            viewBox="0 0 20 20"
+            xmlns="http://www.w3.org/2000/svg">
+            <path
+              fill-rule="evenodd"
+              d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+              clip-rule="evenodd"></path>
+          </svg>
+          <span class="sr-only">Toggle sidebar</span>
+        </button>
+      <% end %>
       <% if brand_name.present? || brand_logo.present? %>
         <a href="<%= root_path %>" class="flex items-center justify-between md:min-w-60">
           <%= brand_logo if brand_logo.present? %>

data/app/views/components/resource_header/resource_header_component.rb

@@ -3,7 +3,9 @@ module PlutoniumUi
     renders_one :brand_logo
     renders_many :actions
 
-    option :brand_name
+    option :brand_name, optional: true
+    option :default_brand_logo, default: -> { true }
+    option :sidebar_toggle, default: -> { false }
 
     private
 
@@ -14,6 +16,14 @@ module PlutoniumUi
         controller: "resource-header"
       }
     end
+
+    def before_render
+      return if brand_logo.present? || !default_brand_logo
+
+      with_brand_logo do
+        resource_logo_tag classname: "mr-3 h-10"
+      end
+    end
   end
 end
 

data/app/views/components/resource_layout/resource_layout_component.html.erb

@@ -7,11 +7,28 @@
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
+    <% if default_turbo_tag %>
+      <meta name="turbo-cache-control" content="no-cache">
+      <meta name="turbo-refresh-method" content="morph">
+      <meta name="turbo-refresh-scroll" content="preserve">
+    <% end %>
+
     <%= meta %>
     <%= favicon %>
-    <%= fonts %>
+
+    <% if default_fonts_tag %>
+      <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 %>
+
+    <% if default_assets_tag %>
+      <%= resource_stylesheet_tag %>
+      <%= resource_script_tag %>
+    <% end %>
+
     <%= assets %>
-    <%= after_head %>
+    <%= head %>
     <%# <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" />

data/app/views/components/resource_layout/resource_layout_component.rb

@@ -2,9 +2,8 @@ module PlutoniumUi
   class ResourceLayoutComponent < PlutoniumUi::Base
     renders_one :meta
     renders_one :favicon
-    renders_one :fonts
     renders_one :assets
-    renders_one :after_head
+    renders_one :head
     renders_one :header
     renders_one :sidebar
 
@@ -14,6 +13,9 @@ module PlutoniumUi
     option :main_classname, default: -> { "p-4 h-auto" }
     option :header_adjustment, default: -> { "pt-20" }
     option :sidebar_adjustment, default: -> { "lg:ml-64" }
+    option :default_turbo_tag, default: -> { true }
+    option :default_fonts_tag, default: -> { true }
+    option :default_assets_tag, default: -> { true }
 
     private
 

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

@@ -1,28 +1,11 @@
-<%= 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">
-  <% end %>
-
+<%= render_component :resource_layout, lang: "en",
+                                        page_title: make_page_title(@page_title) do |layout| %>
   <% 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 %>
-
-  <% layout.with_assets do %>
-    <%= plutonium_stylesheet_tag %>
-    <%= plutonium_script_tag %>
+    <%= resource_favicon_tag %>
   <% end %>
 
   <% layout.with_header do %>
-    <%= render("resource_header") %>
+    <%= render("resource_header", sidebar_toggle: true) %>
   <% end %>
 
   <% layout.with_sidebar do %>

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

@@ -1,30 +1,12 @@
 <%= 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">
-  <% 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 %>
-
-  <% layout.with_assets do %>
-    <%= plutonium_stylesheet_tag %>
-    <%= plutonium_script_tag %>
+    <%= resource_favicon_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" %>
+    <%= resource_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">
@@ -32,7 +14,7 @@
     </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" %>
+    <%= render_icon "outline/home" %>
     <%= link_to "Home", root_path, class: "font-medium text-blue-600 dark:text-blue-500" %>
   </div>
 <% end %>

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

@@ -35,6 +35,9 @@ module Pu
           import { registerControllers } from "@radioactive-labs/plutonium"
           registerControllers(application)
         EOT
+
+        environment "config.plutonium.assets.stylesheet = \"application\""
+        environment "config.plutonium.assets.script = \"application\""
       end
     end
   end

data/lib/generators/pu/core/install/install_generator.rb

@@ -29,8 +29,11 @@ module Pu
       end
 
       def setup_app
-        directory "config"
+        # directory "config"
         directory "app"
+
+        environment "# config.plutonium.assets.favicon = \"favicon.ico\""
+        environment "# config.plutonium.assets.logo = \"logo.png\""
       end
 
       def install_required_gems

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

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

data/lib/plutonium/helpers/assets_helper.rb

@@ -1,33 +1,41 @@
 module Plutonium
   module Helpers
     module AssetsHelper
-      def plutonium_stylesheet_tag
+      def resource_stylesheet_tag
         url = if Plutonium.development?
-          file = JSON.parse(File.read(Plutonium.root.join("src", "build", "css.manifest")))["plutonium.css"]
-          "/build/#{file}"
+          filename = JSON.parse(File.read(Plutonium.root.join("src", "build", "css.manifest")))["plutonium.css"]
+          "/build/#{filename}"
         else
-          "plutonium.css"
+          resource_stylesheet_asset
         end
         stylesheet_link_tag url, "data-turbo-track": "reload"
       end
 
-      def plutonium_script_tag
+      def resource_script_tag
         url = if Plutonium.development?
-          file = JSON.parse(File.read(Plutonium.root.join("src", "build", "js.manifest")))["plutonium.js"]
-          "/build/#{file}"
+          filename = JSON.parse(File.read(Plutonium.root.join("src", "build", "js.manifest")))["plutonium.js"]
+          "/build/#{filename}"
         else
-          "plutonium.min.js"
+          resource_script_asset
         end
         javascript_include_tag url, "data-turbo-track": "reload", type: "module"
       end
 
-      def logo_tag(classname:)
-        image_tag logo, class: classname
+      def resource_favicon_tag
+        favicon_link_tag resource_favicon_asset
       end
 
-      def logo
-        Plutonium::Config.logo || "plutonium-logo.png"
+      def resource_logo_tag(classname:)
+        image_tag resource_logo_asset, class: classname
       end
+
+      def resource_logo_asset = Rails.application.config.plutonium.assets.logo
+
+      def resource_stylesheet_asset = Rails.application.config.plutonium.assets.stylesheet
+
+      def resource_script_asset = Rails.application.config.plutonium.assets.script
+
+      def resource_favicon_asset = Rails.application.config.plutonium.assets.favicon
     end
   end
 end

data/lib/plutonium/railtie.rb

@@ -6,6 +6,12 @@ module Plutonium
     config.plutonium.cache_discovery = defined?(Rails.env) && !Rails.env.development?
     config.plutonium.enable_hotreload = defined?(Rails.env) && Rails.env.development?
 
+    config.plutonium.assets = ActiveSupport::OrderedOptions.new
+    config.plutonium.assets.logo = "plutonium.png"
+    config.plutonium.assets.favicon = "plutonium.ico"
+    config.plutonium.assets.stylesheet = "plutonium.css"
+    config.plutonium.assets.script = "plutonium.min.js"
+
     # If you don't want to precompile Plutonium's assets (eg. because you're using webpack),
     # you can do this in an intiailzer:
     #

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Stefan Froelich
@@ -708,15 +708,15 @@ files:
 - app/assets/icons/solid/youtube.svg
 - app/assets/icons/solid/zoom-in.svg
 - app/assets/icons/solid/zoom-out.svg
-- app/assets/plutonium-logo-original.png
-- app/assets/plutonium-logo-white.png
-- app/assets/plutonium-logo.png
+- app/assets/plutonium-original.png
+- app/assets/plutonium-white.png
 - app/assets/plutonium.css
 - app/assets/plutonium.ico
 - app/assets/plutonium.js
 - app/assets/plutonium.js.map
 - app/assets/plutonium.min.js
 - app/assets/plutonium.min.js.map
+- app/assets/plutonium.png
 - app/views/application/_flash.html.erb
 - app/views/application/_flash_alerts.html.erb
 - app/views/application/_flash_toasts.html.erb