From 09c679318d45e92e04d2f4eb44262364bf73a35f Mon Sep 17 00:00:00 2001 From: clayton Date: Sun, 6 Aug 2023 18:46:25 -0700 Subject: [PATCH] Add history button to group pages --- resources/css/bem/btn-osu-big.less | 4 ++++ resources/css/bem/user-list.less | 4 ++++ resources/js/components/user-list.tsx | 12 +++++++++++- resources/lang/en/group_history.php | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/resources/css/bem/btn-osu-big.less b/resources/css/bem/btn-osu-big.less index 51b87cbbcbd..2394496ecaa 100644 --- a/resources/css/bem/btn-osu-big.less +++ b/resources/css/bem/btn-osu-big.less @@ -349,6 +349,10 @@ margin-top: 10px; } + &--user-list-title { + flex-shrink: 0; + } + &--user-page-edit { border-radius: 10000px; width: 140px; diff --git a/resources/css/bem/user-list.less b/resources/css/bem/user-list.less index e50a718ec8c..df96dc1277b 100644 --- a/resources/css/bem/user-list.less +++ b/resources/css/bem/user-list.less @@ -17,6 +17,10 @@ &__title { .default-gutter-v2(); + display: flex; + align-items: flex-end; + justify-content: space-between; + gap: 10px; padding-top: 20px; padding-bottom: 0; margin: 0; diff --git a/resources/js/components/user-list.tsx b/resources/js/components/user-list.tsx index 7aac01adf38..3825a7e212d 100644 --- a/resources/js/components/user-list.tsx +++ b/resources/js/components/user-list.tsx @@ -4,6 +4,7 @@ import GameMode from 'interfaces/game-mode'; import GroupJson from 'interfaces/group-json'; import UserJson from 'interfaces/user-json'; +import { route } from 'laroute'; import { usernameSortAscending } from 'models/user'; import * as moment from 'moment'; import core from 'osu-core-singleton'; @@ -12,6 +13,7 @@ import { classWithModifiers } from 'utils/css'; import { trans } from 'utils/lang'; import { currentUrlParams } from 'utils/turbolinks'; import { updateQueryString } from 'utils/url'; +import BigButton from './big-button'; import { Sort } from './sort'; import { ViewMode, viewModes } from './user-card'; import { UserCards } from './user-cards'; @@ -151,7 +153,15 @@ export class UserList extends React.PureComponent {
{this.props.group != null && ( -

{this.props.group.name}

+

+ {this.props.group.name} + +

)} {this.props.group?.description != null && ( diff --git a/resources/lang/en/group_history.php b/resources/lang/en/group_history.php index 805d3675399..ec3f31dcb14 100644 --- a/resources/lang/en/group_history.php +++ b/resources/lang/en/group_history.php @@ -5,6 +5,7 @@ return [ 'none' => 'No group history found!', + 'view' => 'View group history', 'event' => [ 'actor' => 'by :user',