Browse Source

update 1

pull/303/head
Daniel 2 years ago
parent
commit
04e53e7961
15 changed files with 21378 additions and 123 deletions
  1. +7
    -0
      .babelrc
  2. +56
    -0
      .eslintrc.json
  3. +0
    -65
      .eslintrc.yml
  4. +1
    -1
      .github/workflows/merge.yml
  5. +1
    -1
      .github/workflows/release.yml
  6. +0
    -1
      .gitignore
  7. +1
    -1
      .nvmrc
  8. +9
    -0
      .stylelintrc.json
  9. +0
    -7
      .stylelintrc.yml
  10. +9
    -6
      CHANGELOG.md
  11. +11
    -2
      browserslist
  12. +21243
    -0
      package-lock.json
  13. +13
    -13
      package.json
  14. +3
    -2
      src/assets/scripts/charts/chartJS/index.js
  15. +24
    -24
      src/assets/scripts/fullcalendar/index.js

+ 7
- 0
.babelrc View File

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

+ 56
- 0
.eslintrc.json View File

@ -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"]
}
}

+ 0
- 65
.eslintrc.yml View File

@ -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

+ 1
- 1
.github/workflows/merge.yml View File

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


+ 1
- 1
.github/workflows/release.yml View File

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


+ 0
- 1
.gitignore View File

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


+ 1
- 1
.nvmrc View File

@ -1 +1 @@
14
20

+ 9
- 0
.stylelintrc.json View File

@ -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
}
}

+ 0
- 7
.stylelintrc.yml View File

@ -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

+ 9
- 6
CHANGELOG.md View File

@ -1,13 +1,16 @@
### Changelog
# Changelog
#### 1.0.0
## [2.0.0]
- Intial release
### 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

+ 11
- 2
browserslist View File

@ -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

+ 21243
- 0
package-lock.json
File diff suppressed because it is too large
View File


+ 13
- 13
package.json View File

@ -21,6 +21,7 @@
"@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/preset-env": "^7.23.5",
"@babel/runtime": "^7.13.9",
"babel-core": "^6.26.3",
"babel-loader": "^8.2.2",
@ -31,42 +32,41 @@
"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": "^8.55.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.23.4",
"html-webpack-plugin": "^5.3.1",
"html-webpack-plugin": "^5.5.4",
"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": "^1.55.0",
"sass-loader": "^12.1.0",
"shx": "^0.3.3",
"style-loader": "^2.0.0",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"stylelint": "^16.0.1",
"stylelint-config-standard": "^35.0.0",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0",
"webpack-dashboard": "^3.3.1",
"webpack-dev-server": "^3.11.2"
},
"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.10",
"@fullcalendar/daygrid": "^6.1.10",
"@fullcalendar/interaction": "^6.1.10",
"@fullcalendar/list": "^6.1.10",
"@fullcalendar/timegrid": "^6.1.10",
"@popperjs/core": "^2.11.6",
"babel-polyfill": "^6.26.0",
"bootstrap": "^5.2.2",
"bootstrap-datepicker": "^1.9.0",
"brand-colors": "^2.1.1",
"chart.js": "^2.9.4",
"chart.js": "^4.4.1",
"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",


+ 3
- 2
src/assets/scripts/charts/chartJS/index.js View File

@ -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',


+ 24
- 24
src/assets/scripts/fullcalendar/index.js View File

@ -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();


Loading…
Cancel
Save