cookei 0.2.4 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c30540b8b626482ec9d1a6067cb2b96abb108d0cc4f9437ff5068e833719452
-  data.tar.gz: ed1141543ed41e304d9108fd578e4e764e761ca81a72ece0cdca7ef772731fe4
+  metadata.gz: c335881555621d5b350e274466157c64c286e23ea89f8b1c736d29c47ab11059
+  data.tar.gz: b9860fd632880460f32bdc185e088c9a8be290c74be7839e4fe39340826c83b3
 SHA512:
-  metadata.gz: 99402979b678191054a541b9593bae41547257a062ace71ac7757d0dcfb7a2ff2700baccfe371f7ac4a3cdbbac2b69338244f68a0709701d9a85fdfd96955910
-  data.tar.gz: e9c3b87c11ab36bb330533b7fb4f344fc13ea9a3570f87bbb0d7d42f272e9eaae0ecfbd2c322114ab471ff56ac73409890ec9053c0e1af02c8480146b3fe3389
+  metadata.gz: eff2480526cf414aae6d94de86773fbe7ce9143708589aa5a22957fe29c888b9b3b98eee4df9ebf83d0374abc2e5bb6b9ef66454812b651c3ab255be437c117c
+  data.tar.gz: 50753b706b3149c29ce8d2dc26afba672d3117bfe1f7228dec1bbece46f983f847a471597247726f0b669a6eb450622792006ef27a119a05bd3295d36a782e47

data/app/assets/stylesheets/cookei.scss

@@ -430,4 +430,129 @@
       }
     }
   }
-}
+}
+
+#cookei_disclaimer {
+  .modal-container {
+    display: none;
+    position: fixed;
+    padding-top: 24px;
+    top: 0;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.8);
+    max-width: 100%;
+    z-index: 101;
+    overflow-y: scroll;
+
+    div {
+      padding: 0;
+    }
+
+    .content-modal {
+      position: absolute;
+      top: 10%;
+      left: 50%;
+      margin-left: -380px;
+      width:760px;
+      padding: 25px;
+
+      background-color: #fefefe;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+
+      form {
+        display: block;
+      }
+
+      .content-between {
+        display: -ms-flexbox;
+        display: flex;
+        -ms-flex-pack: justify;
+        justify-content: space-between;
+      }
+
+      input[type=checkbox] {
+        &:checked+.checkbox {
+          background: #ffc4b9;
+
+          &:after {
+            content: 'On';
+            left: 28px;
+          }
+        }
+
+        &:disabled+.checkbox {
+          opacity: 0.8;
+          cursor: default;
+          background: #cecece;
+        }
+      }
+
+      label {
+        .checkbox {
+          font-size: 0;
+          cursor: pointer;
+          width: 60px;
+          height: 24px;
+          background: #777;
+          border-radius: 24px;
+
+          &:after {
+            content: 'Off';
+            text-align: center;
+            position: absolute;
+            font-size: 11px;
+            top: 2px;
+            right: 3px;
+            width: 33px;
+            height: 20px;
+            line-height: 20px;
+            background: #fff;
+            border-radius: 46px;
+            transition: 0.3s;
+          }
+
+          &:hover {
+            opacity: 0.8;
+          }
+        }
+
+        &:hover {
+          opacity: 1;
+          cursor: default;
+        }
+      }
+    }
+  }
+}
+
+
+#cookei_disclaimer.blue {
+  .content-modal {
+    color: #121e40;
+    h4 {
+      font-weight: normal;
+      margin-bottom: 30px;
+    }
+
+    input[type=checkbox] {
+      &:checked+.checkbox {
+        background: #63d3f4;
+      }
+
+      &:disabled+.checkbox {
+        opacity: 0.8;
+        cursor: default;
+        background: #cecece;
+      }
+    }
+
+    .submit {
+      input {
+        color: #777;
+        border-color: #777;
+      }
+    }
+  }
+}

data/app/views/cookei/api/v1/cookies/_disclaimer.html.erb

@@ -32,7 +32,7 @@
 
 <%- COOKEI_ENABLED_TRACKERS.each do |key, value| %>
   <%- value.each do |tracker| %>
-    <%- next unless session[tracker] %>
+    <%- next unless (session[tracker] == true || session[tracker].try(:to_i) == 1) %>
     <%= render "cookei/tracking/#{key}/#{tracker}" %>
   <%- end %>
 <%- end %>

data/app/views/cookei/api/v2/cookies/_disclaimer.html.erb

@@ -0,0 +1,24 @@
+<%- unless session[:tracking_settings_set] %>
+  <div id="cookei_disclaimer" class="<%= COOKEI_STYLE %> <%= COOKEI_POSITION %>">
+    <div>
+      <%= t('cookei.disclaimer.text_html') %>
+      <%= link_to t('cookei.disclaimer.read_more'), COOKEI_POLICY_URL %>
+      <%= link_to t('cookei.disclaimer.settings'), '#', id: 'myBtn', data: { toggle: "modal" } %>
+
+      <%= form_with(url: cookei.api_v1_cookies_path, method: :post, data: { remote: true }) do  |f| %>
+        <div class="submit">
+          <%= f.submit 'Hyväksy kaikki', name: 'all' %>
+        </div>
+      <%- end %>
+    </div>
+
+      <%= render 'cookei/api/v2/cookies/modal'%>
+  </div>
+<%- end %>
+
+<%- COOKEI_ENABLED_TRACKERS.each do |key, value| %>
+  <%- value.each do |tracker| %>
+    <%- next unless (session[tracker] == true || session[tracker].try(:to_i) == 1) %>
+    <%= render "cookei/tracking/#{key}/#{tracker}" %>
+  <%- end %>
+<%- end %>

data/app/views/cookei/api/v2/cookies/_modal.html.haml

@@ -0,0 +1,23 @@
+#cookie-modal.modal-container
+  .content-modal
+    = form_with(url: cookei.api_v1_cookies_path, method: :post, data: { remote: true }) do |f|
+      .content-between
+        %h4 Ehdottomasti tarpeelliset evästeet
+        = f.label :required do
+          = f.check_box :required, value: '1', checked: 'checked', disabled: true
+          .checkbox
+
+      .content-between
+        %h4 Analyysiin ja suorituskykyyn liittyvät evästeet
+        = f.label :statistics do
+          = f.check_box :statistics, value: '1'
+          .checkbox
+
+      .content-between
+        %h4 Kohdistamis- ja mainontaevästeet
+        = f.label :targeting do
+          = f.check_box :targeting, value: '1'
+          .checkbox
+
+      .submit
+        = f.submit 'Hyväksy valittu', name: 'selected'

data/config/initializers/cookei.rb

@@ -1,7 +1,7 @@
 COOKEI_ENABLED_TRACKERS = {
   required: [],
   preferences: [],
-  statistics: [:google_analytics ],
+  statistics: [:google_analytics],
   marketing: [:google_adsense]
 }
 

data/lib/cookei/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cookei
-  VERSION = '0.2.4'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookei
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.11
 platform: ruby
 authors:
 - Artis Raugulis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,8 @@ files:
 - app/models/cookei/application_record.rb
 - app/views/cookei/api/v1/cookies/_disclaimer.html.erb
 - app/views/cookei/api/v1/cookies/create.js.erb
+- app/views/cookei/api/v2/cookies/_disclaimer.html.erb
+- app/views/cookei/api/v2/cookies/_modal.html.haml
 - app/views/cookei/tracking/marketing/_google_adsense.html.erb
 - app/views/cookei/tracking/statistics/_google_analytics.html.erb
 - app/views/layouts/cookei/application.html.erb
@@ -137,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.6.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="