Skip to content

Commit 3d0d1a4

Browse files
updated fullcalendar and changelog
1 parent b5edbbb commit 3d0d1a4

File tree

5 files changed

+89
-34
lines changed

5 files changed

+89
-34
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## [8.1.1]
4+
5+
- Updated fullcalendar package to v5.3.0
6+
37
## [8.1.0]
48

59
- Updated react and highcharts packages

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,12 @@
5656
"dependencies": {
5757
"@amcharts/amcharts4": "^4.7.6",
5858
"@amcharts/amcharts4-geodata": "^4.1.8",
59-
"@fullcalendar/core": "^4.3.1",
60-
"@fullcalendar/daygrid": "^4.3.0",
61-
"@fullcalendar/interaction": "^4.3.0",
62-
"@fullcalendar/react": "^4.3.0",
63-
"@fullcalendar/timegrid": "^4.3.0",
59+
"@fullcalendar/core": "5.3.0",
60+
"@fullcalendar/daygrid": "5.3.0",
61+
"@fullcalendar/interaction": "5.3.0",
62+
"@fullcalendar/list": "5.3.0",
63+
"@fullcalendar/react": "5.3.0",
64+
"@fullcalendar/timegrid": "5.3.0",
6465
"animate.css": "3.7.0",
6566
"apexcharts": "^3.10.1",
6667
"awesome-bootstrap-checkbox": "1.0.1",

src/pages/extra/calendar/Calendar.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@ import Widget from '../../../components/Widget';
1919
import FullCalendar from "@fullcalendar/react";
2020
import dayGridPlugin from "@fullcalendar/daygrid";
2121
import timeGridPlugin from "@fullcalendar/timegrid";
22+
import listPlugin from '@fullcalendar/list';
2223
import interactionPlugin, {Draggable} from "@fullcalendar/interaction";
2324

24-
import "@fullcalendar/core/main.css";
2525
import "@fullcalendar/daygrid/main.css";
2626
import "@fullcalendar/timegrid/main.css";
2727

28-
29-
3028
class Calendar extends React.Component {
3129
constructor(props) {
3230
super(props)
@@ -42,9 +40,9 @@ class Calendar extends React.Component {
4240
currentMonth: moment().format('MMM YYYY'),
4341
currentDay: moment().format('dddd'),
4442
calendarOptions: {
45-
header: {
43+
headerToolbar: {
4644
left: '',
47-
center: '',
45+
center: 'title',
4846
right: '',
4947
},
5048
events: [
@@ -118,7 +116,7 @@ class Calendar extends React.Component {
118116
editable: true,
119117
droppable: true,
120118
},
121-
calendarPlugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
119+
calendarPlugins: [dayGridPlugin, timeGridPlugin, interactionPlugin, listPlugin],
122120
dragOptions: { zIndex: 999, revert: true, revertDuration: 0 },
123121
}
124122
}
@@ -169,6 +167,7 @@ class Calendar extends React.Component {
169167
this.fullCalendar.getApi().today();
170168
}
171169
changeView = (view) => {
170+
this.setState({ calendarView: view })
172171
this.fullCalendar.getApi().changeView(view);
173172
}
174173
getFormattedDate = (date) => {
@@ -265,6 +264,10 @@ class Calendar extends React.Component {
265264
color="default" onClick={() => this.changeView('timeGridDay')}
266265
active={this.state.calendarView === 'timeGridDay'}
267266
>Day</Button>
267+
<Button
268+
color="default" onClick={() => this.changeView('list')}
269+
active={this.state.calendarView === 'list'}
270+
>List</Button>
268271
</ButtonGroup>
269272
</Col>
270273
</Row>

src/pages/extra/calendar/Calendar.module.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
margin: 0;
1919
padding: 0;
2020
}
21+
2122

2223
.fc-event {
2324
border: none;
2425
font-weight: $font-weight-normal;
2526
background-color: $gray-200;
27+
margin-left: 0!important;
2628
color: $text-color;
2729
}
2830

yarn.lock

Lines changed: 68 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,35 +1214,70 @@
12141214
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc"
12151215
integrity sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA==
12161216

1217-
"@fullcalendar/core@^4.3.1", "@fullcalendar/core@~4.3.0":
1218-
version "4.3.1"
1219-
resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-4.3.1.tgz#a061c6d2e998d4155439dbc8aefdfe01cdf648d8"
1220-
integrity sha512-Eh+p/wpMkWGu26f8NpfQK9ecQMoZxX/aopv+0+4/CH+Ip0paP6iEc40JYgTz7RFl0bFqV1dvwyGyUZ4+9ZeySA==
1217+
"@fullcalendar/common@~5.3.0", "@fullcalendar/common@~5.3.1":
1218+
version "5.3.1"
1219+
resolved "https://registry.yarnpkg.com/@fullcalendar/common/-/common-5.3.1.tgz#9193032cf88f12ebcd8337ef6e98b23fbbbf04ca"
1220+
integrity sha512-2PREEpiFQSDN5MNdoD/OkpJ+d7FPtN2TwTJMsuq3fTjmj3nM+utrxBmUr9a2F6WWW1X+xGU5nHQA52vhqIiQOQ==
1221+
dependencies:
1222+
tslib "^2.0.0"
12211223

1222-
"@fullcalendar/daygrid@^4.3.0", "@fullcalendar/daygrid@~4.3.0":
1223-
version "4.3.0"
1224-
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-4.3.0.tgz#1b4ab9fdc238dba77921cb7c5bd2d813c834e905"
1225-
integrity sha512-OrGaRIGbELESOXOCXtoQVY4cOxnxmN7OrjDGbMoVITdoXWuIZ6sFNO84WcBQoRaIbkmqVM0SAU2MENwy+eEwqQ==
1224+
"@fullcalendar/core@5.3.0":
1225+
version "5.3.0"
1226+
resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-5.3.0.tgz#4888994e9ec9f20203c724787f5161c6afe00d15"
1227+
integrity sha512-blA6r4dFKRyFxB3tiG8eeF2kl75rep8aavYZGpALGZEfPLf/T3xqPf4ulgYZ5bojsUXS9FQM0NqFM9jD/XSnOg==
1228+
dependencies:
1229+
"@fullcalendar/common" "~5.3.0"
1230+
preact "^10.0.5"
1231+
tslib "^2.0.0"
12261232

1227-
"@fullcalendar/interaction@^4.3.0":
1228-
version "4.3.0"
1229-
resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-4.3.0.tgz#a52d22e4fa2666d5032c77afde75ecfad95c0f3b"
1230-
integrity sha512-kaKV+tdgH/oIrwTSMGYFec989L5r+KMYJ9ybwLc8G3LbMVcebo8fAlN9VizmGQAuopKfyvOw8yzJdjfmVCCRYQ==
1233+
"@fullcalendar/daygrid@5.3.0":
1234+
version "5.3.0"
1235+
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-5.3.0.tgz#d3107a32c4f9c3e1a4bb7084f5fc310b1f92a2d0"
1236+
integrity sha512-YDE7Pnxf+jkkQjogYPEgHDn4mahgUl2eNJRSytQOBJDVrsWcR/nAXI0PhsWHKi86BZVviEiEjzuLv+e4jeIVCg==
1237+
dependencies:
1238+
"@fullcalendar/common" "~5.3.0"
1239+
tslib "^2.0.0"
12311240

1232-
"@fullcalendar/react@^4.3.0":
1233-
version "4.3.0"
1234-
resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-4.3.0.tgz#db00bb0486daacdf139923e71d909cd1a572c23a"
1235-
integrity sha512-nNSrStb0YLYPeHySrWlQrRrP7CX922tkAKJWkTtdCnIljYnRjdU0B75XMmt1VH1EpVPY1JPCkMBsWPZF2mcfag==
1241+
"@fullcalendar/daygrid@~5.3.0":
1242+
version "5.3.2"
1243+
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-5.3.2.tgz#c12160fb76729f13dc423c0db12664969ef01af0"
1244+
integrity sha512-BK+YIecF3q9d/+6lAnf6WiJEEs7Wpa/mu9gXpkEf8vn4nl2bicPHUwykg5dUMCBy7ADAkDoL7VuBVi0XBRtPYw==
12361245
dependencies:
1237-
"@fullcalendar/core" "~4.3.0"
1238-
fast-deep-equal "^2.0.1"
1246+
"@fullcalendar/common" "~5.3.1"
1247+
tslib "^2.0.0"
12391248

1240-
"@fullcalendar/timegrid@^4.3.0":
1241-
version "4.3.0"
1242-
resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-4.3.0.tgz#bf003499319e5e66135bb7b8d8ed274b1a62ca91"
1243-
integrity sha512-9JCSZbzw2Hi+X893l5X9ViZaWjxh+sDy59o6nKx0gYKwSfs/vKpmk73GBQfKyUv8orkjpnTdPFfeLDZqlzBP4Q==
1249+
"@fullcalendar/interaction@5.3.0":
1250+
version "5.3.0"
1251+
resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-5.3.0.tgz#f63621b56463a6c3ee462f115d197a6bb6fbeb04"
1252+
integrity sha512-ls1OlE55axFUEVHdk3k+gRThx6dvOtk7XKTYHCy1nQmKafWhvW8wuf8v8Pa5uUAndRkNVZZNfbha842P4zb+NA==
12441253
dependencies:
1245-
"@fullcalendar/daygrid" "~4.3.0"
1254+
"@fullcalendar/common" "~5.3.0"
1255+
tslib "^2.0.0"
1256+
1257+
"@fullcalendar/list@5.3.0":
1258+
version "5.3.0"
1259+
resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-5.3.0.tgz#afd9b96a6e22075eaf9d99d1aa79c4c54b03ed5a"
1260+
integrity sha512-nU9h5hTyVpoAL5w/ifrbqU4e4F8sc5YZRXQz5X0dHcS334IRVARTBc7He79cKhrwBy7yrTZ4RatY5Nd+NUi8pw==
1261+
dependencies:
1262+
"@fullcalendar/common" "~5.3.0"
1263+
tslib "^2.0.0"
1264+
1265+
"@fullcalendar/react@5.3.0":
1266+
version "5.3.0"
1267+
resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-5.3.0.tgz#0d6958b2b0cd5453cb19dd726248d097be36bfa2"
1268+
integrity sha512-mRvU15dqDH29GGGx+JOFEGV7ZXkj+K+gg9aIiLC78geXPH3878OKw56EmNcr5mDXJDjHb5ma47ZqIfQUyTZqiQ==
1269+
dependencies:
1270+
"@fullcalendar/common" "~5.3.0"
1271+
tslib "^2.0.0"
1272+
1273+
"@fullcalendar/timegrid@5.3.0":
1274+
version "5.3.0"
1275+
resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-5.3.0.tgz#e3dda74fde9ae429326f41f707b60c5082e1cfee"
1276+
integrity sha512-bdlqDcN7A+gRhjOqiKyd++TbMclfea2ipGks5pxUyZj5QAiRiQ6XvA5V8ktouN3dBc03UZ5pkIAvXuEgbFmYMw==
1277+
dependencies:
1278+
"@fullcalendar/common" "~5.3.0"
1279+
"@fullcalendar/daygrid" "~5.3.0"
1280+
tslib "^2.0.0"
12461281

12471282
"@hapi/address@2.x.x":
12481283
version "2.1.2"
@@ -9742,6 +9777,11 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.1
97429777
source-map "^0.6.1"
97439778
supports-color "^6.1.0"
97449779

9780+
preact@^10.0.5:
9781+
version "10.4.8"
9782+
resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.8.tgz#8517b106cc5591eb675237c93da99ac052cf4756"
9783+
integrity sha512-uVLeEAyRsCkUEFhVHlOu17OxcrwC7+hTGZ08kBoLBiGHiZooUZuibQnphgMKftw/rqYntNMyhVCPqQhcyAGHag==
9784+
97459785
prelude-ls@~1.1.2:
97469786
version "1.1.2"
97479787
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -12541,6 +12581,11 @@ tslib@^1.9.0, tslib@^1.9.3:
1254112581
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
1254212582
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
1254312583

12584+
tslib@^2.0.0:
12585+
version "2.0.1"
12586+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
12587+
integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
12588+
1254412589
tty-browserify@0.0.0:
1254512590
version "0.0.0"
1254612591
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

0 commit comments

Comments
 (0)