basecoat 1.1.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3273d016589877e63365f54753ec24490331270a14f2870024cf2c17e643d432
-  data.tar.gz: 48df591a8457651c29693b4a7430973146ca90b805307d99517da7525fdb9741
+  metadata.gz: 1211adbec8da355fa5ec5c1794561f8637b1a0cc08441ad67c560fe550f12b1e
+  data.tar.gz: 9e7569725fcfd26c137868fa764d6302b29c1011bda90d00a39e253f857a2474
 SHA512:
-  metadata.gz: 38950b35cb6a9e208f26876d42333ee6c48f08b2feb04f87af01696092b3ba414bf0a350ad55068ee93d42412e6cebc866c59cf5fe4428bc829a28159863187a
-  data.tar.gz: 5578532de781f2fc679a7742d407f0982eaa58f649b5d896b6bce361e19351173673bf889c1eef78790643d3a5ef2bb01f69d2e6fbd4bf5a6d0367502cd4cf7e
+  metadata.gz: 0037adf9df5619c1402db0216bb281f340b5008b954a2cb0c1f278165909d5306037183dd93f839a18b09126a5edec914efab7380c339e928ff0144e3d5145d7
+  data.tar.gz: b0ebf8d1841064e080c81a4a3ad57cacff757fa78b6e3f1d9534f200e68702d5f4376645ba12aad92509acfea0a0aa28514e54f71370b432a0405209bf924873

data/README.md

@@ -5,12 +5,10 @@ It is especially powerful for admin applications with a lot of CRUD actions.
 
 Beautiful responsive, dark & light mode Rails scaffolds, pages for authentication and Devise, and pagy styling.
 
-Login:
+
 ![Basecoat Login](basecoat-login.png)
-Index:
-![Basecoat Index](basecoat-index.png)
-Form, mobile dark mode:
-![Basecoat Dark Form](basecoat-dark-form.png)
+
+![Basecoat Index](basecoat-new.png)
 
 ## Why?
 

data/lib/basecoat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Basecoat
-  VERSION = "1.1.1"
+  VERSION = "2.0.1"
 end

data/lib/generators/basecoat/templates/layouts/_aside.html.erb

@@ -7,7 +7,7 @@
         </div>
         <div class="grid flex-1 text-left text-sm leading-tight">
           <span class="truncate font-medium">Basecoat</span>
-          <span class="truncate text-xs">v0.0.1</span>
+          <span class="truncate text-xs">v0.3.3</span>
         </div>
       </a>
     </header>

data/lib/generators/basecoat/templates/layouts/_theme_toggle.html.erb

@@ -1,4 +1,4 @@
-<button type="button" aria-label="Toggle dark mode" data-tooltip="Toggle dark mode" data-side="left" data-action="click->theme#toggle" class="btn-icon-outline size-8">
+<button type="button" aria-label="Toggle dark mode" data-tooltip="Toggle dark mode" data-side="left" data-action="click->theme#toggle" class="btn-ghost size-8">
   <span class="hidden dark:block"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="4"></circle><path d="M12 2v2"></path><path d="M12 20v2"></path><path d="m4.93 4.93 1.41 1.41"></path><path d="m17.66 17.66 1.41 1.41"></path><path d="M2 12h2"></path><path d="M20 12h2"></path><path d="m6.34 17.66-1.41 1.41"></path><path d="m19.07 4.93-1.41 1.41"></path></svg></span>
   <span class="block dark:hidden"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 3a6 6 0 0 0 9 9 9 9 0 1 1-9-9Z"></path></svg></span>
 </button>

data/lib/generators/basecoat/templates/sessions/new.html.erb

@@ -6,7 +6,7 @@
         <p>Sign in to your account to continue.</p>
       </header>
       <section class="space-y-4">
-        <%= form_with url: session_url, html: { class: "grid gap-6" } do |form| %>
+        <%= form_with url: session_url, html: { data: { turbo: false }, class: "grid gap-6" } do |form| %>
           <div class="grid gap-3">
             <%= form.label :email_address, "Email", class: "label" %>
             <%= form.email_field :email_address, required: true, autofocus: true, autocomplete: "username", value: params[:email_address], class: "input" %>

data/lib/generators/basecoat/templates/shared/_empty.html.erb

@@ -0,0 +1,16 @@
+<div class="flex mt-10 flex-1 flex-col items-center justify-center gap-6">
+  <header class="flex max-w-sm flex-col items-center gap-2 text-center">
+    <div class="mb-2 bg-muted text-foreground flex size-10 shrink-0 items-center justify-center rounded-lg">
+      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 10.5 8 13l2 2.5" /><path d="m14 10.5 2 2.5-2 2.5" /><path d="M20 20a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2z" /></svg>
+    </div>
+    <h3 class="text-lg font-medium tracking-tight">No <%= resource_name %> yet</h3>
+    <p class="text-muted-foreground [&>a:hover]:text-primary text-sm/relaxed [&>a]:underline [&>a]:underline-offset-4">
+      Get started by creating your first <%= resource_name.singularize %>.
+    </p>
+  </header>
+  <section class="flex w-full max-w-sm flex-col items-center gap-4 text-sm text-balance">
+    <div class="flex gap-2">
+      <%= link_to "New #{resource_name.singularize}", new_path, class: "btn", data: { turbo_action: "advance" } %>
+    </div>
+  </section>
+</div>

data/lib/tasks/basecoat.rake

@@ -32,7 +32,7 @@ namespace :basecoat do
 
       unless importmap_content.include?("basecoat-css")
         File.open(importmap_path, "a") do |f|
-          f.puts "\npin \"basecoat-css/all\", to: \"https://cdn.jsdelivr.net/npm/basecoat-css@0.3.2/dist/js/all.js\""
+          f.puts "\npin \"basecoat-css/all\", to: \"https://cdn.jsdelivr.net/npm/basecoat-css@0.3.3/dist/js/all.js\""
         end
         puts "  Added: basecoat-css to config/importmap.rb"
       end
@@ -58,16 +58,10 @@ namespace :basecoat do
         puts "  Added: basecoat-css import to app/javascript/application.js"
       end
 
-      # Add basecoat helper JavaScript directly to application.js
+      # Add cool view transition to application.js
       js_content = File.read(js_path)
       unless js_content.include?("Re-initialize basecoat-css components")
         basecoat_js = <<~JS
-
-          // Re-initialize basecoat-css components after Turbo navigation
-          document.addEventListener('turbo:load', () => {
-            document.dispatchEvent(new Event('DOMContentLoaded', { bubbles: true, cancelable: false }))
-          })
-
           // View transitions for turbo frame navigation
           addEventListener("turbo:before-frame-render", (event) => {
               if (document.startViewTransition) {
@@ -80,7 +74,7 @@ namespace :basecoat do
           })
         JS
         File.open(js_path, "a") { |f| f.write(basecoat_js) }
-        puts "  Added: Basecoat helper JavaScript to app/javascript/application.js"
+        puts "  Added: cool view transition to app/javascript/application.js"
       end
 
       # Copy theme_controller.js
@@ -179,6 +173,17 @@ namespace :basecoat do
       puts "  Created: app/views/layouts/#{filename}"
     end
 
+    # Copy shared partials
+    shared_source = File.expand_path("../generators/basecoat/templates/shared", __dir__)
+    shared_destination = Rails.root.join("app/views/shared")
+
+    FileUtils.mkdir_p(shared_destination)
+    Dir.glob("#{shared_source}/*").each do |file|
+      filename = File.basename(file)
+      FileUtils.cp(file, shared_destination.join(filename))
+      puts "  Created: app/views/shared/#{filename}"
+    end
+
     # Copy scaffold hook initializer
     initializer_source = File.expand_path("../generators/basecoat/templates/scaffold_hook.rb", __dir__)
     initializer_destination = Rails.root.join("config/initializers/scaffold_hook.rb")
@@ -220,8 +225,8 @@ namespace :basecoat do
 
                 <% if defined?(user_signed_in?) && user_signed_in? %>
                   <div id="dropdown-user" class="dropdown-menu">
-                    <button type="button" id="dropdown-user-trigger" aria-haspopup="menu" aria-controls="dropdown-user-menu" aria-expanded="false" class="btn-icon-ghost rounded-full size-8">
-                      <img alt="<%= current_user.email %>" src="https://github.com/lafeber.png" class="size-8 shrink-0 rounded-full">
+                    <button type="button" id="dropdown-user-trigger" aria-haspopup="menu" aria-controls="dropdown-user-menu" aria-expanded="false" class="btn-ghost size-8">
+                      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-user-icon lucide-circle-user"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="10" r="3"/><path d="M7 20.662V19a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v1.662"/></svg>
                     </button>
                     <div id="dropdown-user-popover" data-popover="" aria-hidden="true" data-align="end">
                       <div role="menu" id="dropdown-user-menu" aria-labelledby="dropdown-user-trigger">
@@ -326,8 +331,8 @@ namespace :basecoat do
 
                 <% if defined?(Current) && defined?(Current.user) && Current.user %>
                   <div id="dropdown-user" class="dropdown-menu">
-                    <button type="button" id="dropdown-user-trigger" aria-haspopup="menu" aria-controls="dropdown-user-menu" aria-expanded="false" class="btn-icon-ghost rounded-full size-8">
-                      <img alt="<%= Current.user.email_address %>" src="https://github.com/lafeber.png" class="size-8 shrink-0 rounded-full">
+                    <button type="button" id="dropdown-user-trigger" aria-haspopup="menu" aria-controls="dropdown-user-menu" aria-expanded="false" class="btn-ghost size-8">
+                      <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-user-icon lucide-circle-user"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="10" r="3"/><path d="M7 20.662V19a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v1.662"/></svg>
                     </button>
                     <div id="dropdown-user-popover" data-popover="" aria-hidden="true" data-align="end">
                       <div role="menu" id="dropdown-user-menu" aria-labelledby="dropdown-user-trigger">

data/lib/templates/erb/scaffold/_form.html.erb.tt

@@ -1,15 +1,15 @@
-<%%= form_with(model: <%= model_resource_name %>, class: "space-y-6") do |form| %>
+<%%= form_with(model: <%= model_resource_name %>, class: "space-y-4") do |form| %>
   <%%= render "/layouts/form_errors", object: <%= singular_table_name %> if <%= singular_table_name %>.errors.any? %>
 
 <% attributes.each do |attribute| -%>
 <% required = attribute.to_s.include?('{null}') -%>
-  <div class="grid gap-3">
+  <div class="field">
 <% if attribute.password_digest? -%>
     <%%= form.label :password, class: "label" %>
     <%%= form.password_field :password, class: "input", required: true %>
   </div>
 
-  <div class="grid gap-3">
+  <div class="field">
     <%%= form.label :password_confirmation, class: "label" %>
     <%%= form.password_field :password_confirmation, class: "input", required: true %>
 <% elsif attribute.attachments? -%>

data/lib/templates/erb/scaffold/index.html.erb.tt

@@ -45,15 +45,6 @@
   </div>
 
   <%% if @<%= plural_table_name %>.empty? %>
-    <div class="text-center py-12">
-      <div class="mb-4">
-        <svg class="mx-auto h-12 w-12" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20 13V6a2 2 0 00-2-2H6a2 2 0 00-2 2v7m16 0v5a2 2 0 01-2 2H6a2 2 0 01-2-2v-5m16 0h-2M4 13h2m13-8V4a1 1 0 00-1-1H7a1 1 0 00-1 1v1h10z" />
-        </svg>
-      </div>
-      <h3 class="text-lg font-medium mb-2">No <%= human_name.pluralize.downcase %> yet</h3>
-      <p class="mb-6">Get started by creating your first <%= human_name.downcase %>.</p>
-      <%%= link_to "New <%= human_name.downcase %>", <%= new_helper(type: :path) %>, class: "btn", data: { turbo_action: "advance" } %>
-    </div>
+    <%%= render "shared/empty", resource_name: "<%= human_name.pluralize.downcase %>", new_path: <%= new_helper(type: :path) %> %>
   <%% end %>
 <%% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basecoat
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Martijn Lafeber
@@ -40,9 +40,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- basecoat-dark-form.png
-- basecoat-index.png
 - basecoat-login.png
+- basecoat-new.png
 - lib/basecoat.rb
 - lib/basecoat/railtie.rb
 - lib/basecoat/version.rb
@@ -75,6 +74,7 @@ files:
 - lib/generators/basecoat/templates/scaffold_hook.rb
 - lib/generators/basecoat/templates/sessions.html.erb
 - lib/generators/basecoat/templates/sessions/new.html.erb
+- lib/generators/basecoat/templates/shared/_empty.html.erb
 - lib/generators/basecoat/templates/theme_controller.js
 - lib/tasks/basecoat.rake
 - lib/templates/erb/scaffold/_form.html.erb.tt