glib-web 0.5.18 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481c51fde9d25ee4f8b4470c126f26c957c04209acdb37b1a52db6faecba9f4e
-  data.tar.gz: d2258e2069c804b9ad232bb157c657260352bdf3eabab1342562040f165c1ffa
+  metadata.gz: 97f06c521e0f5efa16bf64c4ba849e86a0c5747899e32880dc596d443b2def46
+  data.tar.gz: 24ffcd3e25128ba56c8e12f34f5b51a7f1669119c3e70d177e389390d3186462
 SHA512:
-  metadata.gz: cc9c9bb53e07b9ef3031167aa3f72d901e2b07098ee4a90f285969c2fc1ee548d966c2947a165fd3c519f8d0cbad13cebc3c7e70498d90cbdc4db220c3a4ad92
-  data.tar.gz: 9b5fc5e2d30f03fe433425f3d4594eb0acfb3bb48774a73e161feae7bca2ea87cae450a291a32a29fd1b4acfcfdf057752be9e0c04386b570bb59ea925a24fec
+  metadata.gz: 383c668d259de6923c5ea2f5792644a52ff2d25d240f950f5b5bc553be180b425a86d93c5a95783c84c54cda02aef15c3d97239ccc80d72ab1fb3bdfdd8c51ed
+  data.tar.gz: c8ccd39d3062284afda5443766c9d42955bdbf120d127bb51b289da78d3c7cde49bc0bcba1b8dfb10b6473082f67c59b192818d991884e01d74b076394530d77

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

@@ -73,8 +73,11 @@ module Glib
 
       module Devices
         class GetPushToken < Action
-          action :onGet
+          string :postUrl
           string :paramNameForToken
+
+          # Use postUrl instead
+          # action :onGet
         end
       end
 

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)

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

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

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/lists/chat_ui.json.jbuilder

@@ -5,7 +5,26 @@ liked = params[:liked] == 'true'
 page = json_ui_page json
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.list firstSection: ->(section) do
+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
@@ -73,18 +92,15 @@ page.footer padding: { top: 12, left: 16, right: 16, bottom: 12 }, childViews: -
 
   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 "links"
-    json.event "new_link"
+    json.topic "rooms"
+    json.event "create_comment"
     json.payload({
-      "club_id": "2",
       "room_id": "30",
       "user_id": "2"
-        #  title: "TITLE",
-        #  url: "URL"
     })
 
   end, childViews: ->(form) do
-    form.fields_text name: 'message[body]', width: 'matchParent', label: 'Message'
+    form.fields_text name: 'user[message]', width: 'matchParent', label: 'Message'
 
     form.panels_split width: 'matchParent', content: ->(split) do
       split.right childViews: ->(right) do

data/app/views/json_ui/garage/notifications/android_post.json.jbuilder

@@ -1,54 +1,46 @@
-if (server_key = ENV['GCM_SERVER_KEY'])
-  fcm = FCM.new(server_key)
 
-  # you can set option parameters in here
-  #  - all options are pass to HTTParty method arguments
-  #  - ref: https://github.com/jnunemaker/httparty/blob/master/lib/httparty.rb#L29-L60
-  #  fcm = FCM.new("my_server_key", timeout: 3)
-
-  registration_ids = [params[:token]] # an array of one or more client registration tokens
-
-
-
-#   # dataJson = Jbuilder.new
-#   data = json_ui_response nil do |action|
-#   action.snackbars_alert message: 'TEST'
-# end
-# # data = dataJson.attributes!
-
-
-# action = json_ui_action nil do |action|
-#   action.snackbars_alert message: 'TEST'
-# end
-
-payload = json_ui_action_payload do |action|
-  action.snackbars_alert message: 'TEST'
-end
-
-puts "D: #{payload}"
-
-  # See https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages for all available options.
-  options = {
-    notification: {
-      title: params[:title],
-      body: "Message from server"
-    },
-    data: {
-      channelId: 'default',
-      notificationId: 1,
-      onClick: payload
+if (server_key = ENV['FCM_SERVER_KEY'])
+  if defined? FCM
+    # Introduce delay so that we have time to place the app to background
+    # before receiving push notification.
+    sleep 2
+
+    fcm = FCM.new(server_key)
+    registration_ids = [params[:token]] # An array of one or more client registration tokens
+
+    payload = json_ui_action_payload do |action|
+      action.dialogs_alert message: 'Opened'
+    end
+
+    # See https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages for all available options.
+    options = {
+      notification: {
+        title: params[:title],
+        body: 'Message from server'
+        # title: 'Offer from Ajisen Ramen',
+        # body: 'Free side order of Gyoza'
+      },
+      data: {
+        channelId: 'default',
+        notificationId: 1,
+        openUrl: json_ui_garage_url(path: 'home/blank'),
+        onOpen: payload
+        # openUrl: 'http://10.0.2.2:3000/offers.json?_render=v1',
+      }
     }
-  }
-  response = fcm.send(registration_ids, options)
-
-  body = JSON.parse(response[:body])
-  if (errors = body['results'].map { |i| i['error'] }.compact).any?
-    message = errors.join(', ')
+    response = fcm.send(registration_ids, options)
+
+    body = JSON.parse(response[:body])
+    if (errors = body['results'].map { |i| i['error'] }.compact).any?
+      message = errors.join(', ')
+    else
+      message = 'Sent'
+    end
   else
-    message = 'Sent'
+    message = 'FCM gem needed'
   end
 else
-  message = 'Need to set env var: GCM_SERVER_KEY'
+  message = 'Env var needed: GCM_SERVER_KEY'
 end
 
 json_ui_response json do |action|

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

@@ -13,12 +13,15 @@ page.list firstSection: ->(section) do
 
     template.thumbnail title: 'Send Android Notification', onClick: ->(action) do
       action.auth_saveCsrfToken token: form_authenticity_token, onSave: ->(subaction) do
-        subaction.devices_getPushToken paramNameForToken: 'formData[token]', onGet: ->(subsubaction) do
-          formData = {
-            title: 'Title from formData'
-          }
-          subsubaction.http_post url: json_ui_garage_url(path: 'notifications/android_post'), formData: formData
-        end
+        # subaction.devices_getPushToken paramNameForToken: 'formData[token]', onGet: ->(subsubaction) do
+        #   formData = {
+        #     title: 'Title from formData'
+        #   }
+        #   subsubaction.http_post url: json_ui_garage_url(path: 'notifications/android_post'), formData: formData
+        # end
+
+        post_url = json_ui_garage_url(path: 'notifications/android_post', title: 'Title from formData')
+        subaction.devices_getPushToken postUrl: post_url, paramNameForToken: 'token'
       end
     end
 

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

@@ -4,30 +4,18 @@ page = json_ui_page json
 
 render "#{@path_prefix}/nav_menu", json: json, page: page
 
-page.navBar backgroundColor: '#a8c4e3', rightButtons: ->(menu) do
-  menu.button icon: 'search', onClick: ->(action) do 
+page.navBar backgroundColor: '#a8c4e3', color: '#ffffff', rightButtons: ->(menu) do
+  menu.button icon: 'search', onClick: ->(action) do
     action.dialogs_alert message: 'Perform some action'
   end
-  menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do 
+  menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do
     action.dialogs_alert message: 'Perform some action'
   end
-  menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do 
+  menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do
     action.dialogs_alert message: 'Perform some action'
   end
 end
 
-# page.rightNavButtons do |menu|
-#   menu.button icon: 'search', onClick: ->(action) do 
-#     action.dialogs_alert message: 'Perform some action'
-#   end
-#   menu.button icon: { name: 'star', badge: { text: '1', backgroundColor: '#ff0000' } }, onClick: ->(action) do 
-#     action.dialogs_alert message: 'Perform some action'
-#   end
-#   menu.button icon: { name: 'map', badge: '2' }, onClick: ->(action) do 
-#     action.dialogs_alert message: 'Perform some action'
-#   end
-# end
-
 page.scroll padding: glib_json_padding_body, childViews: ->(scroll) do
   scroll.label text: 'See the right menu buttons on the nav bar'
 end

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

@@ -1,26 +1,25 @@
 json.title 'Tables'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page, top_nav: true
 
-  page.list firstSection: ->(section) do
-    section.rows builder: ->(template) do
-      template.thumbnail title: 'Layout', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'tables/layout')
-      end
-      template.thumbnail title: 'Horizontal Scroll', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'tables/horizontal_scroll')
-      end
-      template.thumbnail title: 'Export/Import', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'tables/export_import')
-      end
-      template.thumbnail title: 'Autoload as Needed', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'tables/autoload_as_needed')
-      end
-      template.thumbnail title: 'Autoload All', onClick: ->(action) do
-        action.windows_open url: json_ui_garage_url(path: 'tables/autoload_all')
-      end
+page.list firstSection: ->(section) do
+  section.rows builder: ->(template) do
+    template.thumbnail title: 'Layout', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/layout')
+    end
+    template.thumbnail title: 'Horizontal Scroll', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/horizontal_scroll')
+    end
+    template.thumbnail title: 'Export/Import', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/export_import')
+    end
+    template.thumbnail title: 'Autoload as Needed', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/autoload_as_needed')
+    end
+    template.thumbnail title: 'Autoload All', onClick: ->(action) do
+      action.windows_open url: json_ui_garage_url(path: 'tables/autoload_all')
     end
-
   end
+
 end

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

@@ -1,38 +1,36 @@
 json.title 'Tables'
 
-json_ui_page json do |page|
-  render "#{@path_prefix}/nav_menu", json: json, page: page
+page = json_ui_page json
+render "#{@path_prefix}/nav_menu", json: json, page: page
 
-  column_indexes = (1..5)
-  page.table sections: [
-    ->(section) do
-      section.rows builder: ->(row) do
-        row.default colSpans: [3, 2], cellViews: ->(cell) do
-          cell.label text: 'Spans 3 columns'
-          cell.panels_horizontal width: 'matchParent', backgroundColor: '#dddddd', padding: { top: 10, right: 10, bottom: 10, left: 10 }, childViews: ->(horizontal) do
-            horizontal.label text: 'Spans 2 columns'
-          end
+column_indexes = (1..5)
+page.table sections: [
+  ->(section) do
+    section.rows builder: ->(row) do
+      row.default colSpans: [3, 2], cellViews: ->(cell) do
+        cell.label text: 'Spans 3 columns'
+        cell.panels_horizontal width: 'matchParent', backgroundColor: '#dddddd', padding: { top: 10, right: 10, bottom: 10, left: 10 }, childViews: ->(horizontal) do
+          horizontal.label text: 'Spans 2 columns'
         end
       end
-    end,
-    ->(section) do
-      section.header cellViews: ->(header) do
-        column_indexes.each do |i|
-          header.label text: "Heading#{i}"
-        end
+    end
+  end,
+  ->(section) do
+    section.header cellViews: ->(header) do
+      column_indexes.each do |i|
+        header.label text: "Heading#{i}"
       end
+    end
 
-      items = [1, 2, 3]
-      section.rows objects: items, builder: ->(row, item, index) do
-        row.default colStyles: [{ width: 200, backgroundColor: '#eeeeee' }], cellViews: ->(cell) do
-          column_indexes.each do |i|
-            cell.label text: "Data #{item}"
-          end
-        end, onClick: ->(action) do
-          action.windows_open url: json_ui_garage_url(path: 'home/blank')
+    items = [1, 2, 3]
+    section.rows objects: items, builder: ->(row, item, index) do
+      row.default colStyles: [{ width: 200, backgroundColor: '#eeeeee' }], cellViews: ->(cell) do
+        column_indexes.each do |i|
+          cell.label text: "Data #{item}"
         end
+      end, onClick: ->(action) do
+        action.windows_open url: json_ui_garage_url(path: 'home/blank')
       end
     end
-  ]
-
-end
+  end
+]

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

@@ -19,15 +19,27 @@ json_ui_page json do |page|
     scroll.h2 text: 'With select options'
     scroll.spacer height: 6
     scroll.banners_select width: 'matchParent', icon: 'info', message: 'This is a select banner', buttons: ->(menu) do
-      menu.button text: 'Option1', onClick: ->(action) do
+      menu.button icon: 'add', text: 'Add', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'home/blank')
       end
-      menu.button text: 'Option2', onClick: ->(action) do
+      menu.button icon: 'edit', text: 'Edit', onClick: ->(action) do
         action.windows_open url: json_ui_garage_url(path: 'home/slow')
       end
-      menu.button text: 'Option3', onClick: ->(action) do
+      menu.button icon: 'delete', text: 'Delete', onClick: ->(action) do
         action.dialogs_alert message: 'Alert'
       end
+
+      menu.button icon: 'more_vert', childButtons: ->(submenu) do
+        submenu.button icon: 'add', text: 'Option1', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'home/blank')
+        end
+        submenu.button icon: 'edit', text: 'Option2', onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'home/slow')
+        end
+        submenu.button icon: 'delete', text: 'Option3', onClick: ->(action) do
+          action.dialogs_alert message: 'Alert'
+        end
+      end
     end
 
     scroll.spacer height: 20

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib-web
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19
 platform: ruby
 authors:
 - ''