shopapp 0.2.33 → 0.2.34

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: 982aecb815386a153a6875d0092aa5a4dc121ca76231e08306fe00e1c1bef63e
4
- data.tar.gz: '0569f7f627fc7cfe0a467a9d7ad3819da7ad005cd33d937196866d8c8e74ba61'
3
+ metadata.gz: ee2f226e3a05289d025bbbc0c665866daaa1053efb638a588d028078b4dee4f7
4
+ data.tar.gz: 18a6857a10fdab527620d569511aada1eebe984d98963afd2d24f8d964130d93
5
5
  SHA512:
6
- metadata.gz: 14fcb5a42a086ae9373b8b969ea7748ab3526d6c7f6707db3fcaddaf5e58f2f3dfa558f33e1b3db1ef227b1817dd4f99ffdab438c6757c127df043fab7a2d89a
7
- data.tar.gz: feca3e9552f13e98deed5b8b9fd7fca2a3c53a0a5c43ce40d822ec0219359db786061dddb9be010c19d35d53677bd04b3cf454e9ac7ebfc33a19db3fc70a9fe7
6
+ metadata.gz: ab420b44ea7366bee5ff1446c42bdf22a8a94637e1caf15c8350bb3108e4710b3cb55689fa9c49cb7fed22ed6e665f392a646b28791b11eadbcbcb732bd3c10b
7
+ data.tar.gz: f16595bda40c92753deec0505403bd54b66ac44920fb2db443bcc7f15ea3cfa8db4f4e475b3e5666b212223bf8087703125c4bd23b44571449c0f0816a4ce421
Binary file
@@ -0,0 +1,19 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>calendar</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="04-contact-list" transform="translate(-1275.000000, -144.000000)" stroke="#7540EE" stroke-width="2">
8
+ <g id="options" transform="translate(1179.000000, 132.000000)">
9
+ <g id="calendar" transform="translate(97.000000, 13.000000)">
10
+ <path d="M-8.8817842e-16,7 L15.5080624,7" id="Shape"></path>
11
+ <path d="M14.8571429,2 L1.14285714,2 C0.512,2 -1.50990331e-14,2.48246154 -1.50990331e-14,3.07692308 L-1.50990331e-14,14.9230769 C-1.50990331e-14,15.5175385 0.512,16 1.14285714,16 L14.8571429,16 C15.488,16 16,15.5175385 16,14.9230769 L16,3.07692308 C16,2.48246154 15.488,2 14.8571429,2 Z" id="Shape"></path>
12
+ <path d="M13,0 L13,2" id="Shape"></path>
13
+ <path d="M8,0 L8,2" id="Shape"></path>
14
+ <path d="M3,0 L3,2" id="Shape"></path>
15
+ </g>
16
+ </g>
17
+ </g>
18
+ </g>
19
+ </svg>
@@ -0,0 +1,18 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="45px" height="45px" viewBox="0 0 45 45" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>Group 10@0,25x</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7
+ <g id="03-email" transform="translate(-1039.000000, -343.000000)" fill-rule="nonzero">
8
+ <g id="mail" transform="translate(991.000000, 132.000000)">
9
+ <g id="placeholder" transform="translate(0.000000, 163.000000)">
10
+ <g id="Group-10" transform="translate(48.000000, 48.000000)">
11
+ <circle id="Oval" fill="#00D8BB" cx="22.2631579" cy="22.2631579" r="22.2631579"></circle>
12
+ <path d="M17.4395203,32 C16.8116565,32 15.9745048,31.7907121 15.5559289,31.1628483 L8.23085154,23.8377709 L9.06800324,23.0006192 C9.69586702,22.3727554 10.7423066,22.1634675 11.5794584,22.3727554 L18.6952478,24.0470588 L25.3924614,17.3498452 C27.2760528,15.4662539 29.7875079,14.4198142 32.298963,14.2105263 L33.9732664,14.2105263 C34.6011302,14.2105263 35.019706,15.047678 34.6011302,15.4662539 L19.3231116,30.9535604 C18.9045357,31.7907121 18.067384,32 17.4395203,32 Z" id="Shape" fill="#FEFEFE"></path>
13
+ </g>
14
+ </g>
15
+ </g>
16
+ </g>
17
+ </g>
18
+ </svg>
@@ -0,0 +1,16 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>comment-add@0,25x</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="04-contact-list" transform="translate(-1202.000000, -144.000000)" stroke="#7540EE" stroke-width="2">
8
+ <g id="options" transform="translate(1179.000000, 132.000000)">
9
+ <g id="comment-add" transform="translate(24.000000, 13.000000)">
10
+ <path d="M12,1 L12,1 C12,0.44771525 11.5522847,3.08482111e-14 11,-4.4408921e-16 L2,0 C0.8954305,2.02906125e-16 -1.3527075e-16,0.8954305 0,2 L0,12 L3,9" id="Shape"></path>
11
+ <path d="M16,4 L8,4 C6.8954305,4 6,4.8954305 6,6 L6,16 L9,13 L16,13 C17.1045695,13 18,12.1045695 18,11 L18,6 C18,4.8954305 17.1045695,4 16,4 Z" id="Shape" transform="translate(12.000000, 10.000000) scale(-1, 1) translate(-12.000000, -10.000000) "></path>
12
+ </g>
13
+ </g>
14
+ </g>
15
+ </g>
16
+ </svg>
@@ -0,0 +1,19 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>trash</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="04-contact-list" transform="translate(-1346.000000, -145.000000)" stroke="#7540EE" stroke-width="2">
8
+ <g id="options" transform="translate(1179.000000, 132.000000)">
9
+ <g id="buttons">
10
+ <g id="trash" transform="translate(168.000000, 14.000000)">
11
+ <path d="M2,6 L2,13 C2,14.105 2.895,15 4,15 L11,15 C12.105,15 13,14.105 13,13 L13,6" id="Shape"></path>
12
+ <polyline id="Shape" points="5 3 5 0 10 0 10 3"></polyline>
13
+ <rect id="Rectangle-path" x="0" y="3" width="15" height="3"></rect>
14
+ </g>
15
+ </g>
16
+ </g>
17
+ </g>
18
+ </g>
19
+ </svg>
@@ -0,0 +1,25 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>calendar</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="02-calendar-copy" transform="translate(-41.000000, -281.000000)" stroke="#FFFFFF" stroke-width="2">
8
+ <g id="bars">
9
+ <g id="sidebar" transform="translate(0.000000, 108.000000)">
10
+ <g id="icons" transform="translate(0.000000, 150.000000)">
11
+ <g id="Group-3">
12
+ <g id="calendar" transform="translate(42.000000, 24.000000)">
13
+ <path d="M0.8,9.25 L23.2,9.25" id="Shape"></path>
14
+ <path d="M21.6,3.75 L2.4,3.75 C1.5168,3.75 0.8,4.422 0.8,5.25 L0.8,21.75 C0.8,22.578 1.5168,23.25 2.4,23.25 L21.6,23.25 C22.4832,23.25 23.2,22.578 23.2,21.75 L23.2,5.25 C23.2,4.422 22.4832,3.75 21.6,3.75 Z" id="Shape"></path>
15
+ <path d="M5.6,0.75 L5.6,3.75" id="Shape"></path>
16
+ <path d="M18.4,0.75 L18.4,3.75" id="Shape"></path>
17
+ <path d="M12,0.75 L12,3.75" id="Shape"></path>
18
+ </g>
19
+ </g>
20
+ </g>
21
+ </g>
22
+ </g>
23
+ </g>
24
+ </g>
25
+ </svg>
@@ -0,0 +1,24 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>messages</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="02-calendar-copy" transform="translate(-41.000000, -353.000000)" stroke="#FFFFFF" stroke-width="2">
8
+ <g id="bars">
9
+ <g id="sidebar" transform="translate(0.000000, 108.000000)">
10
+ <g id="icons" transform="translate(0.000000, 150.000000)">
11
+ <g id="Group-3">
12
+ <g id="messages" transform="translate(42.000000, 96.000000)">
13
+ <path d="M23.25,9.75 L12,15.75 L0.75,9.75 L0.75,21.75 C0.75,22.578 1.422,23.25 2.25,23.25 L21.75,23.25 C22.578,23.25 23.25,22.578 23.25,21.75 L23.25,9.75 Z" id="Shape"></path>
14
+ <polyline id="Shape" points="3.75 10.5 3.75 0.75 20.25 0.75 20.25 10.5"></polyline>
15
+ <path d="M8.25,5.25 L15.75,5.25" id="Shape"></path>
16
+ <path d="M8.25,9.75 L15.75,9.75" id="Shape"></path>
17
+ </g>
18
+ </g>
19
+ </g>
20
+ </g>
21
+ </g>
22
+ </g>
23
+ </g>
24
+ </svg>
@@ -0,0 +1,24 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="20px" height="26px" viewBox="0 0 20 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>users</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
7
+ <g id="02-calendar-copy" transform="translate(-44.000000, -425.000000)" stroke="#FFFFFF" stroke-width="2">
8
+ <g id="bars">
9
+ <g id="sidebar" transform="translate(0.000000, 108.000000)">
10
+ <g id="icons" transform="translate(0.000000, 150.000000)">
11
+ <g id="Group-3">
12
+ <g id="users" transform="translate(45.000000, 168.000000)">
13
+ <rect id="Rectangle-path" transform="translate(13.500000, 6.000000) rotate(-180.000000) translate(-13.500000, -6.000000) " x="11.25" y="3.75" width="4.5" height="4.5" rx="2.25"></rect>
14
+ <path d="M12.75,21.75 L15.75,21.75 L15.75,17.25 L17.25,17.25 L17.25,12.75 C17.25,11.9215729 16.5784271,11.25 15.75,11.25 L14.25,11.25" id="Shape"></path>
15
+ <rect id="Rectangle-path" x="3" y="0.75" width="6" height="6" rx="3"></rect>
16
+ <path d="M9.75,23.25 L2.25,23.25 L2.25,17.25 L0.75,17.25 L0.75,12.75 C0.75,11.0931458 2.09314575,9.75 3.75,9.75 L8.25,9.75 C9.90685425,9.75 11.25,11.0931458 11.25,12.75 L11.25,17.25 L9.75,17.25 L9.75,23.25 Z" id="Shape"></path>
17
+ </g>
18
+ </g>
19
+ </g>
20
+ </g>
21
+ </g>
22
+ </g>
23
+ </g>
24
+ </svg>
@@ -0,0 +1,20 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <svg width="26px" height="26px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
3
+ <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
4
+ <title>Group 4@</title>
5
+ <desc>Created with Sketch.</desc>
6
+ <g id="web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
7
+ <g id="02-calendar" transform="translate(-396.000000, -41.000000)" stroke="#7540EE" stroke-width="2">
8
+ <g id="bars">
9
+ <g id="topbar">
10
+ <g id="search" transform="translate(397.000000, 42.000000)">
11
+ <g id="Group-4">
12
+ <circle id="Oval-2" cx="11.5" cy="11.5" r="11.5"></circle>
13
+ <path d="M20,20 L24,24" id="Path-3" stroke-linecap="round" stroke-linejoin="round"></path>
14
+ </g>
15
+ </g>
16
+ </g>
17
+ </g>
18
+ </g>
19
+ </g>
20
+ </svg>
@@ -0,0 +1,5 @@
1
+ //= require jquery3
2
+ //= require rails-ujs
3
+ //= require popper
4
+ //= require bootstrap-sprockets
5
+ //= require material.min
@@ -0,0 +1,117 @@
1
+ @import "material.min";
2
+
3
+ html, body {
4
+ font-family: 'Fira Sans', Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica Neue, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
5
+ color: #323232;
6
+ background: #f3f3f3;
7
+ height: 100%;
8
+ -webkit-font-smoothing: antialiased;
9
+ -moz-osx-font-smoothing: grayscale;
10
+ }
11
+ .card {
12
+ box-shadow: none;
13
+ }
14
+ .navdrawer-persistent-lg {
15
+ right: auto;
16
+ width: 32rem;
17
+ z-index: auto;
18
+ }
19
+ .text-subheader {
20
+ font-weight: 500;
21
+ }
22
+ .badge {
23
+ font-size: .85rem;
24
+ }
25
+ .input-number {
26
+ width: 80px;
27
+ padding: 0 12px;
28
+ vertical-align: top;
29
+ text-align: center;
30
+ outline: none;
31
+ }
32
+ .input-number, .input-number-decrement, .input-number-increment {
33
+ border: 1px solid #ccc;
34
+ height: 40px;
35
+ user-select: none;
36
+ }
37
+ .input-number-decrement, .input-number-increment {
38
+ display: inline-block;
39
+ width: 30px;
40
+ line-height: 38px;
41
+ background: #f1f1f1;
42
+ color: #444;
43
+ text-align: center;
44
+ font-weight: bold;
45
+ cursor: pointer;
46
+ }
47
+ .input-number-decrement:active, .input-number-increment:active {
48
+ background: #ddd;
49
+ }
50
+ .input-number-decrement {
51
+ border-right: none;
52
+ border-radius: 4px 0 0 4px;
53
+ }
54
+ .input-number-increment {
55
+ border-left: none;
56
+ border-radius: 0 4px 4px 0;
57
+ }
58
+ #sidebar-wrapper {
59
+ background: url('/assets/shopapp3/bg.jpg') center no-repeat;
60
+ background-size: cover;
61
+ min-height: 100vh;
62
+ margin-left: -80px;
63
+ -webkit-transition: margin .25s ease-out;
64
+ -moz-transition: margin .25s ease-out;
65
+ -o-transition: margin .25s ease-out;
66
+ transition: margin .25s ease-out;
67
+ }
68
+ #sidebar-wrapper .sidebar-heading {
69
+ height: 80px;
70
+ background: #25265E;
71
+ }
72
+ #sidebar-wrapper .nav {
73
+ width: 80px;
74
+ }
75
+ #sidebar-wrapper .nav .nav-item {
76
+ border-right: 2px solid transparent;
77
+ }
78
+ #sidebar-wrapper .nav .nav-item.active {
79
+ background: rgba(37, 38, 94, 0.25);
80
+ border-right: 2px solid #FFC800;
81
+ }
82
+ #sidebar-wrapper .nav .nav-item:hover {
83
+ background: rgba(37, 38, 94, 0.25);
84
+ }
85
+ #page-content-wrapper {
86
+ min-width: 100vw;
87
+ }
88
+ #page-content-wrapper nav {
89
+ height: 80px;
90
+ box-shadow: 0px 2px 20px 0px rgba(37, 38, 94, 0.1);
91
+ }
92
+ .navbar .form-control {
93
+ background-color: #f5f5f5;
94
+ border-bottom: 1px solid #dbdbdb;
95
+ min-width: 15rem;
96
+ outline: 0;
97
+ font-size: .85rem;
98
+ font-weight: 500;
99
+ }
100
+ #wrapper.toggled #sidebar-wrapper {
101
+ margin-left: 0;
102
+ }
103
+ @media (min-width: 768px) {
104
+ .toggle {
105
+ display: none;
106
+ }
107
+ #sidebar-wrapper {
108
+ margin-left: 0;
109
+ }
110
+ #page-content-wrapper {
111
+ min-width: 0;
112
+ width: 100%;
113
+ }
114
+ #wrapper.toggled #sidebar-wrapper {
115
+ margin-left: -80px;
116
+ }
117
+ }
@@ -0,0 +1,31 @@
1
+ require 'active_support/concern'
2
+
3
+ module Shopapp3
4
+ extend ActiveSupport::Concern
5
+
6
+ included do
7
+ end
8
+
9
+ class_methods do
10
+ attr_reader :sidebar_actions_array
11
+ def sidebar_action(params)
12
+ @sidebar_actions_array ||= []
13
+ @sidebar_actions_array << params
14
+ end
15
+ end
16
+
17
+ def sidebar_actions_list
18
+ self.class.sidebar_actions_array || [
19
+ {
20
+ path: '/',
21
+ icon: 'shopapp3/icon-1.svg',
22
+ tooltip: 'Application Home',
23
+ },
24
+ {
25
+ path: 'https://accounts.shoplift.fi',
26
+ icon: 'shopapp3/icon-3.svg',
27
+ tooltip: 'My Account',
28
+ },
29
+ ]
30
+ end
31
+ end
@@ -3,6 +3,7 @@ require 'oauth2'
3
3
 
4
4
  module ShopliftClient
5
5
  extend ActiveSupport::Concern
6
+ include Shopapp3
6
7
 
7
8
  included do
8
9
  attr_reader :authentication
@@ -59,8 +60,15 @@ module ShopliftClient
59
60
  @do_hide_search_for_this_action = true
60
61
  end
61
62
 
62
- def show_search_for_this_action
63
+ def search_remote
64
+ @search_remote || false
65
+ end
66
+
67
+ def show_search_for_this_action(params = {})
63
68
  @do_hide_search_for_this_action = false
69
+ @search_placeholder = params[:placeholder] if params[:placeholder].present?
70
+ self.class.set_search_path params[:search_path] if params[:search_path].present?
71
+ @search_remote = params[:search_remote] if params[:search_remote].present?
64
72
  end
65
73
 
66
74
  def session_cookie
@@ -0,0 +1,16 @@
1
+ module Shopapp3Helper
2
+ def shopapp3_sidebar_icons
3
+ controller.sidebar_actions_list.map do |sidebar_action|
4
+ active = if controller.request.path == sidebar_action[:path]
5
+ 'active'
6
+ end
7
+ <<~HTML
8
+ <li class="nav-item d-flex justify-content-center py-3 #{active}">
9
+ <a class="nav-link" href="#{sidebar_action[:path]}">
10
+ #{image_tag sidebar_action[:icon], width: '20', class: 'img-fluid'}
11
+ </a>
12
+ </li>
13
+ HTML
14
+ end.join("\n").html_safe
15
+ end
16
+ end
@@ -54,6 +54,10 @@ module ShopappHelper
54
54
  controller.search_placeholder || "Search..."
55
55
  end
56
56
 
57
+ def search_remote
58
+ controller.search_remote
59
+ end
60
+
57
61
  def search_path
58
62
  if controller.class.search_path == :current_path
59
63
  request.path
@@ -0,0 +1,41 @@
1
+ #wrapper.d-flex
2
+ #sidebar-wrapper.border-right
3
+ .sidebar-heading.d-flex.align-items-center.justify-content-center
4
+ = image_tag company_logo_path_defined, width: '55'
5
+ %ul.nav.flex-column.mt-5
6
+ = shopapp3_sidebar_icons
7
+ #page-content-wrapper
8
+ %nav.navbar.d-flex.justify-content-between.bg-white(style="z-index: 2;")
9
+ %button#menu-toggle.btn.btn-primary.toggle Toggle Menu
10
+ .d-flex.justify-content-between
11
+ - unless controller.class.do_hide_search_for_this_controller && (controller.do_hide_search_for_this_action != false)
12
+ = image_tag 'shopapp3/search.svg', width: '20', class: 'img-fluid mx-3'
13
+ = form_tag search_path, remote: search_remote, class: 'w-75', method: 'get' do
14
+ = text_field_tag('search', @search, 'aria-label': "Search", class: 'form-control',
15
+ placeholder: search_placeholder, type: "search")
16
+ %div
17
+ %a#navbarDropdown.chip.chip-action.nav-link.dropdown-toggle(aria-expanded="false" aria-haspopup="true" data-toggle="dropdown" href="#" role="button")
18
+ = image_tag gravatar_image_url(@current_user['email']), class: 'chip-img', alt: @current_user['email']
19
+ = @current_user['email']
20
+ .dropdown-menu.dropdown-menu-right(style="margin-top: -22px;" aria-labelledby="navbarDropdown")
21
+ .dropdown-header=@current_user_json_hash['email']
22
+ .dropdown-header
23
+ %strong Company:
24
+ =@current_user_json_hash['company']['name']
25
+ - if (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.present?
26
+ .dropdown-divider
27
+ .dropdown-header Change company
28
+ - (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.each do |c|
29
+ = link_to(change_company_path(c['code']), method: :post, :class => 'dropdown-item') do
30
+ %span(display="block" clear="none" style="width: 32px; margin-right: 6px;")
31
+ = image_tag "https://media.shoplift.fi/company_logos/#{c['logo_code']}_company_logo_24.png", style: "height: 16; width: 32px;"
32
+ = c['name']
33
+ .dropdown-divider
34
+ = link_to(logout_path, method: :delete, :class => 'dropdown-item') do
35
+ Logout
36
+ = yield
37
+ :javascript
38
+ $("#menu-toggle").click(function(e) {
39
+ e.preventDefault();
40
+ $("#wrapper").toggleClass("toggled");
41
+ });
@@ -35,3 +35,5 @@ end
35
35
 
36
36
  Rails.configuration.consider_all_requests_local = true if
37
37
  Rails.configuration.settings['consider_all_requests_local']
38
+
39
+ Rails.application.config.assets.precompile += %w( shopapp3/*.svg )
data/shopapp.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'shopapp'
3
- s.version = '0.2.33'
4
- s.date = '2019-03-29'
3
+ s.version = '0.2.34'
4
+ s.date = '2019-03-30'
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!\
7
7
  I am qualmish at the smell of leek.'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shopapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.33
4
+ version: 0.2.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zeljko
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-03-29 00:00:00.000000000 Z
11
+ date: 2019-03-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -253,25 +253,40 @@ files:
253
253
  - app/assets/images/lamppu.jpg
254
254
  - app/assets/images/logo.png
255
255
  - app/assets/images/purple_icon.svg
256
+ - app/assets/images/shopapp3/avatar.png
257
+ - app/assets/images/shopapp3/bg.jpg
258
+ - app/assets/images/shopapp3/calendar.svg
259
+ - app/assets/images/shopapp3/check.svg
260
+ - app/assets/images/shopapp3/comment.svg
261
+ - app/assets/images/shopapp3/delete.svg
262
+ - app/assets/images/shopapp3/icon-1.svg
263
+ - app/assets/images/shopapp3/icon-2.svg
264
+ - app/assets/images/shopapp3/icon-3.svg
265
+ - app/assets/images/shopapp3/search.svg
256
266
  - app/assets/javascripts/material.min.js
257
267
  - app/assets/javascripts/shopapp.js
258
268
  - app/assets/javascripts/shopapp2.js
269
+ - app/assets/javascripts/shopapp3.js
259
270
  - app/assets/stylesheets/material.min.css
260
271
  - app/assets/stylesheets/project.css.erb
261
272
  - app/assets/stylesheets/shopapp.scss
262
273
  - app/assets/stylesheets/shopapp2.scss
274
+ - app/assets/stylesheets/shopapp3.scss
263
275
  - app/assets/stylesheets/variables.scss
264
276
  - app/controllers/api_controller.rb
265
277
  - app/controllers/auth_controller.rb
278
+ - app/controllers/concerns/shopapp3.rb
266
279
  - app/controllers/concerns/shoplift_client.rb
267
280
  - app/controllers/concerns/shoplift_search.rb
268
281
  - app/controllers/user_authenticated_controller.rb
269
282
  - app/controllers/user_authenticated_or_api_controller.rb
283
+ - app/helpers/shopapp3_helper.rb
270
284
  - app/helpers/shopapp_helper.rb
271
285
  - app/views/layouts/_header_menu.html.haml
272
286
  - app/views/shopapp/403.html.haml
273
287
  - app/views/shopapp/_shopapp.html.haml
274
288
  - app/views/shopapp/_shopapp2.html.haml
289
+ - app/views/shopapp/_shopapp3.html.haml
275
290
  - app/views/shopapp/_shopapp_alerts.html.haml
276
291
  - bin/shop
277
292
  - bin/shopitapp