Skip to content

Commit 5bdd18f

Browse files
BlariBlari
authored
Merge pull request #15 from flatlogic/origin/update
Origin/update
2 parents 8b5d86a + 2a01423 commit 5bdd18f

File tree

138 files changed

+1937
-14549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+1937
-14549
lines changed

‎package.json‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -54,70 +54,71 @@
5454
]
5555
},
5656
"dependencies": {
57-
"@amcharts/amcharts4": "^4.10.18",
58-
"@amcharts/amcharts4-geodata": "^4.1.20",
59-
"@fullcalendar/core": "5.6.0",
60-
"@fullcalendar/daygrid": "5.6.0",
61-
"@fullcalendar/interaction": "5.6.0",
62-
"@fullcalendar/list": "5.6.0",
63-
"@fullcalendar/react": "5.6.0",
64-
"@fullcalendar/timegrid": "5.6.0",
57+
"@amcharts/amcharts4": "^4.10.25",
58+
"@amcharts/amcharts4-geodata": "^4.1.23",
59+
"@fullcalendar/core": "5.11.0",
60+
"@fullcalendar/daygrid": "5.11.0",
61+
"@fullcalendar/interaction": "5.11.0",
62+
"@fullcalendar/list": "5.11.0",
63+
"@fullcalendar/react": "5.11.1",
64+
"@fullcalendar/timegrid": "5.11.0",
6565
"animate.css": "4.1.1",
66-
"apexcharts": "^3.26.1",
67-
"awesome-bootstrap-checkbox": "1.0.1",
68-
"axios": "^0.21.1",
69-
"bootstrap": "4.6.0",
66+
"apexcharts": "^3.35.3",
67+
"awesome-bootstrap-checkbox": "https://github.com/flatlogic/awesome-bootstrap-checkbox#bump-to-bootstrap5",
68+
"axios": "^0.27.2",
69+
"bootstrap": "5.1.3",
7070
"classnames": "^2.3.1",
71-
"connected-react-router": "6.9.1",
71+
"connected-react-router": "6.9.2",
7272
"draft-js": "^0.11.7",
73-
"echarts": "^4.8.0",
73+
"echarts": "^4.9.0",
7474
"echarts-for-react": "^2.0.16",
7575
"file-saver": "^2.0.5",
7676
"filesize": "^6.3.0",
7777
"font-awesome": "4.7.0",
7878
"formik": "1.5.8",
7979
"formsy-react": "0.19.5",
8080
"glyphicons-halflings": "^1.9.1",
81-
"highcharts": "^8.2.0",
82-
"highcharts-react-official": "^3.0.0",
81+
"highcharts": "^10.1.0",
82+
"highcharts-react-official": "^3.1.0",
8383
"history": "^4.10.1",
8484
"jasny-bootstrap": "^4.0.0",
8585
"jsonwebtoken": "^8.5.1",
8686
"line-awesome": "^1.3.0",
8787
"md5": "^2.3.0",
88-
"messenger": "git+https://github.com/HubSpot/messenger.git#v1.4.2",
89-
"moment": "^2.29.1",
88+
"messenger": "https://github.com/HubSpot/messenger.git",
89+
"moment": "^2.29.3",
9090
"nvd3": "1.8.6",
9191
"rc-color-picker": "^1.2.6",
9292
"rc-hammerjs": "0.6.10",
93-
"rc-slider": "^9.7.2",
94-
"react": "^16.14.0",
93+
"rc-slider": "^9.7.5",
94+
"react": "^17.0.2",
9595
"react-animate-height": "^2.0.23",
9696
"react-animated-number": "^0.4.4",
97-
"react-apexcharts": "^1.3.9",
97+
"react-apexcharts": "^1.4.0",
9898
"react-app-polyfill": "^0.2.0",
9999
"react-autosize-textarea": "^5.0.1",
100100
"react-bootstrap-table": "4.3.1",
101101
"react-bootstrap-table-next": "^3.3.5",
102102
"react-bootstrap-table2-paginator": "^2.1.2",
103103
"react-bootstrap-table2-toolkit": "^1.4.2",
104-
"react-datetime": "^3.0.4",
104+
"react-datetime": "^3.1.1",
105105
"react-dev-utils": "^6.1.1",
106-
"react-dom": "^16.14.0",
106+
"react-dom": "^17.0.2",
107107
"react-draft-wysiwyg": "1.14.7",
108-
"react-dropzone": "^11.3.2",
108+
"react-dropzone": "^11.7.1",
109109
"react-google-maps": "^9.4.5",
110110
"react-images": "0.5.19",
111+
"react-joyride": "^2.3.0",
111112
"react-maskedinput": "^4.0.1",
112113
"react-mde": "^11.5.0",
113-
"react-redux": "7.2.4",
114-
"react-router": "5.2.0",
115-
"react-router-dom": "5.2.0",
116-
"react-router-hash-link": "^2.4.1",
114+
"react-redux": "7.2.8",
115+
"react-router": "5.3.3",
116+
"react-router-dom": "5.3.3",
117+
"react-router-hash-link": "^2.4.3",
117118
"react-scrollspy": "^3.4.3",
118119
"react-select": "^3.2.0",
119120
"react-shuffle": "2.1.0",
120-
"react-slick": "^0.28.1",
121+
"react-slick": "^0.29.0",
121122
"react-sortable-hoc": "^1.11.0",
122123
"react-sortable-tree": "^2.8.0",
123124
"react-sortablejs": "1.5.1",
@@ -126,18 +127,18 @@
126127
"react-table": "6.11.5",
127128
"react-tagsinput": "^3.19.0",
128129
"react-toastify": "^6.2.0",
129-
"react-transition-group": "^4.4.1",
130+
"react-transition-group": "^4.4.2",
130131
"react-trend": "^1.2.5",
131-
"reactstrap": "^8.9.0",
132-
"redux": "^4.1.0",
133-
"redux-thunk": "^2.3.0",
132+
"reactstrap": "^9.1.1",
133+
"redux": "^4.2.0",
134+
"redux-thunk": "^2.4.1",
134135
"rickshaw": "1.7.1",
135136
"showdown": "^1.9.1",
136137
"skycons": "^1.0.0",
137-
"sortablejs": "1.13.0",
138-
"styled-components": "^5.3.0",
138+
"sortablejs": "1.15.0",
139+
"styled-components": "^5.3.5",
139140
"uuid": "^8.3.2",
140-
"yup": "^0.32.9"
141+
"yup": "^0.32.11"
141142
},
142143
"devDependencies": {
143144
"@babel/core": "7.14.0",
@@ -194,7 +195,9 @@
194195
"webpack": "4.44.0",
195196
"webpack-dev-server": "3.11.2",
196197
"webpack-manifest-plugin": "2.2.0",
197-
"webpack-raphael": "2.1.4",
198198
"workbox-webpack-plugin": "4.3.1"
199+
},
200+
"resolutions": {
201+
"react-dom": "17.0.0"
199202
}
200203
}

‎public/demo/grid/autoload.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2000 will refresh widget every 2 seconds.
2626
</p>
2727
<div class="clearfix">
28-
<div class="btn-toolbar float-right">
28+
<div class="btn-toolbar float-end">
2929
<button type="submit" class="btn btn-transparent">Cancel</button>
3030
<button type="submit" class="btn btn-success animated wobble">&nbsp;Submit&nbsp;</button>
3131
</div>

‎public/demo/grid/shares.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
<?php sleep(2) ?>
22
<div class="list-group list-group-lg">
33
<a href="#" class="list-group-item animated fadeInDown bg-widget-transparent">
4-
<span class="thumb-sm mr">
4+
<span class="thumb-sm me-2">
55
<img class="rounded-circle" src="/images/people/a6.jpg" alt="...">
66
</span>
77
<div>
88
<h6 class="no-margin"><strong>Jenny Wilington</strong></h6>
99
<small>just now</small>
1010
</div>
11-
<i class="fa fa-circle ml-auto text-success mt-sm"></i>
11+
<i class="fa fa-circle ms-auto text-success mt-sm"></i>
1212
</a>
1313
<a href="#" class="list-group-item ">
14-
<span class="thumb-sm mr">
14+
<span class="thumb-sm me-2">
1515
<img class="rounded-circle" src="/images/people/a1.jpg" alt="...">
1616
</span>
1717
<div>
1818
<h6 class="m-0">Maikel Basso</h6>
1919
<small class="text-muted">about 2 mins ago</small>
2020
</div>
21-
<i class="fa fa-circle ml-auto text-danger"></i>
21+
<i class="fa fa-circle ms-auto text-danger"></i>
2222
</a>
2323
<a href="#" class="list-group-item">
24-
<span class="thumb-sm mr">
24+
<span class="thumb-sm me-2">
2525
<img class="rounded-circle" src="/images/people/a2.jpg" alt="...">
2626
</span>
2727
<div>
2828
<h6 class="m-0">Ianus Arendse</h6>
2929
<small class="text-muted">about 42 mins ago</small>
3030
</div>
31-
<i class="fa fa-circle ml-auto text-info"></i>
31+
<i class="fa fa-circle ms-auto text-info"></i>
3232
</a>
3333
<a href="#" class="list-group-item">
34-
<span class="thumb-sm mr">
34+
<span class="thumb-sm me-2">
3535
<img class="rounded-circle" src="/images/people/a3.jpg" alt="...">
3636
</span>
3737
<div>
3838
<h6 class="m-0">Valdemar Landau</h6>
3939
<small class="text-muted">one hour ago</small>
4040
</div>
41-
<i class="fa fa-circle ml-auto text-success"></i>
41+
<i class="fa fa-circle ms-auto text-success"></i>
4242
</a>
4343
<a href="#" class="list-group-item mb-n-md">
44-
<span class="thumb-sm mr">
44+
<span class="thumb-sm me-2">
4545
<img class="rounded-circle" src="/images/people/a4.jpg" alt="...">
4646
</span>
4747
<div>
4848
<h6 class="m-0">Rick Teagan</h6>
4949
<small class="text-muted">3 hours ago</small>
5050
</div>
51-
<i class="fa fa-circle ml-auto text-warning"></i>
51+
<i class="fa fa-circle ms-auto text-warning"></i>
5252
</a>
5353
</div>

‎src/actions/layout.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
export const CHANGE_THEME = 'CHANGE_THEME';
2+
export const CHANGE_SIDEBAR_COLOR = 'CHANGE_SIDEBAR_COLOR';
3+
export const CHANGE_THEME_COLOR = 'CHANGE_THEME_COLOR';
4+
export const NAVBAR_TYPE_TOGGLE = 'NAVBAR_TYPE_TOGGLE';
5+
export const SIDEBAR_TYPE_TOGGLE = 'SIDEBAR_TYPE_TOGGLE';
6+
7+
export function changeTheme(payload) {
8+
return {
9+
type: CHANGE_THEME,
10+
payload,
11+
};
12+
}
13+
14+
export function changeSidebarColor(payload) {
15+
return {
16+
type: CHANGE_SIDEBAR_COLOR,
17+
payload,
18+
};
19+
}
20+
21+
export function changeThemeColor(payload) {
22+
return {
23+
type: CHANGE_THEME_COLOR,
24+
payload,
25+
};
26+
}
27+
28+
export function navbarTypeToggle(value) {
29+
return {
30+
type: NAVBAR_TYPE_TOGGLE,
31+
payload: value
32+
}
33+
}
34+
35+
export function sidebarTypeToggle(value) {
36+
return {
37+
type: SIDEBAR_TYPE_TOGGLE,
38+
payload: value
39+
}
40+
}
41+

‎src/components/ColorPicker/ColorPicker.js‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
3+
import s from './ColorPicker.module.scss';
4+
5+
class CustomColorPicker extends Component {
6+
7+
render() {
8+
const { colors, activeColor, updateColor, customizationItem } = this.props;
9+
if(customizationItem === 'navbar') {
10+
return (
11+
<div>
12+
<ul className={s.colorsList}>
13+
{Object.entries(colors).map(color => {
14+
return (
15+
<li
16+
key={color[1]}
17+
className={`${s.colorBox} ${(activeColor === color[1]) ? s.active : ""}`}
18+
style={{ background: color[1] }}
19+
onClick={() => updateColor(color[1])}
20+
></li>
21+
)
22+
}
23+
)}
24+
</ul>
25+
</div>
26+
)
27+
} else {
28+
return (
29+
<div>
30+
<ul className={s.colorsList}>
31+
{Object.entries(colors).map(color => {
32+
return (
33+
<li
34+
key={color[1]}
35+
className={`${s.colorBox} ${(activeColor === color[0]) ? s.active : ""}`}
36+
style={{ background: color[1] }}
37+
onClick={() => updateColor(color[0])}
38+
></li>
39+
)
40+
}
41+
)}
42+
</ul>
43+
</div>
44+
)
45+
}
46+
47+
}
48+
}
49+
50+
CustomColorPicker.propTypes = {
51+
colors: PropTypes.object,
52+
activeColor: PropTypes.string,
53+
updateColor: PropTypes.func,
54+
customizationItem: PropTypes.string,
55+
};
56+
57+
export default CustomColorPicker

‎src/components/ColorPicker/ColorPicker.module.scss‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@import "../../styles/app";
2+
3+
.colorsList {
4+
display: flex;
5+
flex-wrap: wrap;
6+
justify-content: space-between;
7+
8+
.colorBox {
9+
min-width: 30px;
10+
height: 30px;
11+
border: 1px solid $border-color;
12+
border-radius: 0;
13+
cursor: pointer;
14+
margin: 3px;
15+
transition: $transition-base;
16+
17+
:global {
18+
.rc-color-picker-trigger {
19+
width: 100%;
20+
height: 100%;
21+
}
22+
}
23+
24+
&:hover {
25+
border-color: darken($border-color, 30%);
26+
}
27+
28+
&.active {
29+
border-color: darken($primary, 10%);
30+
}
31+
}
32+
}

‎src/components/ColorPicker/package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "ColorPicker",
3+
"version": "0.0.0",
4+
"private": true,
5+
"main": "./ColorPicker.js"
6+
}

‎src/components/FormItems/uploaders/FilesUploader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class FilesUploader extends Component {
113113
{this.value().map((item) => {
114114
return (
115115
<div key={item.id}>
116-
<i className="la la-link text-muted mr-2"></i>
116+
<i className="la la-link text-muted me-2"></i>
117117

118118
<a
119119
href={item.publicUrl}

‎src/components/FormItems/uploaders/ImagesUploader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ImagesUploader extends Component {
116116
{this.value().map((item) => {
117117
return (
118118
<div
119-
className="mr-2 mb-2 img-card"
119+
className="me-2 mb-2 img-card"
120120
style={{ height: '100px' }}
121121
key={item.id}
122122
>
@@ -145,7 +145,7 @@ class ImagesUploader extends Component {
145145
{!readonly && (
146146
<button
147147
type="button"
148-
className="btn btn-link ml-2"
148+
className="btn btn-link ms-2"
149149
onClick={() =>
150150
this.handleRemove(item.id)
151151
}

0 commit comments

Comments
 (0)