mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2026-07-23 12:11:59 +00:00
Improved visits pages titles
This commit is contained in:
@@ -22,7 +22,7 @@ const propTypes = {
|
||||
settings: SettingsType,
|
||||
};
|
||||
|
||||
const TagVisits = (VisitsStats) => {
|
||||
const TagVisits = (VisitsStats, colorGenerator) => {
|
||||
const TagVisitsComp = ({
|
||||
history,
|
||||
match,
|
||||
@@ -51,7 +51,7 @@ const TagVisits = (VisitsStats) => {
|
||||
|
||||
return (
|
||||
<VisitsStats getVisits={loadVisits} cancelGetVisits={cancelGetTagVisits} visitsInfo={tagVisits}>
|
||||
<TagVisitsHeader tagVisits={tagVisits} goBack={history.goBack} />
|
||||
<TagVisitsHeader tagVisits={tagVisits} goBack={history.goBack} colorGenerator={colorGenerator} />
|
||||
</VisitsStats>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import Tag from '../tags/helpers/Tag';
|
||||
import { colorGeneratorType } from '../utils/services/ColorGenerator';
|
||||
import VisitsHeader from './VisitsHeader';
|
||||
import { TagVisitsType } from './reducers/tagVisits';
|
||||
import './ShortUrlVisitsHeader.scss';
|
||||
@@ -7,15 +9,17 @@ import './ShortUrlVisitsHeader.scss';
|
||||
const propTypes = {
|
||||
tagVisits: TagVisitsType.isRequired,
|
||||
goBack: PropTypes.func.isRequired,
|
||||
colorGenerator: colorGeneratorType,
|
||||
};
|
||||
|
||||
const TagVisitsHeader = ({ tagVisits, goBack }) => {
|
||||
const TagVisitsHeader = ({ tagVisits, goBack, colorGenerator }) => {
|
||||
const { visits, tag } = tagVisits;
|
||||
|
||||
const visitsStatsTitle = (
|
||||
<React.Fragment>
|
||||
Visits for {tag}
|
||||
</React.Fragment>
|
||||
<span className="d-flex align-items-center justify-content-center">
|
||||
<span className="mr-2">Visits for</span>
|
||||
<Tag text={tag} colorGenerator={colorGenerator} />
|
||||
</span>
|
||||
);
|
||||
|
||||
return <VisitsHeader title={visitsStatsTitle} goBack={goBack} visits={visits} />;
|
||||
|
||||
@@ -30,7 +30,7 @@ const VisitsHeader = ({ visits, goBack, shortUrl, children, title }) => (
|
||||
<ShortUrlVisitsCount visitsCount={visits.length} shortUrl={shortUrl} />
|
||||
</span>
|
||||
</h2>
|
||||
<h3 className="text-center d-block d-sm-none mb-0 mt-2">
|
||||
<h3 className="text-center d-block d-sm-none mb-0 mt-3">
|
||||
<small>{title}</small>
|
||||
</h3>
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ const provideServices = (bottle, connect) => {
|
||||
[ 'shortUrlVisits', 'shortUrlDetail', 'mercureInfo', 'settings' ],
|
||||
[ 'getShortUrlVisits', 'getShortUrlDetail', 'cancelGetShortUrlVisits', 'createNewVisit', 'loadMercureInfo' ]
|
||||
));
|
||||
bottle.serviceFactory('TagVisits', TagVisits, 'VisitsStats');
|
||||
bottle.serviceFactory('TagVisits', TagVisits, 'VisitsStats', 'ColorGenerator');
|
||||
bottle.decorator('TagVisits', connect(
|
||||
[ 'tagVisits', 'mercureInfo', 'settings' ],
|
||||
[ 'getTagVisits', 'cancelGetTagVisits', 'createNewVisit', 'loadMercureInfo' ]
|
||||
|
||||
Reference in New Issue
Block a user