glib-web 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5079872c2112ab26d047f127bc6a1439108ff6e4
-  data.tar.gz: 3b85cc0e2092562954945464557b04f6cbf73daf
+  metadata.gz: df566013ce3acc240e942fce9afae6dbb6b5c035
+  data.tar.gz: 9ce0f54f02cf936abf1d49bfeff57800033fbaa6
 SHA512:
-  metadata.gz: 202573f997d53fd508721b354bd9fe465f7afa63b7eedfe200a18c5d4523f54ca59139c946ae744abbacb41c673fecc80485c0c1c1295759bec71d5f11118328
-  data.tar.gz: e7ab09ff8e10b8cf59607b2bed4c1321b8b3dcd962e6c32792320f2470a7daa81f6bbb3c24ded486e90ff1bc114bc7ad47d77516859c4dc592cbf40d5f1e238e
+  metadata.gz: 51be02308f500ae5a18143cb5259e3ec0aeb453ff45f3445d7b0e78bba4aeced0a90f15acdba7fa2033656a41adf98126c8b785c14c3d06efd7133ebf9ce7b72
+  data.tar.gz: 65fcd88b64d919f03994a0f81c70a269581d75fe68e2900f64656b8cdd3187dbaffe5a7b5b689ffa569d1f4b9e63f898041f4b782e01b1f5415eb2fd5bddf98a

data/app/controllers/glib/home_controller.rb

@@ -10,15 +10,15 @@ module Glib
       render path
     end
 
-    def json_ui_garage_url(options = {})
-      Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
-        protocol: (Rails.application.config.force_ssl ? 'https' : 'http'),
-        host: request.host,
-        port: request.port,
-        _render: params[:_render], format: params[:format])
-      )
-    end
+    # def json_ui_garage_url(options = {})
+    #   Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
+    #     protocol: (Rails.application.config.force_ssl ? 'https' : 'http'),
+    #     host: request.host,
+    #     port: request.port,
+    #     _render: params[:_render], format: params[:format])
+    #   )
+    # end
 
-    helper_method :json_ui_garage_url
+    # helper_method :json_ui_garage_url
   end
 end

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

@@ -12,6 +12,7 @@ module Glib
         string :text
         icon :icon
         action :onClick
+        bool :disabled
       end
     end
   end

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

@@ -1,6 +1,15 @@
 module Glib
   module JsonUi
     module PageHelper
+      def json_ui_garage_url(options = {})
+        return Glib::Web::Engine.routes.url_helpers.json_ui_garage_url(options.merge(
+          protocol: (Rails.application.config.force_ssl ? 'https' : 'http'),
+          host: request.host,
+          port: request.port,
+          _render: params[:_render], format: params[:format])
+        )
+      end
+
       def json_ui_page json
         yield Page.new(json, self)
       end

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

@@ -65,6 +65,16 @@ module Glib
         int :zoom
         string :dataUrl
       end
+      
+      class TabBar < View
+        string :color
+        
+        def tabButtons(block)
+          json.tabButtons do
+            block.call page.menu_builder
+          end
+        end
+      end
 
     end
   end

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

@@ -4,35 +4,47 @@ json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
   page.header childViews: ->(header) do
-    json.child! do
-      json.view 'tabBar-v1'
-      json.width 'matchParent'
-      json.backgroundColor '#ffca05'
-      json.color '#7f561b'
-      json.tabButtons do
-        json.child! do
-          json.text 'FIRST'
-          json.onClick do
-            json.action 'windows/open-v1'
-            json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 0)
-          end
-        end
-        json.child! do
-          json.text 'SECOND'
-          json.onClick do
-            json.action 'windows/open-v1'
-            json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 1)
-          end
-        end
-        json.child! do
-          json.text 'THIRD'
-          json.onClick do
-            json.action 'windows/open-v1'
-            json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 2)
-          end
+    header.tabBar width: 'matchParent', backgroundColor: '#ffca05', color: '#7f561b', tabButtons: ->(menu) do
+      
+      ['FIRST', 'SECOND', 'THIRD'].each_with_index do |text, index|
+        menu.button text: text, disabled: params[:tab].to_i == index, onClick: ->(action) do
+          action.windows_open url: json_ui_garage_url(path: 'pages/tab_bar', tab: index)
         end
       end
     end
+
+    # json.child! do
+    #   json.view 'tabBar-v1'
+    #   json.width 'matchParent'
+    #   json.backgroundColor '#ffca05'
+    #   json.color '#7f561b'
+    #   json.tabButtons do
+    #     json.child! do
+    #       json.text 'FIRST'
+    #       json.selected params[:tab] == 0
+    #       json.onClick do
+    #         json.action 'windows/open-v1'
+    #         json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 0)
+    #       end
+    #     end
+    #     json.child! do
+    #       json.text 'SECOND'
+    #       json.selected params[:tab] == 1
+    #       json.onClick do
+    #         json.action 'windows/open-v1'
+    #         json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 1)
+    #       end
+    #     end
+    #     json.child! do
+    #       json.text 'THIRD'
+    #       json.selected params[:tab] == 2
+    #       json.onClick do
+    #         json.action 'windows/open-v1'
+    #         json.url json_ui_garage_url(path: 'pages/tab_bar', tab: 2)
+    #       end
+    #     end
+    #   end
+    # end
   end
 
   page.scroll padding: {top: 12, left: 20, right: 20, bottom: 12}, childViews: ->(scroll) do

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

@@ -3,9 +3,9 @@ json.title 'Views'
 json_ui_page json do |page|
   render "#{@path_prefix}/nav_menu", json: json, page: page
   
-  page.scroll childViews: ->(scroll) do
-    scroll.label text: "\n"
+  page.scroll padding: {top: 20, left: 20, right: 20, bottom: 20}, childViews: ->(scroll) do
     scroll.h1 text: 'Map'
+    scroll.br height: 6
     scroll.map latitude: 13.4837, longitude: 144.7917, zoom: 11, width: 'matchParent', height: 250, dataUrl: json_ui_garage_url(path: 'views/map_data')
   end
 end

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

@@ -1,42 +1,43 @@
 
 json.pins do
 
-  # TODO: Make sure the vuejs frontend passes the map's center point (lat/long) to the server
-  latitude = params[:lat] || 0
-  longitude = params[:long] || 0
-  subsubtitle = "Current location: #{latitude}, #{longitude}"
+  latitude = params[:lat]&.to_f
+  longitude = params[:long]&.to_f
 
   json.child! do
-    # json.id 'place1'
-    json.latitude 13.516680 + rand(0..0.1)
-    json.longitude 144.817322 + rand(0..0.1)
+    json.latitude 13.516680
+    json.longitude 144.817322
     json.infoWindow do
       json.title 'Place 1'
       json.subtitle 'Big shopping mall'
-      json.subsubtitle subsubtitle
     end
   end
 
   json.child! do
-    # json.id 'place2'
-    json.latitude 13.473001 + rand(0..0.1)
-    json.longitude 144.771303 + rand(0..0.1)
+    json.latitude 13.473001
+    json.longitude 144.771303
     json.infoWindow do
       json.title 'Place 2'
       json.subtitle 'High class restaurant'
-      json.subsubtitle subsubtitle
     end
   end
 
   json.child! do
-    # json.id 'place3'
     json.latitude 13.375903 + rand(0..0.1)
     json.longitude 144.749791 + rand(0..0.1)
     json.infoWindow do
       json.title 'Place 3'
-      json.subtitle 'High class restaurant'
-      json.subsubtitle subsubtitle
+      json.subtitle 'Random location'
     end
   end
 
+  json.child! do
+    json.latitude latitude
+    json.longitude longitude
+    json.infoWindow do
+      json.title 'You'
+      json.subtitle 'Current location'
+      json.subsubtitle "#{latitude}, #{longitude}"
+    end
+  end
 end

metadata

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