Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## [2.0.1] 2020-09-14

- Fix console error on auth pages (#6)
- Upgrade dependencies

## [2.0.0] 2020-09-04

- Upgrade to Bootstrap 5
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A professional Admin & Dashboard template based on Bootstrap 5 that comes with h

## Status

![Version](https://img.shields.io/github/package-json/v/adminkit/adminkit) ![License](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/adminkit/adminkit.svg)](https://github.com/adminkit/adminkit/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/adminkit/adminkit.svg)](https://github.com/adminkit/adminkit/issues?q=is%3Aissue+is%3Aclosed)
![Version](https://img.shields.io/github/package-json/v/adminkit/adminkit) ![License](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/adminkit/adminkit.svg)](https://github.com/adminkit/adminkit/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/adminkit/adminkit.svg)](https://github.com/adminkit/adminkit/issues?q=is%3Aissue+is%3Aclosed) [![GitHub Stars](https://img.shields.io/github/stars/adminkit/adminkit.svg?color=green)](https://github.com/adminkit/adminkit/stargazers) [![Live Demo](https://img.shields.io/badge/demo-online-green.svg)](https://demo.adminkit.io/)

## Features

Expand Down
4 changes: 2 additions & 2 deletions examples/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/js/app.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions examples/js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,4 @@

//! moment.js

//! moment.js language configuration

//! moment.js locale configuration
2 changes: 1 addition & 1 deletion examples/js/app.js.map

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adminkit",
"version": "2.0.0",
"version": "2.0.1",
"description": "AdminKit - Bootstrap 5 Admin Template",
"scripts": {
"build": "cross-env NODE_ENV=production webpack -p --config webpack.config.js",
Expand Down Expand Up @@ -31,43 +31,43 @@
"web"
],
"devDependencies": {
"@babel/core": "7.11.4",
"@babel/core": "7.11.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.11.0",
"@babel/register": "7.10.5",
"@babel/preset-env": "7.11.5",
"@babel/register": "7.11.5",
"autoprefixer": "9.8.6",
"babel-eslint": "10.1.0",
"babel-loader": "8.1.0",
"copy-webpack-plugin": "5.1.2",
"cross-env": "6.0.3",
"css-loader": "3.6.0",
"eslint": "6.8.0",
"file-loader": "5.1.0",
"copy-webpack-plugin": "6.1.0",
"cross-env": "7.0.2",
"css-loader": "4.3.0",
"eslint": "7.9.0",
"file-loader": "6.1.0",
"filemanager-webpack-plugin": "2.0.5",
"hard-source-webpack-plugin": "0.13.1",
"mini-css-extract-plugin": "0.11.0",
"mini-css-extract-plugin": "0.11.2",
"node-sass": "4.14.1",
"optimize-css-assets-webpack-plugin": "5.0.3",
"postcss-loader": "3.0.0",
"optimize-css-assets-webpack-plugin": "5.0.4",
"postcss-loader": "4.0.1",
"resolve-url-loader": "3.1.1",
"sass-loader": "8.0.2",
"sass-loader": "10.0.2",
"script-loader": "0.7.2",
"style-loader": "1.2.1",
"terser-webpack-plugin": "2.3.8",
"url-loader": "3.0.0",
"terser-webpack-plugin": "4.2.0",
"url-loader": "4.1.0",
"webpack": "4.44.1",
"webpack-cli": "3.3.12",
"webpack-dev-server": "3.11.0"
},
"dependencies": {
"@babel/polyfill": "7.10.4",
"@babel/polyfill": "7.11.5",
"@fortawesome/fontawesome-free": "5.14.0",
"bootstrap": "5.0.0-alpha1",
"chart.js": "2.9.3",
"feather-icons": "4.28.0",
"flatpickr": "4.6.6",
"jsvectormap": "1.1.1",
"moment": "2.27.0",
"moment": "2.28.0",
"popper.js": "1.16.1",
"simplebar": "5.2.1"
}
Expand Down
29 changes: 17 additions & 12 deletions src/js/modules/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@
import SimpleBar from "simplebar";

document.addEventListener("DOMContentLoaded", () => {
/* Initialize simplebar */
new SimpleBar(document.getElementsByClassName("js-simplebar")[0])

const sidebarElement = document.getElementsByClassName("sidebar")[0];
const sidebarToggleElement = document.getElementsByClassName("sidebar-toggle")[0];

sidebarToggleElement.addEventListener("click", () => {
sidebarElement.classList.toggle("collapsed");

sidebarElement.addEventListener("transitionend", () => {
window.dispatchEvent(new Event("resize"));
const simpleBarElement = document.getElementsByClassName("js-simplebar")[0];

if(simpleBarElement){
/* Initialize simplebar */
new SimpleBar(document.getElementsByClassName("js-simplebar")[0])

const sidebarElement = document.getElementsByClassName("sidebar")[0];
const sidebarToggleElement = document.getElementsByClassName("sidebar-toggle")[0];

sidebarToggleElement.addEventListener("click", () => {
sidebarElement.classList.toggle("collapsed");

sidebarElement.addEventListener("transitionend", () => {
window.dispatchEvent(new Event("resize"));
});
});
});
}

});
2 changes: 1 addition & 1 deletion src/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* AdminKit v2.0.0 (https://adminkit.io/)
* AdminKit v2.0.1 (https://adminkit.io/)
* Copyright 2020 Paul Laros
* Copyright 2020 AdminKit
* Licensed under MIT (https://github.com/adminkit/adminkit/blob/master/LICENSE)
Expand Down
10 changes: 6 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ module.exports = {
chunkFilename: "css/app.css"
}),
// Copy fonts and images to dist
new CopyWebpackPlugin([
{ from: "src/fonts", to: "fonts" },
{ from: "src/img", to: "img" }
]),
new CopyWebpackPlugin({
patterns: [
{ from: "src/fonts", to: "fonts" },
{ from: "src/img", to: "img" }
]
}),
// Speed up webpack build
new HardSourceWebpackPlugin(),
// Copy dist folder to examples
Expand Down