breeze_cms 1.0.0 → 1.0.2

data/app/assets/stylesheets/breeze_tailwind_styles.css

@@ -1,8 +1,12 @@
-.prose {
+.prose{
   max-width: 100%;
   color: inherit;
   --tw-prose-bullets: #6b7280;
   --tw-prose-headings: inherit;
+  a{
+    color: inherit;
+    font-weight: 700;
+  }
 }
 
 @layer components {

data/app/controllers/breeze/images_controller.rb

@@ -57,10 +57,20 @@ module Breeze
     end
 
     def create
-      image = Image.create_new(params['filename'] ,params['tags'], params['image_file'])
-      image.add_save current_member_email
-      where_to  = determine_redirect(image)
-      redirect_to where_to , notice: "New image created: #{image.name}"
+      io = params['image_file']
+      if(io)
+        _ , endi = io.original_filename.split("/").last.split(".")
+        if( ["jpg","jpeg","png","webp"].include? endi.downcase)
+          image = Image.create_new(params["filename"] ,params['tags'], params['image_file'])
+          image.add_save current_member_email
+          where_to  = determine_redirect(image)
+          redirect_to where_to , notice: "New image created: #{image.name}"
+        else
+          redirect_to new_image_url , alert: "Only jpg, png or tiff allowed"
+        end
+      else
+        redirect_to new_image_url , alert: "No file"
+      end
     end
 
     private

data/app/controllers/breeze/pages_controller.rb

@@ -19,17 +19,10 @@ module Breeze
     def update
       if( !params[:name].blank?  && (params[:name] != @page.name))
         @page.set_name params[:name]
-        @page.edit_save(current_member_email)
-        message = "Page renamed"
-      end
-      options = params[:option]
-      if options
-        @page.option_definitions.each do |option|
-          @page.set_option(option.name,  options[option.name])
-        end
-        @page.edit_save(current_member_email)
-        message = "Options saved"
       end
+      @page.update_options( params[:options])
+      @page.edit_save(current_member_email)
+      message = "Saved"
       redirect_to page_url(@page) , notice: message
     end
 

data/app/controllers/breeze/view_controller.rb

@@ -5,7 +5,12 @@ module Breeze
       locale = params[:lang] || I18n.default_locale
       I18n.locale = locale
       @page = Page.find_by_name(params[:id])
-      redirect_to "/" , alert: "No page #{params[:id]}" unless @page
+      if @page.nil?
+        redirect_to "/" , alert: "No page #{params[:id]}"
+      else
+        @title = @page.options["title"] if @page.options
+        @description = @page.options["description"] if @page.options
+      end
     end
 
   end

data/app/models/breeze/active_yaml.rb

@@ -56,6 +56,23 @@ module Breeze
         find_by( :id , id )
       end
 
+      def next_id(id)
+        dir_id(id , 1)
+      end
+
+      def previous_id(id)
+        dir_id(id , -1)
+      end
+
+      def dir_id(id , inc)
+        while((id > 0) && (id < 300)) do
+          id += inc
+          if(is = find_by(:id , id))
+            return is
+          end
+        end
+      end
+
       def find_by( field , value )
         found = yaml_file.detect { |record| record[field] == value }
         return nil unless found
@@ -114,6 +131,12 @@ module Breeze
         File.join(self.path , full_name )
       end
 
+      def largest
+        largest = 0
+        yaml_file.each { |item| largest = item[:id] if item[:id] > largest }
+        largest
+      end
+
       #create a new data point by adding the hash
       def append(data)
         largest = 0

data/app/models/breeze/image.rb

@@ -43,6 +43,36 @@ module Breeze
       mini.crop( to_size )
       init_file_size
     end
+
+    def destroy(editor)
+      File.delete self.full_filename
+      delete_save!(editor)
+    end
+
+    def asset_name
+      Breeze.images_dir + "/" + self.id.to_s + "." + self.type
+    end
+
+    def full_filename
+      full_filename = self.id.to_s + "." + self.type
+      Rails.root.join(Image.asset_root, full_filename)
+    end
+
+    def init_file_size
+      magick_image = MiniMagick::Image.open(full_filename)
+      self.width = magick_image.width
+      self.height = magick_image.height
+      self.size = (magick_image.size/1024).to_i
+    end
+
+    def next_image
+      self.class.next_id(id)
+    end
+
+    def previous_image
+      self.class.previous_id(id)
+    end
+
     #save an io as new image. The filename is the id, type taken from io
     def self.create_new(name , tags,  io)
       original , end_ = io.original_filename.split("/").last.split(".")
@@ -61,19 +91,6 @@ module Breeze
       new_id = Image.append(image_data)
       Image.new(image_data)
     end
-    def destroy(editor)
-      File.delete self.full_filename
-      delete_save!(editor)
-    end
-
-    def asset_name
-      Breeze.images_dir + "/" + self.id.to_s + "." + self.type
-    end
-
-    def full_filename
-      full_filename = self.id.to_s + "." + self.type
-      Rails.root.join(Image.asset_root, full_filename)
-    end
 
     def self.transform
       Image.all.each do |image|
@@ -89,13 +106,6 @@ module Breeze
       end
     end
 
-    def init_file_size
-      magick_image = MiniMagick::Image.open(full_filename)
-      self.width = magick_image.width
-      self.height = magick_image.height
-      self.size = (magick_image.size/1024).to_i
-    end
-
     def self.asset_root
       "app/assets/images/" + Breeze.images_dir
     end

data/app/views/breeze/images/_editor.haml

@@ -4,6 +4,14 @@
   .flex.justify-between.mx-20
     .flex.justify-between
       %div.justify-self-start.ml-20.mr-10
+        %b Presets
+        600
+        %input{ name: :pre, type: "radio", value: "600", "v-on:input": "handle_preset($event)" }/
+        800
+        %input{ name: :pre, type: "radio", value: "800", "v-on:input": "handle_preset($event)" }/
+        1800
+        %input{ name: :pre, type: "radio", value: "1800", "v-on:input": "handle_preset($event)" }/
+        %br
         %b Scale {{scaled_x}} x {{scaled_y}}
         %br/
         %input{":min": 20 , ":max": 100 , ":step": 0.1 , :type => "range",
@@ -111,6 +119,10 @@
       @size_y = new_y
     end
 
+    def handle_preset(event)
+      @scale = (100 * event.target.value.to_f ) / @size_x
+    end
+
     def handle_size_x(event)
       set_size_x(event.target.value.to_f)
     end

data/app/views/breeze/images/show.haml

@@ -7,6 +7,26 @@
   = form_tag( breeze.image_copy_path(@image.id)  , method: :post) do
     %button.mx-40.button.change Copy
 
+  .grid.grid-cols-3.gap-10
+    %p
+      - if img = @image.previous_image
+        = link_to "Prev #{img.id}" , breeze.image_path(img)
+      -else
+        None
+    %p
+      Current
+      =@image.id
+    %p
+      - if img = @image.next_image
+        = link_to "Next #{img.id}" , breeze.image_path(img)
+      -else
+        None
+  -unless @used
+    %p.align-center Not used
+    = form_tag( breeze.image_path(@image.id) , {method: :delete  } ) do
+      %button.button.remove{type: :submit} Delete
+
+
 .flex.m-20
   .left.flex.gap-2.mt-3
     %p
@@ -37,24 +57,19 @@
           Sections using the image
         -@sections.each do |section|
           %p
-            = link_to section.header , breeze.section_path(section)
+            = link_to section.header , breeze.section_path(section) , target: :blank
           %p
             %em on Page
           %p
-            = link_to section.page.name , breeze.page_sections_path(section.page)
+            = link_to section.page.name , "/#{section.page.name}" , target: :blank
       .grid.grid-cols-3.gap-10
         %p.col-span-3.font-bold
           Cards using the image
         -@cards.each do |card|
           %p
-            = link_to card.header , breeze.section_cards_path(card.section)
+            - link = card.header.blank? ? "(nil)" : card.header
+            = link_to  link , breeze.section_cards_path(card.section) , target: :blank
           %p
             %em on Page
           %p
-            = link_to card.section.page.name , breeze.page_sections_path(card.section.page)
-
-  -else
-    %p.align-center Not used, you may delete
-    %p
-      = form_tag( breeze.image_path(@image.id) , {method: :delete  } ) do
-        %button.button.remove{type: :submit} Delete
+            = link_to card.section.page.name , "/" + card.section.page.name , target: :blank

data/app/views/breeze/view/cards/_card_normal_round.haml

@@ -3,6 +3,6 @@
   %h3.card_header.p-5.text-2xl.bg-gray-100.text-black.font-bold{ text_align_option(card)}= card.header_text(current_lang)
   %div.h-full{background_option(card)}
     .p-5{options(card , :text_align , :text_color)}
-      .card_text.m-2.text-sm.leading-relaxed.line-clamp-3{ prose_classes }
+      .card_text.m-2.text-sm.leading-relaxed{ prose_classes }
         = markdown(card,current_lang)
       =view_button(card , "my-2")

data/app/views/breeze/view/page.haml

@@ -1,2 +1,4 @@
+- content_for(:title , @title)
+- content_for(:description , @description)
 - @page.sections.each do |section|
   = render_section( section )

data/config/breeze/option_definitions.yml

@@ -88,8 +88,8 @@
   :values: left center right
   :default: center
   :id: 17
-- :name: meta
-  :description: Meta tag for page
+- :name: title
+  :description: Title for page
   :values:
   :default:
   :id: 18
@@ -127,3 +127,8 @@
   :values: h-8 h-16 h-24 h-32 h-40 h-48 h-64 h-96
   :default: h-24
   :id: 24
+- :name: description
+  :description: Meta description for page
+  :values:
+  :default:
+  :id: 25

data/config/breeze/page_styles.yml

@@ -1,9 +1,11 @@
 ---
 - :type: page
   :description: A general page, may contain anykind of section.
-        No restrictions of any kind. No options either.
+        No restrictions of any kind. Title goes to the page title and
+        description to meta.
   :options:
-    - meta
+    - title
+    - description
 - :type: blog
   :description: An news or similar article.
   :section_template: blog_header

data/config/initializers/simple_form_tailwind.rb

@@ -0,0 +1,148 @@
+# frozen_string_literal: true
+require "simple_form"
+
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Default class for buttons
+  config.button_class = 'my-2 bg-blue-500 hover:bg-blue-700 text-white font-bold text-sm py-2 px-4 rounded'
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = ''
+
+  # How the label text should be generated altogether with the required text.
+  config.label_text = ->(label, required, _explicit_label) { "#{label} #{required}" }
+
+  # Define the way to render check boxes / radio buttons with labels.
+  config.boolean_style = :inline
+
+  # You can wrap each item in a collection of radio/check boxes with a tag
+  config.item_wrapper_tag = :div
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  config.include_default_input_wrapper_class = false
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-400'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # :to_sentence to list all errors for each field.
+  config.error_method = :to_sentence
+
+  # add validation classes to `input_field`
+  config.input_field_error_class = 'border-red-500'
+  config.input_field_valid_class = 'border-green-400'
+  config.label_class = 'text-sm font-medium text-gray-600'
+
+  # vertical forms
+  #
+  # vertical default_wrapper
+  config.wrappers :vertical_form, tag: 'div', class: 'mb-4' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'block', error_class: 'text-red-500'
+    b.use :input,
+          class: 'shadow appearance-none border border-gray-300 rounded w-full py-2 px-3 bg-white focus:outline-none focus:ring-0 focus:border-blue-500 text-gray-400 leading-6 transition-colors duration-200 ease-in-out', error_class: 'border-red-500', valid_class: 'border-green-400'
+    b.use :full_error, wrap_with: { tag: 'p', class: 'mt-2 text-red-500 text-xs italic' }
+    b.use :hint, wrap_with: { tag: 'p', class: 'mt-2 text-grey-700 text-xs italic' }
+  end
+
+  # vertical input for boolean (aka checkboxes)
+  config.wrappers :vertical_boolean, tag: 'div', class: 'mb-4 flex items-start', error_class: '' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper tag: 'div', class: 'flex items-center h-5' do |ba|
+      ba.use :input,
+             class: 'focus:ring-2 focus:ring-indigo-500 ring-offset-2 h-4 w-4 text-indigo-600 border-gray-300 rounded'
+    end
+    b.wrapper tag: 'div', class: 'ml-3 text-sm' do |bb|
+      bb.use :label, class: 'block', error_class: 'text-red-500'
+      bb.use :hint, wrap_with: { tag: 'p', class: 'block text-grey-700 text-xs italic' }
+      bb.use :full_error, wrap_with: { tag: 'p', class: 'block text-red-500 text-xs italic' }
+    end
+  end
+
+  # vertical input for radio buttons and check boxes
+  config.wrappers :vertical_collection, item_wrapper_class: 'flex items-center',
+                                        item_label_class: 'my-1 ml-3 block text-sm font-medium text-gray-400', tag: 'div', class: 'my-4' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'text-sm font-medium text-gray-600',
+                           error_class: 'text-red-500' do |ba|
+      ba.use :label_text
+    end
+    b.use :input,
+          class: 'focus:ring-2 focus:ring-indigo-500 ring-offset-2 h-4 w-4 text-indigo-600 border-gray-300 rounded', error_class: 'text-red-500', valid_class: 'text-green-400'
+    b.use :full_error, wrap_with: { tag: 'p', class: 'block mt-2 text-red-500 text-xs italic' }
+    b.use :hint, wrap_with: { tag: 'p', class: 'mt-2 text-grey-700 text-xs italic' }
+  end
+
+  # vertical file input
+  config.wrappers :vertical_file, tag: 'div', class: '' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :minlength
+    b.optional :readonly
+    b.use :label, class: 'text-sm font-medium text-gray-600 block', error_class: 'text-red-500'
+    b.use :input, class: 'w-full text-gray-500 px-3 py-2 border rounded', error_class: 'text-red-500 border-red-500',
+                  valid_class: 'text-green-400'
+    b.use :full_error, wrap_with: { tag: 'p', class: 'mt-2 text-red-500 text-xs italic' }
+    b.use :hint, wrap_with: { tag: 'p', class: 'mt-2 text-grey-700 text-xs italic' }
+  end
+
+  # vertical multi select
+  config.wrappers :vertical_multi_select, tag: 'div', class: 'my-4', error_class: 'f', valid_class: '' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.wrapper :legend_tag, tag: 'legend', class: 'text-sm font-medium text-gray-600',
+                           error_class: 'text-red-500' do |ba|
+      ba.use :label_text
+    end
+    b.wrapper tag: 'div', class: 'inline-flex space-x-1' do |ba|
+      # ba.use :input, class: 'flex w-auto w-auto text-gray-500 text-sm border-gray-300 rounded p-2', error_class: 'text-red-500', valid_class: 'text-green-400'
+      ba.use :input,
+             class: 'flex w-auto w-auto shadow appearance-none border border-gray-300 rounded w-full p-2 bg-white focus:outline-none focus:border-blue-500 text-gray-400 leading-4 transition-colors duration-200 ease-in-out'
+    end
+    b.use :full_error, wrap_with: { tag: 'p', class: 'mt-2 text-red-500 text-xs italic' }
+    b.use :hint, wrap_with: { tag: 'p', class: 'mt-2 text-grey-700 text-xs italic' }
+  end
+
+  # vertical range input
+  config.wrappers :vertical_range, tag: 'div', class: 'my-4', error_class: 'text-red-500',
+                                   valid_class: 'text-green-400' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :readonly
+    b.optional :step
+    b.use :label, class: 'text-sm font-medium text-gray-600 block', error_class: 'text-red-500'
+    b.wrapper tag: 'div', class: 'flex items-center h-5' do |ba|
+      ba.use :input, class: 'rounded-lg overflow-hidden appearance-none bg-gray-400 h-3 w-full text-gray-300',
+                     error_class: 'text-red-500', valid_class: 'text-green-400'
+    end
+    b.use :full_error, wrap_with: { tag: 'p', class: 'mt-2 text-red-500 text-xs italic' }
+    b.use :hint, wrap_with: { tag: 'p', class: 'mt-2 text-grey-700 text-xs italic' }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :vertical_form
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  config.wrapper_mappings = {
+    boolean: :vertical_boolean,
+    check_boxes: :vertical_collection,
+    date: :vertical_multi_select,
+    datetime: :vertical_multi_select,
+    file: :vertical_file,
+    radio_buttons: :vertical_collection,
+    range: :vertical_range,
+    time: :vertical_multi_select
+  }
+end

data/lib/breeze/engine.rb

@@ -4,8 +4,7 @@ require "ruby2js/filter/functions"
 require "ruby2js/haml"
 require "ruby2js/filter/vue"
 require "breeze/shared_helper"
-require "simple_form"
-require "simple_form_tailwind_css"
+#require "simple_form"
 require "haml-rails"
 require "opal-rails"
 require "opal-jquery"
@@ -28,9 +27,13 @@ module Breeze
 
     initializer "after_initialize" do |app|
       ActiveSupport::Reloader.to_prepare do
-        [Section, Card, Page, Image, PageStyle,
-          SectionStyle, CardStyle, OptionDefinition].each do |clazz|
-          clazz.reload
+        begin
+          [Section, Card, Page, Image, PageStyle,
+            SectionStyle, CardStyle, OptionDefinition].each do |clazz|
+            clazz.reload
+          end
+        rescue Errno::ENOENT => e
+          puts e
         end
       end
     end

data/lib/breeze/version.rb

@@ -1,3 +1,3 @@
 module Breeze
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breeze_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Torsten
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,58 +28,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby2js
   requirement: !ruby/object:Gem::Requirement
@@ -101,33 +101,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: simple_form_tailwind_css
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: simple_form
+  name: simple_form-tailwind
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opal-rails
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +162,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +329,7 @@ files:
 - config/breeze/section_styles.yml
 - config/initializers/breeze.rb
 - config/initializers/rabl.rb
-- config/initializers/simple_form.rb
+- config/initializers/simple_form_tailwind.rb
 - config/locales/breeze_en.yml
 - config/routes.rb
 - config/tailwind.config.js
@@ -381,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: The tailwind based, developers CMS