diff --git a/Gemfile.lock b/Gemfile.lock index 22a385601f68b4596223aca0bc57da9bd22fefa6..779a34435d3ed37f2f8109d0ef0f60b3172ec5cc 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 e2fe0f05035e64d3dab8edf67da627bebcf3794f..d21c8c30dcefe75f9aaa5ccb154cbdf9a52f76ce 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 78287d1c61c91076bbcd78c89f0ef865eceebd42..23ae425c9b5a48cae95aec35f4bbf21415cd455e 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 0000000000000000000000000000000000000000..23ae425c9b5a48cae95aec35f4bbf21415cd455e --- /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 b8ac55e13b70afc9e0d9500ea664f56db467b705..6191e7000989d28f1345afbef2040255b5f82057 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 b25b6463628fb1defc0e4331b440bdc180431b54..3e28659aaae47d865a730df0ff7868c69514d7d3 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 335ec3484dfc98b6a3f11d75af77a83dada12356..8d1232c39de7a49b9116eaaf17ae1fc7021e498a 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 %>