UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-29 16:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #607 from pixelfed/frontend-ui-refactor

Browse source 
Update DiscoverComponent
This commit is contained in:
daniel 2018-11-28 21:12:37 -07:00 committed by GitHub
commit 9d98a33b1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/components.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

22
resources/assets/js/components/DiscoverComponent.vue
View file

@ -1,6 +1,6 @@
<template>
<div class="container">
<section class="mb-5 section-people">
<!-- <section class="mb-5 section-people">
<p class="lead text-muted font-weight-bold mb-0">Discover People</p>
<div class="loader text-center">
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
@ -21,7 +21,7 @@
</div>
</div>
</div>
</section>
</section> -->
<section class="mb-5 section-explore">
<p class="lead text-muted font-weight-bold mb-0">Explore</p>
<div class="profile-timeline">
@ -77,16 +77,16 @@ export default {
},
fetchData() {
axios.get('/api/v2/discover/people')
.then((res) => {
let data = res.data;
this.people = data.people;
// axios.get('/api/v2/discover/people')
// .then((res) => {
// let data = res.data;
// this.people = data.people;
if(this.people.length > 1) {
$('.section-people .loader').hide();
$('.section-people .row.d-none').removeClass('d-none');
}
});
// if(this.people.length > 1) {
// $('.section-people .loader').hide();
// $('.section-people .row.d-none').removeClass('d-none');
// }
// });
axios.get('/api/v2/discover/posts')
.then((res) => {

2
routes/web.php
View file

@ -46,7 +46,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::get('notifications', 'InternalApiController@notifications');
Route::post('notifications', 'InternalApiController@notificationMarkAllRead');
Route::get('discover', 'InternalApiController@discover');
Route::get('discover/people', 'InternalApiController@discoverPeople');
// Route::get('discover/people', 'InternalApiController@discoverPeople');
Route::get('discover/posts', 'InternalApiController@discoverPosts');
Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');