navilocal 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e980d497b13ebfd62a1972253aa293dcecdb84807923fee18a830eb4821677
-  data.tar.gz: 96faab2e8481f9da047c8014df6ef553d15c7b35c3783dfaab714c945fa0c8e6
+  metadata.gz: 44aea07beba53d9e85a3ca39d76ee5085fc1baec93d0f67fddd8ae4b931ab0f7
+  data.tar.gz: 6c7246d64199dff25eeabed0e6f7da3c1c1652edee78a9529f8207fa38a834a2
 SHA512:
-  metadata.gz: c74d03146953926c7b05fb6827d971c13218ae4dafc39f40faf0a27c06ee28e9568c9c1eb83e7b081f2df04e463ce6a1ff136acf462d5e33ab874a43f0ace158
-  data.tar.gz: ba0eedd2e1ceee20f7ccbceb04c9679b1b4b797060f4da8435ec1fdb287ef153d002ecc6687993af6934d668b5b691555e314af52ffc53372103f9186d7fa738
+  metadata.gz: 06fa4c7f08442c515f705aae097f9c84fcda79ae271f0b51aeb90dc83d116427c775c3e77877f16ade15dac839e927787e4240f0e3ca418051ae4da9f3e26dee
+  data.tar.gz: 6c969be5fa8a7cc045355ca626b556d8453bdc9871297a980094baa7988a693563bdcfc5aa2e8399b84e9e141978be30b37be0c75e3e4a90d7005a0d49435f0c

data/application/ui/navi/account_configuration.rb

@@ -5,8 +5,6 @@ module NaviClientInstaller
     include CommonFunctions
     attr_accessor :next_btn
 
-
-
     def initialize(settings, next_btn=nil)
       builder = Gtk::Builder.new(:resource => '/com/navi/navi-client/ui/account_configuration.ui')
       css_provider = Gtk::CssProvider.new
@@ -32,13 +30,6 @@ module NaviClientInstaller
 
       prepare_ui @next_btn
 
-
-      view_info = builder.get_object("view_info")
-
-
-      view_info.buffer.insert(view_info.buffer.get_iter_at(:offset => 0), "Please enter your email address which you want to associate with NAVI")
-
-
       @combo_text_provider.signal_connect "changed" do |widget|
         settings.provider = widget.active_iter.get_value(1)
         prepare_ui @next_btn
@@ -61,7 +52,6 @@ module NaviClientInstaller
 
       label_top.style_context.add_provider(css_provider, Gtk::StyleProvider::PRIORITY_USER)
       @window_ui.style_context.add_provider(css_provider, Gtk::StyleProvider::PRIORITY_USER)
-#
 
     end
 

data/application/ui/navi/installer_assistant.rb

@@ -17,6 +17,7 @@ module NaviClientInstaller
         bind_template_child 'btn_next'
         bind_template_child 'btn_back'
         bind_template_child 'btn_cancel'
+        bind_template_child 'content_box'
 
       end
     end
@@ -40,7 +41,7 @@ module NaviClientInstaller
       initiate_splash
 
 
-      apply_css bbox_navigation, css_provider
+      apply_css content_box, css_provider
     end
 
     def initiate_splash

data/application/ui/navi/splash.rb

@@ -57,24 +57,51 @@ module NaviClientInstaller
       email_entry = @builder.get_object("entry_splash_email")
       password_entry = @builder.get_object("entry_splash_pass")
       back_btn = @builder.get_object("back")
+      connect_btn = @builder.get_object("connect_btn")
+      account_label = @builder.get_object("account_label")
 
       email_entry.set_text @settings.username
       password_entry.set_text ""
 
-      if login_info.buffer.text.to_s.empty?
+      if login_info.label.to_s.empty?
         back_btn.signal_connect("clicked") {|widget|
           back_callback&.call
         }
 
+        connect_btn.signal_connect("clicked") {|widget|
+          unless password_entry.text.empty?
+            spinner.active = true
+            password_entry.sensitive = false
+            connect_btn.sensitive = false
+
+            response = validate_email @settings.username, password_entry.text
+
+            spinner.active = false
+            password_entry.sensitive = true
+            connect_btn.sensitive = true
+
+            if response && response.code == 200
+              error_label.set_opacity 0
+              @settings.hash = password_entry.text
+              @settings.save_settings
+              callback.call response["access_token"]
+            else
+              error_label.set_opacity 1
+            end
+          end
+        }
+
         password_entry.signal_connect("activate") {|widget|
           unless widget.text.empty?
             spinner.active = true
             password_entry.sensitive = false
+            connect_btn.sensitive = false
 
             response = validate_email @settings.username, widget.text
 
             spinner.active = false
             password_entry.sensitive = true
+            connect_btn.sensitive = true
 
             if response && response.code == 200
               error_label.set_opacity 0
@@ -87,9 +114,13 @@ module NaviClientInstaller
           end
         }
 
-        create_tags(login_info.buffer)
-        login_info.buffer.insert(login_info.buffer.get_iter_at(:offset => 0), "We need you to connect to our app. Please sign in. If you donot have the account already, please sign up first.",
-                                 :tags => %w(double_spaced_line large))
+        # create_tags(login_info.buffer)
+        create_tags(account_label.buffer)
+
+        login_info.label =  "Please connect to our app using your preferred email address."
+        # login_info.buffer.insert(login_info.buffer.get_iter_at(:offset => 0), "Please connect to our app using your preferred email address.")
+
+        account_label.buffer.insert(account_label.buffer.get_iter_at(:offset => 0), "Don't have an Account? Create Account.")
 
       end
 
@@ -98,6 +129,7 @@ module NaviClientInstaller
     end
 
     def show_signup
+      @builder.get_object("loading_spinner")&.visible = false
       @signup_control = @builder.get_object("box_splash_login")
       @signup_control&.visible = true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Msanjib