glib-web 3.25.1 → 3.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838475dd1c241022699ae4cb206a3fac310be83932b8ec6d6094b61a9889d224
-  data.tar.gz: f24efaef3bf63350fb001bd461e3f73c47c0110b2d2b10bc53ef97258eea774a
+  metadata.gz: a8ac2b87b2a72adbd5c302571faea43150d7058c0ff69a93c5a8f3331fc5ce44
+  data.tar.gz: cf37963271e6f7b2653a08b8433ede694de7e3c15c5ffcb8360d1809e7369fce
 SHA512:
-  metadata.gz: 8eaa39d50da3e146150414e1491d73170a1d833037bc623b50d46d83dfc111a762b67e7dc47825b7c3a89d6332c52a0e67f63c5de9049f7164e77f881658c753
-  data.tar.gz: '0940c9ba1f0beebf6088da4a42c1853defd8e67f8728c2ddf135e4c06168e39c0eec299f812e3e9601f1090aadf6b3295a6d265ca1309592325cc863dfa31440'
+  metadata.gz: de93f215305deef0bc19c5b199d5935c2fec9b37dfee551d4a957fa175587ff2ef1efc9cc0e3bfb705410c1efdc6e66156a6e4d10f06b8148028d40e470ff288
+  data.tar.gz: 17a11bab19832cad840d1a95f89adc8617819993c60d2dfd198fa779b06e36005e8ea9b677efa9b7d194384558640fa7539c15502cdf9937ecc8a5d24fd38556

data/app/controllers/glib/home_controller.rb

@@ -31,6 +31,10 @@ module Glib
         .rounded-corner:hover:before {
           border-radius: 16px;
         }
+
+        .ma-2 {
+          margin: 8px;
+        }
         </style>
       eos
 

data/app/helpers/glib/json_ui/action_builder/bottom_banners.rb

@@ -0,0 +1,14 @@
+class Glib::JsonUi::ActionBuilder
+  module BottomBanners
+    class Open < Action
+      def newView(block)
+        json.newView do
+          block.call(page.sview_builder)
+        end
+      end
+    end
+
+    class Close < Action
+    end
+  end
+end

data/app/helpers/glib/json_ui/action_builder/global_states.rb

@@ -0,0 +1,14 @@
+class Glib::JsonUi::ActionBuilder
+  module GlobalStates
+    # Experimental
+    class Watch < Action
+      string :state
+      action :onChange
+    end
+
+    class Set < Action
+      string :state
+      hash :data
+    end
+  end
+end

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

@@ -106,6 +106,7 @@ module Glib
             json.directUploadUrl options[:directUploadUrl]
             json.url options[:url]
             json.inputName options[:inputName]
+            json.strategy options[:strategy]
           end
       end
 

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

@@ -50,17 +50,6 @@ module Glib
 
       ###
 
-      ### Chart
-
-      def glib_chart_tooltip_template(options)
-        %{
-          <div style="border: 1px solid gray; border-radius: 6px;">
-            <div style="border-radius: 6px 6px 0 0; background-color: gray; padding: 4px; color: white;">#{options[:title]}</div>
-            <div style="border-radius: 0 0 6px 6px; background-color: white; padding: 4px" color: black;>#{options[:content]}</div>
-          </div>
-        }
-      end
-
     end
   end
 end

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

@@ -331,6 +331,8 @@ class Glib::JsonUi::ViewBuilder
       string :uploadTitle
       string :uploadFailedText # deprecated
       action :onFinishUpload
+      string :strategy # can be "delegate" or "dropUpload"
+      string :url # http post end point if you don't want to use onFinishUpload
 
       required :accepts, :directUploadUrl
 

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

@@ -329,10 +329,11 @@ module Glib
         string :inputName
         string :url
         string :directUploadUrl
-        array :accepts
+        hash :accepts
         string :selected
         hash :items
         hash :dropData
+        string :strategy
       end
     end
   end

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

@@ -9,16 +9,16 @@ section.rows builder: ->(template) do
       subaction.dialogs_alert message: 'Previous window closed'
     end
   end
-end
 
-section.rows builder: ->(template) do
   template.thumbnail title: 'windows/open', onClick: ->(action) do
     action.windows_open url: json_ui_garage_url(path: 'home/blank')
   end
-end
 
-section.rows builder: ->(template) do
   template.thumbnail title: 'windows/openWeb', onClick: ->(action) do
     action.windows_openWeb url: 'http://www.google.com'
   end
+
+  template.thumbnail title: 'multistep form', onClick: ->(action) do
+    action.windows_open url: json_ui_garage_url(path: 'multistep_form/step1')
+  end
 end

data/app/views/json_ui/garage/multistep_form/step1.json.jbuilder

@@ -0,0 +1,15 @@
+json.title 'Multistep form'
+
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: false
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.p text: 'Go to next page without pushing state to history'
+  scroll.spacer height: 4
+  scroll.markdown text: '`action.windows_reload url: url`'
+  scroll.spacer height: 8
+  scroll.button text: 'Next', onClick: ->(action) do
+    action.windows_reload url: json_ui_garage_url(path: 'multistep_form/step2')
+  end
+end

data/app/views/json_ui/garage/multistep_form/step2.json.jbuilder

@@ -0,0 +1,13 @@
+json.title 'Multistep form'
+
+page = json_ui_page json
+
+render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: false
+
+page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
+  scroll.p text: 'Clicking browser back button will bring you to index page. Clicking button bellow will bring you to step 1'
+  scroll.spacer height: 8
+  scroll.button text: 'Back', onClick: ->(action) do
+    action.windows_reload url: json_ui_garage_url(path: 'multistep_form/step1')
+  end
+end

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

@@ -75,15 +75,33 @@ else
               'Mar' => 70,
               'Apr' => 62,
             }
-            prev = points['Jan']
 
+            prev = ''
+            json.points do
+              points.each do |k, v|
+                prev = points['Jan']
+                content = v >= prev ? "▲ #{v - prev}" : "▼ #{prev - v}"
+                json.child! do
+                    json.x k
+                    json.y v
+                    json.tooltip do
+                      json.childViews do
+                        scroll.panels_responsive \
+                          padding: { top: 8, right: 8, left: 8, bottom: 8 },
+                          backgroundColor: '#EDE4E3',
+                          styleClasses: ['rounded-corner'],
+                          childViews: ->(sview) do
+                            sview.label text: "Delta #{k}", color: '#6C6A61'
+                            sview.spacer height: 4
+                            sview.label text: content, color: '#6C6A61'
+                          end
+                      end
+                    end
+                    prev = k
+                  end
+              end
+            end
 
-            json.points points.map { |k, v|
-              delta = prev - v
-              tooltip = v < prev ? "<div>Delta</div><div>▼ #{delta}</div>" : "<div>Delta</div><div>▲ #{delta}</div>"
-              prev = v
-              { x: k, y: v, tooltip: glib_chart_tooltip_template(title: "Summary #{k}", content: tooltip) }
-            }
           end
         ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 3.25.1
+  version: 3.26.0
 platform: ruby
 authors:
 - ''
@@ -95,10 +95,12 @@ files:
 - app/helpers/glib/forms_helper.rb
 - app/helpers/glib/json_ui/abstract_builder.rb
 - app/helpers/glib/json_ui/action_builder.rb
+- app/helpers/glib/json_ui/action_builder/bottom_banners.rb
 - app/helpers/glib/json_ui/action_builder/commands.rb
 - app/helpers/glib/json_ui/action_builder/components.rb
 - app/helpers/glib/json_ui/action_builder/dialogs.rb
 - app/helpers/glib/json_ui/action_builder/fields.rb
+- app/helpers/glib/json_ui/action_builder/global_states.rb
 - app/helpers/glib/json_ui/action_builder/http.rb
 - app/helpers/glib/json_ui/action_builder/iap.rb
 - app/helpers/glib/json_ui/action_builder/panels.rb
@@ -221,6 +223,8 @@ files:
 - app/views/json_ui/garage/lists/index.json.jbuilder
 - app/views/json_ui/garage/lists/reordering.json.jbuilder
 - app/views/json_ui/garage/lists/templating.json.jbuilder
+- app/views/json_ui/garage/multistep_form/step1.json.jbuilder
+- app/views/json_ui/garage/multistep_form/step2.json.jbuilder
 - app/views/json_ui/garage/notifications/action_cable.json.jbuilder
 - app/views/json_ui/garage/notifications/android_post.json.jbuilder
 - app/views/json_ui/garage/notifications/index.json.jbuilder