glib-web 0.13.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c216d9d31f88411766f7e38ec86bf4e993032c487562a33728a972587ee5a8ad
-  data.tar.gz: fb975c7d55c06b0db38dba2df8c2756ba62d6b79a13d678d36901cd590428872
+  metadata.gz: a291c995ace4d47df8d25452fb05610864b635e2b9d5389cc8355350d3deef22
+  data.tar.gz: 74ae4397312a86bca319d08e21f06d166d27ac98e4e5bb7181e8d18877a70eed
 SHA512:
-  metadata.gz: f406a24519cf923a5603a53f77a6ad68dcecfcb3408ef902833f8022de5463d76b4670c450173917d4690c63e34935b9883c2f3b6924c54101764155ab41a289
-  data.tar.gz: e284fe2ac21627346f026b5c520152b466fb9a1b155ec44a70d55222d297c390c6916d40c4d48db300002f93617c2466288377e9ad8aa4ca960c0d098427cfcb
+  metadata.gz: 87a1ba8c343d1bd48978452a14ede6ee419cfe7694eb5935c72ae3437e4077264d29a15dc23f049fddbc9c6bf6f3d4622904cd534fbef509c3b67f332420084e
+  data.tar.gz: 99894f959d190a9ce3c515b5a4c9bece814e59ffa87826f69675c78f6592ec1400f387f7d7226c7bc9d236ec0e705c77c45ce9d7d9d1502c3177bc65068f1266

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

@@ -129,13 +129,7 @@ module Glib
 
         def self.color(propName)
           define_method(propName) do |value|
-            if (value = value&.to_s)
-              if !Rails.env.production?
-                if !value.match /^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
-                  raise "Invalid color: #{value}"
-                end
-              end
-
+            if (value = to_color(value))
               json.set! propName, value
             end
           end
@@ -162,7 +156,7 @@ module Glib
 
         def self.string(propName, options = {})
           define_method(propName) do |value|
-            str = value&.to_s
+            str = to_string(value)
             instance_variable_set("@#{propName}", str) if options[:cache]
             json.set! propName, str
           end
@@ -264,6 +258,15 @@ module Glib
           end
         end
 
+        def self.badgeable
+          define_method(:badge) do |value|
+            json.badge do
+              json.text to_string(value[:text])
+              json.backgroundColor to_color(value[:backgroundColor])
+            end
+          end
+        end
+
         def self.action(propName)
           define_method(propName) do |value|
             json.set!(propName) { value.call(page.action_builder) }
@@ -318,6 +321,26 @@ module Glib
           # To be overridden
         end
 
+        ### Reusable value converters
+
+        def to_string(value)
+          value&.to_s
+        end
+
+        def to_color(value)
+          value = value&.to_s
+
+          if value
+            if !Rails.env.production?
+              if !value.match /^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i
+                raise "Invalid color: #{value}"
+              end
+            end
+          end
+
+          value
+        end
+
     end
   end
 end

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

@@ -39,12 +39,12 @@ module Glib
       end
 
       class Button < MenuItem
+        badgeable
+
         string :text
         icon :icon
         action :onClick
         bool :disabled
-        color :badgeColor
-        string :badgeContent
         singleton_array :styleClass, :styleClasses
 
         def childButtons(block)

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

@@ -16,25 +16,18 @@ module Glib
         end
 
         json.onResponse do
-          response = Response.new(json, self, true)
+          response = Glib::JsonUi::PageHelper::Page.new(json, self)
           yield response.action_builder
         end
       end
 
       class Response
-        attr_reader :action_builder, :view_builder, :list_section_builder, :table_section_builder, :current_form
+        attr_reader :action_builder
 
-        def initialize(json, context, with_view_builder = false)
+        def initialize(json, context)
           @json = json
           @context = context
-
           @action_builder = ActionBuilder.new(json, self, false)
-
-          if with_view_builder
-            @view_builder = ViewBuilder.new(json, self, true)
-            @list_section_builder = ListBuilders::Section.new(json, self, ListBuilders::Template.new(json, self))
-            @table_section_builder = TableBuilders::Section.new(json, self, TableBuilders::Template.new(json, self))
-          end
         end
       end
     end

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

@@ -127,6 +127,8 @@ module Glib
       end
 
       class Image < View
+        badgeable
+
         string :url
         string :base64Data
         action :onClick
@@ -134,12 +136,16 @@ module Glib
       end
 
       class Avatar < View
+        badgeable
+
         int    :size
         string :url
         action :onClick
       end
 
       class Icon < View
+        badgeable
+
         # TODO: Remove later. Deprecated.
         icon :spec
 
@@ -171,6 +177,8 @@ module Glib
       # end
 
       class Button < View
+        badgeable
+
         icon :icon, cache: true
         string :text, cache: true
         action :onClick
@@ -207,11 +215,10 @@ module Glib
       end
 
       class Chip < View
+        badgeable
+
         string :text
         action :onClick
-
-        string :badgeContent
-        color :badgeColor
       end
 
       class Calendar < View

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

@@ -52,13 +52,11 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
         action.windows_open url: json_ui_garage_url
       end
 
-      menu.button icon: 'refresh', text: 'Reload', onClick: ->(action) do
+      menu.button icon: 'refresh', text: 'Reload', badge: { text: '!' }, onClick: ->(action) do
         action.windows_reload
       end
 
-      # Consider deprecating icon badge
-      # menu.button icon: { name: 'zoom_in', badge: '!' }, text: 'Diagnostics', onClick: ->(action) do
-      menu.button icon: 'zoom_in', text: 'Diagnostics', badgeContent: '!', onClick: ->(action) do
+      menu.button icon: { name: 'zoom_in', badge: { text: '?', backgroundColor: '#00ffff' } }, text: 'Diagnostics', onClick: ->(action) do
         action.dialogs_alert message: %{
           Bundle ID: #{json_ui_app_bundle_id || '<unknown>'}
           App Version: #{json_ui_app_build_version || '<unknown>'}

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

@@ -0,0 +1,19 @@
+json.title 'Forms'
+
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+# The form will be automatically injected into the window.
+#page.template 'full_window_form'
+
+# TODO: This needs to produce page-level form attributes
+page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, childViews: ->(form) do
+  # page.scroll padding: glib_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'
+end
+
+page.footer padding: glib_json_padding_body, backgroundColor: '#b3bac2', childViews: ->(footer) do
+  footer.fields_submit text: 'Submit'
+end

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

@@ -91,6 +91,11 @@ page.list sections: [
         action.windows_open url: json_ui_garage_url(path: 'forms/styled_boxes')
       end
     end
+    # section.rows builder: ->(template) do
+    #   template.thumbnail title: 'Full Window', onClick: ->(action) do
+    #     action.windows_open url: json_ui_garage_url(path: 'forms/full_window_form')
+    #   end
+    # end
   end, ->(section) do
     section.header padding: glib_json_padding_list, childViews: ->(header) do
       header.h2 text: 'Web Only'

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

@@ -49,7 +49,7 @@ page.scroll childViews: ->(scroll) do
         end
 
       form.spacer height: 20
-      form.h1 text: 'Radio Group'
+      form.h2 text: 'Radio Group'
       form.fields_radioGroup \
         name: 'user[seniority]',
         value: 'show',
@@ -65,6 +65,18 @@ page.scroll childViews: ->(scroll) do
           end
         end
 
+      form.spacer height: 20
+      form.h2 text: 'Text'
+      form.fields_text \
+        name: 'user[video_url]',
+        width: 'matchParent',
+        onChange: ->(action) do
+          action.sheets_select message: 'Submit data?', buttons: ->(menu) do
+            menu.button text: 'Yes, submit', onClick: ->(subaction) do
+              action.forms_submit
+            end
+          end
+        end
     end
 
 end

data/app/views/json_ui/garage/pages/full_width.json.jbuilder

@@ -1,29 +1,29 @@
 json.title 'Pages'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
+page = json_ui_page json
 
-  page.template 'fullWidth'
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  page.header childViews: ->(header) do
-    header.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
-      vertical.h1 text: 'Header'
-    end
-    header.spacer height: 10
+page.template 'fullWidth'
+
+page.header childViews: ->(header) do
+  header.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
+    vertical.h1 text: 'Header'
   end
+  header.spacer height: 10
+end
 
-  page.footer childViews: ->(footer) do
-    footer.spacer height: 10
-    footer.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
-      vertical.h1 text: 'Footer'
-    end
+page.footer childViews: ->(footer) do
+  footer.spacer height: 10
+  footer.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
+    vertical.h1 text: 'Footer'
   end
+end
 
-  page.body childViews: ->(scroll) do
-    scroll.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
-      (1..100).each do |index|
-        vertical.label text: 'Content'
-      end
+page.body childViews: ->(scroll) do
+  scroll.panels_vertical width: 'matchParent', styleClass: 'card', padding: glib_json_padding_body, childViews: ->(vertical) do
+    (1..100).each do |index|
+      vertical.label text: 'Content'
     end
   end
 end

data/app/views/json_ui/garage/pages/tab_bar.json.jbuilder

@@ -7,6 +7,20 @@ json_ui_page json do |page|
     scroll.panels_column lg: { cols: 8 }, childViews: ->(column) do
       column.h2 text: 'Tab Bar with Badge'
       column.tabBar buttons: ->(menu) do
+        badges = [
+          {
+            text: nil,
+            backgroundColor: nil
+          },
+          {
+            text: 8,
+            backgroundColor: '#272551'
+          },
+          {
+            text: '⭐⭐⭐',
+            backgroundColor: '#008000'
+          }
+        ]
         {
           'FIRST' => 'home',
           'SECOND' => 'schedule',
@@ -15,8 +29,7 @@ json_ui_page json do |page|
           menu.button \
             icon: icon,
             text: text,
-            badgeContent: [nil, 8, '⭐⭐⭐'][index],
-            badgeColor: [nil, '#272551', '#008000'][index],
+            badge: badges[index],
             disabled: params[:tab].to_i == index,
             onClick: ->(action) do
               action.windows_reload \

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

@@ -19,7 +19,7 @@ json_ui_page json do |page|
     scroll.h2 text: 'With select options'
     scroll.spacer height: 6
     scroll.banners_select width: 'matchParent', icon: 'info', message: 'This is a select banner', buttons: ->(menu) do
-      menu.button icon: 'add', text: 'Add', badgeContent: 80, onClick: ->(action) do
+      menu.button icon: 'add', text: 'Add', badge: { text: 80 }, onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'home/blank')
       end
       menu.button icon: 'edit', text: 'Edit', onClick: ->(action) do
@@ -33,7 +33,7 @@ json_ui_page json do |page|
         submenu.button \
           icon: 'add',
           text: 'Option1',
-          badgeContent: 3,
+          badge: { text: 3 },
           onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'home/blank')
         end

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

@@ -11,13 +11,20 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     action.dialogs_alert message: 'Perform action'
   end
 
-  scroll.button text: 'Buton with build-in classes', styleClasses: ['rounded', 'outlined', 'tile', 'depressed'], onClick: ->(action) do
+  scroll.spacer height: 10
+  scroll.button text: 'Button with built-in classes', styleClasses: ['rounded', 'outlined', 'tile', 'depressed'], onClick: ->(action) do
     action.dialogs_alert message: 'Perform action'
   end
 
-  scroll.button icon: 'info', text: 'Button with Icon and Tooltip', tooltip: { text: 'Tooltip text' }, onClick: ->(action) do
-    action.dialogs_alert message: 'Perform action'
-  end
+  scroll.spacer height: 10
+  scroll.button \
+    icon: 'info',
+    text: 'Button with Icon and Tooltip',
+    tooltip: { text: 'Tooltip text' },
+    badge: { text: '3' },
+    onClick: ->(action) do
+      action.dialogs_alert message: 'Perform action'
+    end
   scroll.spacer height: 20
 
   scroll.button \
@@ -38,7 +45,7 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     action.dialogs_alert message: 'Perform action'
   end
   scroll.spacer height: 10
-  scroll.chip text: 'With Badge', badgeContent: '99'
+  scroll.chip text: 'With Badge', badge: { text: '99' }
 
   scroll.spacer height: 20
   scroll.h2 text: 'Switch'

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

@@ -12,4 +12,8 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.h2 text: 'Icon with color'
   scroll.icon name: 'home', color: '#9370DB'
   scroll.icon name: 'home', color: '#9370DB80'
+
+  scroll.spacer height: 20
+  scroll.h2 text: 'Icon with badge'
+  scroll.icon name: 'home', badge: { text: '22', backgroundColor: '#00ff00' }
 end

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

@@ -13,10 +13,11 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
     url: glib_json_image_avatar_url,
     tooltip: { text: 'This is a tooltip' }
 
-  # scroll.spacer height: 20
-  # scroll.h2 text: 'Icon'
-  # scroll.spacer height: 6
-  # scroll.icon spec: 'info'
+  scroll.h2 text: 'Avatar with badge'
+  scroll.spacer height: 6
+  scroll.avatar \
+    url: glib_json_image_avatar_url,
+    badge: { text: '1', backgroundColor: '#0000ff' }
 
   scroll.spacer height: 20
   scroll.h2 text: 'Image with base64 data'
@@ -46,9 +47,9 @@ page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.image url: glib_json_image_standard_url
 
   scroll.spacer height: 20
-  scroll.h2 text: 'Original size'
+  scroll.h2 text: 'Original size with badge'
   scroll.spacer height: 6
-  scroll.image url: small_image_url
+  scroll.image url: small_image_url, badge: { text: '1', backgroundColor: '#0000ff' }
 
   # Reference: https://docs.imgix.com/apis/url/size/fit#clip
   scroll.spacer height: 20

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.3
 platform: ruby
 authors:
 - ''
@@ -153,6 +153,7 @@ files:
 - app/views/json_ui/garage/forms/dynamic_select_data.json.jbuilder
 - app/views/json_ui/garage/forms/file_upload.json.jbuilder
 - app/views/json_ui/garage/forms/floating_submit.json.jbuilder
+- app/views/json_ui/garage/forms/full_window_form.json.jbuilder
 - app/views/json_ui/garage/forms/generic_post.json.jbuilder
 - app/views/json_ui/garage/forms/index.json.jbuilder
 - app/views/json_ui/garage/forms/local_request.json.jbuilder