glib-web 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f4814b44f64585a3862468a56d2c645eee1b5a
-  data.tar.gz: 8f56b831228ffe905f9d46335f95b4e5199bcac3
+  metadata.gz: 91bbaabb7ba267a91d4f7ff4b8cdd3b142fe2dc2
+  data.tar.gz: 22db4840a440ef31d8161267f366c24ea0e39365
 SHA512:
-  metadata.gz: 3f9752a9758a0674b3d7d889c35f34633f1ee021b1a8b3e6300677b38f4144d24731febb05606902af1a90237638a68808c597683f3a9fe96442f36853ce39a1
-  data.tar.gz: c7e4bc6af22642572c2ba7c65dfcea6c57e0e229ce1031acfdbdd8f6eb109cb543ca0f38b80caaa03c23b71b8a70f76c6eb90da555edb4aa5f2e587380c339b9
+  metadata.gz: 4f70589581f61e65eb0f4dd4d09b07657c30fde7fc8067d0f30c6577ebfa55af9d42f7ad513e4cc7ae3058542619758d2d9bf04cfffaf372d1822a99a975ce35
+  data.tar.gz: 3ce7731eef560c59759fc483d16f3516d88f6f5e849489452d2a4c93120f805d128b3f1a4583e68fa67650ed41ae621c496b7b4f510294d53d6b31497914731e

data/app/helpers/glib/json_ui/list_builders.rb

@@ -48,8 +48,8 @@ module Glib
           block = options[:builder]
           json.rows do
             if (objects = options[:objects])
-              objects.each do |object|
-                block&.call @template, object
+              objects.each_with_index do |object, index|
+                block&.call @template, object, index
               end
             else
               block&.call @template

data/app/helpers/glib/json_ui/page_helper.rb

@@ -16,9 +16,7 @@ module Glib
 
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
-        attr_reader :list_section_builder, :drawer_content_builder
-
-        attr_reader :table_section_builder, :table_template_builder
+        attr_reader :list_section_builder, :drawer_content_builder, :table_section_builder
 
         # See Panels::Form
         attr_accessor :current_form
@@ -33,9 +31,8 @@ module Glib
 
           @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
           @drawer_content_builder = ListBuilders::Section.new(json, self, @menu_builder)
-
-          @table_section_builder = TableBuilders::Section.new(json, self)
-          @table_template_builder = TableBuilders::Template.new(json, self)
+          @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
+          # @table_template_builder = TableBuilders::Template.new(json, self)
         end
         
         def rightNavButtons

data/app/helpers/glib/json_ui/styling_helper.rb

@@ -1,9 +1,17 @@
 module Glib
   module JsonUi
     module StylingHelper
-      def body_padding
+      def json_padding_body
         { top: 12, left: 20, right: 20, bottom: 12 }
       end
+
+      def json_padding_list
+        { top: 12, bottom: 12, left: 16, right: 16 }
+      end
+      
+      def json_padding_body_this
+        { top: 6, right: 10, bottom: 6, left: 10 }
+      end
     end
   end
 end

data/app/helpers/glib/json_ui/table_builders.rb

@@ -23,6 +23,11 @@ module Glib
       end
       
       class Section < AbstractBuilder
+        def initialize json, page, template
+          super json, page
+          @template = template
+        end
+
         def header(options = {})
           json.header do
             json.backgroundColor options[:backgroundColor]
@@ -32,18 +37,32 @@ module Glib
           end
         end
 
-        def rows(array = nil)
-          template = page.table_template_builder
+        def rows(options = {})
+          block = options[:builder]
           json.rows do
-            if array
-              array.each do |row|
-                yield template, row
+            if (objects = options[:objects])
+              objects.each_with_index do |object, index|
+                block&.call @template, object, index
               end
             else
-              yield template
+              block&.call @template
             end
           end
         end
+
+        # def rows(array = nil)
+        #   template = page.table_template_builder
+        #   json.rows do
+        #     if array
+        #       array.each do |row|
+        #         yield template, row
+        #       end
+        #     else
+        #       yield template
+        #     end
+        #   end
+        # end
+
       end
       
     end

data/app/helpers/glib/json_ui/view_builder.rb

@@ -80,6 +80,10 @@ module Glib
         string :dataUrl
       end
       
+      class Chip < View
+        string :text
+      end
+
       class Calendar < View
         string :dataUrl
       end

data/app/views/json_ui/garage/forms/basic.json.jbuilder

@@ -3,7 +3,7 @@ json.title 'Forms'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
+  page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: json_padding_body, childViews: ->(form) do
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
     

data/app/views/json_ui/garage/forms/checkboxes.json.jbuilder

@@ -5,7 +5,7 @@ json_ui_page json do |page|
   
   page.scroll childViews: ->(scroll) do
 
-    scroll.panels_form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
+    scroll.panels_form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: json_padding_body, childViews: ->(form) do
       form.spacer height: 20
       form.h2 text: 'Check Group'
       form.fields_checkGroup name: 'user[skills][]', uncheckValue: 1, childViews: ->(group) do

data/app/views/json_ui/garage/forms/dynamic_select.json.jbuilder

@@ -3,7 +3,7 @@ json.title 'Forms'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
+  page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: json_padding_body, childViews: ->(form) do
     form.h2 text: 'Dynamic Select'
     form.spacer height: 6
 

data/app/views/json_ui/garage/forms/index.json.jbuilder

@@ -5,7 +5,7 @@ json_ui_page json do |page|
   
   page.list sections: [
     ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: json_padding_list, childViews: ->(header) do
         header.h2 text: 'Submission Logics'
       end
 
@@ -25,7 +25,7 @@ json_ui_page json do |page|
         
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: json_padding_list, childViews: ->(header) do
         header.h2 text: 'Form Fields'
       end
 
@@ -42,7 +42,7 @@ json_ui_page json do |page|
 
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: json_padding_list, childViews: ->(header) do
         header.h2 text: 'Web Only'
       end
 
@@ -53,7 +53,7 @@ json_ui_page json do |page|
         
       end
     end, ->(section) do
-      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+      section.header padding: json_padding_list, childViews: ->(header) do
         header.h2 text: 'Experimental (not required yet)'
       end
 

data/app/views/json_ui/garage/forms/pickers.json.jbuilder

@@ -3,7 +3,7 @@ json.title 'Forms'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
+  page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: json_padding_body, childViews: ->(form) do
     form.h2 text: 'Radio Group'
     form.spacer height: 6
     form.h4 text: 'Gender'
@@ -49,25 +49,4 @@ json_ui_page json do |page|
 
   end
 
-  
-  # scroll.panels_form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
-  #   form.spacer height: 20
-  #   form.h2 text: 'Radio Group'
-  #   form.spacer height: 6
-  #   form.h4 text: 'Gender'
-  #   form.fields_radioGroup name: 'user[gender]', childViews: ->(group) do
-  #     group.fields_radio value: 'M', label: 'Male'
-  #     group.fields_radio value: 'F', label: 'Female'
-  #   end
-
-  #   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-  # end
-  
-  # scroll.panels_form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
-  #   form.spacer height: 20
-  #   form.h2 text: 'Single Check'
-  #   form.fields_check name: 'user[employer]', value: 2, uncheckValue: 1, label: 'I am an employer'
-
-  #   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-  # end
 end

data/app/views/json_ui/garage/home/index.json.jbuilder

@@ -27,61 +27,3 @@ json_ui_page json do |page|
 
   end
 end
-
-# json_body_with_list json do
-#   json.rows do
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Pages'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'pages/index')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Lists'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'lists/index')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Forms'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'forms/index')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Panels'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'panels/index')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Views'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'views/index')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Actions'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'actions/index')
-#       end
-#     end
-#   end
-# end

data/app/views/json_ui/garage/lists/templating.json.jbuilder

@@ -10,7 +10,7 @@ json_ui_page json do |page|
 
     section.rows builder: ->(template) do
       template.thumbnail title: 'Click me', onClick: ->(action) do
-        action.dialogs_alert message: 'Perform action'
+        action.windows_openWeb url: 'https://www.google.com'
       end
       template.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle'
       template.thumbnail title: 'Item with thumbnail image', subtitle: 'Item subtitle', imageUrl: @sample_image_url

data/app/views/json_ui/garage/panels/card.json.jbuilder

@@ -3,8 +3,8 @@ json.title 'Panels'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.scroll backgroundColor: '#fafafa', padding: body_padding, childViews: ->(scroll) do
-    scroll.panels_card width: 'matchParent', padding: body_padding, childViews: ->(card) do
+  page.scroll backgroundColor: '#fafafa', padding: json_padding_body_this, childViews: ->(scroll) do
+    scroll.panels_card width: 'matchParent', padding: json_padding_body, childViews: ->(card) do
       card.h1 text: 'With Default Layout'
       card.spacer height: 6
       card.button text: 'Button1'
@@ -12,9 +12,9 @@ json_ui_page json do |page|
       card.button text: 'Button3'
     end
 
-    scroll.spacer height: 20
+    scroll.spacer height: 10
     
-    scroll.panels_card width: 'matchParent', padding: body_padding, childViews: ->(card) do
+    scroll.panels_card width: 'matchParent', padding: json_padding_body, childViews: ->(card) do
       card.h1 text: 'With Child Panel'
       card.spacer height: 6
       card.panels_horizontal backgroundColor: '#b3bac2', childViews: ->(panel) do

data/app/views/json_ui/garage/panels/custom.json.jbuilder

@@ -3,8 +3,9 @@ json.title 'Panels'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.scroll padding: body_padding, childViews: ->(scroll) do
-    scroll.panels_custom template: 'thumbnail', data: { title: 'Title' }
+  page.scroll padding: json_padding_body, childViews: ->(scroll) do
+    scroll.panels_custom template: 'thumbnail', data: { imageUrl: @sample_image_url, title: 'Title', subtitle: 'Subtitle' }
+    scroll.spacer height: 6
     scroll.panels_custom template: 'nonExistentTemplate'
   end
 end

data/app/views/json_ui/garage/panels/index.json.jbuilder

@@ -3,27 +3,65 @@ json.title 'Panels'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
   
-  page.list firstSection: ->(section) do
-    section.rows builder: ->(template) do
-      template.thumbnail title: 'Card', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/card')
-      end
-      template.thumbnail title: 'Vertical', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/vertical')
-      end
-      template.thumbnail title: 'Horizontal', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/horizontal')
-      end
-      template.thumbnail title: 'Split', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/split')
+
+  page.list sections: [
+    ->(section) do
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'Card', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/card')
+        end
+        template.thumbnail title: 'Vertical', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/vertical')
+        end
+        template.thumbnail title: 'Horizontal', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/horizontal')
+        end
+        template.thumbnail title: 'Split', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/split')
+        end
+        template.thumbnail title: 'Carousel', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/carousel')
+        end
+        template.thumbnail title: 'Custom', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/custom')
+        end
+        
       end
-      template.thumbnail title: 'Carousel', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/carousel')
+    end, ->(section) do
+      section.header padding: json_padding_list, childViews: ->(header) do
+        header.h2 text: 'Web Only'
       end
-      template.thumbnail title: 'Custom', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'panels/custom')
+
+      section.rows builder: ->(template) do
+        template.thumbnail title: 'Table', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'panels/table')
+        end
+        
       end
     end
+  ]
+
+  # page.list firstSection: ->(section) do
+  #   section.rows builder: ->(template) do
+  #     template.thumbnail title: 'Card', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/card')
+  #     end
+  #     template.thumbnail title: 'Vertical', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/vertical')
+  #     end
+  #     template.thumbnail title: 'Horizontal', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/horizontal')
+  #     end
+  #     template.thumbnail title: 'Split', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/split')
+  #     end
+  #     template.thumbnail title: 'Carousel', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/carousel')
+  #     end
+  #     template.thumbnail title: 'Custom', onClick: ->(action) do
+  #       action.windows_open url: json_ui_garage_url(path: 'panels/custom')
+  #     end
+  #   end
 
-  end
+  # end
 end

data/app/views/json_ui/garage/panels/table.json.jbuilder

@@ -0,0 +1,25 @@
+json.title 'Panels'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+  page.table firstSection: ->(section) do
+    section.header cellViews: ->(header) do
+      header.label text: 'Heading1'
+      header.label text: 'Heading2'
+      header.label text: 'Heading3'
+    end
+
+    items = [1, 2, 3]
+    section.rows objects: items, builder: ->(row, item, index) do
+      row.default cellViews: ->(cell) do
+        cell.label text: "Data #{item}"
+        cell.label text: "Data #{item}"
+        cell.label text: "Data #{item}"
+      end, onClick: ->(action) do
+        action.windows_openWeb url: 'https://www.google.com'
+      end
+    end
+  end
+
+end

data/app/views/json_ui/garage/views/basic.json.jbuilder

@@ -3,7 +3,30 @@ json.title 'Views'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.scroll padding: body_padding, childViews: ->(scroll) do
+  page.scroll padding: json_padding_body, childViews: ->(scroll) do
+    scroll.h1 text: 'Heading 1'
+
+    scroll.spacer height: 10
+    scroll.h2 text: 'Heading 2'
+    
+    scroll.spacer height: 10
+    scroll.h3 text: 'Heading 3'
+
+    scroll.spacer height: 10
+    scroll.h4 text: 'Heading 4'
+    
+    scroll.spacer height: 10
+    scroll.label text: 'Label'
+    
+    scroll.spacer height: 20
+    scroll.hr width: 'matchParent'
+    scroll.spacer height: 20
+
+    scroll.h2 text: 'Chip'
+    scroll.spacer height: 6
+    scroll.chip text: 'pending'
+
+    scroll.spacer height: 20
     scroll.h2 text: 'Map'
     scroll.spacer height: 6
     scroll.map width: 'matchParent', latitude: 13.4837, longitude: 144.7917, zoom: 11, height: 250, dataUrl: json_ui_garage_url(path: 'views/map_data')

data/app/views/json_ui/garage/views/images.json.jbuilder

@@ -3,7 +3,7 @@ json.title 'Views'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.scroll padding: body_padding, childViews: ->(scroll) do
+  page.scroll padding: json_padding_body, childViews: ->(scroll) do
     scroll.h2 text: 'Avatar'
     scroll.spacer height: 6
     scroll.avatar url: 'https://www.wpjournalist.nl/wp-content/uploads/2019/03/avatar-jongen-voorbeeld-1.jpg'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - ''
@@ -83,6 +83,7 @@ files:
 - app/views/json_ui/garage/panels/horizontal.json.jbuilder
 - app/views/json_ui/garage/panels/index.json.jbuilder
 - app/views/json_ui/garage/panels/split.json.jbuilder
+- app/views/json_ui/garage/panels/table.json.jbuilder
 - app/views/json_ui/garage/panels/vertical.json.jbuilder
 - app/views/json_ui/garage/views/basic.json.jbuilder
 - app/views/json_ui/garage/views/calendar_data.json.jbuilder