Merge branch 'master' of github.com:noesya/osuny

Gemfile

@@ -13,6 +13,7 @@ gem 'delayed_job_web'
 gem 'bootsnap', '>= 1.4.4', require: false
 gem 'bugsnag'
 gem 'sib-api-v3-sdk'
+gem 'gdpr'
 
 # Back
 gem 'rails'

Gemfile.lock

@@ -179,6 +179,10 @@ GEM
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
     front_matter_parser (1.0.1)
+    gdpr (1.2.0)
+      js_cookie_rails
+      rails
+      sassc-rails
     globalid (0.5.2)
       activesupport (>= 5.0)
     i18n (1.8.10)
@@ -194,6 +198,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    js_cookie_rails (2.2.0)
+      railties (>= 3.1)
     json (2.6.0)
     kamifusen (1.9)
       image_processing
@@ -388,6 +394,7 @@ DEPENDENCIES
   enum_help
   figaro
   front_matter_parser
+  gdpr
   image_processing
   jbuilder
   jquery-rails

app/assets/javascripts/admin.js

@@ -7,4 +7,5 @@
 //= require cropperjs/dist/cropper
 //= require jquery-cropper/dist/jquery-cropper
 //= require appstack/app
+//= require gdpr/cookie_consent
 //= require_tree ./admin

app/assets/javascripts/application.js

@@ -7,3 +7,4 @@
 //= require jquery-cropper/dist/jquery-cropper
 //= require simple_form_password_with_hints
 //= require simple_form_bs5_file_input
+//= require gdpr/cookie_consent

app/assets/stylesheets/admin.sass

@@ -4,5 +4,6 @@
 @import 'simple_form_password_with_hints'
 @import 'simple_form_bs5_file_input'
 @import 'cropperjs/dist/cropper'
+@import 'gdpr/cookie_consent'
 @import 'commons/*'
 @import 'admin/*'

app/assets/stylesheets/admin/appstack.sass

 main.content
     padding-bottom: 65px
 
+.sidebar
+    footer
+        a
+            padding: .125rem
+
 .sidebar.collapsed + .footer.fixed
     left: 0
     transition: left .35s ease-in-out

app/assets/stylesheets/application.sass

@@ -3,5 +3,6 @@
 @import 'simple_form_password_with_hints'
 @import 'simple_form_bs5_file_input'
 @import 'cropperjs/dist/cropper'
+@import 'gdpr/cookie_consent'
 @import 'commons/*'
 @import 'application/*'

app/models/research/journal/article.rb

@@ -10,7 +10,7 @@
 #  text                       :text
 #  title                      :string
 #  created_at                 :datetime         not null
-#  updated_at                 :date             not null
+#  updated_at                 :datetime         not null
 #  research_journal_id        :uuid             not null
 #  research_journal_volume_id :uuid
 #  university_id              :uuid             not null

app/views/admin/application/_nav.html.erb

@@ -4,5 +4,14 @@
       <%= image_tag 'osuny-white.svg', class: 'img-fluid' %>
     <% end %>
     <%= render_navigation context: :admin %>
+
+    <footer class="text-center">
+      <%= current_university %>
+      <br>
+      <%= link_to t('terms_of_service'), t('terms_of_service_url'), target: '_blank', rel: 'noreferrer', class: 'sidebar-link' %>
+      <%= link_to t('privacy_policy'), t('privacy_policy_url'), target: '_blank', rel: 'noreferrer', class: 'sidebar-link' %>
+      <%= link_to t('cookies_policy'), t('cookies_policy_url'), target: '_blank', rel: 'noreferrer', class: 'sidebar-link' %>
+      <%= link_to t('cookies_consent_choice'), '', class: 'sidebar-link js-gdpr__cookie_consent__display_again' %>
+    </footer>
   </div>
 </nav>

app/views/admin/layouts/application.html.erb

@@ -38,6 +38,7 @@
       </div>
     </div>
     <%= javascript_include_tag 'admin' %>
+    <%= render 'gdpr/cookie_consent' %>
     <%= render 'bugsnag' %>
   </body>
 </html>

app/views/application/_footer.html.erb

@@ -3,6 +3,9 @@
     <%= image_tag 'osuny-black.svg', width: 80 %>
   </div>
   <%= current_university %> |
-  <%= link_to t('terms_of_service'), '' %> |
-  <%= link_to t('privacy_policy'), '' %>
+  <%= link_to t('terms_of_service'), t('terms_of_service_url'), target: '_blank', rel: 'noreferrer' %> |
+  <%= link_to t('privacy_policy'), t('privacy_policy_url'), target: '_blank', rel: 'noreferrer' %> |
+  <%= link_to t('cookies_policy'), t('cookies_policy_url'), target: '_blank', rel: 'noreferrer' %> |
+  <%= link_to t('cookies_consent_choice'), '', class: 'js-gdpr__cookie_consent__display_again' %>
+
 </footer>

app/views/layouts/application.html.erb

@@ -13,11 +13,11 @@
   <body>
     <%= render 'nav' %>
     <main class="container">
-      
       <%= render_breadcrumbs builder: Appstack::BreadcrumbsOnRailsBuilder %>
       <%= yield %>
     </main>
     <%= render 'footer' %>
+    <%= render 'gdpr/cookie_consent' %>
     <%= render 'bugsnag' %>
   </body>
 </html>

app/views/layouts/devise.html.erb

@@ -38,6 +38,7 @@
       </div>
     </div>
     <%= render 'footer' %>
+    <%= render 'gdpr/cookie_consent' %>
     <%= render 'bugsnag' %>
   </body>
 </html>

config/locales/en.yml

@@ -44,6 +44,9 @@ en:
     users_alerts:
       not_locked_html: '<i>%{model}</i> was not locked.'
       successfully_unlocked_html: "<i>%{model}</i> was successfully unlocked."
+  cookies_consent_choice: Cookies consent choice
+  cookies_policy: Cookies policy
+  cookies_policy_url: https://osuny.org/politique-de-cookies
   create: Create
   delete: Delete
   devise:
@@ -76,6 +79,8 @@ en:
       success: ""
   edit: Edit
   false: No
+  gdpr:
+    privacy_policy: https://osuny.org/politique-de-confidentialite
   home: Home
   languages:
     en: English
@@ -92,6 +97,7 @@ en:
     sign_out: Log out
   please-confirm: Are you sure?
   privacy_policy: Privacy policy
+  privacy_policy_url: https://osuny.org/politique-de-confidentialite
   save: Save
   simple_form:
     error_notification:
@@ -103,5 +109,6 @@ en:
       test_chars: "%{min_length} characters min."
   show: Show
   terms_of_service: Terms of service
+  terms_of_service_url: https://osuny.org/conditions-d-utilisation
   true: Yes
   validate: Validate

config/locales/fr.yml

@@ -45,6 +45,9 @@ fr:
     users_alerts:
       not_locked_html: "<i>%{model}</i> n'était pas verrouillé(e)."
       successfully_unlocked_html: "<i>%{model}</i> a bien été déverrouillé(e)."
+  cookies_consent_choice: Choix en matière de cookies
+  cookies_policy: Politique de cookies
+  cookies_policy_url: https://osuny.org/politique-de-cookies
   create: Créer
   delete: Supprimer
   devise:
@@ -77,6 +80,8 @@ fr:
       success: ""
   edit: Modifier
   false: Non
+  gdpr:
+    privacy_policy: https://osuny.org/politique-de-confidentialite
   home: Accueil
   languages:
     en: Anglais
@@ -93,6 +98,7 @@ fr:
     sign_out: Déconnexion
   please-confirm: Est-ce que vous confirmez ?
   privacy_policy: Politique de confidentialité
+  privacy_policy_url: https://osuny.org/politique-de-confidentialite
   save: Enregistrer
   simple_form:
     error_notification:
@@ -106,5 +112,6 @@ fr:
       test_chars: "%{min_length} caractères min."
   show: Voir
   terms_of_service: Conditions d'utilisation
+  terms_of_service_url: https://osuny.org/conditions-d-utilisation
   true: Oui
   validate: Valider

db/schema.rb

@@ -221,7 +221,7 @@ ActiveRecord::Schema.define(version: 2021_10_19_100112) do
     t.uuid "research_journal_id", null: false
     t.uuid "research_journal_volume_id"
     t.datetime "created_at", precision: 6, null: false
-    t.date "updated_at", null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.uuid "updated_by_id"
     t.text "abstract"
     t.text "references"