breeze_cms 1.0.1 → 1.0.3

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

@@ -48,6 +48,8 @@ module Breeze
       @cards = Card.find_all(:image_id, params[:id].to_i)
       @used = ((@cards.length > 0) || (@sections.length > 0))
       @image_data = @image.data
+      @global_scale = get_scale(@image)
+      puts @global_scale
     end
 
     def copy
@@ -57,25 +59,46 @@ 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
 
+    def get_scale(image)
+      x_scale = (image.width  / 1700.0).ceil
+      y_scale = (image.height / 1000.0).ceil
+      [x_scale , y_scale].max
+    end
+
     def get_images
       images = Image.all
-      return images unless params[:unused]
+      return images if params[:unused].nil?
       hash = images.collect{|i| [i.id , i ] }.to_h
       Section.all.each{ |s| hash.delete(s.image&.id)}
       Card.all.each{ |s| hash.delete(s.image&.id)}
-      hash.values
+      return hash.values if params[:unused] == "true"
+      all = images.collect{|i| [i.id , i ] }.to_h
+      hash.each_key{|i| all.delete(i)}
+      all.values
     end
+
     def set_image
       @image = Image.find(params[:id] || params[:image_id])
     end
+
     def determine_redirect(image)
       if(params[:section_id])
         view_context.section_set_image_url(params[:section_id],image_id: image.id )

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_present_options( params[:options])
+      @page.edit_save(current_member_email)
+      message = "Saved"
       redirect_to page_url(@page) , notice: message
     end
 

data/app/controllers/breeze/sections_controller.rb

@@ -62,7 +62,7 @@ module Breeze
     def set_card_template
       card_template = params[:card_template]
       raise "no card template given" if card_template.blank?
-      @section.card_template = card_template
+      @section.set_card_template( card_template )
       @section.edit_save(current_member_email)
       redirect_to section_url(@section.id)
     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/helpers/breeze/images_helper.rb

@@ -5,13 +5,19 @@ module Breeze
     def text_for_index
       if(section_id)
         section = Section.find(section_id)
-        "Select image for Section #{section.index} : #{section.header}"
-      elsif(card_id)
+        return "Select image for Section #{section.index} : #{section.header}"
+      end
+      if(card_id)
         card = Card.find(card_id)
-        "Select image for Card #{card.index} : #{card.header}"
-      else
-        "All Images"
+        return "Select image for Card #{card.index} : #{card.header}"
+      end
+      if(params[:unused].nil?)
+        return "All Images"
+      end
+      if(params[:unused] == "true")
+        return "Unused Images"
       end
+      return "Used Images"
     end
 
     def text_for_new

data/app/helpers/breeze/options_helper.rb

@@ -38,7 +38,7 @@ module Breeze
 
     def order_option(section , clazz = "")
       if section.has_option?("order")
-        clazz += " order-last" if section.option('order') == "right"
+        clazz += " md:order-last" if section.option('order') == "right"
       end
       {class: clazz}
     end

data/app/helpers/breeze/view_helper.rb

@@ -2,6 +2,31 @@ module Breeze
   module ViewHelper
     include BreezeHelper
 
+    def title
+      @page.options ? @page.options["title"]  : ""
+    end
+
+    def description
+      @page.options ?  @page.options["description"] : ""
+    end
+
+    def breeze_meta_tags
+      metas = "<title> #{title}</title>\n" +
+      "<meta name='description' content='#{description}' />" +
+      breeze_fb_tags
+      metas.html_safe
+    end
+
+    # private, just breaking it up. Returns not safe string
+    def breeze_fb_tags
+      return "" unless @page.options
+      image = Image.find( @page.options["main_image"] )
+      return "" unless image
+      image_path =  asset_path("breeze/" + image.id.to_s + "." + image.type)
+      "\n<meta property='og:image' content='http://nomads.feenix.community#{image_path}' />" +
+      "\n<meta property='og:image:secure_url' content='https://nomads.feenix.community#{image_path}' />"
+    end
+
     def current_lang
       params[:lang]
     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/models/breeze/section.rb

@@ -51,6 +51,7 @@ module Breeze
     def set_template(new_template)
       self.template = new_template
       new_style = template_style
+      add_default_options
       if(new_style.has_cards?)
         if card_template.blank?
           self.card_template = CardStyle.first.template
@@ -58,6 +59,10 @@ module Breeze
       end
     end
 
+    def set_card_template(new_template)
+      self.card_template = new_template
+    end
+
     def allowed_fields
       super + [:page_id]
     end

data/app/models/breeze/shared_base.rb

@@ -14,7 +14,7 @@ module Breeze
       breeze_path = Breeze::Engine.root.join("config")
       breeze_res = YAML.load(File.read(File.join(breeze_path , fullname )))
 
-      res + breeze_res
+      breeze_res + res
     end
   end
 end

data/app/models/breeze/view_base.rb

@@ -26,7 +26,7 @@ module Breeze
       last = Time.now
       last_section = nil
       elements.each do |section|
-        if( section.updated_at < last )
+        if( section.updated_at > last )
           last = section.updated_at
           last_section = section
         end
@@ -58,13 +58,14 @@ module Breeze
         year = value[:year] || Time.new.year
         value = Time.new( year.to_i , value[:month] , value[:day]).to_date
       end
-      safe_options[option] = value
+      safe_options[option] = value.to_s
     end
 
     def add_default_options( definitions = nil )
       definitions = option_definitions if definitions.nil?
       definitions.each do |option|
         next unless option.default
+        next unless option(option.name).blank?
         set_option( option.name , option.default)
       end
     end
@@ -90,6 +91,14 @@ module Breeze
         set_option(option.name,  options[option.name])
       end
     end
+    def update_present_options( options )
+      return unless options
+      option_definitions.each do |option|
+        next unless options.has_key?(option.name)
+        set_option(option.name,  options[option.name])
+      end
+    end
+
     #other may be nil
     def swap_index_with(other)
       return unless other

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

@@ -1,19 +1,26 @@
-%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"}
+%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.16/dist/vue.js"}
 
 %section.image
   .flex.justify-between.mx-20
     .flex.justify-between
       %div.justify-self-start.ml-20.mr-10
         %b Scale {{scaled_x}} x {{scaled_y}}
+        %select.ml-4.mb-2.form-control{ "v-on:input": "handle_preset($event)" }
+          %option{  } Select a preset
+          %option{ value: "600", "v-on:input": "handle_preset($event)" } Card 600
+          %option{ value: "800", "v-on:input": "handle_preset($event)" } Half 800
+          %option{ value: "1200", "v-on:input": "handle_preset($event)" } 2/3  1200
+          %option{ value: "1800", "v-on:input": "handle_preset($event)" } Full 1800
+
         %br/
         %input{":min": 20 , ":max": 100 , ":step": 0.1 , :type => "range",
                 "v-bind:value": "scale" , "v-on:input" => "handle_scale($event)"}/
 
       = form_tag( breeze.image_scale_path(image_id: image.id) ) do
         %input{ hidden: true ,  id: :scale_id , name: :scale , "v-bind:value": "scale" }
-        %button.my-3.button.change Scale  {{scale}} %
+        %button.button.change Scale  {{scale}} %
 
-    %div.mt-2
+    %div
       %b.pr-2 Ratio
       %br/
       %em    {{ratio}} : 1
@@ -23,9 +30,9 @@
       %input{ hidden: true ,  id: :height_id , name: :size_y , "v-bind:value": "size_y" }
       %input{ hidden: true ,  id: :off_x_id , name: :off_x , "v-bind:value": "off_x" }
       %input{ hidden: true ,  id: :off_y_id , name: :off_y , "v-bind:value": "off_y" }
-      %button.my-3.button.change Crop
+      %button.button.change Crop
 
-    %div.mt-2.ml-32
+    %div.ml-32
       %b.pr-2 Fix ratio to
       %select{ "@change": "set_ratio"}
         %option{value: "0" } Any Ratio
@@ -36,11 +43,6 @@
 
   .flex.justify-between.mb-5
     %div.ml-20
-      %b Y Offset {{off_y}}
-      %br/
-      %input.horizontal{":min": 0 , ":max": "#{image.height}", ":step": 1 , :type => "range",
-              "v-bind:value": "off_y" , "v-on:input" => "handle_off_y($event)"}
-    %div
       %b X Offset {{off_x}}
       %br/
       %input{":min": 0 , ":max": "#{image.width}", ":step": 1 , :type => "range",
@@ -50,16 +52,21 @@
       %br/
       %input{":min": 0 , ":max": "#{image.width}", ":step": 1 , :type => "range",
               "v-bind:value": "size_x" , "v-on:input" => "handle_size_x($event)"}
-    %div.mr-20
+    %div
       %b Y Size {{size_y.toFixed(0)}}
       %br
       %input.horizontal{":min": 0 , ":max": "#{image.height}", ":step": 1 , :type => "range",
               "v-bind:value": "size_y" , "v-on:input" => "handle_size_y($event)"}
+    %div.mr-20
+      %b Y Offset {{off_y}}
+      %br/
+      %input.horizontal{":min": 0 , ":max": "#{image.height}", ":step": 1 , :type => "range",
+              "v-bind:value": "off_y" , "v-on:input" => "handle_off_y($event)"}
 
   .flex.justify-center
-    .image-container.overflow-hidden.relative{ "v-bind:style": "{height: scaled_y + 'px' , width: scaled_x + 'px'} " }
-      = image_tag(image.asset_name , class: "")
-      .absolute.bg-transparent.border-4.border-black{ "v-bind:style": "{height: size_y + 'px' , width: size_x + 'px' , top: off_y + 'px', left: off_x + 'px' }" }
+    .image-container.overflow-hidden.relative{ "v-bind:style": "{height: (scaled_y/global_scale) + 'px' , width: (scaled_x/global_scale) + 'px'} " }
+      = image_tag(image.asset_name , class: "" , width: (@image.width / @global_scale).to_i , height: (@image.height/@global_scale).to_i)
+      .absolute.bg-transparent.border-4.border-black{ "v-bind:style": "{height: (size_y/global_scale).toFixed() + 'px' , width: (size_x/global_scale).toFixed() + 'px' , top: (off_y/global_scale).toFixed() + 'px', left: (off_x/global_scale).toFixed() + 'px' }" }
 
 :ruby2js
   class Images < Vue
@@ -68,6 +75,7 @@
       @image_data = #{@image_data.to_json.html_safe}
       @off_x = 0
       @off_y = 0
+      @global_scale = "#{@global_scale}"
       @scale = 100
       @size_x = @image_data[:width]
       @size_y = @image_data[:height]
@@ -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/index.haml

@@ -1,4 +1,4 @@
-%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"}
+%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.16/dist/vue.js"}
 
 .mx-6.md:mx-12.mx-20.flex.h-16.items-center.gap-16.justify-between
   .flex.gap-20
@@ -7,8 +7,10 @@
 
     = link_to(breeze.new_image_path(new_link_params) ) do
       .button.action New Image
-  = link_to(breeze.images_path(unused: true) ) do
-    .button.action Show unused Images
+    = link_to(breeze.images_path(unused: false) ) do
+      .button.bg-cyan-100 Show used
+    = link_to(breeze.images_path(unused: true) ) do
+      .button.bg-orange-100 Show unused
 
 .images
   .flex.justify-center.gap-4
@@ -45,7 +47,7 @@
         %strong.inline-block.rounded.bg-orange-50.px-3.py-1.text-md.font-medium
           {{image.updated_at}}
         %strong.rounded.h-10.bg-orange-50.px-5.py-2.font-medium
-          {{image.tags}}
+          {{image.type}}
 
 .hidden.list
   -@images.each do |image|

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

@@ -1,12 +1,35 @@
-%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.14/dist/vue.js"}
+%script{:src => "https://cdn.jsdelivr.net/npm/vue@2.7.16/dist/vue.js"}
 
 .mx-6.md:mx-12.mx-20.flex.h-16.items-center.gap-16
   .text-xl.font-bold.text-gray-900
     Image: #{@image.name}
-
+    = @global_scale
   = 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
+  .m-2.bg-cyan-200
+    - if(@global_scale > 1)
+      Downscaled by
+      = @global_scale
+
 .flex.m-20
   .left.flex.gap-2.mt-3
     %p
@@ -37,24 +60,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