Skip to content

Commit

Permalink
Merge pull request #252 from puikinsh/dependabot-dependency-update
Browse files Browse the repository at this point in the history
Dependabot dependency update
  • Loading branch information
DPTeamMember authored May 26, 2021
2 parents 981637f + df9ede4 commit eb3938a
Show file tree
Hide file tree
Showing 17 changed files with 194 additions and 157 deletions.
12 changes: 0 additions & 12 deletions .babelrc

This file was deleted.

3 changes: 1 addition & 2 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
extends:
airbnb-base

parser:
@babel/eslint-parser
parser: "@babel/eslint-parser"

settings:
ecmascript: 7
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ package-lock.json
# ----------------------------

build/
dist/
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
#### 1.0.0

- Intial release

#### 1.1.0

- Upgrade to webpack 5
1 change: 1 addition & 0 deletions browserslist
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Last 3 versions
IE 11
51 changes: 30 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "adminator",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"description": "HTML Admin Template",
"scripts": {
"start": "webpack-dev-server",
"dev": "webpack-dashboard -t 'Project' -- webpack-dev-server",
"clean": "shx rm -rf ./build",
"build": "npm run clean && cross-env NODE_ENV=\"production\" webpack",
"preview": "cross-env NODE_ENV=\"production\" webpack-dev-server",
"start": "webpack server",
"dev": "webpack-dashboard -t 'Project' -- webpack server",
"clean": "shx rm -rf ./dist",
"build": "npm run clean && cross-env webpack",
"preview": "cross-env webpack server",
"lint:js": "eslint ./src ./webpack ./*.js -f table --ext .js --ext .jsx",
"lint:scss": "stylelint ./src/**/*.scss --syntax scss",
"lint": "npm run lint:js && npm run lint:scss"
Expand All @@ -21,50 +21,59 @@
"@babel/plugin-transform-runtime": "^7.13.9",
"@babel/runtime": "^7.13.9",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-loader": "^8.2.2",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-0": "^6.24.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"copy-webpack-plugin": "^4.6.0",
"copy-webpack-plugin": "^9.0.0",
"cross-env": "^7.0.3",
"css-loader": "^0.28.11",
"css-loader": "^5.2.6",
"eslint": "^7.21.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "2.22.1",
"extract-text-webpack-plugin": "^3.0.2",
"html-webpack-plugin": "^3.2.0",
"html-webpack-plugin": "^5.3.1",
"imagemin-webpack-plugin": "^2.4.2",
"mini-css-extract-plugin": "^1.6.0",
"node-sass": "^4.14.1",
"postcss-loader": "^3.0.0",
"postcss": "^8.3.0",
"postcss-loader": "^5.3.0",
"postcss-preset-env": "^6.7.0",
"sass-loader": "^7.3.1",
"sass-loader": "^11.1.1",
"shx": "^0.3.3",
"style-loader": "^0.23.1",
"stylelint": "^13.11.0",
"stylelint-config-standard": "^20.0.0",
"webpack": "^3.10.0",
"style-loader": "^2.0.0",
"stylelint": "^13.13.1",
"stylelint-config-standard": "^22.0.0",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0",
"webpack-dashboard": "^3.3.1",
"webpack-dev-server": "^2.11.5"
"webpack-dev-server": "^3.11.2"
},
"dependencies": {
"@fullcalendar/core": "^5.7.0",
"@fullcalendar/daygrid": "^5.7.0",
"@fullcalendar/interaction": "^5.7.0",
"@fullcalendar/list": "^5.7.0",
"@fullcalendar/timegrid": "^5.7.0",
"@popperjs/core": "^2.9.2",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.6.0",
"bootstrap-datepicker": "^1.9.0",
"brand-colors": "^2.1.1",
"chart.js": "^2.9.4",
"datatables": "^1.10.18",
"easy-pie-chart": "^2.1.7",
"file-loader": "^2.0.0",
"fullcalendar": "^3.10.0",
"file-loader": "^6.2.0",
"fullcalendar": "^5.7.0",
"jquery": "^3.6.0",
"jquery-sparkline": "^2.4.0",
"jvectormap": "^2.0.4",
"load-google-maps-api": "^1.3.3",
"load-google-maps-api": "^2.0.2",
"lodash": "^4.17.21",
"masonry-layout": "^4.2.2",
"moment": "^2.29.1",
"perfect-scrollbar": "^1.5.0",
"popper.js": "^1.14.3",
"popper.js": "^1.16.1",
"skycons": "^1.0.0"
}
}
130 changes: 76 additions & 54 deletions src/assets/scripts/fullcalendar/index.js
Original file line number Diff line number Diff line change
@@ -1,59 +1,81 @@
import * as $ from 'jquery';
import 'fullcalendar/dist/fullcalendar.min.js';
import 'fullcalendar/dist/fullcalendar.min.css';
import { Calendar } from '@fullcalendar/core';
import interactionPlugin from '@fullcalendar/interaction';
import dayGridPlugin from '@fullcalendar/daygrid';
import timeGridPlugin from '@fullcalendar/timegrid';
import listPlugin from '@fullcalendar/list';

export default (function () {
const date = new Date();
const d = date.getDate();
const m = date.getMonth();
const y = date.getFullYear();
document.addEventListener('DOMContentLoaded', function() {
var calendarEl = document.getElementById('calendar');

const events = [{
title : 'All Day Event',
start : new Date(y, m, 1),
desc : 'Meetings',
bullet : 'success',
}, {
title : 'Long Event',
start : new Date(y, m, d - 5),
end : new Date(y, m, d - 2),
desc : 'Hangouts',
bullet : 'success',
}, {
title : 'Repeating Event',
start : new Date(y, m, d - 3, 16, 0),
allDay : false,
desc : 'Product Checkup',
bullet : 'warning',
}, {
title : 'Repeating Event',
start : new Date(y, m, d + 4, 16, 0),
allDay : false,
desc : 'Conference',
bullet : 'danger',
}, {
title : 'Birthday Party',
start : new Date(y, m, d + 1, 19, 0),
end : new Date(y, m, d + 1, 22, 30),
allDay : false,
desc : 'Gathering',
}, {
title : 'Click for Google',
start : new Date(y, m, 28),
end : new Date(y, m, 29),
url : 'http ://google.com/',
desc : 'Google',
bullet : 'success',
}];

$('#full-calendar').fullCalendar({
events,
height : 800,
editable : true,
header: {
left : 'month,agendaWeek,agendaDay',
center : 'title',
right : 'today prev,next',
var calendar = new Calendar(calendarEl, {
plugins: [ interactionPlugin, dayGridPlugin, timeGridPlugin, listPlugin ],
headerToolbar: {
left: 'prev,next today',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
},
initialDate: '2018-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',
},
{
title: 'Long Event',
start: '2018-01-07',
end: '2018-01-10'
},
{
groupId: 999,
title: 'Repeating Event',
start: '2018-01-09T16:00:00'
},
{
groupId: 999,
title: 'Repeating Event',
start: '2018-01-16T16:00:00'
},
{
title: 'Conference',
start: '2018-01-11',
end: '2018-01-13'
},
{
title: 'Meeting',
start: '2018-01-12T10:30:00',
end: '2018-01-12T12:30:00'
},
{
title: 'Lunch',
start: '2018-01-12T12:00:00'
},
{
title: 'Meeting',
start: '2018-01-12T14:30:00'
},
{
title: 'Happy Hour',
start: '2018-01-12T17:30:00'
},
{
title: 'Dinner',
start: '2018-01-12T20:00:00'
},
{
title: 'Birthday Party',
start: '2018-01-13T07:00:00'
},
{
title: 'Click for Google',
url: 'http://google.com/',
start: '2018-01-28'
}
]
});
}())

calendar.render();
});
2 changes: 1 addition & 1 deletion src/calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ <h3 class="c-white">Monday</h3>
</div>
</div>
<div class="col-md-8">
<div id='full-calendar'></div>
<div id='calendar'></div>
</div>
</div>
<div class="modal fade" id="calendar-edit">
Expand Down
15 changes: 8 additions & 7 deletions webpack/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,16 @@ const resolve = {
// -----------------

module.exports = {
devtool: manifest.IS_PRODUCTION ? false : 'cheap-eval-source-map',
devtool: manifest.IS_PRODUCTION ? false : 'source-map',
context: path.join(manifest.paths.src, manifest.entries.js),
watch: !manifest.IS_PRODUCTION,
// watch: !manifest.IS_PRODUCTION,
entry,
output: {
path: manifest.paths.build,
publicPath: '',
filename: manifest.outputFiles.bundle,
},
mode: manifest.NODE_ENV,
// output: {
// path: manifest.paths.build,
// publicPath: '',
// filename: manifest.outputFiles.bundle,
// },
module: {
rules,
},
Expand Down
2 changes: 1 addition & 1 deletion webpack/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const
const
paths = {
src : dir('../src'),
build : dir('../build'),
build : dir('../dist'),
};


Expand Down
6 changes: 4 additions & 2 deletions webpack/plugins/copyPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ const
manifest = require('../manifest'),
CopyWebpackPlugin = require('copy-webpack-plugin');

module.exports = new CopyWebpackPlugin([
module.exports = new CopyWebpackPlugin({
patterns: [
{
from : path.join(manifest.paths.src, 'assets/static'),
to : path.join(manifest.paths.build, 'assets/static'),
},
]);
]
});
4 changes: 2 additions & 2 deletions webpack/plugins/extractPlugin.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const
manifest = require('../manifest'),
ExtractTextPlugin = require('extract-text-webpack-plugin');
ExtractTextPlugin = require('mini-css-extract-plugin');

module.exports = new ExtractTextPlugin({
filename: manifest.outputFiles.css,
allChunks: true,
// allChunks: true,
});
3 changes: 2 additions & 1 deletion webpack/plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ plugins.push(
...(require('./htmlPlugin')),
...(require('./internal')),
require('./caseSensitivePlugin'),
require('./extractPlugin')
require('./extractPlugin'),
require('./copyPlugin')
);

if (manifest.IS_DEVELOPMENT) {
Expand Down
Loading

0 comments on commit eb3938a

Please sign in to comment.