glib-web 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a53e5f3f6be6c7d47601f3a401ebbb9cdb2b8e0
-  data.tar.gz: e3ed2b12c3d9a19186864c35d5f771ce63dec2db
+  metadata.gz: 5079872c2112ab26d047f127bc6a1439108ff6e4
+  data.tar.gz: 3b85cc0e2092562954945464557b04f6cbf73daf
 SHA512:
-  metadata.gz: 39369b0bc54cb5ec96d03658a3c50ebb72b5b7a12eab67100ce9cd4e8f540e1c8690d5ee6d09c00c9909cf0ec4bb3a9ffc60ab2c62757ef816aead626e09892c
-  data.tar.gz: 56bec0256c4beb322736880f35d7c0ba4fa800d95aaebe820b5be367e31466d356f9a5030401f789dd772ae2468e7fd5604bf2881f825eb3a46e0de38d1c2381
+  metadata.gz: 202573f997d53fd508721b354bd9fe465f7afa63b7eedfe200a18c5d4523f54ca59139c946ae744abbacb41c673fecc80485c0c1c1295759bec71d5f11118328
+  data.tar.gz: e7ab09ff8e10b8cf59607b2bed4c1321b8b3dcd962e6c32792320f2470a7daa81f6bbb3c24ded486e90ff1bc114bc7ad47d77516859c4dc592cbf40d5f1e238e

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

@@ -46,31 +46,28 @@ module Glib
           json.leftDrawer do
             options[:content]&.call drawer_content_builder
           end
-
         end
 
         def header(options = {})
           json.header do
-            json.padding options[:padding]
-            json.backgroundColor options[:backgroundColor]
-            json.childViews do
-              options[:childViews]&.call @view_builder
-            end
+            vertical_content(options)
           end
         end
 
         def footer(options = {})
           json.footer do
-            json.padding options[:padding]
-            json.backgroundColor options[:backgroundColor]
-            json.childViews do
-              options[:childViews]&.call @view_builder
-            end
+            vertical_content(options)
           end
         end
 
+        def body(options = {})
+          json.body do
+            vertical_content(options)
+          end
+        end
+        
         def list(options = {})
-          json.content do
+          json.body do
             json.childViews do
               @view_builder.add_view('panels_list', options.reverse_merge(width: 'matchParent'))
             end
@@ -78,7 +75,7 @@ module Glib
         end
         
         def table(options = {})
-          json.content do
+          json.body do
             json.childViews do
               @view_builder.add_view('panels_table', options.reverse_merge(width: 'matchParent'))
             end
@@ -86,7 +83,7 @@ module Glib
         end
         
         def scroll(options = {})
-          json.content do
+          json.body do
             json.childViews do
               @view_builder.add_view('panels_scroll', options.reverse_merge(width: 'matchParent'))
             end
@@ -98,6 +95,21 @@ module Glib
             @view_builder.add_view('panels_form', options.reverse_merge(width: 'matchParent'))
           end
         end
+
+        private
+        def vertical_content(options)
+          options = options.reverse_merge(width: 'matchParent')
+
+          [:padding, :backgroundColor, :width, :height].each do |name|
+            if (value = options[name])
+              json.set! name, value
+            end
+          end
+          json.childViews do
+            options[:childViews]&.call @view_builder
+          end
+        end
+
       end
     end
   end

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

@@ -1,84 +1,126 @@
-json.leftDrawer do
-  json.items do
-    json.child! do
-      json.icon do
-        json.materialName 'home'
-      end
-      json.text 'Home'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url
-      end
-    end
-  end
 
-  json.items do
-    json.child! do
-      json.text 'Pages'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'pages/index')
-      end
-    end
-  end
 
-  json.items do
-    json.child! do
-      json.text 'Lists'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'lists/index')
-      end
+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
     end
   end
 
-  json.items do
-    json.child! do
-      json.text 'Forms'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'forms/index')
-      end
-    end
-  end
+  drawer.rows builder: ->(menu) do
 
-  json.items do
-    json.child! do
-      json.text 'Panels'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'panels/index')
-      end
+    menu.button text: 'Pages', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'pages/index')
     end
-  end
 
-  json.items do
-    json.child! do
-      json.text 'Views'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'views/index')
-      end
+    menu.button text: 'Lists', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'lists/index')
     end
-  end
 
-  json.items do
-    json.child! do
-      json.text 'Actions'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'actions/index')
-      end
+    menu.button text: 'Forms', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'forms/index')
     end
-  end
-
-  json.items do
-    json.child! do
-      json.text 'Diagnostics'
-      json.onClick do
-        json.action 'dialogs/alert-v1'
-        json.message 'JSON UI v1.0'
-      end
+    
+    menu.button text: 'Panels', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'panels/index')
+    end
+    
+    menu.button text: 'Views', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'views/index')
     end
+    
+    menu.button text: 'Actions', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'actions/index')
+    end
+    
+    menu.button text: 'Diagnostics', onClick: ->(action) do
+      action.dialogs_alert message: 'JSON UI v1.0'
+    end
+    
   end
 end
+
+# json.leftDrawer do
+#   # json.items do
+#   #   json.child! do
+#   #     json.icon do
+#   #       json.materialName 'home'
+#   #     end
+#   #     json.text 'Home'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Pages'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'pages/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Lists'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'lists/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Forms'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'forms/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Panels'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'panels/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Views'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'views/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Actions'
+#   #     json.onClick do
+#   #       json.action 'windows/open-v1'
+#   #       json.url json_ui_garage_url(path: 'actions/index')
+#   #     end
+#   #   end
+#   # end
+
+#   # json.items do
+#   #   json.child! do
+#   #     json.text 'Diagnostics'
+#   #     json.onClick do
+#   #       json.action 'dialogs/alert-v1'
+#   #       json.message 'JSON UI v1.0'
+#   #     end
+#   #   end
+#   # end
+# end

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

@@ -1,16 +1,15 @@
 json.title 'Actions'
 
-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: 'dialogs/alert', onClick: ->(action) do
+    section.rows builder: ->(template) do
+      template.thumbnail title: 'dialogs/alert', onClick: ->(action) do
         action.dialogs_alert message: 'This is an alert'
       end
 
-      # row.thumbnail title: 'dialogs/confirm (TODO)', onClick: ->(action) do
+      # template.thumbnail title: 'dialogs/confirm (TODO)', onClick: ->(action) do
       #   action.dialogs_confirm message: 'Confirm?', onConfirm: ->(action) do
       #     action.dialogs_alert message: 'Good'
       #   end, onCancel: ->(action) do
@@ -18,23 +17,23 @@ json_ui_page json do |page|
       #   end
       # end
 
-      row.thumbnail title: 'dialogs/option', onClick: ->(action) do
+      template.thumbnail title: 'dialogs/option', onClick: ->(action) do
         action.dialogs_options message: 'Select one', buttons: ->(menu) do
-          menu.button title: 'Option1', onClick: ->(action) do
+          menu.button text: 'Option1', onClick: ->(action) do
             action.dialogs_alert message: 'Option 1'
           end
-          menu.button title: 'Option2', onClick: ->(action) do
+          menu.button text: 'Option2', onClick: ->(action) do
             action.dialogs_alert message: 'Option 2'
           end
-          menu.button title: 'Cancel'
+          menu.button text: 'Cancel'
         end
       end
 
-      row.thumbnail title: 'dialogs/open', onClick: ->(action) do
+      template.thumbnail title: 'dialogs/open', onClick: ->(action) do
         action.dialogs_open url: json_ui_garage_url(path: 'forms/basic')
       end
 
-      row.thumbnail title: 'dialogs/snackbar', onClick: ->(action) do
+      template.thumbnail title: 'dialogs/snackbar', onClick: ->(action) do
         action.dialogs_snackbar message: 'This is a snackbar'
       end
 

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

@@ -1,15 +1,9 @@
 json.title 'Forms'
 
-render "#{@path_prefix}/nav_menu", json: json
-
-options = {
-  url: json_ui_garage_url(path: 'forms/basic_post'),
-  method: 'post',
-  padding: { top: 12, left: 20, right: 20, bottom: 12 }
-}
-
 json_ui_page json do |page|
-  page.form options.merge(childViews: ->(form) do
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+  
+  page.form url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: { top: 12, left: 20, right: 20, bottom: 12 }, childViews: ->(form) do
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     form.fields_email name: 'user[email]', width: 'matchParent', label: 'Email'
     form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
@@ -26,50 +20,5 @@ json_ui_page json do |page|
     form.panels_split width: 'matchParent', rightViews: ->(split) do
       split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
     end
-  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 'fields/email-v1'
-#     json.name 'user[email]'
-#     json.width 'matchParent'
-#     json.label 'Email'
-#   end
-
-#   json.child! do
-#     json.view 'fields/password-v1'
-#     json.name 'user[password]'
-#     json.width 'matchParent'
-#     json.label 'Password'
-#   end
-
-#   json.child! do
-#     json.view 'panels/split-v1'
-#     json.width 'matchParent'
-
-#     json.rightViews do
-#       json.child! do
-#         json.view 'button-v1'
-#         json.text 'Submit'
-#         json.onClick do
-#           json.action 'forms/submit-v1'
-
-#           # json.action 'forms/encode-v1'
-#           # json.paramName 'formData'
-#           # json.onEncoded do
-#           #   json.action 'http/post-v1'
-#           #   json.url json_ui_garage_url(path: 'forms/basic_post')
-#           # end
-#         end
-#       end
-#     end
-#   end
-# end

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

@@ -1,7 +1,5 @@
 json.title 'Forms'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 options = {
   url: json_ui_garage_url(path: 'forms/generic_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_file name: 'user[photo]', width: 'matchParent', label: 'Photo', accepts: "image/*", s3_direct_upload_url: rails_direct_uploads_path, file_size_limit: 5000, file_size_limit_alert_text: 'Too big!', value: 'VALUE_OF_THE_PREVIOUS_IMAGE_WHICH_IS_USEFUL_WHEN_UPDATING_EXISTING_MODEL'
     form.button text: 'Submit', onClick: ->(action) { action.forms_submit }

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

@@ -1,7 +1,5 @@
 json.title 'Forms'
 
-render "#{@path_prefix}/nav_menu", json: json
-
 # footer = Jbuilder.new do |json|
 #   json.padding(top: 12, left: 20, right: 80, bottom: 12)
 #   json.backgroundColor '#b3bac2'
@@ -20,6 +18,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.label text: 'Demonstrates the use Floating Action Button on a form with footer'
     30.times do |i|
@@ -29,32 +29,3 @@ json_ui_page json do |page|
     form.fab icon: 'send', onClick: ->(action) { action.forms_submit }
   end)
 end
-
-# json_body_with_form json, nil, footer, options do
-#   30.times do |i|
-#     json.child! do
-#       json.view 'fields/text-v1'
-#       json.name "user[field#{i}]"
-#       json.width 'matchParent'
-#       json.label "Field#{i}"
-#     end
-#   end
-
-#   json.child! do
-#     json.view 'button-v1'
-#     json.text 'Submit'
-#     json.onClick do
-#       json.action 'forms/submit-v1'
-#     end
-#   end
-
-#   json.child! do
-#     json.view 'fab-v1'
-#     json.icon do
-#       json.materialName 'send'
-#     end
-#     json.onClick do
-#       json.action 'forms/submit-v1'
-#     end
-#   end
-# end