shopapp 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7358bcd191eca835a745a359c283c2c021a89578552c09b82fdecfcd44c2ca1
-  data.tar.gz: 8d1f82dfba08d9da9dd1a19d55db02b121ca65d5d904fe1ab5750d1b47184736
+  metadata.gz: 20d46c43bba283b3d2a3abda46048b8b0e55f1c1f73070f84c2af1ec1b84d5c5
+  data.tar.gz: 320def0a006db8f0d21388a31c1dcd1df78d51c307d5c639af1a94630ab4d99b
 SHA512:
-  metadata.gz: 4767ee96a987c7000aa21f81a1084cb6851d120e19c16d144bd1b477dae3a75853d2126e9ca4f84ecf0b931962f7fe8c47ca478c4889b3d6d69940b16586f901
-  data.tar.gz: e9f323c0da1970f17c8bfcb27e4e7b5308cb2902fa83c90e1a5d7f9b9d5554b8351d57382282170f737e57f5eefd01192c0e18cd2055854b15b4e07749e939e4
+  metadata.gz: 6b1843c4265d331d351da3f35e3d9b10d14cfb8b7400a0519bf8cb6d8986ac8139ec5af3eeba6988b86d8063fee1dee1881ac5594ac7621df3e7c0b559b2fa75
+  data.tar.gz: 1694787c6c6b52cded3499723e38883f24181dadbbe3c499851b436718a9e8e30618078a45b59bc5b02bfb82466ba05080048e4a38796d55aa85df5e8fde3f91

data/app/assets/stylesheets/variables.scss

@@ -36,6 +36,7 @@ $zcolor_neutral:   #7487D0 !default; //928DAE
 $zcolor_light:     #f1f0f6 !default; //CECACF
 $zcolor_dark:      #100C2E !default;
 $zcolor_secondary: #71678C !default; //8B669D
+$zcolor_main_light:#6D049B !default; //e236ff
 
 // Z functional colors
 // As suggested by http://colormind.io/bootstrap/

data/app/controllers/concerns/shoplift_client.rb

@@ -71,9 +71,13 @@ module ShopliftClient
     [Rails.configuration.settings['authlift_default_scope'], 'public'].compact.join ' '
   end
 
-  def find_company_by_code(code)
+  def find_company_by_code(code, parameters = {})
     begin
-      @current_company ||= Company.find_or_create_by! code: code
+      @current_company ||= Company.find_or_create_by! code: code do |new_company|
+        fail if parameters.empty?
+        new_company.name = parameters[:name]
+        new_company.info = parameters.to_json
+      end
     rescue ActiveRecord::StatementInvalid
       if $!.cause.is_a? PG::UndefinedTable
         fail <<-ERROR.strip_heredoc
@@ -92,7 +96,7 @@ module ShopliftClient
       @token = OAuth2::AccessToken.new client, session_cookie, scope: scope
       begin
         x = srv.get '/api/users/profile'
-        @current_user = JSON.parse x.response.body
+        @current_user_json_hash = @current_user = JSON.parse x.response.body
         user_scopes = JSON.parse @current_user['scopes']
         unless user_scopes.include? 'admin'
           (self.class.required_scopes || []).each do |required_scope|
@@ -102,7 +106,9 @@ module ShopliftClient
             end
           end
         end
-        find_company_by_code current_user['company']['code']
+        find_company_by_code current_user['company']['code'],
+                             name: current_user['company']['name'],
+                             logo_code: current_user['company']['logo_code']
       rescue OAuth2::Error
         return false
       end
@@ -207,7 +213,7 @@ module ShopliftClient
     if  defined? self.company_logo_path
       company_logo_path
     else
-      "https://media.shoplift.fi/company_logos/#{@current_company.code}_company_logo_24.png"
+      "https://media.shoplift.fi/company_logos/#{@current_user_json_hash['company']['logo_code']}_company_logo_24.png"
     end
   end
 end

data/app/views/shopapp/_shopapp.html.haml

@@ -23,19 +23,19 @@
         %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
           %i.fa.fa-th(aria-hidden="true")
         .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
-          -(@current_user['company']['apps'] || []).each do |app|
+          -(@current_user_json_hash['company']['apps'] || []).each do |app|
             - if app['home'].present?
               %a.dropdown-item(href="#{app['home']}")=app['name']
       %li.nav-item.dropdown.ml-md-2.ml-3.mr-3
         %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
           %i.fa.fa-user(aria-hidden="true")
         .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
-          .dropdown-header=@current_user['email']
+          .dropdown-header=@current_user_json_hash['email']
           .dropdown-header
             %strong Company:
-            =@current_user['company']['name']
+            =@current_user_json_hash['company']['name']
           .dropdown-divider
-          - (@current_user['memberships'] || []).reject { |c| @current_user['company']['code'] == c['code'] }.each do |c|
+          - (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.each do |c|
             = link_to(change_company_path(c['code']), method: :post, :class => 'dropdown-item') do
               Switch company to: #{c['name']}
           = link_to(logout_path, method: :delete, :class => 'dropdown-item') do

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.7'
-  s.date        = '2018-09-25'
+  s.version     = '0.2.8'
+  s.date        = '2018-09-27'
   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.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties