glib-web 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f28df42b84aa95f3f0b7a62edc043922c794088b
-  data.tar.gz: 15fcac1a3f3ff687de3282bec0e8cbe6b5cdc633
+  metadata.gz: c83072e2914de9cfd87a8186b2cedab3845c0e93
+  data.tar.gz: b6bdb92718c15e224f7036eaa8c7097938bb286f
 SHA512:
-  metadata.gz: 1c5964f043ccf8d63df46718435865515652e7d484b01decb790bce8eacc49812dc3e348c92fbcd446077869764991f604a97dbc0254128ca2da200007eb145a
-  data.tar.gz: 68be8065f0f8d9f1b18e142643c7355d91d8e5b6be608958abb5ad30c9e0f0619b1b9d0353c3014c39b5eddf4cd41670cf8cff58c1ceeb23e3ecbf430c3856e9
+  metadata.gz: 9dec1a9494b9fa83d8b354609f0fb47b0996be052b3192cb8e286fc7ae6737110a586f8b2764b8b042f02635f0ab8135bfe19891bebc057165543ad5f7e4af51
+  data.tar.gz: 0122da0480a928e4b3ad046223fefa581e2c27d1fef0cb36635d62917164b92330ec0e095dd13827a738f2ca88552d63b1ff77167ce2b3b7bfead67d350d67f2

data/app/controllers/concerns/application/json/ui.rb

@@ -56,16 +56,6 @@ module Concerns::Application::Json::Ui
 
   private
 
-  # TODO: Remove. Deprecated
-  def __json_ui_mdc(hash)
-    prepend_view_path 'app/views/json_ui/mdc'
-    if (next_action = hash['onResponse']).is_a?(Hash)
-      response.body = render_to_string(file: 'renderer.js', layout: false, content_type: 'text/javascript', locals: { response: next_action })
-    else
-      response.body = render_to_string(file: 'renderer.html', layout: false, content_type: 'text/html', locals: { page: hash })
-    end
-  end
-
   def __json_ui_vue(hash, renderer_path)
     @__json_ui_orig_page = response.body
     response.body = render_to_string(file: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash })

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

@@ -13,6 +13,26 @@ module Glib
         icon :icon
         action :onClick
         bool :disabled
+
+        def created
+          json.type 'button'
+        end
+      end
+      
+      class Divider < MenuItem
+        # Override
+        def created
+          json.type 'divider'
+        end
+      end
+      
+      class Label < MenuItem
+        string :text
+        
+        # Override
+        def created
+          json.type 'label'
+        end
       end
     end
   end

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

@@ -50,6 +50,7 @@ module Glib
         icon :icon
         string :text
         action :onClick
+        color :color
       end
 
       class Fab < View

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

@@ -47,8 +47,9 @@ class Glib::JsonUi::ViewBuilder
     class Hidden < Text
     end
 
-    class CheckGroup < View
-      string :name
+    # class CheckGroup < View
+      class CheckGroup < AbstractField
+      # string :name
       views :childViews
       string :uncheckValue
     end
@@ -76,12 +77,22 @@ class Glib::JsonUi::ViewBuilder
       bool :multiple
     end
 
+    class DynamicSelect < AbstractField
+      array :selectedOptions
+      string :url
+      bool :multiple
+      
+      # Override
+      def value(value)
+        raise "Use selectedOptions instead (for clarity)"
+      end
+    end
+
     class RadioGroup < View
       string :name
       views :childViews
     end
 
-    # TODO: Support array props
     class Radio < View
       string :label
       string :value

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

@@ -3,12 +3,21 @@ class Glib::JsonUi::ViewBuilder
     class Form < View
       # boolean :local
 
+      def is_association?(prop)
+        @model.class.reflect_on_association(prop)
+      end
+
       def field_name(prop)
-        "#{@model_name}[#{prop}]"
+        suffix = is_association?(prop) ? '[]' : ''
+        "#{@model_name}[#{prop}]#{suffix}"
       end
 
       def field_value(prop)
-        @model.send(prop)
+        if is_association?(prop)
+          @model.send(prop).map { |record| record.id }
+        else
+          @model.send(prop)
+        end
       end
 
       def url(url)
@@ -131,5 +140,10 @@ class Glib::JsonUi::ViewBuilder
       views :childViews
     end
 
+    class Custom < View
+      string :template
+      hash :data
+    end
+
   end
 end

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

@@ -4,17 +4,12 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
   page.leftDrawer content: ->(drawer) do
     drawer.header childViews: ->(header) do
       header.h1 text: 'App', onClick: ->(action) do
-        # action.windows_open url: json_ui_garage_url
         action.windows_open url: root_url
       end
     end
   
     drawer.rows builder: ->(menu) do
   
-      menu.button text: 'Menu', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url
-      end
-  
       menu.button text: 'Pages', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/index')
       end
@@ -38,7 +33,14 @@ if local_assigns[:top_nav] || json_ui_app_is_web?
       menu.button text: 'Actions', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'actions/index')
       end
+
+      menu.divider
+      menu.label text: 'Misc Menu'
       
+      menu.button text: 'Categories', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url
+      end
+  
       menu.button text: 'Diagnostics', onClick: ->(action) do
         action.dialogs_alert message: %{
           Bundle ID: #{json_ui_app_bundle_id || '<unknown>'}

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

@@ -0,0 +1,23 @@
+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
+    form.h2 text: 'Dynamic Select'
+    form.spacer height: 6
+
+    form.fields_dynamicSelect name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language',
+      # value: 'id3',
+      selectedOptions: [ { value: 'id3', text: 'Item 3' } ],
+      url: json_ui_garage_url(path: 'forms/dynamic_select_data')
+
+    form.fields_dynamicSelect name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', 
+      # value: ['id3', 'id5'], multiple: true,
+      selectedOptions: [ { value: 'id3', text: 'Item 3' }, { value: 'id5', text: 'Item 5' } ],
+      url: json_ui_garage_url(path: 'forms/dynamic_select_data'),
+      multiple: true
+
+    form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+  end
+end

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

@@ -0,0 +1,40 @@
+
+sleep 0.5
+
+page = params[:page].to_i
+if page < 2
+  json.nextPageUrl json_ui_garage_url(path: 'forms/dynamic_select_data', page: page + 1)
+end
+
+json.rows do
+
+  count_per_page = 20
+  count_per_page.times do |i|
+    json.child! do
+      index = page * count_per_page + i
+      json.template 'thumbnail'
+      json.title "City #{index}"
+      json.subtitle "State #{index}"
+      json.subsubtitle "Country #{index}"
+      json.value "id#{index}"
+      json.text "Item #{index}"
+    end
+  end
+
+  # languages = {
+  #   'zh-HK' => 'Hong Kong',
+  #   'zh-TW' => 'Taiwan',
+  #   'zh-CN' => 'China',
+  #   'ja-JP' => 'Japan',
+  #   'ko-KR' => 'Korea',
+  #   'ru-RU' => 'Russian',
+  #   'en-PH' => 'Philippines'
+  # }
+  # languages.each do |k, v|
+  #   json.child! do
+  #     json.value k
+  #     json.text v
+  #   end
+  # end
+
+end

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

@@ -13,7 +13,7 @@ json_ui_page json do |page|
         template.thumbnail title: 'Basic', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/basic')
         end
-        template.thumbnail title: 'Pickers (TODO: web, ios, android)', onClick: ->(action) do
+        template.thumbnail title: 'Pickers (TODO: ios, android)', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/pickers')
         end
         template.thumbnail title: 'Checkboxes', onClick: ->(action) do
@@ -53,6 +53,9 @@ json_ui_page json do |page|
         template.thumbnail title: 'Rich Text Editor', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/rich_text')
         end
+        template.thumbnail title: 'Dynamic Select', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/dynamic_select')
+        end
         
       end
     end

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

@@ -0,0 +1,19 @@
+json.title 'Lists'
+
+json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+  page.list firstSection: ->(section) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Click menu (web) or swipe left (Android/iOS)', editButtons: ->(menu) do
+        menu.button text: 'Edit', onClick: ->(action) do
+          action.dialogs_alert message: 'Perform action'
+        end
+        menu.button text: 'Delete', onClick: ->(action) do
+          action.dialogs_alert message: 'Perform action'
+        end
+      end
+    end
+
+  end
+end

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

@@ -8,6 +8,9 @@ json_ui_page json do |page|
       template.thumbnail title: 'Templating', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/templating')
       end
+      template.thumbnail title: 'Edit Actions', onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'lists/edit_actions')
+      end
       template.thumbnail title: 'Infinite Scroll', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/infinite_scroll')
       end

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: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(scroll) do
-    scroll.panels_card width: 'matchParent', padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(card) do
+  page.scroll backgroundColor: '#fafafa', padding: body_padding, childViews: ->(scroll) do
+    scroll.panels_card width: 'matchParent', padding: body_padding, childViews: ->(card) do
       card.h1 text: 'With Default Layout'
       card.spacer height: 6
       card.button text: 'Button1'
@@ -14,7 +14,7 @@ json_ui_page json do |page|
 
     scroll.spacer height: 20
     
-    scroll.panels_card width: 'matchParent', padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(card) do
+    scroll.panels_card width: 'matchParent', padding: body_padding, 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

@@ -0,0 +1,10 @@
+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' }
+    scroll.panels_custom template: 'nonExistentTemplate'
+  end
+end

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

@@ -20,6 +20,9 @@ json_ui_page json do |page|
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - ''
@@ -52,6 +52,8 @@ files:
 - app/views/json_ui/garage/forms/basic.json.jbuilder
 - app/views/json_ui/garage/forms/basic_post.json.jbuilder
 - app/views/json_ui/garage/forms/checkboxes.json.jbuilder
+- app/views/json_ui/garage/forms/dynamic_select.json.jbuilder
+- 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/generic_post.json.jbuilder
@@ -65,6 +67,7 @@ files:
 - app/views/json_ui/garage/forms/text_validation.json.jbuilder
 - app/views/json_ui/garage/home/index.json.jbuilder
 - app/views/json_ui/garage/lists/_infinite_scroll_section.json.jbuilder
+- app/views/json_ui/garage/lists/edit_actions.json.jbuilder
 - app/views/json_ui/garage/lists/index.json.jbuilder
 - app/views/json_ui/garage/lists/infinite_scroll.json.jbuilder
 - app/views/json_ui/garage/lists/templating.json.jbuilder
@@ -75,6 +78,7 @@ files:
 - app/views/json_ui/garage/pages/tab_bar.json.jbuilder
 - app/views/json_ui/garage/panels/card.json.jbuilder
 - app/views/json_ui/garage/panels/carousel.json.jbuilder
+- app/views/json_ui/garage/panels/custom.json.jbuilder
 - 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