From dacf3b366f4052f76d9da7600d61439bb601893f Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 1 Dec 2022 17:06:24 +0100
Subject: [PATCH] js
---
Gemfile.lock | 12 +++++------
app/assets/config/manifest.js | 2 ++
.../{admin.js => admin/appstack.js} | 8 +++----
app/assets/javascripts/admin/pure.js | 21 +++++++++++++++++++
.../admin/layouts/themes/_appstack.html.erb | 2 +-
app/views/admin/layouts/themes/_pure.html.erb | 2 +-
.../admin/layouts/themes/pure/_hero.html.erb | 2 +-
7 files changed, 36 insertions(+), 13 deletions(-)
rename app/assets/javascripts/{admin.js => admin/appstack.js} (76%)
create mode 100644 app/assets/javascripts/admin/pure.js
diff --git a/Gemfile.lock b/Gemfile.lock
index 22a385601..779a34435 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,16 +98,16 @@ GEM
autoprefixer-rails (10.4.7.0)
execjs (~> 2)
aws-eventstream (1.2.0)
- aws-partitions (1.666.0)
- aws-sdk-core (3.168.1)
+ aws-partitions (1.669.0)
+ aws-sdk-core (3.168.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.59.0)
+ aws-sdk-kms (1.60.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.117.1)
+ aws-sdk-s3 (1.117.2)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -126,7 +126,7 @@ GEM
rails (>= 3.1)
breadcrumbs_on_rails (4.1.0)
railties (>= 5.0)
- bugsnag (6.24.2)
+ bugsnag (6.25.0)
concurrent-ruby (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
@@ -211,7 +211,7 @@ GEM
font-awesome-sass (6.2.1)
sassc (~> 2.0)
front_matter_parser (1.0.1)
- gdpr (1.2.4)
+ gdpr (1.2.5)
js_cookie_rails
rails
sassc-rails
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index e2fe0f050..d21c8c30d 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -5,3 +5,5 @@
//= link vue.js
//= link admin/appstack.css
//= link admin/pure.css
+//= link admin/appstack.js
+//= link admin/pure.js
diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin/appstack.js
similarity index 76%
rename from app/assets/javascripts/admin.js
rename to app/assets/javascripts/admin/appstack.js
index 78287d1c6..23ae425c9 100644
--- a/app/assets/javascripts/admin.js
+++ b/app/assets/javascripts/admin/appstack.js
@@ -13,9 +13,9 @@
//= require slug/slug
//= require cocoon
//= require_self
-//= require_tree ./admin/commons
-//= require_tree ./application/plugins
-//= require_tree ./admin/plugins
-//= require ./admin/communication/init
+//= require_tree ./commons
+//= require_tree ../application/plugins
+//= require_tree ./plugins
+//= require ./communication/init
window.osuny = {};
diff --git a/app/assets/javascripts/admin/pure.js b/app/assets/javascripts/admin/pure.js
new file mode 100644
index 000000000..23ae425c9
--- /dev/null
+++ b/app/assets/javascripts/admin/pure.js
@@ -0,0 +1,21 @@
+//= require activestorage
+//= require jquery3
+//= require jquery_ujs
+//= require notyf/notyf.min
+//= require simple_form_password_with_hints
+//= require simple_form_bs5_file_input
+//= require cropperjs/dist/cropper
+//= require jquery-cropper/dist/jquery-cropper
+//= require appstack/app
+//= require gdpr/cookie_consent
+//= require sortablejs/Sortable
+//= require summernote/summernote-bs5
+//= require slug/slug
+//= require cocoon
+//= require_self
+//= require_tree ./commons
+//= require_tree ../application/plugins
+//= require_tree ./plugins
+//= require ./communication/init
+
+window.osuny = {};
diff --git a/app/views/admin/layouts/themes/_appstack.html.erb b/app/views/admin/layouts/themes/_appstack.html.erb
index b8ac55e13..6191e7000 100644
--- a/app/views/admin/layouts/themes/_appstack.html.erb
+++ b/app/views/admin/layouts/themes/_appstack.html.erb
@@ -26,7 +26,7 @@
</main>
</div>
</div>
- <%= javascript_include_tag 'admin' %>
+ <%= javascript_include_tag 'admin/appstack' %>
<%= render 'gdpr/cookie_consent' %>
<%= render 'bugsnag' %>
</body>
\ No newline at end of file
diff --git a/app/views/admin/layouts/themes/_pure.html.erb b/app/views/admin/layouts/themes/_pure.html.erb
index b25b64636..3e28659aa 100644
--- a/app/views/admin/layouts/themes/_pure.html.erb
+++ b/app/views/admin/layouts/themes/_pure.html.erb
@@ -17,7 +17,7 @@
</main>
<%= render "admin/layouts/themes/pure/commands" %>
<%= render "admin/layouts/themes/pure/footer" %>
- <%= javascript_include_tag 'admin' %>
+ <%= javascript_include_tag 'admin/pure' %>
<%= render 'gdpr/cookie_consent' %>
<%= render 'bugsnag' %>
</body>
\ No newline at end of file
diff --git a/app/views/admin/layouts/themes/pure/_hero.html.erb b/app/views/admin/layouts/themes/pure/_hero.html.erb
index 335ec3484..8d1232c39 100644
--- a/app/views/admin/layouts/themes/pure/_hero.html.erb
+++ b/app/views/admin/layouts/themes/pure/_hero.html.erb
@@ -1,7 +1,7 @@
<div class="hero">
<div class="container-fluid">
<h1><%= yield :title %></h1>
- <div class="float-md-end mt-md-n4">
+ <div class="float-md-end text-end mt-md-n4">
<%= yield :title_right %>
</div>
<%= render_breadcrumbs builder: Osuny::BreadcrumbsOnRailsBuilder %>
--
GitLab