/osu-web

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make user modding history public #3080

Merged
merged 46 commits into from Apr 26, 2018

Conversation

Reviewers

@nanaya nanaya

Assignees
No one assigned
Labels
Milestone
No milestone
3 participants
@notbakaneko @nanaya @peppy
@notbakaneko
Contributor

notbakaneko commented Apr 25, 2018 •
edited

fixes #2675

  • is terrible 🔥
  • moves the user modding history stuff to /users/{user}/modding Adds user-specific modding history stuff to /users/{user}/modding
  • adds a little icon next to the username in discussion posts that goes to the user's modding history
  • the views, styles, etc. need to be fixed separately
@nanaya

This comment has been minimized.

Sign in to view
Collaborator

nanaya commented Apr 25, 2018

Are we removing global overview ?_? (as in not specific to certain user)
@notbakaneko
Revert "remove old stuff" 
This reverts commit 1e30f29.
e8509dc

@notbakaneko notbakaneko added the WIP label Apr 25, 2018

@notbakaneko

This comment has been minimized.

Sign in to view
Contributor

notbakaneko commented Apr 25, 2018

I guess not

@notbakaneko notbakaneko removed the WIP label Apr 25, 2018

@peppy peppy added the resolves issue label Apr 26, 2018

resources/views/beatmap_discussion_posts/_item.blade.php Outdated
<span class="beatmap-discussion-post__user-text u-ellipsis-overflow">{!! link_to_user($post->user) !!}</span>
</div>
</div>
@component('beatmapset_activities._user', ['user' => $post->user])

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

how about plain @include ಠ_ಠ (also other places with no slot content)

This comment has been minimized.

Sign in to view
Copy link
@notbakaneko

notbakaneko Apr 26, 2018 •
edited

Contributor

@include with no $slot explodes

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

$slot ?? ''?

This comment has been minimized.

Sign in to view
Copy link
@notbakaneko

notbakaneko Apr 26, 2018

Contributor

just so @include can be used? yeah, no

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

but they're same thing with just with some $slot magic.
resources/lang/es/layout.php Outdated
@@ -118,7 +118,7 @@
'settings' => 'Opciones',
'logout' => 'Cerrar sesión',
'help' => 'Ayuda',
'beatmapset_activities' => 'actividades del usuario en el beatmap',
'user-modding-history' => 'actividades del usuario en el beatmap', // needs update

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

the key doesn't seem right
resources/assets/coffee/react/beatmap-discussions/post.coffee
@props.user.username
a
className: "#{bn}__user-modding-history-link"

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

is this the correct link color?

This comment has been minimized.

Sign in to view
Copy link
@notbakaneko

notbakaneko Apr 26, 2018

Contributor

apparently
resources/assets/coffee/react/beatmap-discussions/post.coffee
style:
color: userColor
a

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

looking again, not sure if worth it linking the whole thing or just link username and avatar separately instead.

This comment has been minimized.

Sign in to view
Copy link
@notbakaneko

notbakaneko Apr 26, 2018

Contributor

┐(ツ)┌
routes/web.php Outdated
Route::get('users/{user}/posts', 'UsersController@posts')->name('users.posts');
Route::group(['as' => 'users.modding.', 'namespace' => 'Users'], function () {

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

should use prefix more ('prefix' => 'users/{user}/modding').
resources/views/users/beatmapset_activities.blade.php Outdated
</a>
</span>
<div class="beatmapset-activities__user-upvote-list">
<h3>{{ trans('users.beatmapset_activities.votes_received.title_most') }}</h3>

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

should be outside the list container.
resources/views/users/beatmapset_activities.blade.php Outdated
<span class="beatmap-discussion-post__user-text u-ellipsis-overflow">{{$userVotes->sum('score') > 0 ? '+' : ''}}{{$userVotes->sum('score')}} ({{count($userVotes)}} votes)</span>
</a>
<div class="beatmapset-activities__user-upvote-list">
<h3>{{ trans('users.beatmapset_activities.votes_made.title_most') }}</h3>

This comment has been minimized.

Sign in to view
Copy link
@nanaya

nanaya Apr 26, 2018

Collaborator

same about outside list container.
@nanaya

nanaya approved these changes Apr 26, 2018
View changes

@nanaya
Merge branch 'master' into feature/public-beatmapset-activities
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
21f87f2

@nanaya nanaya merged commit 2d2d98c into ppy:master Apr 26, 2018
2 checks passed

2 checks passed

continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@notbakaneko notbakaneko deleted the notbakaneko:feature/public-beatmapset-activities branch Apr 27, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment