AgileVentures · wordhouse66 · Dec 14, 2020 · Dec 14, 2020 · Jan 22, 2021 · Jun 23, 2021
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -25,6 +25,19 @@
   background-color: #34495e !important;
 }
 
+.cookies-modalo {
+  position: fixed;
+  padding: 0.5rem;
+  z-index: 2;
+  left: 0.5rem;
+  bottom: 0.5rem;
+  min-width: 50%;
+  max-width: 24rem;
+  word-break: break-word;
+  border-radius: 6px;
+  background: #bad5ff;
+}
+
 .custom_menu_item {
   margin-left: 10px;
   margin-top: 10px;

diff --git a/app/controllers/cookies_controller.rb b/app/controllers/cookies_controller.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class CookiesController < ApplicationController
+  def index
+    session[:cookies_accepted] = params[:cookies] if params[:cookies]
+  end
+end
diff --git a/app/helpers/cookies_helper.rb b/app/helpers/cookies_helper.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module CookiesHelper
+end
diff --git a/app/views/cookies/index.html.erb b/app/views/cookies/index.html.erb
@@ -0,0 +1,9 @@
+<%= turbo_frame_tag :cookies_modal do %>
+  <% if session[:cookies_accepted].nil? %>
+    <section class="cookies-modalo">
+      <p>This website uses cookies. You can take a look at our privacy policy <%= link_to 'here.', '/privacy', target: '__blank' %></p>
+      <%= link_to "Accept cookies", cookies_path(cookies: true), method: :post, class: 'btn btn-primary' %>
+      <%= link_to "Reject cookies", cookies_path(cookies: false), method: :post, class: 'btn btn-default' %>
+    </section>
+  <% end %>
+<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,31 +14,32 @@
       <div id="main">
         <% if current_page? root_path %>
           <%= yield %>
-          <% elsif content_for?(:content) %>
-            <div class="container" id="with-sidebar-container">
-              <div class="row">
-                <%= yield(:content) %>
-              </div>
+        <% elsif content_for?(:content) %>
+          <div class="container" id="with-sidebar-container">
+            <div class="row">
+              <%= yield(:content) %>
             </div>
-          <% else %>
-            <div class="container">
-              <div class="col-lg-9">
-                <%= yield %>
-              </div>
-              <div class="col-lg-3">
-                <%= render 'layouts/sponsors' %>
-              </div>
+          </div>
+        <% else %>
+          <div class="container">
+            <div class="col-lg-9">
+              <%= yield %>
             </div>
-          <% end %>
-        </div>
-        <% if current_user && current_user.incomplete? && new_user_session_url == request.referrer %>
-          <%= render 'layouts/require_users_profile' %>
+            <div class="col-lg-3">
+              <%= render 'layouts/sponsors' %>
+            </div>
+          </div>
         <% end %>
       </div>
+      <% if current_user && current_user.incomplete? && new_user_session_url == request.referrer %>
+        <%= render 'layouts/require_users_profile' %>
+      <% end %>
+      <%= turbo_frame_tag :cookies_modal, src: cookies_path if session[:cookies_accepted].nil? %>
+    </div>
 
-      <footer id="footer">
-        <%= render 'layouts/footer' %>
-      </footer>
+    <footer id="footer">
+      <%= render 'layouts/footer' %>
+    </footer>
 
-    </body>
-  </html>
+  </body>
+</html>
diff --git a/app/views/visitors/index.html.erb b/app/views/visitors/index.html.erb
@@ -25,7 +25,51 @@
   <%= render 'layouts/require_users_profile' %>
 <% end %>
   <%= render 'text_and_image_trail' %>
-
+  <!DOCTYPE html>
+  <html>
+
+    <%= render 'layouts/head' %>
+
+    <% if flash[:user_signup] %>
+      <%= render 'layouts/adwords_signup_conversion' %>
+    <% end %>
+
+    <body lang="en-GB">
+
+      <div id="wrap">
+        <%= render 'layouts/navbar' %>
+        <div id="main">
+          <% if current_page? root_path %>
+            <%= yield %>
+          <% elsif content_for?(:content) %>
+            <div class="container" id="with-sidebar-container">
+              <div class="row">
+                <%= yield(:content) %>
+              </div>
+            </div>
+          <% else %>
+            <div class="container">
+              <div class="col-lg-9">
+                <%= yield %>
+              </div>
+              <div class="col-lg-3">
+                <%= render 'layouts/sponsors' %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+        <% if current_user && current_user.incomplete? && new_user_session_url == request.referrer %>
+          <%= render 'layouts/require_users_profile' %>
+        <% end %>
+        <%= turbo_frame_tag :cookies_modal, src: cookies_path if session[:cookies_accepted].nil? %>
+      </div>
+
+      <footer id="footer">
+        <%= render 'layouts/footer' %>
+      </footer>
+
+    </body>
+  </html>
 <footer id="footer">
   <%= render 'layouts/footer' %>
 </footer>

diff --git a/config/routes.rb b/config/routes.rb
@@ -7,6 +7,8 @@ def loaderio_token
 Rails.application.routes.draw do
   root 'visitors#index'
 
+  get 'cookies', to: 'cookies#index'
+
   get '/.well-known/acme-challenge/:id' => 'static_pages#letsencrypt'
   get loaderio_token => 'static_pages#loaderio'
   get '/get-token' => 'av_dashboard_tokens#create', as: 'get_av_dashboard_token'

diff --git a/features/events/show_event.feature b/features/events/show_event.feature
@@ -158,3 +158,4 @@ Feature: Show Events
   #   And I am on Events index page
   #   And I click on the event body for the event named "Scrum"
   #   Then I should be on the event "show" page for "Scrum"
+
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
@@ -28,6 +28,7 @@
   puts e.to_s.strip
   exit 1
 end
+Ferrum::Browser.new(:timeout => 15)
 OmniAuth.config.test_mode = true
 WebMock.disable_net_connect!(allow_localhost: true)
 RSpec.configure do |config|
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,3 +158,4 @@ Feature: Show Events
		# And I am on Events index page
		# And I click on the event body for the event named "Scrum"
		# Then I should be on the event "show" page for "Scrum"