Merge branch 'main' into spike_5000_queries_round_deux

Gemfile

@@ -16,7 +16,6 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'bootsnap', require: false
 gem 'cal-heatmap-rails', '~> 3.6' # provides assets for cal heatmap, that requires old d3
 gem 'colorize', require: false
-gem 'cookies_eu'
 gem 'd3-rails', '~> 3.5.5' # For cal heatmap
 gem 'devise', '>= 4.6.2'
 gem 'devise_invitable', '~> 2.0'

Gemfile.lock

@@ -133,8 +133,6 @@ GEM
     colorize (1.1.0)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    cookies_eu (1.7.8)
-      js_cookie_rails (~> 2.2.0)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -225,8 +223,6 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
-    js_cookie_rails (2.2.0)
-      railties (>= 3.1)
     json (2.9.0)
     json-jwt (1.16.7)
       activesupport (>= 4.2)
@@ -547,7 +543,6 @@ DEPENDENCIES
   cal-heatmap-rails (~> 3.6)
   capybara
   colorize
-  cookies_eu
   d3-rails (~> 3.5.5)
   debug
   derailed_benchmarks

app/assets/javascripts/core.js

@@ -29,9 +29,6 @@
 //= require d3
 //= require d3-tip
 
-// Cookie prompt only renders properly in the core app
-//= require cookies_eu
-
 //= require angular/angular
 //= require ace-builds/src-min-noconflict/ace
 //= require ace-builds/src-min-noconflict/ext-language_tools

app/assets/stylesheets/core.css

@@ -19,8 +19,6 @@
  * We use Bootstrap Icons to have icons that work between core and the rest of the app
  *= require bootstrap-icons/font/bootstrap-icons
  *
- *= require cookies_eu
- *
  *= require fonts
  *= require bootstrap3-add
  *

app/assets/templates/views/searchResults.html

@@ -37,8 +37,8 @@ <h2 class="results-title">
 
     <span ng-show="query.isNotAllRated()" class="pull-right" style="margin-right: 20px;" title="Hop to it!  There are unrated results!">      
       <div class="icon-container">
-          <i class="bi bi-balloon" style="font-size: 2rem;"></i>
-          <div class="notification-bubble">3</div>
+        🐸
+        <div class="notification-bubble">3</div>        
       </div>
     </span>
 

app/controllers/pages_controller.rb

@@ -3,11 +3,11 @@
 class PagesController < ApplicationController
   skip_before_action :require_login
   skip_before_action :check_for_announcement
-  # before_action :check_page, only: [:show]
+  before_action :check_page, only: [ :show ]
 
-  # def show
-  # render template: "pages/#{params[:page]}"
-  # end
+  def show
+    render template: "pages/#{params[:page]}"
+  end
 
   private
 

app/javascript/application2.js

@@ -5,9 +5,10 @@
 
 // Note: the file in vendor/javascript/vendored-local-time.js is the one that was downloaded via
 // importmap pin.  See https://github.com/basecamp/local_time/issues/113 for others who suggested
-// remaining it
+// vendoring it
 import "@hotwired/turbo-rails"
 import LocalTime from "local-time"
+import Cookies from 'js-cookie'
 LocalTime.start()
 
 Turbo.config.drive.progressBarDelay = 1
@@ -17,3 +18,27 @@ import "vega-lite"
 import "vega-embed"
 
 window.dispatchEvent(new Event("vega:load"))
+
+// cookies consent toast handling begin
+// Only rendered on the home page.
+document.addEventListener("turbo:load", function() {
+  // Show the toast when the page loads if it's been rendered.
+  // The logic for deciding if we need to show the banner is in the server side partial _consent_toast.html.erb.
+  const toastEl = document.getElementById('consent_banner');
+  if (toastEl){
+    const toast = new bootstrap.Toast(toastEl);
+    toast.show();
+  }
+
+  const cookiesEuOKButton = document.querySelector('.js-cookies-eu-ok');  
+  if (cookiesEuOKButton) {
+    cookiesEuOKButton.addEventListener('click', setCookie, false);
+  }
+
+});
+
+function setCookie() {
+  const isSecure = location.protocol === 'https:';
+  Cookies.set('cookie_eu_consented', true, { path: '/', expires: 365, secure: isSecure });
+}
+// cookies consent toast handling end

app/views/home/_consent_toast.html.erb

@@ -0,0 +1,20 @@
+<% unless Rails.application.config.cookies_url.blank? %>
+  <% if cookies.kind_of? ActionDispatch::Cookies::CookieJar %>
+    <% if cookies && cookies['cookie_eu_consented'] != 'true' %>
+      <div class="toast" id="consent_banner" role="alert" data-bs-autohide="true" data-bs-delay="15000">
+        <div class="toast-header">
+          <strong class="me-auto">Cookies</strong>
+          <!--small class="text-muted">11 mins ago</small-->
+          <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+        </div>
+        <div class="toast-body">
+          Cookies help us deliver our services. By using our services, you agree to our use of cookies.
+          <div class="mt-2 pt-2 border-top">
+            <%= link_to 'Learn more', Rails.application.config.cookies_url, class: "btn btn-sm btn-secondary", target: "_blank" %>
+            <button type="button" class="js-cookies-eu-ok btn btn-primary btn-sm" data-bs-dismiss="toast">Accept</button>      
+          </div>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>

app/views/home/show.html.erb

@@ -3,6 +3,11 @@ Inspired by https://dev.to/themesberg/tutorial-how-to-build-a-simple-admin-dashb
 -->
 <%= turbo_stream_from(:notifications) %>
 
+<div class="toast-container top-0 end-0 p-3">
+  <%= render partial: "consent_toast" %>
+
+</div>
+
 <div class="text-center">
     <p/>
     <h5 class="card-title"><%= Time.now.strftime("%A, %B %d") %></h5>

app/views/layouts/application.html.erb

@@ -68,7 +68,6 @@
 
   <%= javascript_include_tag 'application', 'data-turbo-track': 'reload' %>
   <%= javascript_importmap_tags 'application2' %>
-
 
 </head>
 

app/views/layouts/core.html.erb

@@ -14,8 +14,6 @@
 <base href="<%= ENV['RAILS_RELATIVE_URL_ROOT'] %>/">
 </head>
 <body ng-app="QuepidApp">
-  <%= render 'cookies_eu/consent_banner', link: '/cookies', target: '_blank' unless Rails.application.config.cookies_url.blank? %>
-
   <%= render 'layouts/header_core_app' %>
 
   <div id="main-content">

config/importmap.rb

@@ -9,3 +9,4 @@
 pin 'vega', to: 'vega.js'
 pin 'vega-lite', to: 'vega-lite.js'
 pin 'vega-embed', to: 'vega-embed.js'
+pin 'js-cookie' # @3.0.5

config/routes.rb

@@ -650,7 +650,6 @@
   get '/scorers'                      => 'core#index'
 
   # Static pages
-  # get '*page' => 'pages#show'
-  #
+  get '*page' => 'pages#show'
 end
 # rubocop:enable Metrics/BlockLength

docs/operating_documentation.md

@@ -169,6 +169,8 @@ PRIVACY_URL # privacy policy
 COOKIES_URL # cookies policy
 ```
 
+Quepid ships with a default cookie policy page available via `COOKIES_URL=/cookies`.
+
 To comply with GDPR, and be a good citizen, the hosted version of Quepid asks if they are willing to receive Quepid related updates via email.  This feature isn't useful to private installs, so this controls the display.
 
 ```