leviathonbeast/adminkit
1
0
Fork 0
mirror of https://github.com/adminkit/adminkit.git synced 2026-03-31 19:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #135 from adminkit/dev

Browse Source 
v3.4.0
This commit is contained in:
Paul Laros
2023-06-08 23:14:44 +02:00
committed by GitHub
parent 50ca4eb7c7 ab66df7f01
commit 4d84aec6ca
18 changed files with 110 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/bug_report.md
+3 -1
View File
@@ -27,8 +27,10 @@ Steps:
## Your Environment 🌎 ## Your Environment 🌎
<!-- What browser, OS and screen size are you using --> <!-- What version, browser, OS and screen size are you using -->
- Theme version:
- Free or paid version:
- Browser: - Browser:
- OS: - OS:
- Screen size: - Screen size:
.nvmrc
+1 -1
View File
@@ -1 +1 @@
16.13.2 18.16.0
CHANGELOG.md
+8
View File
@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [3.4.0] 2023-06-08
- Add error catching to JavaScript modules
- Update browserslist file
- Upgrade to Webpack v5.86.0
- Upgrade to Bootstrap v5.3.0
- Upgrade dependencies
## [3.3.0] 2022-08-10 ## [3.3.0] 2022-08-10
- Fix table in card styling issues - Fix table in card styling issues
package.json
+26 -28
View File
@@ -1,6 +1,6 @@
{ {
"name": "@adminkit/core", "name": "@adminkit/core",
"version": "3.3.0", "version": "3.4.0",
"description": "AdminKit - Bootstrap 5 Admin Template", "description": "AdminKit - Bootstrap 5 Admin Template",
"keywords": [ "keywords": [
"bootstrap", "bootstrap",
@@ -39,52 +39,50 @@
"prepublishOnly": "cross-env NODE_ENV=production webpack --progress --config webpack.config.js" "prepublishOnly": "cross-env NODE_ENV=production webpack --progress --config webpack.config.js"
}, },
"browserslist": [ "browserslist": [
"> 0.5%", ">= 0.5%",
"last 2 major versions", "last 2 major versions",
"not dead", "not dead",
"Chrome >= 60", "Chrome >= 60",
"Firefox >= 60", "Firefox >= 60",
"not Edge < 79",
"Firefox ESR", "Firefox ESR",
"iOS >= 10", "iOS >= 12",
"Safari >= 10", "Safari >= 12",
"Android >= 6",
"not Explorer <= 11" "not Explorer <= 11"
], ],
"dependencies": { "dependencies": {
"@babel/polyfill": "7.12.1", "@babel/polyfill": "7.12.1",
"@popperjs/core": "2.11.5", "@popperjs/core": "2.11.8",
"bootstrap": "5.2.0", "bootstrap": "5.3.0",
"chart.js": "2.9.4", "chart.js": "2.9.4",
"feather-icons": "4.29.0", "feather-icons": "4.29.0",
"flatpickr": "4.6.13", "flatpickr": "4.6.13",
"jsvectormap": "1.5.0", "jsvectormap": "1.5.3",
"simplebar": "5.3.8" "simplebar": "5.3.9"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.18.10", "@babel/core": "7.22.5",
"@babel/plugin-syntax-dynamic-import": "7.8.3", "@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.18.10", "@babel/preset-env": "7.22.5",
"@babel/register": "7.18.9", "@babel/register": "7.22.5",
"autoprefixer": "10.4.8", "autoprefixer": "10.4.14",
"babel-eslint": "10.1.0", "babel-eslint": "10.1.0",
"babel-loader": "8.2.5", "babel-loader": "9.1.2",
"copy-webpack-plugin": "9.1.0", "copy-webpack-plugin": "11.0.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"css-loader": "6.7.1", "css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "3.4.1", "css-minimizer-webpack-plugin": "5.0.0",
"eslint": "7.32.0", "eslint": "8.42.0",
"file-loader": "6.2.0", "file-loader": "6.2.0",
"filemanager-webpack-plugin": "6.1.7", "filemanager-webpack-plugin": "8.0.0",
"hard-source-webpack-plugin": "0.13.1", "hard-source-webpack-plugin": "0.13.1",
"mini-css-extract-plugin": "2.6.1", "mini-css-extract-plugin": "2.7.6",
"postcss-loader": "6.2.1", "postcss-loader": "7.3.2",
"sass": "1.54.4", "sass": "1.63.2",
"sass-loader": "12.6.0", "sass-loader": "13.3.1",
"terser-webpack-plugin": "5.3.3", "terser-webpack-plugin": "5.3.9",
"url-loader": "4.1.1", "url-loader": "4.1.1",
"webpack": "5.74.0", "webpack": "5.86.0",
"webpack-cli": "4.10.0", "webpack-cli": "5.1.4",
"webpack-dev-server": "4.9.3" "webpack-dev-server": "4.15.0"
} }
} }
src/js/modules/feather.js
+6
View File
@@ -2,7 +2,13 @@
import feather from "feather-icons"; import feather from "feather-icons";
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
try {
feather.replace(); feather.replace();
}
catch(e) {
console.log('You might have made a typo with one of the feather icons');
console.log(e);
}
}); });
window.feather = feather; window.feather = feather;
src/js/modules/vector-maps.js
+1 -1
View File
@@ -1,3 +1,3 @@
// Usage: https://github.com/themustafaomar/jsvectormap // Usage: https://github.com/themustafaomar/jsvectormap
import "jsvectormap" import "jsvectormap"
import "jsvectormap/dist/maps/world.js" import "./vector-maps/world.js"
src/js/modules/vector-maps/world.js
+1
View File
File diff suppressed because one or more lines are too long
src/scss/1-variables/_app.scss
+6
View File
@@ -50,6 +50,7 @@ $min-contrast-ratio: 3 !default;
$enable-validation-icons: false !default; $enable-validation-icons: false !default;
$enable-rfs: false !default; $enable-rfs: false !default;
$enable-negative-margins: true !default; $enable-negative-margins: true !default;
$enable-dark-mode: false !default;
// Transitions // Transitions
$transition-base: all .35s ease-in-out !default; $transition-base: all .35s ease-in-out !default;
@@ -205,6 +206,7 @@ $input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + ($input-bt
$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default; $input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
// Cards // Cards
$card-bg: $white !default;
$card-border-radius: .25rem !default; $card-border-radius: .25rem !default;
$card-inner-border-radius: $card-border-radius !default; $card-inner-border-radius: $card-border-radius !default;
$card-border-width: 0 !default; $card-border-width: 0 !default;
@@ -224,6 +226,7 @@ $table-cell-padding-y: .75rem !default;
$table-cell-padding-x: .75rem !default; $table-cell-padding-x: .75rem !default;
$table-cell-padding-y-sm: .3rem !default; $table-cell-padding-y-sm: .3rem !default;
$table-cell-padding-x-sm: .3rem !default; $table-cell-padding-x-sm: .3rem !default;
$table-bg: transparent !default;
$table-striped-bg: $gray-100 !default; $table-striped-bg: $gray-100 !default;
$table-hover-bg: rgba($black, .0375) !default; $table-hover-bg: rgba($black, .0375) !default;
@@ -293,6 +296,9 @@ $badge-font-size: 80% !default;
$badge-padding-y: .3em !default; $badge-padding-y: .3em !default;
$badge-padding-x: .45em !default; $badge-padding-x: .45em !default;
// Dropdowns
$dropdown-bg: $white !default;
// Main // Main
$main-box-shadow: inset .75rem 0px 1.5rem 0px rgba($black, 0.075); $main-box-shadow: inset .75rem 0px 1.5rem 0px rgba($black, 0.075);
src/scss/app.scss
+3 -3
View File
@@ -1,7 +1,7 @@
/*! /*!
* AdminKit v3.3.0 (https://adminkit.io/) * AdminKit v3.4.0 (https://adminkit.io/)
* Copyright 2022 Paul Laros * Copyright 2023 Paul Laros
* Copyright 2022 AdminKit * Copyright 2023 AdminKit
* Licensed under MIT (https://github.com/adminkit/adminkit/blob/master/LICENSE) * Licensed under MIT (https://github.com/adminkit/adminkit/blob/master/LICENSE)
*/ */
static/css/app.css
+4 -4
View File
File diff suppressed because one or more lines are too long
static/css/app.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/index.html
+16 -16
View File
@@ -485,57 +485,57 @@
<tbody> <tbody>
<tr> <tr>
<td>Project Apollo</td> <td>Project Apollo</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td> <td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Vanessa Tucker</td> <td class="d-none d-md-table-cell">Vanessa Tucker</td>
</tr> </tr>
<tr> <tr>
<td>Project Fireball</td> <td>Project Fireball</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-danger">Cancelled</span></td> <td><span class="badge bg-danger">Cancelled</span></td>
<td class="d-none d-md-table-cell">William Harris</td> <td class="d-none d-md-table-cell">William Harris</td>
</tr> </tr>
<tr> <tr>
<td>Project Hades</td> <td>Project Hades</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td> <td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Sharon Lessman</td> <td class="d-none d-md-table-cell">Sharon Lessman</td>
</tr> </tr>
<tr> <tr>
<td>Project Nitro</td> <td>Project Nitro</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-warning">In progress</span></td> <td><span class="badge bg-warning">In progress</span></td>
<td class="d-none d-md-table-cell">Vanessa Tucker</td> <td class="d-none d-md-table-cell">Vanessa Tucker</td>
</tr> </tr>
<tr> <tr>
<td>Project Phoenix</td> <td>Project Phoenix</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td> <td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">William Harris</td> <td class="d-none d-md-table-cell">William Harris</td>
</tr> </tr>
<tr> <tr>
<td>Project X</td> <td>Project X</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td> <td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Sharon Lessman</td> <td class="d-none d-md-table-cell">Sharon Lessman</td>
</tr> </tr>
<tr> <tr>
<td>Project Romeo</td> <td>Project Romeo</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td> <td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Christina Mason</td> <td class="d-none d-md-table-cell">Christina Mason</td>
</tr> </tr>
<tr> <tr>
<td>Project Wombat</td> <td>Project Wombat</td>
<td class="d-none d-xl-table-cell">01/01/2021</td> <td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2021</td> <td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-warning">In progress</span></td> <td><span class="badge bg-warning">In progress</span></td>
<td class="d-none d-md-table-cell">William Harris</td> <td class="d-none d-md-table-cell">William Harris</td>
</tr> </tr>
static/js/app.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/js/app.js.LICENSE.txt
+2 -2
View File
@@ -1,6 +1,6 @@
/*! /*!
* Bootstrap v5.2.0 (https://getbootstrap.com/) * Bootstrap v5.3.0 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/ */
static/js/app.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/pages-sign-in.html
+11 -18
View File
@@ -24,11 +24,11 @@
<main class="d-flex w-100"> <main class="d-flex w-100">
<div class="container d-flex flex-column"> <div class="container d-flex flex-column">
<div class="row vh-100"> <div class="row vh-100">
<div class="col-sm-10 col-md-8 col-lg-6 mx-auto d-table h-100"> <div class="col-sm-10 col-md-8 col-lg-6 col-xl-5 mx-auto d-table h-100">
<div class="d-table-cell align-middle"> <div class="d-table-cell align-middle">
<div class="text-center mt-4"> <div class="text-center mt-4">
<h1 class="h2">Welcome back, Charles</h1> <h1 class="h2">Welcome back!</h1>
<p class="lead"> <p class="lead">
Sign in to your account to continue Sign in to your account to continue
</p> </p>
@@ -36,10 +36,7 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="m-sm-4"> <div class="m-sm-3">
<div class="text-center">
<img src="img/avatars/avatar.jpg" alt="Charles Hall" class="img-fluid rounded-circle" width="132" height="132" />
</div>
<form> <form>
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Email</label> <label class="form-label">Email</label>
@@ -48,27 +45,23 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Password</label> <label class="form-label">Password</label>
<input class="form-control form-control-lg" type="password" name="password" placeholder="Enter your password" /> <input class="form-control form-control-lg" type="password" name="password" placeholder="Enter your password" />
<small>
<a href="index.html">Forgot password?</a>
</small>
</div> </div>
<div> <div>
<label class="form-check"> <div class="form-check align-items-center">
<input class="form-check-input" type="checkbox" value="remember-me" name="remember-me" checked> <input id="customControlInline" type="checkbox" class="form-check-input" value="remember-me" name="remember-me" checked>
<span class="form-check-label"> <label class="form-check-label text-small" for="customControlInline">Remember me</label>
Remember me next time </div>
</span>
</label>
</div> </div>
<div class="text-center mt-3"> <div class="d-grid gap-2 mt-3">
<a href="index.html" class="btn btn-lg btn-primary">Sign in</a> <a href="index.html" class="btn btn-lg btn-primary">Sign in</a>
<!-- <button type="submit" class="btn btn-lg btn-primary">Sign in</button> -->
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<div class="text-center mb-3">
Don't have an account? <a href="pages-sign-up.html">Sign up</a>
</div>
</div> </div>
</div> </div>
</div> </div>
static/pages-sign-up.html
+7 -10
View File
@@ -24,7 +24,7 @@
<main class="d-flex w-100"> <main class="d-flex w-100">
<div class="container d-flex flex-column"> <div class="container d-flex flex-column">
<div class="row vh-100"> <div class="row vh-100">
<div class="col-sm-10 col-md-8 col-lg-6 mx-auto d-table h-100"> <div class="col-sm-10 col-md-8 col-lg-6 col-xl-5 mx-auto d-table h-100">
<div class="d-table-cell align-middle"> <div class="d-table-cell align-middle">
<div class="text-center mt-4"> <div class="text-center mt-4">
@@ -36,16 +36,12 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="m-sm-4"> <div class="m-sm-3">
<form> <form>
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Name</label> <label class="form-label">Full name</label>
<input class="form-control form-control-lg" type="text" name="name" placeholder="Enter your name" /> <input class="form-control form-control-lg" type="text" name="name" placeholder="Enter your name" />
</div> </div>
<div class="mb-3">
<label class="form-label">Company</label>
<input class="form-control form-control-lg" type="text" name="company" placeholder="Enter your company name" />
</div>
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Email</label> <label class="form-label">Email</label>
<input class="form-control form-control-lg" type="email" name="email" placeholder="Enter your email" /> <input class="form-control form-control-lg" type="email" name="email" placeholder="Enter your email" />
@@ -54,15 +50,16 @@
<label class="form-label">Password</label> <label class="form-label">Password</label>
<input class="form-control form-control-lg" type="password" name="password" placeholder="Enter password" /> <input class="form-control form-control-lg" type="password" name="password" placeholder="Enter password" />
</div> </div>
<div class="text-center mt-3"> <div class="d-grid gap-2 mt-3">
<a href="index.html" class="btn btn-lg btn-primary">Sign up</a> <a href="index.html" class="btn btn-lg btn-primary">Sign up</a>
<!-- <button type="submit" class="btn btn-lg btn-primary">Sign up</button> -->
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<div class="text-center mb-3">
Already have account? <a href="pages-sign-in.html">Log In</a>
</div>
</div> </div>
</div> </div>
</div> </div>
webpack.config.js
+12 -16
View File
@@ -51,15 +51,17 @@ module.exports = {
] ]
}), }),
// Copy dist folder to static // Copy dist folder to static
new FileManagerPlugin({ ...(process.env.NODE_ENV === "production")? [
events: { new FileManagerPlugin({
onEnd: { events: {
copy: [ onEnd: {
{ source: "./dist/", destination: "./static" } copy: [
] { source: "./dist/", destination: "./static" }
} ]
} }
}), },
})
] : [],
], ],
module: { module: {
rules: [ rules: [
@@ -81,12 +83,7 @@ module.exports = {
MiniCssExtractPlugin.loader, MiniCssExtractPlugin.loader,
"css-loader", "css-loader",
"postcss-loader", "postcss-loader",
{ "sass-loader"
loader: "sass-loader",
options: {
implementation: require.resolve("sass"),
}
}
] ]
}, },
// Load fonts // Load fonts
@@ -118,7 +115,6 @@ module.exports = {
static: { static: {
directory: Path.join(__dirname, "static") directory: Path.join(__dirname, "static")
}, },
compress: true,
port: 8080, port: 8080,
open: true open: true
} }