shopapp 0.2.67 → 0.2.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d027c6f21b4d8853222c8c2ec2d2a8ed73c8539ddfed1198cac272835ca0d30
-  data.tar.gz: 00cdadce9a12b39ad422eb690afa6899a81c646b074cd91ae6a3454752b12c8d
+  metadata.gz: 738ab7bb67c5529b4184fd324415e44aad3bfa911bbd6bdec41f28e13af43f37
+  data.tar.gz: 694d7f2e1d4976f7c651f239c24e70810107dc16e0472ca724c6d203ca00df56
 SHA512:
-  metadata.gz: a8ac31a92fba30b166b38108208273536ec4363d37fcc91b4185740ce9aab30eebe6012a55b312aa16abd81541a6119d4a5208fc50e6cdab5315fd6e9dd99a0e
-  data.tar.gz: 7060fba84857eaf91f929b97f9ebf75494719f56a9a0f6c9ff0ac85be995bbbf1bc3c5f11e7d0522dc06204c8a21e34aebb4ead24d0933e9ebb3668b2cd5a575
+  metadata.gz: d5254b85c1219fc355cc615a916d530bfa468a40a71f027ff883bad4910969ec1847869f69e546692334ebad8761daef433d47308cf1399dbd385bdb9801368a
+  data.tar.gz: 58fa561426e2f322acd0e66ccac96af5d62628fd7d1a97ebe4b3f5575b9fc511239b18a38e6efe99b49cf1b5b1c3508db2fcfd6bb498e0362e8d6b66d0f585a6

data/README.md

@@ -93,4 +93,4 @@ shopapp to support i18n, add two methods to your ApplicationController:
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    gem build shopapp.gemspec ; gem push shopapp-0.2.67.gem; gem install shopapp
+    gem build shopapp.gemspec ; gem push shopapp-0.2.68.gem; gem install shopapp

data/app/controllers/concerns/shoplift_client.rb

@@ -109,9 +109,16 @@ module ShopliftClient
   end
 
   def shoplift_login_url
-    client.auth_code.authorize_url(
+    redirect_parameters = {
       redirect_uri: local_authlift_redirect_uri,
-      scope: scope)
+      scope: scope
+    }
+
+    if cookies[:set_i18n_pub]
+      redirect_parameters[:set_i18n_pub] = cookies[:set_i18n_pub]
+    end
+
+    client.auth_code.authorize_url(redirect_parameters)
   end
 
   def redirect_unauthorized(skip_landing_page = false)

data/app/controllers/shopapp_login_controller.rb

@@ -2,6 +2,17 @@ class ShopappLoginController < ApplicationController
   include ShopliftClient
 
   def welcome
+    redirect_parameters = { return_path: request.url }
+
+    if params['set_i18n_pub']
+      cookies[:set_i18n_pub] = params['set_i18n_pub']
+    end
+
+    if cookies[:set_i18n_pub]
+      redirect_parameters[:set_i18n_pub] = cookies[:set_i18n_pub]
+      I18n.locale = (cookies[:set_i18n_pub] || I18n.default_locale).to_sym
+    end
+
     unless Rails.configuration.settings['use_welcome_screen'].present?
       redirect_to root_path
       return
@@ -16,7 +27,7 @@ class ShopappLoginController < ApplicationController
         authenticate_user! true
       else
         destination = URI("#{Rails.configuration.settings['authlift_url']}softly_verify_login")
-        destination.query = { return_path: request.url }.to_query
+        destination.query = redirect_parameters.to_query
         redirect_to destination.to_s
       end
     end

data/app/views/shopapp/login_message.haml

@@ -20,12 +20,14 @@
           .jumbotron.bg-secondary.text-light
             .container.h-100
               = image_tag company_logo_path_defined
-              %h2.pt-5 #{@current_shop_owner.name} B2B shop
-              %h1.mt-3 Welcome!
+              = link_to '?set_i18n_pub=fi', class: 'float-right ml-2', data: { turbolinks: false } do
+                = image_tag "flags/fi.png", style: "height: 24; width: 36px;"
+              = link_to '?set_i18n_pub=en', class: 'float-right', data: { turbolinks: false } do
+                = image_tag "flags/en.png", style: "height: 24; width: 36px;"
+              %h2.pt-5 #{@current_shop_owner.name} #{t :b2b_shop}
+              %h1.mt-3= t :welcome
               %p.mt-5
-                #{@current_shop_owner.name} B2B Shop is running on OZZ platform.
-                You need to login with your OZZ account to proceed.
-              = link_to shoplift_login_url do
-                %button.btn.btn-primary.btn-lg.float-right.my-5
-                  Proceed to login
+                #{@current_shop_owner.name} #{t :landing_message}
+              = link_to shoplift_login_url, data: { turbolinks: false } do
+                %button.btn.btn-primary.btn-lg.float-right.my-5= t :landing_button
               .clearfix

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.67'
-  s.date        = '2019-09-27'
+  s.version     = '0.2.68'
+  s.date        = '2019-10-03'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.67
+  version: 0.2.68
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties