shopapp 0.0.14 → 0.0.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 46ab99ece9ac369441a8b4f469a63283c3c6f377c6b95ed88f63827bf659db1f
4
- data.tar.gz: 919995ad7e1e9ab562c646d9de69dbe9e49bb62d2ff50764723d4b9b27176803
3
+ metadata.gz: 3a99f18760d6a92f7b64dbbcbabce9f5cda75771377230ac3eaacad53d5a6182
4
+ data.tar.gz: 91462700b29516799a2a1ca055111f736e4f0c6ae6f7da1c497853b2e25687d1
5
5
  SHA512:
6
- metadata.gz: 13ec4ac6fa396c0104d2854f997807870645a1e8f47bee2d35f56de35527e1de658be936c218208d1db53d677c12cc69c9ea0ec52ade23b7b7e5ab78ab9d4bcf
7
- data.tar.gz: c3c99b493250040be1bba1b2eed351fc9ec305f8fb7e80e5c2262f21003ecf851ebc4daad64824fef7ed7986708d419629cbeffa307a683e67483158e07edc7a
6
+ metadata.gz: 9249080f59805aed3d8b44aa0bfbf4902fb80301a42f5338ffd5151c26cd05cfe74a1b036083c04fbd6b92f64a6326bf512cb7179ed2ef5650d29338db62b937
7
+ data.tar.gz: 9fc09e00ef6b15fc488f37f4acc68fc63013db461526bc082b20ea41d0bb57ca4d11370eec272e716d86d141aeec6ff7283f4979fc2e3aa3e4c8ff1fac87afb5
@@ -1,44 +1,2 @@
1
- $enable-rounded: false;
2
1
  @import "bootstrap";
3
2
  @import "font-awesome";
4
- .table-hover {
5
- tr{cursor: pointer;}
6
- background-color: rgba(243,243,243,.85);
7
- margin-bottom: 0;
8
- padding-bottom: 0;
9
- border-bottom: 0;
10
- }
11
- .table-condensed th,
12
- .table-condensed td{
13
- padding: 0.45rem;
14
- font-size: 14px;
15
- }
16
- .badge{
17
- line-height: 15px;
18
- }
19
- th{
20
- background-color: #fff;
21
- }
22
- .header{
23
- border-bottom: 1px solid #dadada;
24
- border-top:1px solid #dadada;
25
- box-sizing: border-box;
26
- background-color: #ececec;
27
- padding: 10px 0;
28
- #more_apps,
29
- #profile{
30
- background-color: transparent;
31
- border:none;
32
- cursor: pointer;
33
- }
34
- }
35
- .products{
36
- padding: 0;
37
- overflow: scroll;
38
- height: calc(100vh - 79px);
39
- margin-bottom: 0;
40
- padding-bottom: 0;
41
- }
42
- .additional_nav{
43
- line-height: 33px;
44
- }
@@ -20,4 +20,13 @@ class AuthController < ActionController::Base
20
20
 
21
21
  redirect_to "#{Rails.configuration.settings['authlift_url']}users/sign_outx?signouttoken=#{signouttoken}"
22
22
  end
23
- end
23
+
24
+ def change_company
25
+ authenticate_user!
26
+ return if current_user.blank?
27
+ new_company_code = params.except(:_method, :authenticity_token).permit(:new_company_code)[:new_company_code]
28
+
29
+ signouttoken = session_cookie
30
+ redirect_to "#{Rails.configuration.settings['authlift_url']}users/change_companyx/#{new_company_code}?change_company_token=#{signouttoken}"
31
+ end
32
+ end
@@ -1,33 +1,37 @@
1
- .container-fluid
2
- .row.header.navbar.justify-content-between
3
- .col-4.col-md-2
4
- = link_to(Rails.configuration.settings['shopapp_name'], '/')
5
- .col-4.col-md-2.order-md-2
6
- .row.justify-content-end
7
- .col-4
8
- = render 'layouts/header_menu'
9
- .col-4
10
- .dropdown
11
- %button#more_apps(aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" type="button")
12
- %i.fa.fa-th(aria-hidden="true")
13
- .dropdown-menu.dropdown-menu-right(aria-labelledby="dropdownMenuButton" style="right: 0; left: auto;")
14
- %a.dropdown-item(href="#") Order Manager
15
- %a.dropdown-item(href="#") Shipment Manager
16
- %a.dropdown-item(href="#") Store Configuration
17
- .col-4
18
- .dropdown
19
- %button#profile(aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" type="button")
20
- %i.fa.fa-user(aria-hidden="true")
21
- .dropdown-menu.dropdown-menu-right(aria-labelledby="dropdownMenuButton" style="right: 0; left: auto;")
22
- .dropdown-header=@current_user['email']
23
- %a.dropdown-item(href="#") Edit Profile
24
- = link_to(logout_path, method: :delete, :class => 'dropdown-item') do
25
- Logout
26
- .col-md-6.order-1
1
+ .navbar.navbar-expand-md.navbar-light.bg-secondary
2
+ .container-fluid
3
+ = link_to(Rails.configuration.settings['shopapp_name'], '/', class: 'navbar-brand')
4
+ %button.navbar-toggler(type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation")
5
+ %span.navbar-toggler-icon
6
+ #navbarSupportedContent.collapse.navbar-collapse.navbar-toggleable-xs
27
7
  - unless controller.class.do_hide_search_for_this_controller
28
- %form(action="#{controller.class.search_path || '/'}")
29
- .input-group
30
- %input#search.form-control(name="search" placeholder="Search" type="text" value=@search)
31
- %button.btn.btn-primary.input-group-addon(type="submit" style="width: 80px; padding-left: 30px;")
32
- %i.fa.fa-search(aria-hidden="true")
8
+ .w-75.mx-md-auto.mt-4.mt-md-0
9
+ %form(action="#{controller.class.search_path || '/'}")
10
+ .input-group
11
+ %input#search.form-control(name="search" placeholder="Search" type="text" value=@search)
12
+ %button.btn.btn-dark.input-group-addon(type="submit")
13
+ %i.fa.fa-search.mx-4(aria-hidden="true")
14
+ %ul.navbar-nav.ml-auto
15
+ = render 'layouts/header_menu'
16
+ %li.nav-item.dropdown
17
+ %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
18
+ %i.fa.fa-th(aria-hidden="true")
19
+ .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
20
+ -(@current_user['company']['apps'] || []).each do |app|
21
+ %a.dropdown-item(href="#{app['home']}")=app['name']
22
+ %li.nav-item.dropdown.ml-md-2
23
+ %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
24
+ %i.fa.fa-user(aria-hidden="true")
25
+ .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
26
+ .dropdown-header=@current_user['email']
27
+ .dropdown-header
28
+ %strong Company:
29
+ =@current_user['company']['name']
30
+ .dropdown-divider
31
+ - (@current_user['memberships'] || []).reject { |c| @current_user['company']['code'] == c['code'] }.each do |c|
32
+ = link_to(change_company_path(c['code']), method: :post, :class => 'dropdown-item') do
33
+ Switch company to: #{c['name']}
34
+ = link_to(logout_path, method: :delete, :class => 'dropdown-item') do
35
+ Logout
36
+ .container-fluid.mt-2
33
37
  = yield
@@ -1,6 +1,7 @@
1
1
  class ActionDispatch::Routing::Mapper
2
2
  def shoplift_single_sign_on
3
3
  get 'auth', to: 'auth#auth'
4
+ post 'auth/change_company/:new_company_code', to: 'auth#change_company', as: 'change_company'
4
5
  delete 'auth', to: 'auth#destroy', as: 'logout'
5
6
  end
6
7
  end
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'shopapp'
3
- s.version = '0.0.14'
3
+ s.version = '0.0.15'
4
4
  s.date = '2018-05-17'
5
5
  s.summary = 'Do a shoplift.'
6
6
  s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shopapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zeljko