Merge branch 'release-1.6.0'

baton/static/baton/app/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015", "stage-0"]
+  "presets": ["@babel/preset-env"]
 }

baton/static/baton/app/package.json

@@ -1,35 +1,39 @@
 {
   "name": "baton",
-  "version": "1.5.8",
+  "version": "1.6.0",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {
-    "compile": "./node_modules/webpack/bin/webpack.js -p",
-    "dev": "webpack-dev-server --host 0.0.0.0 --progress --colors --config ./webpack.config.babel.js",
+    "compile": "./node_modules/webpack/bin/webpack.js --env.NODE_ENV=production",
+    "dev": "webpack-dev-server --env.NODE_ENV=development --host 0.0.0.0 --progress --colors --config ./webpack.config.babel.js",
     "lint": "./node_modules/eslint/bin/eslint.js ."
   },
   "author": "abidibo",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
+    "@babel/core": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
+    "@babel/register": "^7.9.0",
     "@fortawesome/fontawesome-free": "^5.8.1",
     "autoprefixer": "^9.2.1",
-    "babel-core": "^6.21.0",
-    "babel-loader": "^6.2.10",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-stage-0": "^6.16.0",
+    "babel-cli": "^6.26.0",
+    "babel-loader": "^8.1.0",
     "babel-register": "^6.18.0",
-    "bootstrap": "^4.3.1",
-    "css-loader": "^0.26.1",
-    "file-loader": "^0.10.0",
+    "bootstrap": "^4.5.0",
+    "css-loader": "^3.5.3",
+    "file-loader": "^6.0.0",
     "jquery": "^3.1.1",
     "js-event-dispatcher": "^0.1.0",
+    "loader": "^2.1.1",
+    "mini-svg-data-uri": "^1.2.3",
     "node-sass": "^4.5.0",
-    "popper.js": "^1.14.4",
+    "popper.js": "^1.16.1",
     "postcss-loader": "^3.0.0",
-    "sass-loader": "^4.1.1",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
     "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^1.14.0"
+    "url-loader": "^4.1.0",
+    "webpack": "^4.43.0"
   },
   "devDependencies": {
     "babel-eslint": "^7.1.1",
@@ -39,6 +43,8 @@
     "eslint-plugin-flow-vars": "^0.5.0",
     "eslint-plugin-promise": "^3.4.0",
     "eslint-plugin-standard": "^2.0.1",
-    "webpack-dev-server": "^1.16.2"
+    "webpack-bundle-analyzer": "^3.7.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.11.0"
   }
 }

baton/static/baton/app/src/core/Menu.js

@@ -55,11 +55,17 @@ let Menu = {
     let mainUl = $('<ul/>', { 'class': 'depth-0' }).appendTo(self.menu)
     data.forEach((voice, index) => {
       let active = false
-      if (voice.url) {
-        let pathRexp = new RegExp(voice.url)
-        active = pathRexp.test(location.pathname)
+      if (voice.type === 'free') {
+        active = (location.pathname === voice.url)
+      } else {
+        if (voice.url) {
+          let pathRexp = new RegExp(voice.url)
+          active = pathRexp.test(location.pathname)
+        }
       }
-      let li = $('<li />', { 'class': 'top-level ' + voice.type + (active ? ' active' : '') })
+      let li = $('<li />', {
+        'class': 'top-level ' + voice.type + (voice.defaultOpen ? ' default-open' : '') + (active ? ' active' : '')
+      })
       let a = $('<' + (voice.url ? 'a' : 'span') + ' />', {
         href: voice.url || '#'
       }).text(voice.label).appendTo(li)
@@ -102,8 +108,8 @@ let Menu = {
       let p = $(this).parent()
       let depth0 = $('.depth-0')
       let depth1 = p.children('ul')
-      if (p.hasClass('open')) {
-        p.removeClass('open')
+      if ((p.hasClass('open')) || (p.hasClass('default-open'))) {
+        p.removeClass('open default-open')
         depth1.children('.nav-back').remove()
         depth0.css('overflow', 'auto')
       } else {

baton/static/baton/app/src/styles/_menu.scss

@@ -150,7 +150,8 @@
   }
 
 
-  .open {
+  .open,
+  .default-open {
     @include media-breakpoint-up(lg) {
       .has-children {
         &::after {

baton/static/baton/app/webpack.config.babel.js

@@ -1,79 +1,89 @@
 import webpack from 'webpack'
 import path from 'path'
+import svgToMiniDataURI from 'mini-svg-data-uri'
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
-const webpackConfig = {
-  // this is needed to resolve imports from the js root
-  resolve: {
-    // always import from root (src and node_modules)
-    root: [
-      'src',
-      'node_modules'
-    ],
-    extensions: ['', '.js']
-  },
-  // let the loaders be found when parsing resources in all paths
-  resolveLoader: {
-    root: path.join(__dirname, 'node_modules')
-  },
-  // library entry point
-  entry: './src/index.js',
-  output: {
-    path: path.join(__dirname, 'dist'),
-    publicPath: '/dist',
-    filename: 'baton.min.js',
-  },
-  // this for creating source maps
-  devtool: 'source-map'
-}
-
-webpackConfig.plugins = [
-  new webpack.optimize.UglifyJsPlugin({minimize: true}),
-  new webpack.ProvidePlugin({
-    jQuery: 'jquery',
-    $: 'jquery',
-    jquery: 'jquery'
-  })
-]
+module.exports = env => {
+  const webpackConfig = {
+    mode: 'production',
+    // this is needed to resolve imports from the js root
+    resolve: {
+      // always import from root (src and node_modules)
+      modules: [
+        path.join(__dirname, 'src'),
+        'node_modules'
+      ],
+      extensions: ['.js']
+    },
+    // library entry point
+    entry: './src/index.js',
+    output: {
+      path: path.join(__dirname, 'dist'),
+      publicPath: '/dist',
+      filename: 'baton.min.js',
+    },
+    // this for creating source maps
+    devtool: 'source-map'
+  }
 
-webpackConfig.module = {
-  loaders: []
-}
+  webpackConfig.plugins = [
+    new BundleAnalyzerPlugin(),
+    new webpack.ProvidePlugin({
+      jQuery: 'jquery',
+      $: 'jquery',
+      jquery: 'jquery'
+    })
+  ]
 
-// js loaders
-webpackConfig.module.loaders.push({
-  test: /\.(js)$/,
-  exclude: /node_modules/,
-  loader: 'babel-loader',
-  query: {
-    presets: ['es2015', 'stage-0']
+  webpackConfig.module = {
+    rules: []
   }
-})
 
-// css loaders
-webpackConfig.module.loaders.push({
-  test: /\.scss/,
-  loader: 'style!css!postcss!sass'
-}, {
-  test: /\.sass/,
-  loader: 'style!css!postcss!sass'
-})
+  // js loaders
+  webpackConfig.module.rules.push({
+    test: /\.(js)$/,
+    exclude: /node_modules/,
+    loader: 'babel-loader',
+    query: {
+      presets: ['@babel/preset-env']
+    }
+  })
 
-// File loaders
-webpackConfig.module.loaders.push(
-  {
-    test: /\.svg(\?.*)?$/,
-    loader: 'url?prefix=fonts/&name=[path][name].[ext]&limit=10000&mimetype=image/svg+xml'
-  },
-  /*
-  {
-    test: /\.(png|jpg)$/,
-    loader: 'url?limit=8192'
-  },
-  */
-  {
-    test: /\.(eot|woff|woff2|ttf|svg|png|jpe?g|gif)(\?\S*)?$/,
-    loader: 'url?limit=100000&name=[name].[ext]'
-  }
-)
+  // css loaders
+  webpackConfig.module.rules.push({
+    test: /\.scss/,
+    loader: 'style-loader!css-loader!postcss-loader!sass-loader'
+  }, {
+    test: /\.sass/,
+    loader: 'style-loader!css-loader!postcss-loader!sass-loader'
+  })
 
-export default webpackConfig
+  // File loaders
+  webpackConfig.module.rules.push(
+    {
+      test: /\.(eot|woff|woff2|ttf|png|jpe?g|gif)(\?\S*)?$/,
+      use: {
+        loader: 'url-loader',
+        options: {
+          limit: env.NODE_ENV === 'development' ? 5e6 : 1e4,
+          publicPath: '/static/baton/app/dist/',
+        }
+      }
+    },
+    {
+      test: /\.svg$/i,
+      use: [
+        {
+          loader: 'url-loader',
+          options: {
+            limit: env.NODE_ENV === 'development' ? 5e6 : 1e4,
+            publicPath: '/static/baton/app/dist/',
+            generator: (content) => svgToMiniDataURI(content.toString()),
+          },
+        },
+      ],
+    },
+  )
+
+  return webpackConfig
+}

baton/views.py

@@ -71,6 +71,7 @@ def get_title_voice(self, item):
                 'type': 'title',
                 'label': item.get('label', ''),
                 'icon': item.get('icon', None),
+                'defaultOpen': item.get('default_open', False),
                 'children': children,
             }
         return None
@@ -97,6 +98,7 @@ def get_free_voice(self, item):
                 'label': item.get('label', ''),
                 'icon': item.get('icon', None),
                 'url': item.get('url', None),
+                'defaultOpen': item.get('default_open', False),
                 'children': children,
             }
         return None
@@ -127,6 +129,7 @@ def get_app_voice(self, item):
                 'type': 'app',
                 'label': item.get('label', ''),
                 'icon': item.get('icon', None),
+                'defaultOpen': item.get('default_open', False),
                 'children': children
             }
         return None

docs/conf.py

@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.5.8'
+version = u'1.6.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.5.8'
+release = u'1.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/configuration.rst

@@ -25,6 +25,7 @@ This is an example of configuration::
                 'name': 'auth',
                 'label': 'Authentication',
                 'icon': 'fa fa-lock',
+                'default_open': True,
                 'models': (
                     {
                         'name': 'user',
@@ -142,6 +143,8 @@ Title and free voices can have children. Children follow these rules:
 
 - children children are ignored (do not place an app voice as child)
 
+Voices with children can specify a ``default_open`` option, used to expand the submenu by default.
+
 Title
 ^^^^^
 
@@ -155,14 +158,14 @@ or ::
 
     { 'type': 'title', 'label': 'main', 'apps': ('auth', ) },
 
-It accepts children voices.
+It accepts children voices, though you can specify the ``default_open`` key.
 
 App
 ^^^
 
 In order to add an application with all its models to the menu, you need an `app` menu voice.
 
-You must specify the ``type`` and ``name`` keys, optionally an ``icon`` key (you can use FontAwesome classes which are included by default) and a ``models`` key.
+You must specify the ``type`` and ``name`` keys, optionally an ``icon`` key (you can use FontAwesome classes which are included by default), a ``default_open`` key and a ``models`` key.
 
 .. important:: If you don't define the models key then the default app models are listed under your app, otherwise only the specified models are listed (in the order you provide).
 
@@ -216,6 +219,8 @@ It accepts children voices ::
         { 'type': 'free', 'label': 'Photos', 'url': 'http://www.myphotossite.com' },
     ] },
 
+Since free voices can have children you can specify the ``default_open`` key.
+
 Analytics
 ---------
 

docs/index.rst

@@ -14,8 +14,8 @@ Everything is done with css (sass and bootstrap mixins), and when the markup nee
 Features
 --------
 
-- Tested with django 1.10.5, 1.11.1, 2.0, 2.1 and 2.2
-- Based on bootstrap 4.3.1 and FontAwesome 5.8.1
+- Tested with django >= 1.10.5
+- Based on bootstrap 4.5.0 and FontAwesome 5.8.1
 - Fully responsive
 - Custom and flexible sidebar menu
 - Text input filters facility

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.5.8',
+    version='1.6.0',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',