Skip to content

Commit 4828615

Browse files
author
Yeliazar
committed
fix: position icon on page Grid,
updated: vector map circles, Apex Monochrome Pie Chart
1 parent d27e182 commit 4828615

File tree

12 files changed

+156
-44
lines changed

12 files changed

+156
-44
lines changed

changelog.md

+130
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,134 @@
11
# Changelog
2+
## [1.1.4]
3+
updated position icon on page Grid,
4+
customized vector map circles
5+
removed text shadow from Apex Monochrome Pie Chart
6+
7+
## [1.1.3]
8+
add new nivo charts;
9+
customized bootstrap table in table dynamic;
10+
updated follow dependencies and devDependencies:
11+
"dependencies": {
12+
"@amcharts/amcharts4": "^4.7.1" -> "^4.10.18" ,
13+
"@amcharts/amcharts4-geodata": "^4.1.7" -> "^4.1.20",
14+
"@fullcalendar/core": "5.3.0" -> "5.7.0",
15+
"@fullcalendar/daygrid": "5.3.0" -> "5.7.0",
16+
"@fullcalendar/interaction": "5.3.0" -> "5.7.0",
17+
"@fullcalendar/list": "5.3.0" -> "5.7.0",
18+
"@fullcalendar/react": "5.3.0" -> "5.7.0",
19+
"@fullcalendar/timegrid": "5.3.0" -> "5.7.0",
20+
"animate.css": "3.7.0" -> "4.1.1",
21+
"axios": "^0.19.2" -> "^0.21.1",
22+
"apexcharts": "^3.10.0" -> "^3.26.3",
23+
"bootstrap": "4.3.1" -> "4.6.0",
24+
"chroma-js": "^2.1.0" -> "^2.1.2",
25+
"classnames": "^2.2.6" -> "^2.3.1" ,
26+
"draft-js": "0.10.5" -> "0.11.7",
27+
"echarts": "^4.4.0" -> "4.9.0",
28+
"echarts-for-react": "^2.0.15-beta.1" -> "2.0.16",
29+
"formik": "^2.1.4" -> "^2.2.8",
30+
"moment": "^2.22.2" -> "^2.29.1",
31+
"prettier": "^2.0.5" -> "^2.3.0",
32+
"rc-hammerjs": "^0.6.9" -> "^0.6.10",
33+
"react": "^16.5.2" -> "^16.14.0",
34+
"react-animate-height": "^2.0.15" -> "2.0.23",
35+
"react-animated-number": "^0.4.4",
36+
"react-apexcharts": "^1.3.9",
37+
"react-autosize-textarea": "5.0.0" -> "5.0.1",
38+
"react-bootstrap-table": "4.1.5" -> "4.3.1",
39+
"react-datetime": "2.16.1" -> "2.16.3",
40+
"react-dev-utils": "^6.0.5" -> "6.1.1",
41+
"react-dom": "^16.5.2" -> "16.14.0",
42+
"react-draft-wysiwyg": "1.10.12" -> "1.14.7",
43+
"react-redux": "^5.0.7" -> "5.1.2",
44+
"react-router": "^4.3.1" -> "^4.4.0-beta.8",
45+
"react-router-dom": "^4.3.1" -> "^4.4.0-beta.8",
46+
"react-router-hash-link": "^1.2.1" -> "^1.2.2",
47+
"react-scrollspy": "3.3.5" -> "3.4.3",
48+
"react-select": "3.0.8" -> "3.2.0",
49+
"react-slick": "0.23.1" -> "0.28.1",
50+
"react-sortable-hoc": "0.8.3" -> "0.8.4",
51+
"react-sortable-tree": "2.2.0" -> "2.8.0",
52+
"react-sortablejs": "1.5.0" -> "1.5.1",
53+
"react-syntax-highlighter": "10.1.2" -> "10.3.5",
54+
"react-table": "6.7.6" -> "6.11.5",
55+
"react-toastify": "^5.4.0" -> "^5.5.0",
56+
"react-transition-group": "^2.5.2" -> "^2.9.0",
57+
"redux": "^4.0.1" -> "^4.1.0",
58+
"redux-logger": "^3.0.6",
59+
"redux-thunk": "^2.3.0",
60+
"rickshaw": "1.6.6" -> "1.7.1",
61+
"showdown": "1.8.6" -> "1.9.1",
62+
"sortablejs": "1.10.0" -> "1.13.0"
63+
},
64+
"devDependencies": {
65+
"@babel/core": "7.4.4" -> "7.14.3" ,
66+
"@babel/plugin-proposal-class-properties": "7.4.4" -> "7.13.0",
67+
"@babel/plugin-proposal-optional-chaining": "^7.2.0" -> "^7.14.2",
68+
"@svgr/webpack": "4.2.0" -> "4.3.3",
69+
"babel-eslint": "10.0.1" -> "10.1.0",
70+
"babel-jest": "24.8.0" -> "24.9.0",
71+
"babel-loader": "8.0.5" -> "8.2.2",
72+
"babel-plugin-named-asset-import": "1.0.0-next.103" -> "1.0.0-next.154",
73+
"babel-preset-react-app": "9.0.0" -> "9.1.2",
74+
"bfj": "6.1.1" -> "6.1.2",
75+
"bundle-loader": "0.5.6",
76+
"case-sensitive-paths-webpack-plugin": "2.2.0" -> "2.4.0",
77+
"chalk": "2.4.2",
78+
"cross-env": "^7.0.3",
79+
"css-loader": "2.1.1",
80+
"dotenv": "8.0.0" -> "8.6.0",
81+
"eslint-loader": "2.1.1", //deprecated
82+
"eslint-plugin-flowtype": "3.8.1" -> "3.13.0",
83+
"eslint-plugin-import": "2.17.2" -> "2.23.2",
84+
"eslint-plugin-jsx-a11y": "6.2.1" -> "6.4.1" ,
85+
"eslint-plugin-react": "7.13.0" -> "7.23.2",
86+
"eslint-plugin-react-hooks": "1.6.0" -> "1.7.0",
87+
"expose-loader": "0.7.5",
88+
"file-loader": "3.0.1",
89+
"fs-extra": "7.0.1",
90+
"html-webpack-plugin": "4.0.0-alpha.2" -> "4.5.2",
91+
"imports-loader": "0.8.0",
92+
"jest": "24.8.0" -> "24.9.0",
93+
"jest-pnp-resolver": "1.2.1" -> "1.2.2",
94+
"jest-resolve": "24.8.0" -> "24.9.0",
95+
"lodash.clonedeep": "^4.5.0",
96+
"mini-css-extract-plugin": "0.6.0" -> "0.12.0",
97+
"optimize-css-assets-webpack-plugin": "5.0.1" -> "5.0.6",
98+
"pnp-webpack-plugin": "1.4.3" -> "1.6.4",
99+
"postcss-flexbugs-fixes": "4.1.0" -> "4.2.1",
100+
"postcss-loader": "3.0.0",
101+
"postcss-preset-env": "6.6.0" -> "6.7.0",
102+
"postcss-safe-parser": "4.0.1" -> "4.0.2",
103+
"react-responsive-carousel": "^3.2.9" -> "^3.2.18",
104+
"resolve": "1.10.1" -> "1.20.0",
105+
"sass-loader": "7.1.0" -> "7.3.1",
106+
"style-loader": "0.23.0" -> "0.23.1",
107+
"terser-webpack-plugin": "1.2.3" -> "1.4.5",
108+
"url-loader": "1.1.2",
109+
"webpack": "4.31.0" -> "4.46.0",
110+
"webpack-dev-server": "3.3.1" -> "3.11.2" ,
111+
"webpack-manifest-plugin": "2.0.4" -> "2.2.0",
112+
"webpack-raphael": "2.1.4",
113+
"workbox-webpack-plugin": "4.3.1"
114+
}
115+
add following packages:
116+
-"react-bootstrap-table-next": "^4.0.3",
117+
-"react-bootstrap-table2-editor": "^1.4.0",
118+
-"react-bootstrap-table2-filter": "^1.3.3",
119+
-"react-bootstrap-table2-paginator": "^2.1.2",
120+
-"react-bootstrap-table2-toolkit": "^2.1.3",
121+
-"@nivo/bar": "^0.70.1",
122+
-"@nivo/calendar": "^0.70.1",
123+
-"@nivo/chord": "^0.70.1",
124+
-"@nivo/circle-packing": "^0.70.1",
125+
-"@nivo/core": "^0.70.1",
126+
-"@nivo/pie": "^0.70.1",
127+
-"@nivo/radar": "^0.70.1",
128+
-"@nivo/stream": "^0.70.1",
129+
-"@nivo/sunburst": "^0.70.1",
130+
-"@nivo/swarmplot": "^0.70.1",
131+
-"@nivo/waffle": "^0.70.1".
2132

3133
## [1.1.2]
4134

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flatlogic-one-react",
3-
"version": "1.1.3",
3+
"version": "1.1.4",
44
"private": true,
55
"scripts": {
66
"build": "cross-env PUBLIC_URL='./' node scripts/build.js",
@@ -73,7 +73,7 @@
7373
"@nivo/swarmplot": "^0.70.1",
7474
"@nivo/waffle": "^0.70.1",
7575
"animate.css": "4.1.1",
76-
"apexcharts": "^3.26.3",
76+
"apexcharts": "^3.27.1",
7777
"awesome-bootstrap-checkbox": "1.0.1",
7878
"axios": "^0.21.1",
7979
"bootstrap": "4.6.0",

src/pages/charts/mock.js

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import config from './config';
22

33
const colors = config.app.colors;
4-
const { warning } = colors;
4+
const { warning} = colors;
55
const chartColors = config.app.chartColors;
66
const {axisColor} = chartColors;
77

@@ -60,25 +60,19 @@ export const chartData = {
6060
theme: {
6161
monochrome: {
6262
enabled: true,
63-
color: warning,
63+
color: warning
64+
}
65+
},
66+
dataLabels: {
67+
dropShadow: {
68+
enabled: false
6469
}
6570
},
6671
stroke: {
6772
show: false,
6873
width: 0
6974
},
7075
legend: false,
71-
responsive: [{
72-
breakpoint: 480,
73-
options: {
74-
chart: {
75-
width: 200
76-
},
77-
legend: {
78-
position: 'bottom'
79-
}
80-
}
81-
}]
8276
}
8377
}
8478
},

src/pages/dashboard/Visits.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { Row, Col, Progress, Table, Label, Input } from "reactstrap";
2+
import { Row, Col, Progress, Table } from "reactstrap";
33

44
import Widget from "../../components/Widget";
55
import Map from "./components/am4chartMap/am4chartMap";

src/pages/extra/search/Search.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,14 @@ import React from "react";
44
import {
55
Row,
66
Col,
7-
ButtonGroup,
87
Button,
98
Nav,
109
NavItem,
1110
NavLink,
1211
Pagination,
1312
PaginationLink,
1413
PaginationItem,
15-
Badge,
16-
UncontrolledButtonDropdown,
17-
DropdownMenu,
18-
DropdownToggle,
19-
DropdownItem,
14+
Badge
2015
} from "reactstrap";
2116
import Widget from '../../../components/Widget'
2217

src/pages/grid/Grid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class Grid extends React.Component {
120120
tooltipPlacement={tooltipPlacement}
121121
title={
122122
<p style={{ fontWeight: 700 }}>
123-
<span className="badge badge-primary">
123+
<span className="badge badge-primary" style={{verticalAlign: "middle", marginBottom: "1%"}}>
124124
<i className="fa fa-facebook" />
125125
</span>{" "}
126126
&nbsp; Latest Shares

src/pages/management/Management.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from "react";
22
import PropTypes from "prop-types";
33
import { withRouter } from "react-router";
4-
import { BootstrapTable, TableHeaderColumn } from "react-bootstrap-table";
54
import { connect } from "react-redux";
65
import { Link } from "react-router-dom";
76
import { Popover, PopoverBody, PopoverHeader, Alert } from "reactstrap";

src/pages/maps/vector/Vector.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ class VectorMap extends React.Component {
4343
place.propertyFields.longitude = "longitude";
4444
let circle = place.createChild(am4core.Circle);
4545
circle.radius = 5;
46-
circle.fill = am4core.color("#FEB04A");
47-
circle.stroke = am4core.color("#FEB04A");
48-
circle.strokeWidth = 2;
46+
circle.fill = am4core.color("#323232");
47+
circle.stroke = am4core.color("#000000");
48+
circle.strokeWidth = 1;
49+
circle.strokeOpacity = 1;
4950
placeSeries.data = places;
50-
circle.tooltipText = '{name}';
51+
circle.tooltipText = '{name}'
52+
var latitudeState = circle.states.create("hover");
53+
latitudeState.properties.scale = 1.3;
54+
5155
this.map = map;
5256
}
5357

src/pages/maps/vector/mock.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ export default [
2424
{latitude: 15.3, longitude: -61.38 , name: 'Dominica'},
2525
{latitude: -20.2, longitude: 57.5 , name: 'Mauritius'},
2626
{latitude: 26.02, longitude: 50.55 , name: 'Bahrain'},
27-
{latitude: 0.33, longitude: 6.73 , name: 'S?o Tom? and Pr?ncipe'},
28-
]
27+
{latitude: 0.33, longitude: 6.73 , name: 'Saint Thomas and Prince'},
28+
]

src/pages/package/SPackage.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import {
77
import Widget from '../../components/Widget';
88
import s from './SPackage.module.scss';
99
import reactLogo from '../../images/react-logo.svg';
10-
import angularLogo from '../../images/angularjs-logo.svg';
11-
import angularJSLogo from '../../images/angular-logo.svg';
12-
import vueLogo from '../../images/vue-logo.svg';
10+
//import angularLogo from '../../images/angularjs-logo.svg';
11+
//import angularJSLogo from '../../images/angular-logo.svg';
12+
//import vueLogo from '../../images/vue-logo.svg';
1313
import jsLogo from '../../images/js-logo.svg';
1414

1515
class SPackage extends React.Component {

src/pages/product/components/General/General.js

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import React from "react";
22
import cx from "classnames";
33
import PropTypes from "prop-types";
4-
5-
import Rating from "../Rating/Rating";
6-
74
import s from "./General.module.scss";
8-
import { Label } from "reactstrap";
95

106
const General = ({ rating, title, subtitle, price }) => (
117
<div className={s.general}>

src/pages/tables/dynamic/Dynamic.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
import React from "react";
2-
import {
3-
Progress,
4-
Dropdown,
5-
DropdownMenu,
6-
DropdownToggle,
7-
DropdownItem,
8-
} from "reactstrap";
2+
import { Progress } from "reactstrap";
93

104
import ReactTable from "react-table";
115

0 commit comments

Comments
 (0)