Merge user feeds & followers #118
@ -78,6 +78,9 @@ return [
|
|||||||
'uploaded_12_months' => 'Photos uploaded in the last 12 months',
|
'uploaded_12_months' => 'Photos uploaded in the last 12 months',
|
||||||
],
|
],
|
||||||
'user_activity_feed' => [
|
'user_activity_feed' => [
|
||||||
|
'no_activity_p1' => 'Nothing to see here',
|
||||||
|
'no_activity_p2' => 'There is no recent activity to show you.',
|
||||||
|
'no_activity_p3' => 'Find someone new to follow on the :l_explore_startPhotographer Explorer:l_explore_end page.',
|
||||||
'title' => 'My Activity Feed'
|
'title' => 'My Activity Feed'
|
||||||
],
|
],
|
||||||
'user_feed_type' => [
|
'user_feed_type' => [
|
||||||
|
@ -33,7 +33,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="text-center" v-if="!is_loading && feed_items.length == 0">
|
<div class="text-center" v-if="!is_loading && feed_items.length == 0">
|
||||||
<h4 class="text-danger"><b>@lang('gallery.user_activity_feed.no_activity_p1')</b></h4>
|
<h4 class="text-danger"><b>@lang('gallery.user_activity_feed.no_activity_p1')</b></h4>
|
||||||
<p>@lang('gallery.user_activity_feed.no_activity_p2', ['user_name' => $user->name])</p>
|
<p>@lang('gallery.user_activity_feed.no_activity_p2')</p>
|
||||||
|
<p>@lang('gallery.user_activity_feed.no_activity_p3', [
|
||||||
|
'l_explore_start' => sprintf('<a href="%s">', route('userExplore')),
|
||||||
|
'l_explore_end' => '</a>'
|
||||||
|
])</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -155,6 +155,8 @@ Route::get('u/{idOrAlias}', 'Gallery\UserController@show')
|
|||||||
Route::get('me', 'Gallery\UserController@activityFeed')
|
Route::get('me', 'Gallery\UserController@activityFeed')
|
||||||
->name('userActivityFeed')
|
->name('userActivityFeed')
|
||||||
->middleware('auth');
|
->middleware('auth');
|
||||||
|
Route::get('explore', 'Gallery\UserController@exploreProfiles')
|
||||||
|
->name('userExplore');
|
||||||
Route::get('me.json', 'Gallery\UserController@activityFeedJson')
|
Route::get('me.json', 'Gallery\UserController@activityFeedJson')
|
||||||
->name('userActivityFeedJson')
|
->name('userActivityFeedJson')
|
||||||
->middleware('auth');
|
->middleware('auth');
|
||||||
|
Loading…
Reference in New Issue
Block a user