shopapp 0.2.19 → 0.2.20

data/app/assets/stylesheets/project.css.erb

@@ -0,0 +1,205 @@
+@font-face {
+    font-family: 'Aktiv Grotesk';
+    src: url('<%= font_path('aktivgrotesk-bold-webfont.woff2')%>') format('woff2'),
+         url('<%= font_path('aktivgrotesk-bold-webfont.woff')%>') format('woff');
+    font-weight: 600;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Aktiv Grotesk';
+    src: url('<%= font_path('aktivgrotesk-light-webfont.woff2')%>') format('woff2'),
+         url('<%= font_path('aktivgrotesk-light-webfont.woff')%>') format('woff');
+    font-weight: 300;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Aktiv Grotesk';
+    src: url('<%= font_path('aktivgrotesk-medium-webfont.woff2')%>') format('woff2'),
+         url('<%= font_path('aktivgrotesk-medium-webfont.woff')%>') format('woff');
+    font-weight: 500;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'Aktiv Grotesk';
+    src: url('<%= font_path('aktivgrotesk-regular-webfont.woff2')%>') format('woff2'),
+         url('<%= font_path('aktivgrotesk-regular-webfont.woff')%>') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+html, body {
+  font-family: 'Aktiv Grotesk', Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica Neue, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;
+  background: #F4F5FA;
+  color: #595B62;
+  height: 100%;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.text-thin {
+  font-weight: 300;
+}
+.text-regular {
+  font-weight: 400;
+}
+.text-confirmed {
+  color: #37B899;
+}
+.shadow-sm {
+  box-shadow: 0 1px 5px 0 rgba(0, 0, 0, .08)!important;
+}
+.btn {
+  text-transform: none;
+}
+.btn-outline-primary {
+  color: #A042F4;
+  border: 1px solid #A042F4;
+}
+.btn-outline-primary:hover {
+  color: #A042F4;
+  background: #fff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, .15)!important;
+}
+.divider {
+  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIxcHgiIGhlaWdodD0iMXB4IiB2aWV3Qm94PSIwIDAgMSAxIiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJTaG9wbGlmdC1zZWxlY3QiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yOTAuMDAwMDAwLCAtODAyLjAwMDAwMCkiIGZpbGw9IiM5RkEyQTkiIGZpbGwtcnVsZT0ibm9uemVybyI+ICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZSIgeD0iMjkwIiB5PSI4MDIiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiPjwvcmVjdD4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==);
+  background-repeat: repeat-x;
+  background-position: left 58%;
+  text-align: left;
+  margin-right: 1.5rem;
+}
+.divider p {
+  background-color: #F4F5FA;
+  color: #9FA2A9;
+  margin: 0 auto;
+  padding: 0 10px;
+  display: inline-block;
+}
+.navbar .form-control {
+  opacity: 1;
+  background: #F4F5FA;
+  font-weight: 300;
+}
+.navbar .form-control::placeholder {
+  color: #444;
+}
+.sidebar {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 100;
+  padding: 25px 0 0;
+}
+.sidebar-sticky {
+  position: relative;
+  top: 0;
+  height: calc(100vh - 48px);
+  padding-top: .5rem;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.sidebar .nav-link, .topbar .nav-link {
+  font-size: .87rem;
+  color: #595B62;
+  padding-left: 1.5rem;
+  padding-top: .7rem;
+  padding-bottom: .7rem;
+}
+.topbar .nav-link {
+  font-size: 1rem;
+  color: #595B62;
+  padding-left: .5rem;
+}
+.sidebar .nav-link{
+  margin-right: 3rem;
+}
+.sidebar .nav-link.active{
+  background: rgba(134, 147, 201, 0.2);
+  border-top-right-radius: 40px;
+  border-bottom-right-radius: 40px;
+}
+.sidebar .nav-link:hover {
+  background: rgba(0, 0, 0, 0.04);
+  border-top-right-radius: 40px;
+  border-bottom-right-radius: 40px;
+}
+.sidebar .nav-link .material-icons, .topbar .nav-link .material-icons {
+  font-size: 1.2rem;
+  vertical-align: text-bottom;
+  margin-right: .35rem;
+}
+.sidebar .nav-link.active .material-icons, .topbar .nav-link.active .material-icons {
+  color: #A042F4;
+}
+.navbar-expand-lg .navbar-nav .nav-item {
+  width: 100%;
+  padding: .5rem 0;
+}
+.info-box {
+  background: #A042F4;
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+.table-box {
+  background: #FFFFFF;
+  border-radius: 5px;
+}
+.chip {
+  background: transparent;
+}
+.chip-action:active, .chip-action:focus, .chip-action:hover {
+  box-shadow: none;
+  color: rgba(0, 0, 0, .87);
+  text-decoration: none;
+}
+.list-group-item {
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  box-shadow: none;
+}
+.list-group-item:last-child {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+.expansion-panel.show:not(:last-child) {
+  margin-bottom: 0;
+}
+.expansion-panel.show:not(:first-child) {
+  margin-top: 0;
+}
+.list-group-flush .expansion-panel-toggler{
+  font-size: .85rem;
+}
+.list-group .expansion-panel-toggler:active, .list-group .expansion-panel-toggler:focus, .list-group .expansion-panel-toggler:hover {
+    background-color: rgba(111,26,157, 0.05);
+}
+.list-group-flush .expansion-panel-toggler:active, .list-group-flush .expansion-panel-toggler:focus, .list-group-flush .expansion-panel-toggler:hover {
+    background-color: #fff;
+}
+.list-group-flush .expansion-panel-toggler:hover{
+    text-decoration: underline;
+    color: #9c27b0;
+}
+.table thead td, .table thead th {
+  font-size: .85rem;
+  font-weight: 500;
+}
+.table {
+  table-layout: fixed;
+}
+.table-actions a {
+  font-size: .62rem;
+  color: #444;
+  padding: 0 1rem;
+}
+@media screen and (max-width: 992px) {
+  .table {
+    table-layout: auto;
+  }
+  .table-actions {
+    display: flex;
+  }
+  .table-actions a {
+    padding: 0 .5rem;
+  }
+}
+
+.shopliftviewport {
+  height: 75vh;
+}

data/app/assets/stylesheets/shopapp2.scss

@@ -0,0 +1,2 @@
+@import "material.min";
+@import "project";

data/app/helpers/shopapp_helper.rb

@@ -55,4 +55,15 @@ module ShopappHelper
       "#{controller.class.search_path || '/'}"
     end
   end
+
+  def sidebar_item(url, text, dropdown, icon)
+    <<~HTML.html_safe
+      <li class="nav-item">
+        <a class="nav-link #{'active' if request.path.starts_with? url}" href="#{url}">
+          <i class="material-icons">#{icon}</i>
+          #{text}
+        </a>
+      </li>
+    HTML
+  end
 end

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

@@ -0,0 +1,110 @@
+.container-fluid
+  .row
+    %nav.col-lg-2.d-none.d-lg-block.sidebar
+      .sidebar-sticky
+        %ul.nav.flex-column
+          %a.navbar-brand.pl-3.mb-3{:href => "/"}
+            = image_tag company_logo_path_defined, alt: "#{@current_company.name}_logo", height: '30'
+          = render 'layouts/sidebar', dropdown: true
+        - if @current_user_json_hash['company']['apps'].present?
+          .divider.mt-3.py-3
+            %p.ml-3.small My Apps
+          %ul.nav.flex-column
+            -(@current_user_json_hash['company']['apps'] || []).each do |app|
+              - if app['home'].present?
+                %li.nav-item
+                  %a.nav-link{:href => "#"}
+                    -# %i.material-icons fingerprint
+                    = image_tag "https://media.shoplift.fi/application_logos/#{app['name'].downcase}.svg", style: "padding-bottom: 3px; height: 24px;"
+                    %span.ml-2
+                      = app['name'].capitalize
+        .divider.py-3{:style => "margin-top: 5rem;"}
+          %p.ml-3.small Help & Feedback
+        %ul.nav.flex-column
+          %li.nav-item
+            %a.nav-link{:href => "#"}
+              %i.material-icons help
+              Help
+          %li.nav-item
+            %a.nav-link{:href => "#"}
+              %i.material-icons feedback
+              Feedback
+    %main.col-lg-10.ml-lg-auto{:role => "main"}
+      .row.justify-content-center
+        .col-lg-8.px-lg-0.pt-lg-3
+          %nav.navbar.navbar-light.justify-content-start.flex-nowrap
+            %span.material-icons.d-inline-block.text-muted.mr-1 search
+            %form.w-100(action=search_path)
+              .form-group.mb-0
+                %input.form-control{"aria-describedby" => "basic-addon1", "aria-label" => "Search", :placeholder => "Search here for names, dates and ID's", :type => "search"}/
+        .col-lg-4.px-lg-0.pt-lg-3.d-none.d-lg-flex.align-items-center.justify-content-end
+          .dropdown
+            %a#dropdownMenuButton.chip.chip-action.dropdown-toggle.mr-lg-4{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :href => "#"}
+              %img.chip-img(alt="#{@current_user['email']}" src="#{gravatar_image_url(@current_user['email'])}")/
+              = @current_user['email']
+            .dropdown-menu.dropdown-menu-right.mt-2{"aria-labelledby" => "dropdownMenuButton"}
+              .dropdown-header=@current_user_json_hash['email']
+              .dropdown-header
+                %strong Company:
+                =@current_user_json_hash['company']['name']
+              - if (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.present?
+                .dropdown-divider
+                .dropdown-header Change company
+                - (@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
+                    %span(display="block" clear="none" style="width: 32px; margin-right: 6px;")
+                      = image_tag "https://media.shoplift.fi/company_logos/#{c['logo_code']}_company_logo_24.png", style: "height: 16; width: 32px;"
+                    = c['name']
+              .dropdown-divider
+              = link_to(logout_path, method: :delete, :class => 'dropdown-item') do
+                Logout
+      .row.justify-content-end
+        .col
+          - flash.keys.each do |flash_key|
+            .alert.alert-dismissible.container.fade.show(role="alert" class="alert-#{flash_key}")
+              = flash[flash_key].html_safe
+              %button.close{"aria-label" => "Close", "data-dismiss" => "alert", :type => "button"}
+                %span{"aria-hidden" => "true"} ×
+          %nav.navbar.navbar-expand-lg.navbar-light.d-lg-none.d-xl-none.topbar
+            %button.navbar-toggler{"aria-controls" => "navbarNavDropdown", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarNavDropdown", "data-toggle" => "collapse", :type => "button"}
+              %span.navbar-toggler-icon
+            #navbarNavDropdown.collapse.navbar-collapse
+              %ul.navbar-nav
+                = render 'layouts/sidebar', dropdown: false
+      -# .row.justify-content-end.d-none.d-lg-block
+      -#   .col-lg-12.mt-3.pr-lg-0
+      -#     .info-box.shadow-sm.py-4
+      -#       %p.text-white{:style => "padding-left: 7.5rem;"}
+      -#         %strong Sales statistics
+      -#       .d-flex.justify-content-around.align-items-center
+      -#         %div
+      -#           %h3.mb-0
+      -#             %span.material-icons.text-success.mr-2 trending_up
+      -#           %h3.text-white
+      -#             %span.text-thin Total orders
+      -#             %span.h2 2938
+      -#           %p.text-white
+      -#             + 8.2%
+      -#             %span.text-white-secondary Compared to all time average
+      -#         %div
+      -#           %h3.mb-0
+      -#             %span.material-icons.text-warning.mr-2 trending_flat
+      -#           %h3.text-white
+      -#             %span.text-thin Monthly orders
+      -#             %span.h2 120
+      -#           %p.text-white
+      -#             + 0.2%
+      -#             %span.text-white-secondary Compared to last month
+      -#         %div
+      -#           %h3.mb-0
+      -#             %span.material-icons.text-danger.mr-2 trending_down
+      -#           %h3.text-white
+      -#             %span.text-thin Weekly
+      -#             %span.h2 38
+      -#           %p.text-white
+      -#             \- 3.2%
+      -#             %span.text-white-secondary Compared to last week
+      .row.justify-content-start
+        .col-lg-12.my-3
+          .table-box.shadow-sm.pt-3.shopliftviewport
+            = yield

data/config/initializers/active_settings.rb

@@ -22,4 +22,14 @@ Rails.configuration.generators do |g|
   # you can also specify a different test framework or ORM here
   # g.test_framework  :rspec
   # g.orm             :mongoid
-end 
+end
+
+GravatarImageTag.configure do |config|
+  config.default_image           = :wavatar   # Set this to use your own default gravatar image rather then serving up Gravatar's default image [ 'http://example.com/images/default_gravitar.jpg', :identicon, :monsterid, :wavatar, 404 ].
+  # config.filetype                = nil   # Set this if you require a specific image file format ['gif', 'jpg' or 'png'].  Gravatar's default is png
+  # config.include_size_attributes = true  # The height and width attributes of the generated img will be set to avoid page jitter as the gravatars load.  Set to false to leave these attributes off.
+  # config.rating                  = nil   # Set this if you change the rating of the images that will be returned ['G', 'PG', 'R', 'X']. Gravatar's default is G
+  # config.size                    = nil   # Set this to globally set the size of the gravatar image returned (1..512). Gravatar's default is 80
+  config.secure                  = true # Set this to true if you require secure images on your pages.
+end
+

data/lib/shopapp/engine.rb

@@ -1,3 +1,5 @@
+require 'gravatar_image_tag'
+
 module Shopapp
   class Engine < ::Rails::Engine
     rake_tasks do

data/shopapp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.19'
+  s.version     = '0.2.20'
   s.date        = '2019-01-17'
   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!\
@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.executables = 'shopitapp'
   s.homepage    = 'http://rubygems.org/gems/shopapp'
   s.license     = 'MIT'
+  s.require_paths = ["lib"]
+
 
   # Dependences
   s.add_dependency 'railties', '~> 5.2', '>= 5.2'
@@ -25,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'pry-rails', '~> 0.3'
   s.add_dependency 'oauth2', '~> 1.4'
   s.add_dependency 'rest-client', '~> 2.0'
+  s.add_dependency 'gravatar_image_tag', '~> 1.2'
 
   s.add_dependency 'capistrano', '~> 3.11'
   s.add_dependency 'capistrano-rvm', '~> 0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Zeljko
@@ -142,6 +142,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: gravatar_image_tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -209,8 +223,28 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - README.md
+- app/assets/fonts/aktivgrotesk-bold-webfont.woff
+- app/assets/fonts/aktivgrotesk-bold-webfont.woff2
+- app/assets/fonts/aktivgrotesk-light-webfont.woff
+- app/assets/fonts/aktivgrotesk-light-webfont.woff2
+- app/assets/fonts/aktivgrotesk-medium-webfont.woff
+- app/assets/fonts/aktivgrotesk-medium-webfont.woff2
+- app/assets/fonts/aktivgrotesk-regular-webfont.woff
+- app/assets/fonts/aktivgrotesk-regular-webfont.woff2
+- app/assets/images/avatar.jpg
+- app/assets/images/blue_icon.svg
+- app/assets/images/dot.svg
+- app/assets/images/empty.svg
+- app/assets/images/lamppu.jpg
+- app/assets/images/logo.png
+- app/assets/images/purple_icon.svg
+- app/assets/javascripts/material.min.js
 - app/assets/javascripts/shopapp.js
+- app/assets/javascripts/shopapp2.js
+- app/assets/stylesheets/material.min.css
+- app/assets/stylesheets/project.css.erb
 - app/assets/stylesheets/shopapp.scss
+- app/assets/stylesheets/shopapp2.scss
 - app/assets/stylesheets/variables.scss
 - app/controllers/api_controller.rb
 - app/controllers/auth_controller.rb
@@ -222,6 +256,7 @@ files:
 - app/views/layouts/_header_menu.html.haml
 - app/views/shopapp/403.html.haml
 - app/views/shopapp/_shopapp.html.haml
+- app/views/shopapp/_shopapp2.html.haml
 - app/views/shopapp/_shopapp_alerts.html.haml
 - bin/shopitapp
 - config/initializers/active_settings.rb