mirrors/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2024-12-23 01:20:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #68 from acelaya/feature/chart-labels

Browse source 
Feature/chart labels
This commit is contained in:
Alejandro Celaya 2018-10-30 20:48:21 +01:00 committed by GitHub
commit a65aadd4b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -24,7 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
#### Fixed #### Fixed
* *Nothing* * [#66](https://github.com/shlinkio/shlink-web-client/issues/66) Fixed tooltips in graphs with too small bars not being displayed.
## 1.1.1 - 2018-10-20 ## 1.1.1 - 2018-10-20

2
package.json
View file

@ -31,7 +31,7 @@
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"qs": "^6.5.2", "qs": "^6.5.2",
"ramda": "^0.25.0", "ramda": "^0.25.0",
"react": "^16.3.2", "react": "^16.6",
"react-autosuggest": "^9.4.0", "react-autosuggest": "^9.4.0",
"react-chartjs-2": "^2.7.4", "react-chartjs-2": "^2.7.4",
"react-color": "^2.14.1", "react-color": "^2.14.1",

4
src/index.js
View file

@ -1,6 +1,6 @@
import 'bootstrap/dist/css/bootstrap.min.css'; import 'bootstrap/dist/css/bootstrap.min.css';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import { render } from 'react-dom';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom'; import { BrowserRouter } from 'react-router-dom';
import { applyMiddleware, compose, createStore } from 'redux'; import { applyMiddleware, compose, createStore } from 'redux';
@ -20,7 +20,7 @@ const store = createStore(reducers, composeEnhancers(
applyMiddleware(ReduxThunk) applyMiddleware(ReduxThunk)
)); ));
ReactDOM.render( render(
<Provider store={store}> <Provider store={store}>
<BrowserRouter> <BrowserRouter>
<ScrollToTop> <ScrollToTop>

6
src/utils/SortingDropdown.js
View file

@ -3,8 +3,8 @@ import { UncontrolledDropdown, DropdownToggle, DropdownMenu, DropdownItem } from
import { toPairs } from 'ramda'; import { toPairs } from 'ramda';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import FontAwesomeIcon from '@fortawesome/react-fontawesome'; import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import caretUpIcon from '@fortawesome/fontawesome-free-solid/faCaretUp'; import sortAscIcon from '@fortawesome/fontawesome-free-solid/faSortAmountUp';
import caretDownIcon from '@fortawesome/fontawesome-free-solid/faCaretDown'; import sortDescIcon from '@fortawesome/fontawesome-free-solid/faSortAmountDown';
import classNames from 'classnames'; import classNames from 'classnames';
import { determineOrderDir } from '../utils/utils'; import { determineOrderDir } from '../utils/utils';
import './SortingDropdown.scss'; import './SortingDropdown.scss';
@ -47,7 +47,7 @@ const SortingDropdown = ({ items, orderField, orderDir, onChange, isButton, righ
{fieldValue} {fieldValue}
{orderField === fieldKey && ( {orderField === fieldKey && (
<FontAwesomeIcon <FontAwesomeIcon
icon={orderDir === 'ASC' ? caretUpIcon : caretDownIcon} icon={orderDir === 'ASC' ? sortAscIcon : sortDescIcon}
className="sorting-dropdown__sort-icon" className="sorting-dropdown__sort-icon"
/> />
)} )}

3
src/visits/GraphCard.js
View file

@ -76,6 +76,9 @@ const renderGraph = (title, isBarChart, stats, matchMedia) => {
}, },
], ],
} : null, } : null,
tooltips: {
intersect: !isBarChart,
},
}; };
return <Component data={generateGraphData(title, isBarChart, labels, data)} options={options} height={null} />; return <Component data={generateGraphData(title, isBarChart, labels, data)} options={options} height={null} />;

2
test/utils/SortingDropdown.test.js
View file

@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
import { DropdownItem } from 'reactstrap'; import { DropdownItem } from 'reactstrap';
import { identity, values } from 'ramda'; import { identity, values } from 'ramda';
import FontAwesomeIcon from '@fortawesome/react-fontawesome'; import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import caretDownIcon from '@fortawesome/fontawesome-free-solid/faCaretDown'; import caretDownIcon from '@fortawesome/fontawesome-free-solid/faSortAmountDown';
import * as sinon from 'sinon'; import * as sinon from 'sinon';
import SortingDropdown from '../../src/utils/SortingDropdown'; import SortingDropdown from '../../src/utils/SortingDropdown';

35
yarn.lock
View file

@ -1997,7 +1997,7 @@ copy-to-clipboard@^3:
core-js@^1.0.0: core-js@^1.0.0:
version "1.2.7" version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" resolved "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
core-js@^2.4.0, core-js@^2.5.0: core-js@^2.4.0, core-js@^2.5.0:
version "2.5.7" version "2.5.7"
@ -3927,12 +3927,18 @@ iconv-lite@0.4.19:
version "0.4.19" version "0.4.19"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13: iconv-lite@^0.4.17, iconv-lite@^0.4.4:
version "0.4.23" version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
dependencies: dependencies:
safer-buffer ">= 2.1.2 < 3" safer-buffer ">= 2.1.2 < 3"
iconv-lite@~0.4.13:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
dependencies:
safer-buffer ">= 2.1.2 < 3"
icss-replace-symbols@^1.1.0: icss-replace-symbols@^1.1.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@ -6914,14 +6920,14 @@ react-transition-group@^2.3.1:
prop-types "^15.6.2" prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4" react-lifecycles-compat "^3.0.4"
react@^16.3.2: react@^16.6:
version "16.4.2" version "16.6.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f" resolved "https://registry.yarnpkg.com/react/-/react-16.6.0.tgz#b34761cfaf3e30f5508bc732fb4736730b7da246"
dependencies: dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0" loose-envify "^1.1.0"
object-assign "^4.1.1" object-assign "^4.1.1"
prop-types "^15.6.0" prop-types "^15.6.2"
scheduler "^0.10.0"
reactcss@^1.2.0: reactcss@^1.2.0:
version "1.2.3" version "1.2.3"
@ -7452,6 +7458,13 @@ sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
scheduler@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.10.0.tgz#7988de90fe7edccc774ea175a783e69c40c521e1"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
schema-utils@^0.3.0: schema-utils@^0.3.0:
version "0.3.0" version "0.3.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
@ -8397,8 +8410,8 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
ua-parser-js@^0.7.18: ua-parser-js@^0.7.18:
version "0.7.18" version "0.7.19"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
uglify-js@3.4.x, uglify-js@^3.0.13: uglify-js@3.4.x, uglify-js@^3.0.13:
version "3.4.6" version "3.4.6"
@ -8837,8 +8850,8 @@ whatwg-fetch@2.0.3:
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
whatwg-fetch@>=0.10.0: whatwg-fetch@>=0.10.0:
version "2.0.4" version "3.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
whatwg-url@^4.3.0: whatwg-url@^4.3.0:
version "4.8.0" version "4.8.0"