shopapp 0.0.14 → 0.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/shopapp.scss +0 -42
- data/app/controllers/auth_controller.rb +10 -1
- data/app/views/shopapp/_shopapp.html.haml +35 -31
- data/lib/shopapp/routes.rb +1 -0
- data/shopapp.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3a99f18760d6a92f7b64dbbcbabce9f5cda75771377230ac3eaacad53d5a6182
|
|
4
|
+
data.tar.gz: 91462700b29516799a2a1ca055111f736e4f0c6ae6f7da1c497853b2e25687d1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
-
|
|
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
|
-
.
|
|
2
|
-
.
|
|
3
|
-
.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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
|
-
|
|
29
|
-
.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
%
|
|
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
|
data/lib/shopapp/routes.rb
CHANGED
data/shopapp.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = 'shopapp'
|
|
3
|
-
s.version = '0.0.
|
|
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!\
|