b4um_generators 0.2.17 → 0.4.0

data/lib/generators/b4um/install/templates/b4um/sortable.css

@@ -0,0 +1,158 @@
+/* -------------------------------------------------------
+   Sortable
+------------------------------------------------------- */
+
+.b4um-sortable {
+  display: grid;
+  gap: 0.75rem;
+}
+
+.b4um-sortable__item {
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 1.25rem;
+
+  padding: 1rem 1.25rem;
+
+  background: var(--b4um-surface);
+  border: 1px solid var(--b4um-border-light);
+  border-radius: var(--b4um-radius);
+
+  transition:
+    border-color 0.2s ease,
+    box-shadow 0.2s ease,
+    opacity 0.2s ease;
+}
+
+.b4um-sortable__item:hover {
+  border-color: var(--b4um-border-hover);
+}
+
+.b4um-sortable__item--dragging {
+  opacity: 0.5;
+  box-shadow: 0 8px 24px var(--b4um-primary-shadow-soft);
+}
+
+/* -------------------------------------------------------
+   Controls
+------------------------------------------------------- */
+
+.b4um-sortable__controls {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.b4um-sortable__position {
+  box-sizing: border-box;
+
+  width: 4rem;
+  min-width: 4rem;
+  height: 2.75rem;
+
+  margin: 0;
+  padding: 0.5rem;
+
+  background: var(--b4um-surface);
+  color: var(--b4um-text);
+
+  border: 1px solid var(--b4um-border);
+  border-radius: 10px;
+
+  font: inherit;
+  text-align: center;
+}
+
+.b4um-sortable__position:hover {
+  border-color: var(--b4um-border-hover);
+}
+
+.b4um-sortable__position:focus {
+  border-color: var(--b4um-primary);
+  outline: 3px solid var(--b4um-primary-focus);
+  outline-offset: 1px;
+}
+
+/* -------------------------------------------------------
+   Drag handle
+------------------------------------------------------- */
+
+.b4um-sortable__handle {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+
+  width: 2.75rem;
+  height: 2.75rem;
+
+  margin: 0;
+  padding: 0;
+
+  background: transparent;
+  color: var(--b4um-text-secondary);
+
+  border: 0;
+  border-radius: 10px;
+
+  font: inherit;
+  font-size: 1.2rem;
+  line-height: 1;
+
+  cursor: grab;
+
+  transition:
+    background 0.2s ease,
+    color 0.2s ease;
+}
+
+.b4um-sortable__handle:hover {
+  background: var(--b4um-primary-soft);
+  color: var(--b4um-primary);
+}
+
+.b4um-sortable__handle:active {
+  cursor: grabbing;
+}
+
+/* -------------------------------------------------------
+   Content
+------------------------------------------------------- */
+
+.b4um-sortable__content {
+  min-width: 0;
+}
+
+.b4um-sortable__content .resource {
+  margin: 0;
+}
+
+/* -------------------------------------------------------
+   Actions
+------------------------------------------------------- */
+
+.b4um-sortable__actions {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+.b4um-sortable__actions .button {
+  margin: 0;
+  white-space: nowrap;
+}
+
+/* -------------------------------------------------------
+   Responsive
+------------------------------------------------------- */
+
+@media (max-width: 48rem) {
+  .b4um-sortable__item {
+    grid-template-columns: 1fr;
+    gap: 0.75rem;
+  }
+
+  .b4um-sortable__actions {
+    justify-content: flex-start;
+  }
+}

data/lib/generators/b4um/install/templates/b4um.css

@@ -22,6 +22,7 @@
 @import 'b4um/hero.css';
 @import 'b4um/cards.css';
 @import 'b4um/tables.css';
+@import 'b4um/sortable.css';
 @import 'b4um/pagination.css';
 @import 'b4um/badges.css';
 @import 'b4um/callouts.css';

data/lib/generators/b4um/pagination/pagination_generator.rb

@@ -108,20 +108,33 @@ module B4um
         /
           @#{Regexp.escape(plural_table_name)}\s*=\s*
           b4um_search\(\s*
-          #{Regexp.escape(class_name)}\.all,\s*
+          (?<collection>
+            #{Regexp.escape(class_name)}
+            \.(?:all|order\(\s*:position\s*,\s*:id\s*\))
+          )\s*,\s*
           params\[:q\]\s*
           \)
         /x
       end
 
       def paginate_existing_search
+        controller_content = File.read(controller_path)
+        match = controller_content.match(search_pattern)
+
+        unless match
+          raise Thor::Error,
+                "Could not find the search collection in app/controllers/#{plural_table_name}_controller.rb"
+        end
+
+        collection = match[:collection]
+
         gsub_file(
           controller_path,
           search_pattern,
           [
             "@#{plural_table_name}, @pagination = b4um_paginate(",
             "      b4um_search(",
-            "        #{class_name}.all,",
+            "        #{collection},",
             "        params[:q]",
             "      ),",
             "      per_page: #{options[:per_page]}",
@@ -131,19 +144,33 @@ module B4um
       end
 
       def paginate_plain_collection(controller_content)
-        old_index = "@#{plural_table_name} = #{class_name}.all"
+        plain_collection = "#{class_name}.all"
+        sortable_collection = "#{class_name}.order(:position, :id)"
 
-        unless controller_content.include?(old_index)
+        collection =
+          if controller_content.include?(
+            "@#{plural_table_name} = #{sortable_collection}"
+          )
+            sortable_collection
+          elsif controller_content.include?(
+            "@#{plural_table_name} = #{plain_collection}"
+          )
+            plain_collection
+          end
+
+        unless collection
           raise Thor::Error,
                 "Could not find the index collection in app/controllers/#{plural_table_name}_controller.rb"
         end
 
+        old_index = "@#{plural_table_name} = #{collection}"
+
         gsub_file(
           controller_path,
           old_index,
           [
             "@#{plural_table_name}, @pagination = b4um_paginate(",
-            "      #{class_name}.all,",
+            "      #{collection},",
             "      per_page: #{options[:per_page]}",
             "    )"
           ].join("\n")

data/lib/generators/b4um/scaffold/scaffold_generator.rb

@@ -33,6 +33,39 @@ module B4um
                    type: :string,
                    desc: "Renders a field as radio buttons. Example: condition:new=Neu,used=Gebraucht"
 
+      class_option :required,
+                   type: :string,
+                   desc: "Adds presence validation to fields. Example: name,email"
+
+      def initialize(args, options, config)
+        super
+
+        validate_required_fields
+      end
+
+      no_tasks do
+        def validate_required_fields
+          return if required_fields.empty?
+
+          attribute_names = attributes.map(&:name)
+
+          unknown_fields = required_fields - attribute_names
+
+          return if unknown_fields.empty?
+
+          raise Thor::Error,
+                "Unknown required field: #{unknown_fields.first}"
+        end
+
+        def required_fields
+          options[:required]
+            .to_s
+            .split(",")
+            .map(&:strip)
+            .reject(&:empty?)
+        end
+      end
+
       def validate_editor_options
         configurations = {
           select: select_configuration,
@@ -147,6 +180,23 @@ module B4um
         )
       end
 
+      def add_required_validations
+        return if required_fields.empty?
+
+        validation = required_fields
+                     .map { |field| ":#{field}" }
+                     .join(", ")
+
+        inject_into_class(
+          File.join(
+            "app/models",
+            "#{singular_table_name}.rb"
+          ),
+          class_name,
+          "  validates #{validation}, presence: true\n"
+        )
+      end
+
       def add_secure_password
         return unless attributes.any? { |attribute| attribute.name == "password_digest" }
 

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

@@ -15,6 +15,8 @@
   <%% end %>
 
 <% attributes.each do |attribute| -%>
+<% required = required_fields.include?(attribute.name) -%>
+<% label = attribute.name.humanize + (required ? " *" : "") -%>
 <% if attribute.name == "password_digest" -%>
   <div class="form-field">
     <%%= form.password_field :password,
@@ -35,7 +37,7 @@
     <%%= form.email_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:password|password_confirmation)(?:_|$)/) -%>
@@ -43,7 +45,7 @@
     <%%= form.password_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:phone|telephone|mobile)(?:_|$)/) -%>
@@ -51,7 +53,7 @@
     <%%= form.telephone_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:url|website|homepage)(?:_|$)/) -%>
@@ -59,12 +61,12 @@
     <%%= form.url_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif select_field?(attribute.name) -%>
   <div class="form-field form-field--select">
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
 
     <%%= form.select :<%= attribute.name %>,
           <%= select_configuration[:values].inspect %>.map { |choice|
@@ -76,7 +78,7 @@
 
 <% elsif radio_field?(attribute.name) -%>
   <div class="form-field form-field--radio">
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
 
     <div class="form-radio-options">
       <%% <%= radio_configuration[:values].inspect %>.each do |choice| %>
@@ -94,7 +96,7 @@
 <% elsif attribute.type == :boolean -%>
   <div class="form-field form-field--checkbox">
     <%%= form.check_box :<%= attribute.name %>, class: "form-checkbox" %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label form-label--checkbox" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label form-label--checkbox" %>
   </div>
 
 <% elsif attribute.type == :text -%>
@@ -102,7 +104,7 @@
     <%%= form.text_area :<%= attribute.name %>,
           class: "form-textarea",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :integer -%>
@@ -111,7 +113,7 @@
           class: "form-input",
           placeholder: " ",
           step: 1 %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif [:float, :decimal].include?(attribute.type) -%>
@@ -120,7 +122,7 @@
           class: "form-input",
           placeholder: " ",
           step: "any" %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :date -%>
@@ -128,7 +130,7 @@
     <%%= form.date_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif [:datetime, :timestamp].include?(attribute.type) -%>
@@ -136,7 +138,7 @@
     <%%= form.datetime_local_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :time -%>
@@ -144,7 +146,7 @@
     <%%= form.time_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :attachment -%>
@@ -153,6 +155,7 @@
 
     <div class="form-file-control">
       <%%= form.label :<%= attribute.name %>,
+            "<%= label %>",
             class: "form-file-label" %>
 
       <%%= form.file_field :<%= attribute.name %>,
@@ -189,6 +192,7 @@
 
     <div class="form-file-control">
       <%%= form.label :<%= attribute.name %>,
+            "<%= label %>",
             class: "form-file-label" %>
 
       <%% <%= singular_table_name %>.<%= attribute.name %>.each do |image| %>
@@ -246,7 +250,7 @@
     <%%= form.<%= attribute.field_type %> :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 <% end -%>
 <% end -%>

data/lib/generators/b4um/search/search_generator.rb

@@ -92,19 +92,33 @@ module B4um
           return
         end
 
-        old_index = "@#{file_name.pluralize} = #{class_name}.all"
+        plain_collection = "#{class_name}.all"
+        sortable_collection = "#{class_name}.order(:position, :id)"
 
-        unless controller_content.include?(old_index)
+        collection =
+          if controller_content.include?(
+            "@#{file_name.pluralize} = #{sortable_collection}"
+          )
+            sortable_collection
+          elsif controller_content.include?(
+            "@#{file_name.pluralize} = #{plain_collection}"
+          )
+            plain_collection
+          end
+
+        unless collection
           raise Thor::Error,
                 "Could not find the index collection in #{controller_path}"
         end
 
-        search_code = <<~RUBY.chomp
-          @#{file_name.pluralize} = b4um_search(
-            #{class_name}.all,
-            params[:q]
-          )
-        RUBY
+        old_index = "@#{file_name.pluralize} = #{collection}"
+
+        search_code = [
+          "@#{file_name.pluralize} = b4um_search(",
+          "      #{collection},",
+          "      params[:q]",
+          "    )"
+        ].join("\n")
 
         gsub_file(
           controller_path,