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
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ Steps:

## 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:
- OS:
- Screen size:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.2
18.16.0
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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

- Fix table in card styling issues
Expand Down
54 changes: 26 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@adminkit/core",
"version": "3.3.0",
"version": "3.4.0",
"description": "AdminKit - Bootstrap 5 Admin Template",
"keywords": [
"bootstrap",
Expand Down Expand Up @@ -39,52 +39,50 @@
"prepublishOnly": "cross-env NODE_ENV=production webpack --progress --config webpack.config.js"
},
"browserslist": [
"> 0.5%",
">= 0.5%",
"last 2 major versions",
"not dead",
"Chrome >= 60",
"Firefox >= 60",
"not Edge < 79",
"Firefox ESR",
"iOS >= 10",
"Safari >= 10",
"Android >= 6",
"iOS >= 12",
"Safari >= 12",
"not Explorer <= 11"
],
"dependencies": {
"@babel/polyfill": "7.12.1",
"@popperjs/core": "2.11.5",
"bootstrap": "5.2.0",
"@popperjs/core": "2.11.8",
"bootstrap": "5.3.0",
"chart.js": "2.9.4",
"feather-icons": "4.29.0",
"flatpickr": "4.6.13",
"jsvectormap": "1.5.0",
"simplebar": "5.3.8"
"jsvectormap": "1.5.3",
"simplebar": "5.3.9"
},
"devDependencies": {
"@babel/core": "7.18.10",
"@babel/core": "7.22.5",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.18.10",
"@babel/register": "7.18.9",
"autoprefixer": "10.4.8",
"@babel/preset-env": "7.22.5",
"@babel/register": "7.22.5",
"autoprefixer": "10.4.14",
"babel-eslint": "10.1.0",
"babel-loader": "8.2.5",
"copy-webpack-plugin": "9.1.0",
"babel-loader": "9.1.2",
"copy-webpack-plugin": "11.0.0",
"cross-env": "7.0.3",
"css-loader": "6.7.1",
"css-minimizer-webpack-plugin": "3.4.1",
"eslint": "7.32.0",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.0",
"eslint": "8.42.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",
"mini-css-extract-plugin": "2.6.1",
"postcss-loader": "6.2.1",
"sass": "1.54.4",
"sass-loader": "12.6.0",
"terser-webpack-plugin": "5.3.3",
"mini-css-extract-plugin": "2.7.6",
"postcss-loader": "7.3.2",
"sass": "1.63.2",
"sass-loader": "13.3.1",
"terser-webpack-plugin": "5.3.9",
"url-loader": "4.1.1",
"webpack": "5.74.0",
"webpack-cli": "4.10.0",
"webpack-dev-server": "4.9.3"
"webpack": "5.86.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.15.0"
}
}
6 changes: 6 additions & 0 deletions src/js/modules/feather.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@
import feather from "feather-icons";

document.addEventListener("DOMContentLoaded", () => {
try {
feather.replace();
}
catch(e) {
console.log('You might have made a typo with one of the feather icons');
console.log(e);
}
});

window.feather = feather;
2 changes: 1 addition & 1 deletion src/js/modules/vector-maps.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Usage: https://github.com/themustafaomar/jsvectormap
import "jsvectormap"
import "jsvectormap/dist/maps/world.js"
import "./vector-maps/world.js"
1 change: 1 addition & 0 deletions src/js/modules/vector-maps/world.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/scss/1-variables/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ $min-contrast-ratio: 3 !default;
$enable-validation-icons: false !default;
$enable-rfs: false !default;
$enable-negative-margins: true !default;
$enable-dark-mode: false !default;

// Transitions
$transition-base: all .35s ease-in-out !default;
Expand Down Expand Up @@ -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;

// Cards
$card-bg: $white !default;
$card-border-radius: .25rem !default;
$card-inner-border-radius: $card-border-radius !default;
$card-border-width: 0 !default;
Expand All @@ -224,6 +226,7 @@ $table-cell-padding-y: .75rem !default;
$table-cell-padding-x: .75rem !default;
$table-cell-padding-y-sm: .3rem !default;
$table-cell-padding-x-sm: .3rem !default;
$table-bg: transparent !default;
$table-striped-bg: $gray-100 !default;
$table-hover-bg: rgba($black, .0375) !default;

Expand Down Expand Up @@ -293,6 +296,9 @@ $badge-font-size: 80% !default;
$badge-padding-y: .3em !default;
$badge-padding-x: .45em !default;

// Dropdowns
$dropdown-bg: $white !default;

// Main
$main-box-shadow: inset .75rem 0px 1.5rem 0px rgba($black, 0.075);

Expand Down
6 changes: 3 additions & 3 deletions src/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* AdminKit v3.3.0 (https://adminkit.io/)
* Copyright 2022 Paul Laros
* Copyright 2022 AdminKit
* AdminKit v3.4.0 (https://adminkit.io/)
* Copyright 2023 Paul Laros
* Copyright 2023 AdminKit
* Licensed under MIT (https://github.com/adminkit/adminkit/blob/master/LICENSE)
*/

Expand Down
8 changes: 4 additions & 4 deletions static/css/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/css/app.css.map

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -485,57 +485,57 @@ <h5 class="card-title mb-0">Latest Projects</h5>
<tbody>
<tr>
<td>Project Apollo</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Vanessa Tucker</td>
</tr>
<tr>
<td>Project Fireball</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-danger">Cancelled</span></td>
<td class="d-none d-md-table-cell">William Harris</td>
</tr>
<tr>
<td>Project Hades</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Sharon Lessman</td>
</tr>
<tr>
<td>Project Nitro</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-warning">In progress</span></td>
<td class="d-none d-md-table-cell">Vanessa Tucker</td>
</tr>
<tr>
<td>Project Phoenix</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">William Harris</td>
</tr>
<tr>
<td>Project X</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Sharon Lessman</td>
</tr>
<tr>
<td>Project Romeo</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-success">Done</span></td>
<td class="d-none d-md-table-cell">Christina Mason</td>
</tr>
<tr>
<td>Project Wombat</td>
<td class="d-none d-xl-table-cell">01/01/2021</td>
<td class="d-none d-xl-table-cell">31/06/2021</td>
<td class="d-none d-xl-table-cell">01/01/2023</td>
<td class="d-none d-xl-table-cell">31/06/2023</td>
<td><span class="badge bg-warning">In progress</span></td>
<td class="d-none d-md-table-cell">William Harris</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion static/js/app.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions static/js/app.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Bootstrap v5.2.0 (https://getbootstrap.com/)
* Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap v5.3.0 (https://getbootstrap.com/)
* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

Expand Down
2 changes: 1 addition & 1 deletion static/js/app.js.map

Large diffs are not rendered by default.

29 changes: 11 additions & 18 deletions static/pages-sign-in.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,19 @@
<main class="d-flex w-100">
<div class="container d-flex flex-column">
<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="text-center mt-4">
<h1 class="h2">Welcome back, Charles</h1>
<h1 class="h2">Welcome back!</h1>
<p class="lead">
Sign in to your account to continue
</p>
</div>

<div class="card">
<div class="card-body">
<div class="m-sm-4">
<div class="text-center">
<img src="img/avatars/avatar.jpg" alt="Charles Hall" class="img-fluid rounded-circle" width="132" height="132" />
</div>
<div class="m-sm-3">
<form>
<div class="mb-3">
<label class="form-label">Email</label>
Expand All @@ -48,27 +45,23 @@ <h1 class="h2">Welcome back, Charles</h1>
<div class="mb-3">
<label class="form-label">Password</label>
<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>
<label class="form-check">
<input class="form-check-input" type="checkbox" value="remember-me" name="remember-me" checked>
<span class="form-check-label">
Remember me next time
</span>
</label>
<div class="form-check align-items-center">
<input id="customControlInline" type="checkbox" class="form-check-input" value="remember-me" name="remember-me" checked>
<label class="form-check-label text-small" for="customControlInline">Remember me</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>
<!-- <button type="submit" class="btn btn-lg btn-primary">Sign in</button> -->
</div>
</form>
</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>
Expand Down
17 changes: 7 additions & 10 deletions static/pages-sign-up.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<main class="d-flex w-100">
<div class="container d-flex flex-column">
<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="text-center mt-4">
Expand All @@ -36,16 +36,12 @@ <h1 class="h2">Get started</h1>

<div class="card">
<div class="card-body">
<div class="m-sm-4">
<div class="m-sm-3">
<form>
<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" />
</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">
<label class="form-label">Email</label>
<input class="form-control form-control-lg" type="email" name="email" placeholder="Enter your email" />
Expand All @@ -54,15 +50,16 @@ <h1 class="h2">Get started</h1>
<label class="form-label">Password</label>
<input class="form-control form-control-lg" type="password" name="password" placeholder="Enter password" />
</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>
<!-- <button type="submit" class="btn btn-lg btn-primary">Sign up</button> -->
</div>
</form>
</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>
Expand Down
Loading