UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Glitch] Port upstream changes about trending links

master
Jeong Arm 2021-11-26 15:01:04 +09:00 committed by Claire
parent 025a2ceb0f
commit 97151840b0
5 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/components/admin/Counter.js
View File

@ -32,6 +32,7 @@ export default class Counter extends React.PureComponent {
end_at: PropTypes.string.isRequired, end_at: PropTypes.string.isRequired,
label: PropTypes.string.isRequired, label: PropTypes.string.isRequired,
href: PropTypes.string, href: PropTypes.string,
params: PropTypes.object,
}; };
state = { state = {
@ -40,9 +41,9 @@ export default class Counter extends React.PureComponent {
}; };
componentDidMount () { componentDidMount () {
const { measure, start_at, end_at } = this.props; const { measure, start_at, end_at, params } = this.props;
api().post('/api/v1/admin/measures', { keys: [measure], start_at, end_at }).then(res => { api().post('/api/v1/admin/measures', { keys: [measure], start_at, end_at, [measure]: params }).then(res => {
this.setState({ this.setState({
loading: false, loading: false,
data: res.data, data: res.data,

5
app/javascript/flavours/glitch/components/admin/Dimension.js
View File

@ -13,6 +13,7 @@ export default class Dimension extends React.PureComponent {
end_at: PropTypes.string.isRequired, end_at: PropTypes.string.isRequired,
limit: PropTypes.number.isRequired, limit: PropTypes.number.isRequired,
label: PropTypes.string.isRequired, label: PropTypes.string.isRequired,
params: PropTypes.object,
}; };
state = { state = {
@ -21,9 +22,9 @@ export default class Dimension extends React.PureComponent {
}; };
componentDidMount () { componentDidMount () {
const { start_at, end_at, dimension, limit } = this.props; const { start_at, end_at, dimension, limit, params } = this.props;
api().post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit }).then(res => { api().post('/api/v1/admin/dimensions', { keys: [dimension], start_at, end_at, limit, [dimension]: params }).then(res => {
this.setState({ this.setState({
loading: false, loading: false,
data: res.data, data: res.data,

2
app/javascript/flavours/glitch/components/admin/Trends.js
View File

@ -19,7 +19,7 @@ export default class Trends extends React.PureComponent {
componentDidMount () { componentDidMount () {
const { limit } = this.props; const { limit } = this.props;
api().get('/api/v1/admin/trends', { params: { limit } }).then(res => { api().get('/api/v1/admin/trends/tags', { params: { limit } }).then(res => {
this.setState({ this.setState({
loading: false, loading: false,
data: res.data, data: res.data,

16
app/javascript/flavours/glitch/styles/accounts.scss
View File

@ -327,3 +327,19 @@
margin-top: 10px; margin-top: 10px;
} }
} }
.batch-table__row--muted .pending-account__header {
&,
a,
strong {
color: lighten($ui-base-color, 26%);
}
}
.batch-table__row--attention .pending-account__header {
&,
a,
strong {
color: $gold-star;
}
}

10
app/javascript/flavours/glitch/styles/dashboard.scss
View File

@ -100,6 +100,16 @@
transition: all 200ms ease-out; transition: all 200ms ease-out;
} }
&.positive {
background: lighten($ui-base-color, 4%);
color: $valid-value-color;
}
&.negative {
background: lighten($ui-base-color, 4%);
color: $error-value-color;
}
span { span {
flex: 1 1 auto; flex: 1 1 auto;
} }