glib-web 0.5.14 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f440c189aedc472b187e045fc6a7f860450f8301
-  data.tar.gz: 395891b80b5ca90022b42f5216003d57006a5ebc
+SHA256:
+  metadata.gz: d1d6528e82e0ce768820820d544d382db8f412e2e0ea2d5e572ab16065f7b173
+  data.tar.gz: 2c8d52f0b60d4ac9b8253bbc1f7cc67c7172647981b5e036d4bedc306827f97a
 SHA512:
-  metadata.gz: 29f95c4110b05050e3d5a28035c12c62c1bae2448798882f629fb1e2c0fd5a9b9e40c9df149f6ec90233dbce339d1a83830c99245cee5a33559c7fe7c3d283e7
-  data.tar.gz: 01fee1f715657b457dfd1f4e2026db4e014c5912c446c12e6042b8b416e0119e9da985491d37fee39af24c3576a40d3da41d2c3916820b4b13b4da71cdc1a6fd
+  metadata.gz: 591bb9bb58b8034ee825c49f27483f8b1a756efc586de444c49b9bce35727fac47eb7852511b81dd0762736cdad7fd5972172c74d73d3b8f69218beaead56611
+  data.tar.gz: b7a9552472085631f0123187103b1667652428f58a45863539e1ca2d8a2ef219b59357655f88abe4c9a2291fda805627ddc9a385b51f69d4bdd04d37aac80c95

data/app/controllers/concerns/glib/json/traversal.rb

@@ -76,8 +76,9 @@ module Glib::Json::Traversal
       # Table/List
       if (sections = view['sections']).is_a? Array
         sections.each do |section|
-          # Table
+          traverse_vertical_content section['header'], block
           traverse_multiple section['rows'], block
+          traverse_vertical_content section['footer'], block
         end
       end
     end

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

@@ -66,12 +66,9 @@ module Glib::Json::Ui
   end
 
   private
-
-  def __json_ui_vue(hash, options)
-    renderer_path = options[:renderer_path]
-    @__json_ui_orig_page = response.body
-    response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
-
-    # response.body = render_to_string(template: renderer_path, layout: false, content_type: 'text/html', locals: { page: hash, options: options })
-  end
+    def __json_ui_vue(hash, options)
+      renderer_path = options[:renderer_path]
+      @__json_ui_orig_page = response.body
+      response.body = render_to_string(template: renderer_path, layout: 'json_ui/renderer', content_type: 'text/html', locals: { page: hash, options: options })
+    end
 end

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

@@ -71,6 +71,16 @@ module Glib
         end
       end
 
+      module Devices
+        class GetPushToken < Action
+          string :postUrl
+          string :paramNameForToken
+
+          # Use postUrl instead
+          # action :onGet
+        end
+      end
+
       module Analytics
         class LogEvent < Action
           string :name

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

@@ -15,8 +15,8 @@ module Glib
         bool :disabled
         singleton_array :styleClass, :styleClasses
 
-        def childItems(block)
-          json.childItems do
+        def childButtons(block)
+          json.childButtons do
             block.call page.menu_builder
           end
         end
@@ -43,10 +43,15 @@ module Glib
         end
       end
 
-      class MenuLeftBottom < Button
-        icon :icon
-        array :buttons
-      end
+      # class MenuLeftBottom < Button
+      #   icon :icon
+      #   array :buttons
+      # end
+
+      # class Select < Button
+      #   icon :icon
+      #   array :buttons
+      # end
     end
   end
 end

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

@@ -10,6 +10,10 @@ module Glib
         )
       end
 
+      def json_ui_garage_current_url(options = {})
+        json_ui_garage_url(options.merge(path: params[:path]))
+      end
+
       # TODO: Remove the block
       def json_ui_page(json, &block)
         @__json_ui_page ||= Page.new(json, self)
@@ -45,6 +49,12 @@ module Glib
         @__json_ui_section.action_builder
       end
 
+      def json_ui_action_payload(&block)
+        dataJson = Jbuilder.new
+        block&.call Page.new(dataJson, self).action_builder
+        dataJson.attributes!
+      end
+
       class Page
         attr_reader :json, :context, :view_builder, :action_builder, :menu_builder
         attr_reader :list_section_builder, :table_section_builder, :drawer_content_builder, :split_content_builder

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

@@ -95,6 +95,7 @@ class Glib::JsonUi::ViewBuilder
     # - It has a default onClick so no need to specify `onClick: ->(action) { action.forms_submit }`
     class Submit < AbstractField
       string :text
+      color :color
     end
 
     class CheckGroup < AbstractField
@@ -157,6 +158,7 @@ class Glib::JsonUi::ViewBuilder
     class DynamicGroup < AbstractField
       string :titlePrefix
       panels_builder :content, :template
+      hash :groupFieldProperties
 
       # NOTE: Consider using sub-panel instead (e.g. groupTemplate)
       # views :groupTemplateViews

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

@@ -89,7 +89,6 @@ class Glib::JsonUi::ViewBuilder
           @childViewsBlock.call(page.view_builder)
           page.current_form = nil
         end
-
       end
 
       def childViews(block)
@@ -98,6 +97,7 @@ class Glib::JsonUi::ViewBuilder
     end
 
     class List < View
+      hash :ws
       hash :nextPage
       action :onScrollToTop
       action :onScrollToBottom
@@ -164,6 +164,19 @@ class Glib::JsonUi::ViewBuilder
       hash :md
       hash :sm
       hash :xs
+
+      hash :xlOnly
+      hash :lgOnly
+      hash :mdOnly
+      hash :smOnly
+      hash :xsOnly
+
+      hash :xlAndDown
+      hash :lgAndDown
+      hash :mdAndDown
+      hash :smAndDown
+      hash :xsAndDown
+
       views :childViews
     end
 

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

@@ -1,6 +1,5 @@
 
 if local_assigns[:top_nav] || json_ui_app_is_web?
-
   page.leftDrawer content: ->(drawer) do
     drawer.header childViews: ->(header) do
       header.button text: 'App', styleClasses: ['link', 'logo'], onClick: ->(action) do

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

@@ -5,14 +5,20 @@ end
 
 section.rows builder: ->(template) do
   template.thumbnail title: 'http/post', onClick: ->(action) do
-    action.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_post url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'New Joe' }
+    end
   end
 
   template.thumbnail title: 'http/patch', onClick: ->(action) do
-    action.http_patch url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Edit Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_patch url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Edit Joe' }
+    end
   end
 
   template.thumbnail title: 'http/delete', onClick: ->(action) do
-    action.http_delete url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Delete Joe' }
+    action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
+      subaction.http_delete url: json_ui_garage_url(path: 'forms/basic_post'), formData: { 'user[name]' => 'Delete Joe' }
+    end
   end
 end

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

@@ -7,14 +7,6 @@ json_ui_page json do |page|
     form.fields_text name: 'user[name]', width: 'matchParent', label: 'Name'
     form.fields_password name: 'user[password]', width: 'matchParent', label: 'Password'
 
-    # form.panels_split width: 'matchParent', leftViews: ->(split) do
-    #   if params[:mode] == 'dialog'
-    #     split.button styleClass: 'link', text: 'cancel', onClick: ->(action) { action.dialogs_close }
-    #   end
-    # end, rightViews: ->(split) do
-    #   split.button text: 'Submit', onClick: ->(action) { action.forms_submit }
-    # end
-
     form.panels_split width: 'matchParent', content: ->(split) do
       split.left childViews: ->(left) do
         if params[:mode] == 'dialog'
@@ -22,13 +14,9 @@ json_ui_page json do |page|
         end
       end
       split.right childViews: ->(right) do
-        right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+        # right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+        right.fields_submit text: 'Submit'
       end
     end
-
   end
-  # , paramNameForFormData: 'formData', onSubmit: ->(action) do
-  #   action.http_post url: json_ui_garage_url(path: 'forms/generic_post')
-  # end
-
 end

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

@@ -7,23 +7,38 @@ json_ui_page json do |page|
     form.h2 text: 'Dynamic Group'
     form.spacer height: 6
 
-    value = [
-      {
-        'question': 'Punctuality',
-        'type': 'rating',
-        'enabled': '1'
-      },
-      {
-        'question': 'Quality of work',
-        'type': 'rating'
-      },
-      {
-        'question': 'Satisfied?',
-        'type': 'yes_no'
-      }
-    ]
+    # value = [
+    #   {
+    #     'question': 'Punctuality',
+    #     'type': 'rating'
+    #   },
+    #   {
+    #     'question': 'Quality of work',
+    #     'type': 'rating',
+    #     'enabled': '1'
+    #   },
+    #   {
+    #     'question': 'Satisfied?',
+    #     'type': 'yes_no'
+    #   }
+    # ]
 
-    form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', value: value, titlePrefix: 'Entry', content: ->(group) do
+    properties = [
+      [
+        { name: 'question', value: 'Punctuality' },
+        { name: 'type', value: 'rating' },
+      ],
+      [
+        { name: 'question', value: 'Quality of work' },
+        { name: 'type', value: 'rating' },
+        { name: 'enabled', value: '1', styleClasses: ['success'] },
+      ],
+      [
+        { name: 'question', value: 'Satisfied?' },
+        { name: 'type', value: 'yes_no' },
+      ]
+    ]
+    form.fields_dynamicGroup width: 'matchParent', name: 'user[evaluation]', groupFieldProperties: properties, titlePrefix: 'Entry', content: ->(group) do
       group.template padding: { left: 32 }, childViews: ->(template) do
         template.spacer height: 10
         template.fields_text width: 'matchParent', name: 'question', label: 'Question', placeholder: 'Question'

data/app/views/json_ui/garage/lists/{_infinite_scroll_section.json.jbuilder → _autoload_section.json.jbuilder}

@@ -10,11 +10,13 @@
 #   end
 # end
 
-section = json_ui_section json
+# section = json_ui_section json
+
+section = page.list_section_builder
 section.rows builder: ->(row) do
   batch_count = 30
   batch_count.times do |i|
-    index = page * batch_count + i
+    index = page_index * batch_count + i
     row.thumbnail title: "Item #{index}"
   end
 end

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

@@ -0,0 +1,32 @@
+
+page_index = params[:page].to_i
+next_page = {
+  url: json_ui_garage_url(path: 'lists/autoload_all', page: page_index + 1, section_only: 'v1'),
+  autoload: 'all'
+}
+
+page = json_ui_page json
+
+if params[:section_only].present?
+  sleep 1
+
+  json.nextPage next_page if page_index < 3
+  json.sections do
+    json.child! do
+      render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index
+    end
+  end
+else
+  json.title 'Lists'
+
+  render "#{@path_prefix}/nav_menu", json: json, page: page
+
+  page.list nextPage: next_page, firstSection: ->(section) do
+    render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index
+  end, onScrollToBottom: ->(action) do
+    action.snackbars_alert message: 'Scrolled to Bottom'
+  end, onScrollToTop: ->(action) do
+    action.snackbars_alert message: 'Scrolled to Top'
+  end
+
+end

data/app/views/json_ui/garage/lists/{infinite_scroll.json.jbuilder → autoload_as_needed.json.jbuilder}

@@ -1,34 +1,31 @@
 
 page_index = params[:page].to_i
 next_page = {
-  url: json_ui_garage_url(path: 'lists/infinite_scroll', page: page_index + 1, section_only: 'v1'),
-  # TODO: rename, e.g. autoloadAsNeeded vs autoloadAll
-  autoLoad: true
+  url: json_ui_garage_url(path: 'lists/autoload_as_needed', page: page_index + 1, section_only: 'v1'),
+  autoload: 'asNeeded'
 }
 
+page = json_ui_page json
+
 # TODO: Cater
 # - 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 next_page
+  sleep 1
+
+  json.nextPage next_page if page_index < 3
   json.sections do
     json.child! do
-      render 'json_ui/garage/lists/infinite_scroll_section', json: json, page: page_index
+      render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index
     end
   end
 else
   json.title 'Lists'
 
-  # 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
-
-  page = json_ui_page json
   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
+    render 'json_ui/garage/lists/autoload_section', page: page, page_index: page_index
   end, onScrollToBottom: ->(action) do
     action.snackbars_alert message: 'Scrolled to Bottom'
   end, onScrollToTop: ->(action) do

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

@@ -0,0 +1,112 @@
+json.title 'Lists'
+
+liked = params[:liked] == 'true'
+
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
+
+json.ws({
+  "socket" => {
+    "endpoint" => "/socket/websocket",
+    "params" => {
+      vsn: '2.0.0',
+      token: 'TOKEN'
+    }
+  },
+  "topic" => "rooms",
+  "events" => [],
+  # "events" => ["new_link_added"],
+  # "header" => {
+  #   "user_id" => 2,
+  #   "prev_item_id" => nil,
+  #   "last_item_id" => nil
+  # }
+})
+
+list_ws = { topic: 'rooms', events: ['comments_updated'] }
+page.list ws: list_ws, firstSection: ->(section) do
+  section.header padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(header) do
+    header.h3 text: 'Chat with John Doe'
+  end
+
+  section.rows builder: ->(template) do
+    # template.thumbnail title: "windows/reload (timestamp: #{DateTime.current.to_i}) -- #{liked}", onClick: ->(action) do
+    #   action.windows_reload
+    # end, onLongPress: ->(action) do
+    #   action.sheets_select message: "Context Menu (#{DateTime.current.to_i})", buttons: ->(menu) do
+    #     if liked
+    #       menu.button text: 'Cancel 👍', onClick: ->(subaction) do
+    #         subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: false)
+    #       end
+    #     else
+    #       menu.button text: 'Give 👍', onClick: ->(subaction) do
+    #         subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat', liked: true)
+    #       end
+    #     end
+    #   end
+    # end
+
+    template.commentOutgoing subtitle: 'Hey!', subsubtitle: l(10.minutes.ago, format: :short), imageUrl: glib_json_image_standard_url, chips: ->(menu) do
+      menu.button text: '😊 2', styleClass: 'info'
+    end
+
+    template.commentOutgoing subtitle: 'How are you?', subsubtitle: l(DateTime.current, format: :short)
+
+    template.commentIncoming title: 'John Doe', subtitle: 'Very well', subsubtitle: l(7.minutes.ago, format: :short), imageUrl: glib_json_image_standard_url, chips: ->(menu) do
+      menu.button text: "👍 #{liked ? 2 : 1}"
+    end, onLongPress: ->(action) do
+      action.sheets_select message: 'Context Menu', buttons: ->(menu) do
+        if liked
+          menu.button text: 'Cancel 👍', onClick: ->(subaction) do
+            subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat_ui', liked: false)
+          end
+        else
+          menu.button text: 'Give 👍', onClick: ->(subaction) do
+            subaction.windows_reload url: json_ui_garage_url(path: 'lists/chat_ui', liked: true)
+          end
+        end
+      end
+    end
+  end
+end
+
+page.footer padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: ->(footer) do
+  # json.ws({
+  #   "socket" => {
+  #     "endpoint" => "/socket/websocket",
+  #     "params" => {
+  #       vsn: '2.0.0',
+  #       token: 'TOKEN'
+  #     }
+  #   },
+  #   # "topic" => "room:30",
+  #   # "event" => "comments_updated",
+  #   "topic" => "links",
+  #   "events" => ["new_link_added"],
+  #   "header" => {
+  #     "user_id" => 2,
+  #     "prev_item_id" => nil,
+  #     "last_item_id" => nil
+  #   }
+  # })
+
+  footer.panels_form width: 'matchParent', url: json_ui_garage_url(path: 'forms/basic_post'), method: 'post', padding: glib_json_padding_body, paramNameForFormData: 'formData', onSubmit: ->(action) do
+    json.action "ws/push"
+    json.topic "rooms"
+    json.event "create_comment"
+    json.payload({
+      "room_id": "30",
+      "user_id": "2"
+    })
+
+  end, childViews: ->(form) do
+    form.fields_text name: 'user[message]', width: 'matchParent', label: 'Message'
+
+    form.panels_split width: 'matchParent', content: ->(split) do
+      split.right childViews: ->(right) do
+        right.button text: 'Submit', onClick: ->(action) { action.forms_submit }
+      end
+    end
+  end
+
+end