Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Bootstrap and dependencies. #186

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
9f21075
Updating Bootstrap and dependencies.
ericsizemore Feb 25, 2024
fb0e838
Create dependabot.yml
ericsizemore Feb 27, 2024
b6ca00a
Added new workflow for building dist.
ericsizemore Mar 2, 2024
4b72942
Bump autoprefixer from 10.4.17 to 10.4.18
dependabot[bot] Mar 4, 2024
4d5738c
Merge pull request #1 from ericsizemore/dependabot/npm_and_yarn/autop…
ericsizemore Mar 4, 2024
792f4a4
Update scripts/render-scss.js
ericsizemore Mar 6, 2024
9d1659f
Merge branch 'master' of https://github.com/ericsizemore/startbootstr…
ericsizemore Mar 6, 2024
edf2e19
Add renovate.json
renovate[bot] Mar 6, 2024
a228547
Merge pull request #2 from ericsizemore/renovate/configure
ericsizemore Mar 6, 2024
bb858fe
Added the ability to generate both compressed and expanded css
ericsizemore Mar 11, 2024
3844021
Update dependency sass to v1.72.0
renovate[bot] Mar 14, 2024
e88360b
Merge pull request #4 from ericsizemore/renovate/sass-1.x
ericsizemore Mar 15, 2024
44e344e
Bump follow-redirects from 1.15.5 to 1.15.6
dependabot[bot] Mar 15, 2024
9804684
Merge pull request #5 from ericsizemore/dependabot/npm_and_yarn/follo…
ericsizemore Mar 15, 2024
70fb2ff
Update dependency postcss to v8.4.36
renovate[bot] Mar 17, 2024
62041af
Merge pull request #6 from ericsizemore/renovate/postcss-8.x
ericsizemore Mar 19, 2024
526bba0
Update dependency postcss to v8.4.37
renovate[bot] Mar 19, 2024
8863c28
Merge pull request #8 from ericsizemore/renovate/postcss-8.x
ericsizemore Mar 20, 2024
6e4f6b2
Update dependency autoprefixer to v10.4.19
renovate[bot] Mar 20, 2024
69f97cb
Update dependency postcss to v8.4.38
renovate[bot] Mar 20, 2024
9519f54
Merge pull request #9 from ericsizemore/renovate/autoprefixer-10.x
ericsizemore Mar 21, 2024
132b51c
Merge pull request #10 from ericsizemore/renovate/postcss-8.x
ericsizemore Mar 21, 2024
0c5d7a6
dev-dependency updates
ericsizemore Mar 24, 2024
16e563b
Merge branch 'master' of https://github.com/ericsizemore/startbootstr…
ericsizemore Mar 24, 2024
4a4e704
Update package-lock.json
ericsizemore Mar 24, 2024
6e99ac7
Update dependency sass to v1.74.1
renovate[bot] Apr 4, 2024
947a6fc
Merge pull request #11 from ericsizemore/renovate/sass-1.x
ericsizemore Apr 4, 2024
e51862b
Update dependency sass to v1.75.0
renovate[bot] Apr 11, 2024
faee064
Merge pull request #12 from ericsizemore/renovate/sass-1.x
ericsizemore Apr 13, 2024
f974478
Update package-lock.json
ericsizemore Apr 28, 2024
b0a89de
Update dependency sass to v1.76.0
renovate[bot] Apr 30, 2024
5a6afd8
Update package-lock.json
ericsizemore May 3, 2024
dd06802
Merge pull request #13 from ericsizemore/renovate/sass-1.x
ericsizemore May 6, 2024
089940b
Update dependency sass to v1.77.0
renovate[bot] May 7, 2024
a40c3d6
Merge pull request #15 from ericsizemore/renovate/sass-1.x
ericsizemore May 7, 2024
ed4d708
Update dependency sass to v1.77.1
renovate[bot] May 11, 2024
de7c866
Merge pull request #16 from ericsizemore/renovate/sass-1.x
ericsizemore May 11, 2024
9be6e5c
Update dependency sass to v1.77.2
renovate[bot] May 17, 2024
01cc3e4
Merge pull request #17 from ericsizemore/renovate/sass-1.x
ericsizemore May 18, 2024
ebcefbd
Create build-dist.yml
ericsizemore May 18, 2024
879712f
Update build-dist.yml
ericsizemore May 18, 2024
5ea9a66
Delete .github/workflows/update-dist.yml
ericsizemore May 18, 2024
870d6aa
Update build-dist.yml
ericsizemore May 18, 2024
ee78f1c
Replace `upath` with `@ewizardjs/upath`
ericsizemore May 18, 2024
20e47fe
Update dependency pug to v3.0.3
renovate[bot] May 24, 2024
f3b5a8b
Merge pull request #18 from ericsizemore/renovate/pug-3.x
ericsizemore May 25, 2024
293dcc1
Update package-lock.json
ericsizemore May 25, 2024
2ba69a2
Update dependency sass to v1.77.3
renovate[bot] May 30, 2024
d94813c
Merge pull request #19 from ericsizemore/renovate/sass-1.x
ericsizemore May 30, 2024
81d7294
Update dependency sass to v1.77.4
renovate[bot] May 31, 2024
6c0aa6b
Merge pull request #20 from ericsizemore/renovate/sass-1.x
ericsizemore May 31, 2024
a38a46e
Update dependency prettier to v3.3.0
renovate[bot] Jun 1, 2024
fbdc969
Merge pull request #21 from ericsizemore/renovate/prettier-3.x
ericsizemore Jun 2, 2024
f62641b
Update dependency prettier to v3.3.1
renovate[bot] Jun 5, 2024
d02ae92
Merge pull request #22 from ericsizemore/renovate/prettier-3.x
ericsizemore Jun 6, 2024
6140556
Update dependency prettier to v3.3.2
renovate[bot] Jun 11, 2024
afccb60
Merge pull request #23 from ericsizemore/renovate/prettier-3.x
ericsizemore Jun 11, 2024
0d6071e
Update dependency sass to v1.77.5
renovate[bot] Jun 12, 2024
b440d29
Merge pull request #24 from ericsizemore/renovate/sass-1.x
ericsizemore Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text eol=lf

*.gif binary
*.jpg binary
*.png binary
*.webp binary

# Ignore all test and documentation with "export-ignore".
/.github export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.editorconfig export-ignore
/.package-lock.json export-ignore
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
45 changes: 45 additions & 0 deletions .github/workflows/build-dist.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Build Dist

on:
workflow_dispatch:
schedule:
- cron: "15 9 */3 * *"
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [20.x, 21.x, 22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: package-lock.json
- run: npm ci
- run: npm run build
- name: "Upload the dist artifact from Node ${{ matrix.node-version }}"
uses: actions/upload-artifact@v4
with:
name: startbootstrap-sb-admin-nodeV${{ matrix.node-version }}
path: dist/
compression-level: 1
if-no-files-found: error
- name: Commit and push changes
uses: EndBug/add-and-commit@v9
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.idea
node_modules
.DS_Store
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@

### 8.0.0

Built/tested on:

```bash
npm --version
10.4.0

node --version
v20.11.1
```

#### Changed

* Bumped version to 8.0.0 considering all of the changes.
* Updated dependencies:
* Updated Bootstrap to 5.3.3
* Updated dev-dependencies:
* Updated `autoprefixer` to 10.4.17
* Updated `browser-sync` to 3.0.2
* Updated `chokidar` to 3.6.0
* Updated `concurrently` to 8.2.2
* Consequently, had to update `scripts/start.js` and `scripts/start-debug.js` for this change.
* Updated `postcss` to 8.4.35
* Updated `prettier` to 3.2.5
* As a result, had to update `scripts/render-pug.js` to change the `renderPug` function to an async function.
* Also, has to modify the 'prettified' const to be await.
* Updated `sass` to 1.71.1
* Updated `scripts/render-scss.js` to replace legacy `sass.renderSync` with `sass.compileString`.
* Updated scripts and css for `simple-datatables` to 9.0.0
* Updated main css as well, as a result. The `.datatable-pagination` had to be updated throughout to include `button`, which was a change made in `simple-datatables` >8.0
* Updated `Charts.js` to 4.4.1
* Updated `assests/demo/chart-*-demo.js` files as a result.
* Updated `fontawesome` to 6.5.1
* Replaced `upath` with `@ewizardjs/upath` v3.0.0
* Updated copyright year to 2024.

##### Addressing Bootstrap Deprecations

* This theme does not seem to be affected that much with the deprecations in Bootstrap 5.3
* `.text-muted` replaced with `.text-body-secondary`
* `.navbar-dark` left for now, with `data-bs-theme="dark"` added

#### Added

* As a result of updating `Charts.js`, `luxon` ^3 and `chartjs-adapter-luxon` ^1 have been added.
* This was needed as Charts.js >v2 appears to require an adapter for `Time Cartesian Axis`
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ You can hire Start Bootstrap to create a custom build of any template, or create

## About

Start Bootstrap is an open source library of free Bootstrap templates and themes. All of the free templates and themes on Start Bootstrap are released under the MIT license, which means you can use them for any purpose, even for commercial projects.
Start Bootstrap is an open source library of free Bootstrap templates and themes. All the free templates and themes on Start Bootstrap are released under the MIT license, which means you can use them for any purpose, even for commercial projects.

* <https://startbootstrap.com>
* <https://twitter.com/SBootstrap>
Expand All @@ -70,4 +70,4 @@ Start Bootstrap is based on the [Bootstrap](https://getbootstrap.com/) framework

## Copyright and License

Copyright 2013-2023 Start Bootstrap LLC. Code released under the [MIT](https://github.com/StartBootstrap/startbootstrap-sb-admin/blob/master/LICENSE) license.
Copyright 2013-2024 Start Bootstrap LLC. Code released under the [MIT](https://github.com/StartBootstrap/startbootstrap-sb-admin/blob/master/LICENSE) license.
10 changes: 5 additions & 5 deletions dist/401.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand All @@ -7,8 +7,8 @@
<meta name="description" content="" />
<meta name="author" content="" />
<title>404 Error - SB Admin</title>
<link href="css/styles.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<link href="css/styles.min.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.5.1/js/all.js" crossorigin="anonymous"></script>
</head>
<body>
<div id="layoutError">
Expand All @@ -35,7 +35,7 @@ <h1 class="display-1">401</h1>
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid px-4">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Your Website 2023</div>
<div class="text-body-secondary">Copyright &copy; Your Website 2024</div>
<div>
<a href="#">Privacy Policy</a>
&middot;
Expand All @@ -46,7 +46,7 @@ <h1 class="display-1">401</h1>
</footer>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="js/scripts.js"></script>
</body>
</html>
10 changes: 5 additions & 5 deletions dist/404.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand All @@ -7,8 +7,8 @@
<meta name="description" content="" />
<meta name="author" content="" />
<title>404 Error - SB Admin</title>
<link href="css/styles.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<link href="css/styles.min.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.5.1/js/all.js" crossorigin="anonymous"></script>
</head>
<body>
<div id="layoutError">
Expand All @@ -34,7 +34,7 @@
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid px-4">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Your Website 2023</div>
<div class="text-body-secondary">Copyright &copy; Your Website 2024</div>
<div>
<a href="#">Privacy Policy</a>
&middot;
Expand All @@ -45,7 +45,7 @@
</footer>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="js/scripts.js"></script>
</body>
</html>
10 changes: 5 additions & 5 deletions dist/500.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand All @@ -7,8 +7,8 @@
<meta name="description" content="" />
<meta name="author" content="" />
<title>404 Error - SB Admin</title>
<link href="css/styles.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<link href="css/styles.min.css" rel="stylesheet" />
<script src="https://use.fontawesome.com/releases/v6.5.1/js/all.js" crossorigin="anonymous"></script>
</head>
<body>
<div id="layoutError">
Expand All @@ -34,7 +34,7 @@ <h1 class="display-1">500</h1>
<footer class="py-4 bg-light mt-auto">
<div class="container-fluid px-4">
<div class="d-flex align-items-center justify-content-between small">
<div class="text-muted">Copyright &copy; Your Website 2023</div>
<div class="text-body-secondary">Copyright &copy; Your Website 2024</div>
<div>
<a href="#">Privacy Policy</a>
&middot;
Expand All @@ -45,7 +45,7 @@ <h1 class="display-1">500</h1>
</footer>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
<script src="js/scripts.js"></script>
</body>
</html>
108 changes: 60 additions & 48 deletions dist/assets/demo/chart-area-demo.js
Original file line number Diff line number Diff line change
@@ -1,54 +1,66 @@
// Set new default font family and font color to mimic Bootstrap's default styling
Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
Chart.defaults.global.defaultFontColor = '#292b2c';
Chart.defaults.font.family = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
Chart.defaults.color = '#292b2c';

// Area Chart Example
var ctx = document.getElementById("myAreaChart");
var myLineChart = new Chart(ctx, {
type: 'line',
data: {
labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"],
const areaDemoData = {
labels: [
"Mar 1",
"Mar 2",
"Mar 3",
"Mar 4",
"Mar 5",
"Mar 6",
"Mar 7",
"Mar 8",
"Mar 9",
"Mar 10",
"Mar 11",
"Mar 12",
"Mar 13",
],
datasets: [{
label: "Sessions",
lineTension: 0.3,
backgroundColor: "rgba(2,117,216,0.2)",
borderColor: "rgba(2,117,216,1)",
pointRadius: 5,
pointBackgroundColor: "rgba(2,117,216,1)",
pointBorderColor: "rgba(255,255,255,0.8)",
pointHoverRadius: 5,
pointHoverBackgroundColor: "rgba(2,117,216,1)",
pointHitRadius: 50,
pointBorderWidth: 2,
data: [10000, 30162, 26263, 18394, 18287, 28682, 31274, 33259, 25849, 24159, 32651, 31984, 38451],
}],
},
options: {
scales: {
xAxes: [{
time: {
unit: 'date'
},
gridLines: {
display: false
},
ticks: {
maxTicksLimit: 7
}
}],
yAxes: [{
ticks: {
min: 0,
max: 40000,
maxTicksLimit: 5
label: "Sessions",
lineTension: 0.3,
backgroundColor: "rgba(2,117,216,0.2)",
borderColor: "rgba(2,117,216,1)",
pointRadius: 5,
pointBackgroundColor: "rgba(2,117,216,1)",
pointBorderColor: "rgba(255,255,255,0.8)",
pointHoverRadius: 5,
pointHoverBackgroundColor: "rgba(2,117,216,1)",
pointHitRadius: 50,
pointBorderWidth: 2,
fill: 'origin',
data: [10000, 22310, 30162, 26263, 18394, 18287, 28682, 31274, 33259, 25849, 24159, 32651, 38451]
}]
};

const areaDemoConfig = {
type: 'line',
data: areaDemoData,
options: {
scales: {
x: {
ticks: {
maxTicksLimit: 7
}
},
y: {
beginAtZero: true,
ticks: {
min: 0,
max: 40000,
maxTicksLimit: 7,
}
}
},
gridLines: {
color: "rgba(0, 0, 0, .125)",
plugins: {
legend: {
display: false
}
}
}],
},
legend: {
display: false
}
}
});
};

var ctx = document.getElementById("myAreaChart");
var myLineChart = new Chart(ctx, areaDemoConfig);