Skip to content

Commit 88e2cb3

Browse files
updated fullcalendar and changelog
1 parent dd1afec commit 88e2cb3

File tree

5 files changed

+97
-66
lines changed

5 files changed

+97
-66
lines changed

changelog.md

+9-31
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,19 @@
11
# Changelog
22

3-
## [7.3.0]
3+
## [1.1.0]
44

5-
### New Features
5+
### Update
66

7-
- Brand new chat component
7+
- Updated fullcalendar package to v5.3.0
88

9-
## [7.2.0]
9+
## [1.0.1]
1010

11-
### New Features
11+
### Update
1212

13-
- New exquisite design
13+
- Updated dependencies, fixed bugs
1414

15-
## [7.1.1]
15+
## [1.0.0]
1616

17-
### New Features
17+
### Initial release
1818

19-
- Virtual Tour
20-
21-
## [7.1.0]
22-
23-
### New Features
24-
25-
- Theme customizer
26-
27-
## [7.0.1]
28-
29-
### Fixed
30-
31-
- Fix bugs and css improvements
32-
33-
## [7.0.0]
34-
35-
### Updated
36-
37-
- Removed Jquery from core layout
38-
39-
### New Features
40-
41-
- New charts
19+
- Initial release of one-react template

package.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@
5555
"dependencies": {
5656
"@amcharts/amcharts4": "^4.7.1",
5757
"@amcharts/amcharts4-geodata": "^4.1.7",
58-
"@fullcalendar/core": "^4.4.0",
59-
"@fullcalendar/daygrid": "^4.4.0",
60-
"@fullcalendar/interaction": "^4.4.0",
61-
"@fullcalendar/react": "^4.4.0",
62-
"@fullcalendar/timegrid": "^4.4.0",
58+
"@fullcalendar/core": "5.3.0",
59+
"@fullcalendar/daygrid": "5.3.0",
60+
"@fullcalendar/interaction": "5.3.0",
61+
"@fullcalendar/list": "5.3.0",
62+
"@fullcalendar/react": "5.3.0",
63+
"@fullcalendar/timegrid": "5.3.0",
6364
"animate.css": "3.7.0",
6465
"apexcharts": "^3.10.0",
6566
"awesome-bootstrap-checkbox": "1.0.1",

src/pages/extra/calendar/Calendar.js

+14-6
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ 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

@@ -40,10 +40,10 @@ class Calendar extends React.Component {
4040
currentMonth: moment().format("MMM YYYY"),
4141
currentDay: moment().format("dddd"),
4242
calendarOptions: {
43-
header: {
44-
left: "",
45-
center: "",
46-
right: "",
43+
headerToolbar: {
44+
left: '',
45+
center: 'title',
46+
right: ''
4747
},
4848
events: [
4949
{
@@ -117,7 +117,7 @@ class Calendar extends React.Component {
117117
editable: true,
118118
droppable: true,
119119
},
120-
calendarPlugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
120+
calendarPlugins: [dayGridPlugin, timeGridPlugin, interactionPlugin, listPlugin],
121121
dragOptions: { zIndex: 999, revert: true, revertDuration: 0 },
122122
};
123123
}
@@ -167,6 +167,7 @@ class Calendar extends React.Component {
167167
this.fullCalendar.getApi().today();
168168
};
169169
changeView = (view) => {
170+
this.setState({ calendarView: view });
170171
this.fullCalendar.getApi().changeView(view);
171172
};
172173
getFormattedDate = (date) => {
@@ -284,6 +285,13 @@ class Calendar extends React.Component {
284285
>
285286
Day
286287
</Button>
288+
<Button
289+
color="default"
290+
onClick={() => this.changeView("list")}
291+
active={this.state.calendarView === "list"}
292+
>
293+
List
294+
</Button>
287295
</ButtonGroup>
288296
</Col>
289297
</Row>

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

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
a.fc-event {
3434
text-decoration: none;
3535
cursor: pointer;
36-
display: block;
3736
height: 30px;
3837
line-height: 30px;
3938
position: relative;

yarn.lock

+68-23
Original file line numberDiff line numberDiff line change
@@ -1101,35 +1101,70 @@
11011101
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
11021102
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
11031103

1104-
"@fullcalendar/core@^4.4.0", "@fullcalendar/core@~4.4.0":
1105-
version "4.4.0"
1106-
resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-4.4.0.tgz#79dbc0cca836ce628a07e739a456da11ff141373"
1107-
integrity sha512-PC4mmXHJHAlXmUEmZVnePyA8yYCOBdxBNq8yjJqedEtT1X0x36yTFz/Y0Ux6bniICZDqYtk0xoxe6jaxi++e0g==
1104+
"@fullcalendar/common@~5.3.0", "@fullcalendar/common@~5.3.1":
1105+
version "5.3.1"
1106+
resolved "https://registry.yarnpkg.com/@fullcalendar/common/-/common-5.3.1.tgz#9193032cf88f12ebcd8337ef6e98b23fbbbf04ca"
1107+
integrity sha512-2PREEpiFQSDN5MNdoD/OkpJ+d7FPtN2TwTJMsuq3fTjmj3nM+utrxBmUr9a2F6WWW1X+xGU5nHQA52vhqIiQOQ==
1108+
dependencies:
1109+
tslib "^2.0.0"
11081110

1109-
"@fullcalendar/daygrid@^4.4.0", "@fullcalendar/daygrid@~4.4.0":
1110-
version "4.4.0"
1111-
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-4.4.0.tgz#25fcae7226b62688b4e086a611582e72253b5229"
1112-
integrity sha512-pDfvL0XZxKHTZ4VFOmwaYe3LmuABEIZsEopeqQ8y5O6BDen9KCbJqgHeCI8FpASSBd6bNlUx7il7EHdSoHhgIw==
1111+
"@fullcalendar/[email protected]":
1112+
version "5.3.0"
1113+
resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-5.3.0.tgz#4888994e9ec9f20203c724787f5161c6afe00d15"
1114+
integrity sha512-blA6r4dFKRyFxB3tiG8eeF2kl75rep8aavYZGpALGZEfPLf/T3xqPf4ulgYZ5bojsUXS9FQM0NqFM9jD/XSnOg==
1115+
dependencies:
1116+
"@fullcalendar/common" "~5.3.0"
1117+
preact "^10.0.5"
1118+
tslib "^2.0.0"
11131119

1114-
"@fullcalendar/interaction@^4.4.0":
1115-
version "4.4.0"
1116-
resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-4.4.0.tgz#fc8f8baaf5cb3533d6ce0a684d6f9952a4430685"
1117-
integrity sha512-nGu0ZzYYlNpIhqfyv3JupteWKFETs3W1MzbRJcEZkuPncn4BooEi4A2blgHfacHAmmpaNkT84tAmhzi734MFBA==
1120+
"@fullcalendar/[email protected]":
1121+
version "5.3.0"
1122+
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-5.3.0.tgz#d3107a32c4f9c3e1a4bb7084f5fc310b1f92a2d0"
1123+
integrity sha512-YDE7Pnxf+jkkQjogYPEgHDn4mahgUl2eNJRSytQOBJDVrsWcR/nAXI0PhsWHKi86BZVviEiEjzuLv+e4jeIVCg==
1124+
dependencies:
1125+
"@fullcalendar/common" "~5.3.0"
1126+
tslib "^2.0.0"
11181127

1119-
"@fullcalendar/react@^4.4.0":
1120-
version "4.4.0"
1121-
resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-4.4.0.tgz#243fda9e3d053a51e7eab9263a03847ca6eb5514"
1122-
integrity sha512-7PExd430is8/KoUkddfSKnvozOw18UzqOW10PmLLxs3l+wki3Z/sh7nxC6df13VC/l9GljhsLZwU0hEF7dm2Kg==
1128+
"@fullcalendar/daygrid@~5.3.0":
1129+
version "5.3.2"
1130+
resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-5.3.2.tgz#c12160fb76729f13dc423c0db12664969ef01af0"
1131+
integrity sha512-BK+YIecF3q9d/+6lAnf6WiJEEs7Wpa/mu9gXpkEf8vn4nl2bicPHUwykg5dUMCBy7ADAkDoL7VuBVi0XBRtPYw==
11231132
dependencies:
1124-
"@fullcalendar/core" "~4.4.0"
1125-
fast-deep-equal "^2.0.1"
1133+
"@fullcalendar/common" "~5.3.1"
1134+
tslib "^2.0.0"
11261135

1127-
"@fullcalendar/timegrid@^4.4.0":
1128-
version "4.4.0"
1129-
resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-4.4.0.tgz#c5837cfd676afff0d95535ac4cc054ed65965976"
1130-
integrity sha512-QwJ9oM87/ZTbXaE8PMIVp20GPtVCFmroaeR1GydJ6BKYtbxG/nsaSv7RhqvDa2jLjHaTWC2NjHo9hRfjQjtCZA==
1136+
"@fullcalendar/[email protected].0":
1137+
version "5.3.0"
1138+
resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-5.3.0.tgz#f63621b56463a6c3ee462f115d197a6bb6fbeb04"
1139+
integrity sha512-ls1OlE55axFUEVHdk3k+gRThx6dvOtk7XKTYHCy1nQmKafWhvW8wuf8v8Pa5uUAndRkNVZZNfbha842P4zb+NA==
11311140
dependencies:
1132-
"@fullcalendar/daygrid" "~4.4.0"
1141+
"@fullcalendar/common" "~5.3.0"
1142+
tslib "^2.0.0"
1143+
1144+
"@fullcalendar/[email protected]":
1145+
version "5.3.0"
1146+
resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-5.3.0.tgz#afd9b96a6e22075eaf9d99d1aa79c4c54b03ed5a"
1147+
integrity sha512-nU9h5hTyVpoAL5w/ifrbqU4e4F8sc5YZRXQz5X0dHcS334IRVARTBc7He79cKhrwBy7yrTZ4RatY5Nd+NUi8pw==
1148+
dependencies:
1149+
"@fullcalendar/common" "~5.3.0"
1150+
tslib "^2.0.0"
1151+
1152+
"@fullcalendar/[email protected]":
1153+
version "5.3.0"
1154+
resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-5.3.0.tgz#0d6958b2b0cd5453cb19dd726248d097be36bfa2"
1155+
integrity sha512-mRvU15dqDH29GGGx+JOFEGV7ZXkj+K+gg9aIiLC78geXPH3878OKw56EmNcr5mDXJDjHb5ma47ZqIfQUyTZqiQ==
1156+
dependencies:
1157+
"@fullcalendar/common" "~5.3.0"
1158+
tslib "^2.0.0"
1159+
1160+
"@fullcalendar/[email protected]":
1161+
version "5.3.0"
1162+
resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-5.3.0.tgz#e3dda74fde9ae429326f41f707b60c5082e1cfee"
1163+
integrity sha512-bdlqDcN7A+gRhjOqiKyd++TbMclfea2ipGks5pxUyZj5QAiRiQ6XvA5V8ktouN3dBc03UZ5pkIAvXuEgbFmYMw==
1164+
dependencies:
1165+
"@fullcalendar/common" "~5.3.0"
1166+
"@fullcalendar/daygrid" "~5.3.0"
1167+
tslib "^2.0.0"
11331168

11341169
11351170
version "2.1.2"
@@ -9626,6 +9661,11 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.1
96269661
source-map "^0.6.1"
96279662
supports-color "^6.1.0"
96289663

9664+
preact@^10.0.5:
9665+
version "10.4.8"
9666+
resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.8.tgz#8517b106cc5591eb675237c93da99ac052cf4756"
9667+
integrity sha512-uVLeEAyRsCkUEFhVHlOu17OxcrwC7+hTGZ08kBoLBiGHiZooUZuibQnphgMKftw/rqYntNMyhVCPqQhcyAGHag==
9668+
96299669
prelude-ls@~1.1.2:
96309670
version "1.1.2"
96319671
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -12327,6 +12367,11 @@ tslib@^1.9.0, tslib@^1.9.3:
1232712367
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
1232812368
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
1232912369

12370+
tslib@^2.0.0:
12371+
version "2.0.1"
12372+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
12373+
integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
12374+
1233012375
1233112376
version "0.0.0"
1233212377
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

0 commit comments

Comments
 (0)