glib-web 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c83072e2914de9cfd87a8186b2cedab3845c0e93
-  data.tar.gz: b6bdb92718c15e224f7036eaa8c7097938bb286f
+  metadata.gz: 07f4814b44f64585a3862468a56d2c645eee1b5a
+  data.tar.gz: 8f56b831228ffe905f9d46335f95b4e5199bcac3
 SHA512:
-  metadata.gz: 9dec1a9494b9fa83d8b354609f0fb47b0996be052b3192cb8e286fc7ae6737110a586f8b2764b8b042f02635f0ab8135bfe19891bebc057165543ad5f7e4af51
-  data.tar.gz: 0122da0480a928e4b3ad046223fefa581e2c27d1fef0cb36635d62917164b92330ec0e095dd13827a738f2ca88552d63b1ff77167ce2b3b7bfead67d350d67f2
+  metadata.gz: 3f9752a9758a0674b3d7d889c35f34633f1ee021b1a8b3e6300677b38f4144d24731febb05606902af1a90237638a68808c597683f3a9fe96442f36853ce39a1
+  data.tar.gz: c7e4bc6af22642572c2ba7c65dfcea6c57e0e229ce1031acfdbdd8f6eb109cb543ca0f38b80caaa03c23b71b8a70f76c6eb90da555edb4aa5f2e587380c339b9

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

@@ -47,9 +47,7 @@ class Glib::JsonUi::ViewBuilder
     class Hidden < Text
     end
 
-    # class CheckGroup < View
-      class CheckGroup < AbstractField
-      # string :name
+    class CheckGroup < AbstractField
       views :childViews
       string :uncheckValue
     end
@@ -98,47 +96,11 @@ class Glib::JsonUi::ViewBuilder
       string :value
     end
 
-    # TODO: Use the array props above to implement `value` property
     class File < Text
-      # string :value
-      
-      # def value(value)
-      #   # @value = value if value != Glib::Value::DEFAULT
-      # end
-      
-      # def prop(prop)
-      #   super
-
-      #   @value ||= form.field_value(prop)
-
-      #   # if (form = page.current_form)
-      #   #   @name ||= form.field_name(prop)
-      #   #   @value ||= form.field_value(prop)
-      #   # end
-      # end
-
       hash :accepts
       string :directUploadUrl
-      # int :file_size_limit
-      # string :file_size_limit_alert_text
-
-      
-      def blob(active_storage_blob)
-        value(active_storage_blob.signed_id)
-        fileUrl(active_storage_blob.key)
-
-        # Avoid returning active_storage_blob.filename for privacy reason
-        fileTitle(active_storage_blob.created_at)
-      end
-
-      # Rename
-      def fileTitle(file_title)
-        json.fileTitle file_title
-      end
-      
-      def fileUrl(file_url)
-        json.fileUrl file_url
-      end
+      string :fileUrl
+      string :fileTitle
     end
 
     class Date < AbstractField

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

@@ -0,0 +1,7 @@
+info = "Submitted information:\n{\n"
+params.require(:user).each do |k, v|
+  value = v.is_a?(String) ? '"' + v + '"' : v
+  info += "  #{k} => #{value}\n"
+end
+info += "}"
+action.dialogs_alert message: info

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

@@ -3,6 +3,6 @@ json_ui_response json do |action|
   if !name.present?
     action.dialogs_alert message: 'Please enter name'
   else
-    action.dialogs_alert message: "Submitted information: #{params.require(:user).values.join(", ")}"
+    render "#{@path_prefix}/forms/alert_post_data", action: action
   end
 end

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

@@ -4,18 +4,6 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: 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
-      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
@@ -32,108 +20,5 @@ json_ui_page json do |page|
       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
-
-  
-  # form.spacer height: 20
-  # form.h2 text: 'Radio/Check'
-  # 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
-
-  # page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
-  #   # form.h2 text: 'Select'
-  #   # form.spacer height: 6
-  #   # languages = {
-  #   #   'zh-HK' => 'Hong Kong',
-  #   #   'zh-TW' => 'Taiwan',
-  #   #   'zh-CN' => 'China',
-  #   #   'ja-JP' => 'Japan',
-  #   #   'ko-KR' => 'Korea',
-  #   #   'ru-RU' => 'Russian',
-  #   #   'en-PH' => 'Philippines'
-  #   # }
-  #   # form.fields_select name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language', options: languages.map { |k, v| { value: k, text: v } }, value: 'ja-JP'
-  #   # form.fields_select name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', options: languages.map { |k, v| { value: k, text: v } }, value: ['ja-JP', 'ko-KR'], multiple: true
-
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Date/Time'
-  #   # form.spacer height: 6
-  #   # form.fields_date name: 'user[date]', width: 'matchParent', label: 'Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01'
-  #   # form.fields_datetime name: 'user[date_time]', width: 'matchParent', label: 'Date Time', min: '2018-06-09T00:00', max: '2018-06-17T00:00', value: '2018-06-15T19:30'
-    
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Radio/Check'
-  #   # 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.fields_check name: 'user[skills][]', value: 1, label: 'Game Development'
-  #   form.fields_check name: 'user[skills][]', value: 2, label: 'Web Development'
-  #   form.fields_check name: 'user[skills][]', value: 3, label: 'Mobile Development'
-
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Map'
-  #   # form.spacer height: 6
-  #   # form.fields_latLong name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
-  #   #   latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
-  #   #   longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
-
-  #   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-  # end
-  
-  # page.form url: json_ui_garage_url(path: 'forms/generic_post'), method: 'post', padding: body_padding, childViews: ->(form) do
-  #   # form.h2 text: 'Select'
-  #   # form.spacer height: 6
-  #   # languages = {
-  #   #   'zh-HK' => 'Hong Kong',
-  #   #   'zh-TW' => 'Taiwan',
-  #   #   'zh-CN' => 'China',
-  #   #   'ja-JP' => 'Japan',
-  #   #   'ko-KR' => 'Korea',
-  #   #   'ru-RU' => 'Russian',
-  #   #   'en-PH' => 'Philippines'
-  #   # }
-  #   # form.fields_select name: 'user[primary_language]', width: 'matchParent', label: 'Primary Language', options: languages.map { |k, v| { value: k, text: v } }, value: 'ja-JP'
-  #   # form.fields_select name: 'user[preferred_languages][]', width: 'matchParent', label: 'Preferred Languages', options: languages.map { |k, v| { value: k, text: v } }, value: ['ja-JP', 'ko-KR'], multiple: true
-
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Date/Time'
-  #   # form.spacer height: 6
-  #   # form.fields_date name: 'user[date]', width: 'matchParent', label: 'Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01'
-  #   # form.fields_datetime name: 'user[date_time]', width: 'matchParent', label: 'Date Time', min: '2018-06-09T00:00', max: '2018-06-17T00:00', value: '2018-06-15T19:30'
-    
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Radio/Check'
-  #   # 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.fields_check name: 'user[skills][]', value: 1, label: 'Game Development'
-  #   form.fields_check name: 'user[skills][]', value: 2, label: 'Web Development'
-  #   form.fields_check name: 'user[skills][]', value: 3, label: 'Mobile Development'
-
-  #   # form.spacer height: 20
-  #   # form.h2 text: 'Map'
-  #   # form.spacer height: 6
-  #   # form.fields_latLong name: 'user[address]', width: 'matchParent', label: 'Type an address', value: 'Sydney Harbour Bridge',
-  #   #   latitudeField: { name: 'user[latitude]', label: 'Lat', value: -33.8523063, readOnly: true },
-  #   #   longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
-
-  #   form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-  # end
 end

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

@@ -12,11 +12,11 @@ json_ui_page json do |page|
   page.form options.merge(childViews: ->(form) do
     rules1 = { fileType: "image/*", maxFileSize: 5000 }
     rules2 = { fileType: "image/*", maxFileSize: 1, fileTypeErrorText: 'Invalid!', maxFileSizeErrorText: 'Too big!' }
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_path, 
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules1, directUploadUrl: rails_direct_uploads_url, 
       value: 'eyJfcmFpbHMiOnsibWVzc2FnZSI6IkJBaHBFQT09IiwiZXhwIjpudWxsLCJwdXIiOiJibG9iX2lkIn19--193dc0d939b9558fc4973fafbba91d989cbb04d4',
       fileUrl: 'https://imageserver-demo.herokuapp.com/image/itinerarybuilder-demo/o6CKzNt67PWnkPdUEnWMt7pr?h=100&w=100',
       fileTitle: '1 month ago'
-    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules2, directUploadUrl: rails_direct_uploads_path
+    form.fields_file name: 'user[photo][]', width: 'matchParent', label: 'Photo', accepts: rules2, directUploadUrl: rails_direct_uploads_url
     form.button text: 'Submit', onClick: ->(action) { action.forms_submit }
   end)
 end

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

@@ -1,3 +1,3 @@
 json_ui_response json do |action|
-  action.dialogs_alert message: "Submitted information: #{params.require(:user).values.join(", ")}"
+  render "#{@path_prefix}/forms/alert_post_data", action: action
 end

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

@@ -6,19 +6,33 @@ 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
-        header.h2 text: 'Form Fields'
+        header.h2 text: 'Submission Logics'
       end
 
       section.rows builder: ->(template) do
-        template.thumbnail title: 'Basic', onClick: ->(action) do
+        template.thumbnail title: 'Basic Logic', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/basic')
         end
+        template.thumbnail title: "Submission Flow (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/submission_flow')
+        end
+        template.thumbnail title: "Submission Indicator", onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/submission_indicator')
+        end
+        template.thumbnail title: 'Text Validation - TODO: web, ios, android', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/text_validation')
+        end
+        
+      end
+    end, ->(section) do
+      section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
+        header.h2 text: 'Form Fields'
+      end
+
+      section.rows builder: ->(template) 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
-          action.windows_open url: json_ui_garage_url(path: 'forms/checkboxes')
-        end
         template.thumbnail title: 'File Upload', onClick: ->(action) do
           action.windows_open url: json_ui_garage_url(path: 'forms/file_upload')
         end
@@ -29,33 +43,27 @@ json_ui_page json do |page|
       end
     end, ->(section) do
       section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
-        header.h2 text: 'Submission Logics'
+        header.h2 text: 'Web Only'
       end
 
       section.rows builder: ->(template) do
-        template.thumbnail title: "Submission Flow (timestamp: #{DateTime.current.to_i})", onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'forms/submission_flow')
-        end
-        template.thumbnail title: "Submission Indicator", onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'forms/submission_indicator')
-        end
-        template.thumbnail title: 'Text Validation - TODO: web, ios, android', onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'forms/text_validation')
+        template.thumbnail title: 'Rich Text Editor', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/rich_text')
         end
         
       end
     end, ->(section) do
       section.header padding: { top: 12, bottom: 12, left: 16, right: 16 }, childViews: ->(header) do
-        header.h2 text: 'Web Only'
+        header.h2 text: 'Experimental (not required yet)'
       end
 
       section.rows builder: ->(template) do
-        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
+        template.thumbnail title: 'Checkboxes', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'forms/checkboxes')
+        end
         
       end
     end

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

@@ -4,6 +4,20 @@ 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: '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.spacer height: 20
+    form.h2 text: 'Single Checkbox'
+    form.fields_check name: 'user[age_range]', value: '16+', uncheckValue: '0-16', label: 'I am over 16 (has default value)'
+    form.fields_check name: 'user[employer]', value: 1, label: 'I am an employer (no default value)'
+
+    form.spacer height: 20
     form.h2 text: 'Select'
     form.spacer height: 6
     languages = {
@@ -23,15 +37,6 @@ json_ui_page json do |page|
     form.spacer height: 6
     form.fields_date name: 'user[date]', width: 'matchParent', label: 'Date', min: '2010-01-01', max: '2012-01-01', value: '2010-02-01'
     form.fields_datetime name: 'user[date_time]', width: 'matchParent', label: 'Date Time', min: '2018-06-09T00:00', max: '2018-06-17T00:00', value: '2018-06-15T19:30'
-    
-    # form.spacer height: 20
-    # form.h2 text: 'Radio/Check'
-    # 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.spacer height: 20
     form.h2 text: 'Map'
@@ -41,5 +46,28 @@ json_ui_page json do |page|
       longitudeField: { name: 'user[longitude]', label: 'Long', value: 151.21078710000006, readOnly: true }
 
     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: '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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - ''
@@ -49,6 +49,7 @@ files:
 - app/views/app/views/json_ui/vue/renderer.html.erb
 - app/views/json_ui/garage/_nav_menu.json.jbuilder
 - app/views/json_ui/garage/actions/index.json.jbuilder
+- app/views/json_ui/garage/forms/_alert_post_data.json.jbuilder
 - 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