glib-web 0.1.0 → 0.1.1

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

@@ -1,20 +1,20 @@
 json.title 'Forms'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.list firstSection: ->(section) do
-    section.rows do |row|
-      row.thumbnail title: 'Basic', onClick: ->(action) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Basic', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/basic')
       end
-      row.thumbnail title: 'Submit Indicator', onClick: ->(action) do
+      template.thumbnail title: 'Submit Indicator', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/submit_indicator')
       end
-      row.thumbnail title: 'Floating Submit', onClick: ->(action) do
+      template.thumbnail title: 'Floating Submit', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/floating_submit')
       end
-      row.thumbnail title: 'File Upload', onClick: ->(action) do
+      template.thumbnail title: 'File Upload', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'forms/file_upload')
       end
     end

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

@@ -1,7 +1,5 @@
 json.title 'Forms'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 options = {
   url: json_ui_garage_url(path: 'forms/submit_indicator_post'),
   method: 'post',
@@ -9,6 +7,8 @@ options = {
 }
 
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.form options.merge(childViews: ->(form) do
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     form.panels_split width: 'matchParent', rightViews: ->(split) do
@@ -16,27 +16,3 @@ json_ui_page json do |page|
     end
   end)
 end
-
-# json_body_with_form json, nil, nil, options do
-#   json.child! do
-#     json.view 'fields/text-v1'
-#     json.name 'user[name]'
-#     json.width 'matchParent'
-#     json.label 'Name'
-#   end
-
-#   json.child! do
-#     json.view 'panels/split-v1'
-#     json.width 'matchParent'
-
-#     json.content do
-#       json.right do
-#         json.view 'button-v1'
-#         json.text 'Submit'
-#         json.onClick do
-#           json.action 'forms/submit-v1'
-#         end
-#       end
-#     end
-#   end
-# end

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

@@ -1,26 +1,26 @@
 json.title 'Home'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.list firstSection: ->(section) do
-    section.rows do |row|
-      row.thumbnail title: 'Pages', onClick: ->(action) do 
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Pages', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'pages/index')
       end
-      row.thumbnail title: 'Lists', onClick: ->(action) do 
+      template.thumbnail title: 'Lists', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'lists/index')
       end
-      row.thumbnail title: 'Forms', onClick: ->(action) do 
+      template.thumbnail title: 'Forms', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'forms/index')
       end
-      row.thumbnail title: 'Panels', onClick: ->(action) do 
+      template.thumbnail title: 'Panels', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'panels/index')
       end
-      row.thumbnail title: 'Views', onClick: ->(action) do 
+      template.thumbnail title: 'Views', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'views/index')
       end
-      row.thumbnail title: 'Actions', onClick: ->(action) do 
+      template.thumbnail title: 'Actions', onClick: ->(action) do 
         action.windows_open url: json_ui_garage_url(path: 'actions/index')
       end
     end

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

@@ -1,39 +1,17 @@
 json.title 'Lists'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.list firstSection: ->(section) do
-    section.rows do |row|
-      row.thumbnail title: 'Templating', onClick: ->(action) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Templating', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/templating')
       end
-      row.thumbnail title: 'Infinite Scroll', onClick: ->(action) do
+      template.thumbnail title: 'Infinite Scroll', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'lists/infinite_scroll')
       end
     end
 
   end
 end
-
-# json_body_with_list json do
-#   json.rows do
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Templating'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'lists/templating')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Infinite Scroll'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'lists/infinite_scroll')
-#       end
-#     end
-#   end
-# end

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

@@ -1,7 +1,7 @@
 
-page = params[:page].to_i
-nextPage = {
-  url: json_ui_garage_url(path: 'lists/infinite_scroll', page: page + 1, section_only: 'v1'),
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'lists/infinite_scroll', page: page_index + 1, section_only: 'v1'),
   autoLoad: true
 }
 
@@ -9,19 +9,26 @@ nextPage = {
 # - for SEO: one URL for a standalone page and one URL for pagination only
 # - for generic approach, e.g. excluding nav_menu when there is no change
 if params[:section_only].present?
-  json.nextPage nextPage
+  json.nextPage next_page
   json.sections do
     json.child! do
-      render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page
+      render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page_index
     end
   end
 else
   json.title 'Lists'
 
-  render "#{@path_prefix}/nav_menu", json: json
-
-  options = { nextPage: nextPage }
-  json_body_with_list json, nil, nil, options do
-    render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page
+  # options = { nextPage: nextPage }
+  # json_body_with_list json, nil, nil, options do
+  #   render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page
+  # end
+  
+  json_ui_page json do |page|
+    render "#{@path_prefix}/nav_menu", json: json, page: page
+    
+    page.list nextPage: next_page, firstSection: ->(section) do
+      render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page_index
+    end
   end
+
 end

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

@@ -1,62 +1,20 @@
 json.title 'Lists'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.list firstSection: ->(section) do
     section.header(padding: { top: 12, left: 16, right: 16, bottom: 12 }) do |header|
       header.label text: 'Section Header'
     end
 
-    section.rows do |row|
-      row.thumbnail title: 'Click me', onClick: ->(action) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Click me', onClick: ->(action) do
         action.dialogs_alert message: 'Perform action'
       end
-      row.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle'
-      row.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle', imageUrl: @sample_image_url
-      row.featured title: 'Item with subtitle', subtitle: 'Item subtitle', imageUrl: @sample_image_url
+      template.thumbnail title: 'Item with subtitle', subtitle: 'Item subtitle'
+      template.thumbnail title: 'Item with thumbnail image', subtitle: 'Item subtitle', imageUrl: @sample_image_url
+      template.featured title: 'Featured with featured image', subtitle: 'Item subtitle', imageUrl: @sample_image_url
     end
   end
 end
-
-# json_body_with_list json do
-#   json.header do
-#     json.subviews do
-#       json.child! do
-#         json.view 'label-v1'
-#         json.text 'Section Header'
-#       end
-#     end
-#   end
-
-#   json.rows do
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Click me'
-#       json.onClick do
-#         json.action 'dialogs/alert-v1'
-#         json.message 'Perform action'
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Item with subtitle'
-#       json.subtitle 'Item subtitle'
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Item with thumbnail image'
-#       json.subtitle 'Item subtitle'
-#       json.imageUrl @sample_image_url
-#     end
-
-#     json.child! do
-#       json.template 'featured-v1'
-#       json.title 'Featured with featured image'
-#       json.subtitle 'Item subtitle'
-#       json.imageUrl @sample_image_url
-#     end
-#   end
-# end

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

@@ -1,53 +1,61 @@
 json.title 'Pages'
 
-render "#{@path_prefix}/nav_menu", json: json
-
-json.header do
-  json.padding(left: 20, right: 20, top: 5, bottom: 5)
-  json.backgroundColor '#b3bac2'
-  json.subviews do
-    json.child! do
-      json.view 'h1-v1'
-      json.text 'Header'
-    end
-  end
-end
+# json.header do
+#   render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+#   json.padding(left: 20, right: 20, top: 5, bottom: 5)
+#   json.backgroundColor '#b3bac2'
+#   json.subviews do
+#     json.child! do
+#       json.view 'h1-v1'
+#       json.text 'Header'
+#     end
+#   end
+# end
 
-json.content do
-  json.height 'matchParent'
-  json.padding(top: 15, left: 20, right: 20, bottom: 15)
-  json.subviews do
-    json.child! do
-      json.view 'button-v1'
-      json.width 'matchParent'
-      json.height 'matchParent'
-      json.text 'Full Width/Height'
-    end
-  end
-end
+# json.content do
+#   json.height 'matchParent'
+#   json.padding(top: 15, left: 20, right: 20, bottom: 15)
+#   json.subviews do
+#     json.child! do
+#       json.view 'button-v1'
+#       json.width 'matchParent'
+#       json.height 'matchParent'
+#       json.text 'Full Width/Height'
+#     end
+#   end
+# end
 
-json.footer do
-  json.height 80
-  json.padding(left: 20, right: 20, top: 5, bottom: 5)
-  json.backgroundColor '#b3bac2'
-  json.subviews do
-    json.child! do
-      json.view 'h1-v1'
-      json.text 'Footer'
-    end
-  end
-end
+# json.footer do
+#   json.height 80
+#   json.padding(left: 20, right: 20, top: 5, bottom: 5)
+#   json.backgroundColor '#b3bac2'
+#   json.subviews do
+#     json.child! do
+#       json.view 'h1-v1'
+#       json.text 'Footer'
+#     end
+#   end
+# end
 
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
   page.header padding: {top: 12, left: 20, right: 20, bottom: 12}, backgroundColor: '#b3bac2', childViews: ->(header) do
     header.h1 text: 'Header'
   end
 
+  page.body height: 'matchParent', padding: {top: 15, left: 20, right: 20, bottom: 15}, childViews: ->(body) do
+    body.panels_scroll width: 'matchParent', height: 'matchParent', padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
+      scroll.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
+    end
+  end
+
   page.footer height: 80, padding: {top: 12, left: 20, right: 20, bottom: 12}, backgroundColor: '#b3bac2', childViews: ->(footer) do
     footer.h1 text: 'Footer'
   end
 
-  page.scroll height: 'matchParent', padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
-    scroll.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
-  end
+  # page.scroll height: 'matchParent', padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
+  #   scroll.button width: 'matchParent', height: 'matchParent', text: 'Full Width/Height'
+  # end
 end

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

@@ -1,56 +1,23 @@
 json.title 'Pages'
 
-render "#{@path_prefix}/nav_menu", json: json
-
-# json_body_with_list json do
-#   json.rows do
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Nav Buttons'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'pages/nav_buttons')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Hamburger Layout'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'pages/layout')
-#       end
-#     end
-
-#     json.child! do
-#       json.template 'thumbnail-v1'
-#       json.title 'Full Width/Height'
-#       json.onClick do
-#         json.action 'windows/open-v1'
-#         json.url json_ui_garage_url(path: 'pages/full_width_height')
-#       end
-#     end
-
-#   end
-# end
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page  
   
   page.list firstSection: ->(section) do
-    section.rows do |row|
-      row.thumbnail title: 'Nav Buttons', onClick: ->(action) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'Nav Buttons', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/nav_buttons')
       end
       
-      row.thumbnail title: 'Hamburger Layout', onClick: ->(action) do
+      template.thumbnail title: 'Hamburger Layout', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/layout')
       end
       
-      row.thumbnail title: 'Full Width/Height', onClick: ->(action) do
+      template.thumbnail title: 'Full Width/Height', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/full_width_height')
       end
       
-      row.thumbnail title: 'Tab Bar', onClick: ->(action) do
+      template.thumbnail title: 'Tab Bar', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'pages/tab_bar')
       end
     end

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

@@ -1,40 +1,8 @@
 json.title 'Pages'
 
-render "#{@path_prefix}/nav_menu", json: json
-
-# header = Jbuilder.new do |json|
-#   json.padding(top: 12, left: 20, right: 20, bottom: 12)
-#   json.backgroundColor '#b3bac2'
-#   json.subviews do
-#     json.child! do
-#       json.view 'h1-v1'
-#       json.text 'Header'
-#     end
-#   end
-# end
-
-# footer = Jbuilder.new do |json|
-#   json.padding(top: 12, left: 20, right: 20, bottom: 12)
-#   json.backgroundColor '#b3bac2'
-#   json.subviews do
-#     json.child! do
-#       json.view 'h1-v1'
-#       json.text 'Footer'
-#     end
-#   end
-# end
-
-# options = {padding: {top: 20, left: 20, right: 20, bottom: 20}}
-# json_body_with_scroll json, header, footer, options do
-#   (1..100).each do |index|
-#     json.child! do
-#       json.view 'label-v1'
-#       json.text 'Content'
-#     end
-#   end
-# end
-
 json_ui_page json do |page|
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
   page.header padding: {top: 12, left: 20, right: 20, bottom: 12}, backgroundColor: '#b3bac2', childViews: ->(header) do
     header.h1 text: 'Header'
   end