arctic_admin 3.2.1 → 4.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f913893bfeb6224b1dd113545dca1818da6e987d64c516d03381aa48828daf
-  data.tar.gz: 220f72694714143f5c79c791003fba0838ce3bbf5ed2f60675b319dcdadbecff
+  metadata.gz: d80f79149e44a52c1d586e425e82313f2d83aea8455d59eaba12a72fb94abc30
+  data.tar.gz: ff9b250756327bb54eb0ee374d4cacb0a9cb7b6090da861ee85beceda2534f62
 SHA512:
-  metadata.gz: 41cd46ed6aaed2bf349f9ef27237b42e48869d8e025ab497e3ef39bae4fa64ece63428895f32b3c8526aec84000397d37ee643316b850faad18ed7f08a652597
-  data.tar.gz: ae67be0074df46fd0c19bef15866132936bd1c06900785b7654b22ac2cd8a58c6677bcf23b129dcf4f1e0647c929ba357df7d752675b17530527f74ce1be9f23
+  metadata.gz: 6844d6c0fbd22ce592aa64c9f5f27e93033564f44bd7856a3e9d2f3f0ab52ffb5c8a44c106ec9eac85e7dd50c6213649930bfa303a451b4ea867405bc9ded0fd
+  data.tar.gz: 159bce7c3570d89754af6964c035497b6adbc0a87f6f709a06fa556c4ddfdd924a48866518336e6424a81cd0efa6ae87df472c3e9f8442d10bf4ef846bb62548

data/app/assets/javascripts/arctic_admin/base.js

@@ -1,4 +1,2 @@
-//= require jquery
-//= require jquery_ujs
 //= require active_admin/base
 //= require ./main

data/app/assets/javascripts/arctic_admin/main.js

@@ -1,99 +1,50 @@
-$(function () {
-  var animationFilterDone = true
-  $(document).on('click touchstart', '#sidebar', function (e) {
-    if (animationFilterDone == true) {
-      var position = $(this).position()
-      var width = $(this).width()
-      var target = e.target
-      if (
-        e.pageX < position.left &&
-        target.tagName != 'SELECT' &&
-        target.tagName != 'OPTION'
-      ) {
-        if ($(this).css('right') == '0px') {
-          $(this).css('position', 'fixed')
-          $(this).animate(
-            {
-              right: '-=' + width
-            },
-            600,
-            function () {
-              $(this).removeAttr('style')
-              animationFilterDone = true
-            }
-          )
-        } else {
-          $(this).animate(
-            {
-              right: '+=' + width
-            },
-            600,
-            function () {
-              $(this).css('position', 'absolute')
-              animationFilterDone = true
-            }
-          )
-        }
-      }
-    }
-  })
+document.addEventListener('DOMContentLoaded', () => {
 
-  var animationDone = true
-  $(document).on('click touchstart', '#utility_nav', function (e) {
-    var position = $(this).position()
-    var tabs = $('#tabs')    
-    var width = (tabs.length==0)? 0 : Math.round(tabs[0].getBoundingClientRect().width)    
-    if (e.pageX < position.left + 40) {
-      if (animationDone == true) {
-        animationDone = false
-        if (tabs.css('left') == '0px') {
-          tabs.animate(
-            {
-              left: '-=' + width
-            },
-            400,
-            function () {
-              animationDone = true
-            }
-          )
-        } else {
-          tabs.animate(
-            {
-              left: '+=' + width
-            },
-            400,
-            function () {
-              animationDone = true
-            }
-          )
-        }
+  // right filter sidebar
+  const sidebar = document.querySelector('#sidebar')
+  if (sidebar) {
+    sidebar.addEventListener('click', event => {
+      const insideSection = document.querySelector('#filters_sidebar_section')
+      if (!(event.target === insideSection || insideSection.contains(event.target))) {
+        sidebar.classList.toggle('sidebar_open')
       }
+    })
+  }
+
+  const menuButton = document.querySelector('#utility_nav')
+  const menu = document.querySelector('#tabs')
+
+  // toggle menu sidebar with the menu button
+  menuButton.addEventListener('click', event => {
+    const currentUser = document.querySelector('#current_user')
+    const logout = document.querySelector('#logout')
+    const forbiddenLinks = event.target === logout ||
+        logout.contains(event.target) ||
+        event.target === currentUser ||
+        currentUser.contains(event.target)
+    if (!forbiddenLinks) {
+      menu.classList.toggle('tabs_open')
     }
   })
 
-  $(document).on('click touchstart', 'body', function (e) {
-    var tabs = $('#tabs')
-    var width = (tabs.length==0)? 0 : Math.round(tabs[0].getBoundingClientRect().width)
-    if (tabs.css('left') == '0px') {
-      if (e.pageX > width && e.pageY > 60) {
-        if (animationDone == true) {
-          animationDone = false
-          tabs.animate(
-            {
-              left: '-=' + width
-            },
-            400,
-            function () {
-              animationDone = true
-            }
-          )
-        }
-      }
+  // close left menu sidebar on any click outside
+  document.body.addEventListener('click', event => {
+    const forbiddenLinks = event.target === menu ||
+        menu.contains(event.target) ||
+        event.target === menuButton ||
+        menuButton.contains(event.target)
+    if (menu.classList.contains('tabs_open') && !forbiddenLinks) {
+      menu.classList.remove('tabs_open')
     }
   })
 
-  $(document).on('click', '#tabs .has_nested', function (e) {
-    e.stopPropagation()
-    $(this).toggleClass('open')
-  })
+  // toggle of nested menu items
+  const nestedMenuItem = document.querySelector('#tabs .has_nested')
+  if (nestedMenuItem) {
+    nestedMenuItem.addEventListener('click', (e) => {
+      e.stopPropagation()
+      nestedMenuItem.classList.toggle('open')
+    })
+  }
+
 })

data/app/assets/stylesheets/arctic_admin/layouts/_filter.scss

@@ -49,6 +49,11 @@
     .filter_date_range input {
       width: 45%;
       display: inline-block;
+
+      // consistent look of all filters
+      &:nth-child(2) {
+        float: right;
+      }
     }
 
     input[type="submit"] {
@@ -56,9 +61,21 @@
       line-height: 31px;
       margin-right: 10px;
     }
+
+    &.panel {
+      position: relative;
+    }
   }
 
   #search-status-_sidebar_section {
     font-size: 14px;
   }
-}
+
+  // 'Filter' and 'Clear Filters' buttons
+  .buttons {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 1rem;
+  }
+}

data/app/assets/stylesheets/arctic_admin/layouts/_sidebar.scss

@@ -8,6 +8,12 @@
   z-index: 1;
   overflow: auto;
   left: - $header-width;
+  transition: .5s;
+  transition-timing-function: ease-in-out;
+
+  &.tabs_open {
+    left: 0;
+  }
 
   @media screen and (min-width: $sm-width) {
     top: 60px;

data/app/assets/stylesheets/arctic_admin/pages/_index.scss

@@ -94,8 +94,14 @@ body.index {
 
   #sidebar {
     position: fixed;
+    transition: .5s;
+    transition-timing-function: ease-in-out;
     right: - $filter-width;
 
+    &.sidebar_open {
+      right: 0;
+    }
+
     @media screen and (min-width: $x-lg-width) {
       right: - $lg-filter-width;
     }

data/lib/arctic_admin/version.rb

@@ -1,3 +1,3 @@
 module ArcticAdmin
-  VERSION = "3.2.1"
+  VERSION = "4.0.0.alpha"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arctic_admin
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0.alpha
 platform: ruby
 authors:
 - Clément Prod'homme
@@ -58,20 +58,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -168,9 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: