@saltcorn/sbadmin2 0.7.1-beta.3 → 0.7.2-beta.2

package/index.js

@@ -152,12 +152,13 @@ const sideBarItem = (currentUrl) => (item) => {
  * @param {string} currentUrl
  * @returns {function}
  */
-const sideBarSection = (currentUrl) => (section) => [
-  section.section &&
-    hr({ class: "sidebar-divider" }) +
-      div({ class: "sidebar-heading" }, section.section),
-  section.items.map(sideBarItem(currentUrl)).join(""),
-];
+const sideBarSection = (currentUrl) => (section) =>
+  [
+    section.section &&
+      hr({ class: "sidebar-divider" }) +
+        div({ class: "sidebar-heading" }, section.section),
+    section.items.map(sideBarItem(currentUrl)).join(""),
+  ];
 
 /**
  * @param {object} brand
@@ -327,11 +328,11 @@ const wrapIt = (headers, title, bodyAttr, rest) =>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/vendor/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.5/vendor/fontawesome-free/css/all.min.css">
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i" rel="stylesheet">
 
     <!-- Custom styles for this template-->
-    <link rel="stylesheet" href="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/css/sb-admin-2.css">
+    <link rel="stylesheet" href="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.5/css/sb-admin-2.css">
     ${headersInHead(headers)}
     <title>${text(title)}</title>
   </head>
@@ -340,9 +341,9 @@ const wrapIt = (headers, title, bodyAttr, rest) =>
     <script src="/static_assets/${
       db.connectObj.version_tag
     }/jquery-3.6.0.min.js"></script>
-            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/vendor/jquery-easing/jquery.easing.min.js"></script>
-            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.0/js/sb-admin-2.min.js"></script>
+            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.5/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.5/vendor/jquery-easing/jquery.easing.min.js"></script>
+            <script src="/plugins/pubdeps/sbadmin2/startbootstrap-sb-admin-2-bs5/4.1.5-beta.5/js/sb-admin-2.min.js"></script>
     ${headersInBody(headers)}
     </body>
   </html>`;
@@ -388,7 +389,7 @@ const authWrap = ({
                     </div>
                     ${renderForm(formModify(form), csrfToken)}
                     ${renderAuthLinks(authLinks)}
-                    ${afterForm}
+                    ${afterForm ? afterForm : ""}
                   </div>
                 </div>
               </div>
@@ -427,7 +428,7 @@ const wrap = ({
     title,
     `id="page-top" class="${bodyClass || ""}"`,
     `<div id="wrapper">
-      ${sidebar(brand, menu, currentUrl)}
+      ${db.is_node ? sidebar(brand, menu, currentUrl) : ""}
 
       <div id="content-wrapper" class="d-flex flex-column">
         <div id="content">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/sbadmin2",
-  "version": "0.7.1-beta.3",
+  "version": "0.7.2-beta.2",
   "description": "SB Admin 2 layout plugin",
   "main": "index.js",
   "scripts": {
@@ -9,14 +9,14 @@
     "clean": "echo \"Error: no TypeScript support yet\""
   },
   "dependencies": {
-    "@saltcorn/data": "0.7.1-beta.3",
-    "@saltcorn/markup": "0.7.1-beta.3",
-    "startbootstrap-sb-admin-2-bs5": "^4.1.5-beta.3"
+    "@saltcorn/data": "0.7.2-beta.2",
+    "@saltcorn/markup": "0.7.2-beta.2",
+    "startbootstrap-sb-admin-2-bs5": "^4.1.5-beta.5"
   },
   "author": "Tom Nielsen",
   "license": "MIT",
   "devDependencies": {
-    "jest": "^25.1.0"
+    "jest": "26.6.3"
   },
   "repository": "github:saltcorn/saltcorn",
   "jest": {

package/webpack.config.js

@@ -0,0 +1,31 @@
+const { join } = require("path");
+
+module.exports = {
+  optimization: {
+    minimize: false, // debug
+    splitChunks: {
+      chunks: "all",
+      name: "common_chunks",
+    },
+  },
+  entry: {
+    sbadmin2: {
+      import: join(__dirname, "./index.js"),
+      dependOn: ["data", "markup"],
+    },
+  },
+  output: {
+    path: __dirname,
+    filename: "bundle/[name].bundle.js",
+    libraryTarget: "umd",
+    library: ["saltcorn", "[name]"],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+      },
+    ],
+  },
+};