Merge pull request #303 from danny007in/update2

Upgraded Packages and reconfigured

.babelrc

@@ -0,0 +1,7 @@
+{
+  "presets": ["@babel/preset-env"],
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-object-rest-spread"
+  ]
+}

.eslintrc.json

@@ -0,0 +1,56 @@
+{
+  "extends": "airbnb-base",
+  "parser": "@babel/eslint-parser",
+  "settings": {
+    "ecmascript": 7
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "ecmaFeatures": {
+      "modules": true,
+      "destructuring": true,
+      "classes": true,
+      "forOf": true,
+      "blockBindings": true,
+      "arrowFunctions": true
+    }
+  },
+  "env": {
+    "browser": true
+  },
+  "rules": {
+    "arrow-body-style": 0,
+    "prefer-arrow-callback": 0,
+    "arrow-parens": 0,
+    "no-param-reassign": 0,
+    "no-new": 0,
+    "consistent-return": 0,
+    "key-spacing": 0,
+    "no-multi-spaces": 0,
+    "no-underscore-dangle": 0,
+    "one-var": 0,
+    "global-require": 0,
+    "class-methods-use-this": 0,
+    "comma-dangle": ["error", {
+      "arrays": "always-multiline",
+      "objects": "always-multiline",
+      "imports": "always-multiline",
+      "exports": "always-multiline",
+      "functions": "never"
+    }],
+    "func-names": 0,
+    "function-paren-newline": 0,
+    "indent": 2,
+    "new-cap": 0,
+    "no-plusplus": 0,
+    "no-return-assign": 0,
+    "quote-props": 0,
+    "template-curly-spacing": 0,
+    "no-unused-expressions": 0,
+    "import/extensions": 0,
+    "import/no-extraneous-dependencies": 0,
+    "import/no-unresolved": 0,
+    "import/prefer-default-export": 0,
+    "linebreak-style": ["error", "windows"]
+  }
+}

.eslintrc.yml

@@ -1,65 +0,0 @@
----
-  extends:
-    airbnb-base
-
-  parser: "@babel/eslint-parser"
-
-  settings:
-    ecmascript: 7
-
-  parserOptions:
-    ecmaFeatures:
-      modules: true
-      destructuring: true
-      experimentalObjectRestSpread: true
-      classes: true
-      forOf: true
-      blockBindings: true
-      arrowFunctions: true
-
-  env:
-    browser: true
-
-  rules:
-    # -------------
-    # General Rules
-    # -------------
-
-    arrow-body-style: 0
-    prefer-arrow-callback: 0
-    arrow-parens: 0
-    no-param-reassign: 0
-    no-new: 0
-    consistent-return: 0
-    key-spacing: 0
-    no-multi-spaces: 0
-    no-underscore-dangle: 0
-    one-var: 0
-    global-require: 0
-    class-methods-use-this: 0
-    comma-dangle: ["error", {
-      "arrays": "always-multiline",
-      "objects": "always-multiline",
-      "imports": "always-multiline",
-      "exports": "always-multiline",
-      "functions": "never"
-    }]
-    func-names: 0
-    function-paren-newline: 0
-    indent: 2
-    new-cap: 0
-    no-plusplus: 0
-    no-return-assign: 0
-    quote-props: 0
-    template-curly-spacing: 0
-    no-unused-expressions: 0
-
-
-    # ------------
-    # Import Rules
-    # ------------
-
-    import/extensions: 0
-    import/no-extraneous-dependencies: 0
-    import/no-unresolved: 0
-    import/prefer-default-export: 0

.github/workflows/merge.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
     
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
     
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -23,7 +23,6 @@ logs
 npm-debug.log*
 node_modules
 yarn.lock
-package-lock.json
 
 # ----------------------------
 # Project Folders

.nvmrc

@@ -1 +1 @@
-14
+20

.stylelintrc.json

@@ -0,0 +1,9 @@
+{
+  "extends": "stylelint-config-standard",
+  "rules": {
+    "at-rule-no-unknown": null,
+    "at-rule-empty-line-before": null,
+    "selector-list-comma-newline-after": null,
+    "block-opening-brace-space-before": null
+  }
+}

.stylelintrc.yml

@@ -1,7 +0,0 @@
----
-  extends: stylelint-config-standard
-  rules:
-    at-rule-no-unknown: null
-    at-rule-empty-line-before: null
-    selector-list-comma-newline-after: null
-    block-opening-brace-space-before: null

CHANGELOG.md

@@ -1,13 +1,19 @@
-### Changelog
+# Changelog
 
-#### 1.0.0
+## [2.1.0]
+- Upgraded all dependencies
 
-- Intial release
+## [2.0.0]
+
+### Changed
+- Upgrade to Bootstrap 5
 
-#### 1.1.0
+## [1.1.0]
 
+### Changed
 - Upgrade to webpack 5
 
-#### 2.0.0
+## [1.0.0]
 
-- Upgrade to Bootstrap 5
+### Added
+- Intial release

browserslist

@@ -1,2 +1,11 @@
-Last 3 versions
-IE 11
+# https://github.com/browserslist/browserslist#readme
+
+>= 0.5%
+last 2 major versions
+not dead
+Chrome >= 60
+Firefox >= 60
+Firefox ESR
+iOS >= 12
+Safari >= 12
+not Explorer <= 11

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminator",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "private": true,
   "description": "HTML Admin Template",
   "scripts": {
@@ -16,64 +16,64 @@
     "lint": "npm run lint:js && npm run lint:scss"
   },
   "devDependencies": {
-    "@babel/core": "^7.13.8",
-    "@babel/eslint-parser": "^7.13.8",
+    "@babel/core": "^7.24.5",
+    "@babel/eslint-parser": "^7.24.5",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-    "@babel/plugin-transform-runtime": "^7.13.9",
-    "@babel/runtime": "^7.13.9",
+    "@babel/plugin-transform-runtime": "^7.24.3",
+    "@babel/preset-env": "^7.24.5",
+    "@babel/runtime": "^7.24.5",
     "babel-core": "^6.26.3",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^9.1.3",
     "babel-preset-env": "^1.7.0",
     "babel-preset-stage-0": "^6.24.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
-    "copy-webpack-plugin": "^9.0.0",
+    "copy-webpack-plugin": "^12.0.2",
     "cross-env": "^7.0.3",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^7.21.0",
-    "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.23.4",
-    "html-webpack-plugin": "^5.3.1",
+    "css-loader": "^7.1.1",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "eslint": "^8.55.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.29.1",
+    "html-webpack-plugin": "^5.6.0",
     "imagemin-webpack-plugin": "^2.4.2",
-    "mini-css-extract-plugin": "^1.6.0",
-    "postcss": "^8.3.4",
-    "postcss-loader": "^6.1.0",
-    "sass": "^1.55.0",
-    "postcss-preset-env": "^6.7.0",
-    "sass-loader": "^12.1.0",
+    "mini-css-extract-plugin": "^2.9.0",
+    "postcss": "^8.4.38",
+    "postcss-loader": "^8.1.1",
+    "postcss-preset-env": "^9.5.13",
+    "sass": "^1.77.1",
+    "sass-loader": "^14.2.1",
     "shx": "^0.3.3",
-    "style-loader": "^2.0.0",
-    "stylelint": "^13.13.1",
-    "stylelint-config-standard": "^22.0.0",
-    "webpack": "^5.37.1",
-    "webpack-cli": "^4.7.0",
+    "style-loader": "^4.0.0",
+    "stylelint": "^16.5.0",
+    "stylelint-config-standard": "^36.0.0",
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4",
     "webpack-dashboard": "^3.3.1",
-    "webpack-dev-server": "^3.11.2"
+    "webpack-dev-server": "^5.0.4"
   },
   "dependencies": {
-    "@fullcalendar/core": "^5.11.3",
-    "@fullcalendar/daygrid": "^5.11.3",
-    "@fullcalendar/interaction": "^5.11.3",
-    "@fullcalendar/list": "^5.11.3",
-    "@fullcalendar/timegrid": "^5.11.3",
+    "@fullcalendar/core": "^6.1.11",
+    "@fullcalendar/daygrid": "^6.1.11",
+    "@fullcalendar/interaction": "^6.1.11",
+    "@fullcalendar/list": "^6.1.11",
+    "@fullcalendar/timegrid": "^6.1.11",
     "@popperjs/core": "^2.11.6",
     "babel-polyfill": "^6.26.0",
-    "bootstrap": "^5.2.2",
+    "bootstrap": "^5.3.3",
     "bootstrap-datepicker": "^1.9.0",
     "brand-colors": "^2.1.1",
-    "chart.js": "^2.9.4",
+    "chart.js": "^4.4.2",
     "datatables": "^1.10.18",
     "easy-pie-chart": "^2.1.7",
     "file-loader": "^6.2.0",
-    "fullcalendar": "^5.11.3",
     "jquery": "^3.6.0",
     "jquery-sparkline": "^2.4.0",
     "jvectormap": "^2.0.4",
     "load-google-maps-api": "^2.0.2",
     "lodash": "^4.17.21",
     "masonry-layout": "^4.2.2",
-    "moment": "^2.29.1",
+    "moment": "^2.30.1",
     "perfect-scrollbar": "^1.5.1",
     "skycons": "^1.0.0"
   }

src/assets/scripts/charts/chartJS/index.js

@@ -1,4 +1,4 @@
-import Chart from 'chart.js';
+import Chart from 'chart.js/auto';
 import { COLORS } from '../../constants/colors';
 
 export default (function () {
@@ -112,7 +112,8 @@ export default (function () {
   if (scatterChartBox) {
     const scatterCtx = scatterChartBox.getContext('2d');
 
-    Chart.Scatter(scatterCtx, {
+    new Chart(scatterCtx, {
+      type: 'scatter',
       data: {
         datasets: [{
           label           : 'My First dataset',

src/assets/scripts/fullcalendar/index.js

@@ -4,81 +4,81 @@ import dayGridPlugin from '@fullcalendar/daygrid';
 import timeGridPlugin from '@fullcalendar/timegrid';
 import listPlugin from '@fullcalendar/list';
 
-document.addEventListener('DOMContentLoaded', function() {
-  var calendarEl = document.getElementById('calendar');
+document.addEventListener('DOMContentLoaded', function () {
+  const calendarEl = document.getElementById('calendar');
 
   // element found in dom ?
   if (calendarEl == null) {
-    return
+    return;
   }
 
-  var calendar = new Calendar(calendarEl, {
-    plugins: [ interactionPlugin, dayGridPlugin, timeGridPlugin, listPlugin ],
+  const calendar = new Calendar(calendarEl, {
+    plugins: [interactionPlugin, dayGridPlugin, timeGridPlugin, listPlugin],
     headerToolbar: {
       left: 'prev,next today',
       center: 'title',
-      right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
+      right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek',
     },
-    initialDate: '2018-01-12',
+    initialDate: '2024-01-12',
     navLinks: true, // can click day/week names to navigate views
     editable: true,
     dayMaxEvents: true, // allow "more" link when too many events
     events: [
       {
         title: 'All Day Event',
-        start: '2018-01-01',
+        start: '2024-01-01',
       },
       {
         title: 'Long Event',
-        start: '2018-01-07',
-        end: '2018-01-10'
+        start: '2024-01-07',
+        end: '2024-01-10',
       },
       {
         groupId: 999,
         title: 'Repeating Event',
-        start: '2018-01-09T16:00:00'
+        start: '2024-01-09T16:00:00',
       },
       {
         groupId: 999,
         title: 'Repeating Event',
-        start: '2018-01-16T16:00:00'
+        start: '2024-01-16T16:00:00',
       },
       {
         title: 'Conference',
-        start: '2018-01-11',
-        end: '2018-01-13'
+        start: '2024-01-11',
+        end: '2024-01-13',
       },
       {
         title: 'Meeting',
-        start: '2018-01-12T10:30:00',
-        end: '2018-01-12T12:30:00'
+        start: '2024-01-12T10:30:00',
+        end: '2024-01-12T12:30:00',
       },
       {
         title: 'Lunch',
-        start: '2018-01-12T12:00:00'
+        start: '2024-01-12T12:00:00',
       },
       {
         title: 'Meeting',
-        start: '2018-01-12T14:30:00'
+        start: '2024-01-12T14:30:00',
       },
       {
         title: 'Happy Hour',
-        start: '2018-01-12T17:30:00'
+        start: '2024-01-12T17:30:00',
       },
       {
         title: 'Dinner',
-        start: '2018-01-12T20:00:00'
+        start: '2024-01-12T20:00:00',
       },
       {
         title: 'Birthday Party',
-        start: '2018-01-13T07:00:00'
+        start: '2024-01-13T07:00:00',
       },
       {
         title: 'Click for Google',
         url: 'http://google.com/',
-        start: '2018-01-28'
-      }
-    ]
+        start: '2024-01-28',
+      },
+    ],
   });
 
   calendar.render();

webpack/devServer.js

@@ -15,27 +15,33 @@ const
  */
 
 const devServer = {
-  contentBase        : manifest.IS_PRODUCTION ? manifest.paths.build : manifest.paths.src,
-  historyApiFallback : true,
-  port               : manifest.IS_PRODUCTION ? 3001 : 3000,
-  compress           : manifest.IS_PRODUCTION,
-  inline             : !manifest.IS_PRODUCTION,
-  watchContentBase: true,
-  hot                : !manifest.IS_PRODUCTION,
-  host               : '0.0.0.0',
-  disableHostCheck   : true, // [1]
-  overlay            : true,
-  stats: {
-    assets     : true,
-    children   : false,
-    chunks     : false,
-    hash       : false,
-    modules    : false,
-    publicPath : false,
-    timings    : true,
-    version    : false,
-    warnings   : true,
-    colors     : true,
+  static: {
+    directory: manifest.IS_PRODUCTION ? manifest.paths.build : manifest.paths.src,
+    watch: true,
+  },
+  historyApiFallback: true,
+  port: manifest.IS_PRODUCTION ? 3001 : 3000,
+  compress: manifest.IS_PRODUCTION,
+  client: {
+    overlay: true,
+    progress: !manifest.IS_PRODUCTION,
+  },
+  hot: !manifest.IS_PRODUCTION,
+  host: '0.0.0.0',
+  allowedHosts: 'all', // [1]
+  devMiddleware: {
+    stats: {
+      assets: true,
+      children: false,
+      chunks: false,
+      hash: false,
+      modules: false,
+      publicPath: false,
+      timings: true,
+      version: false,
+      warnings: true,
+      colors: true,
+    },
   },
 };
 
@@ -44,4 +50,4 @@ const devServer = {
 // @Exporting Module
 // -----------------
 
-module.exports = devServer;
+module.exports = devServer;

webpack/rules/fonts.js

@@ -1,5 +1,5 @@
 module.exports = {
   test: /\.(eot|svg|ttf|woff|woff2)$/,
   exclude : /(node_modules)/,
-  use     : ['file-loader'],
-};
+  type: 'asset/resource',
+};