YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

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 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/js/components.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -1,5 +1,5 @@
{ {
"/js/components.js": "/js/components.js?id=9b43be8feb8e7d974d25", "/js/components.js": "/js/components.js?id=e4933ebf56139bfe7fd5",
"/js/app.js": "/js/app.js?id=763d01bb175be69c8ad3", "/js/app.js": "/js/app.js?id=763d01bb175be69c8ad3",
"/css/app.css": "/css/app.css?id=0f11643b1635ebda5e1b", "/css/app.css": "/css/app.css?id=0f11643b1635ebda5e1b",
"/js/timeline.js": "/js/timeline.js?id=415bfde862ab8c5b4548", "/js/timeline.js": "/js/timeline.js?id=415bfde862ab8c5b4548",

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

@ -1,6 +1,6 @@
<template> <template>
<div class="container"> <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> <p class="lead text-muted font-weight-bold mb-0">Discover People</p>
<div class="loader text-center"> <div class="loader text-center">
<div class="lds-ring"><div></div><div></div><div></div><div></div></div> <div class="lds-ring"><div></div><div></div><div></div><div></div></div>
@ -21,7 +21,7 @@
</div> </div>
</div> </div>
</div> </div>
</section> </section> -->
<section class="mb-5 section-explore"> <section class="mb-5 section-explore">
<p class="lead text-muted font-weight-bold mb-0">Explore</p> <p class="lead text-muted font-weight-bold mb-0">Explore</p>
<div class="profile-timeline"> <div class="profile-timeline">
@ -77,16 +77,16 @@ export default {
}, },
fetchData() { fetchData() {
axios.get('/api/v2/discover/people') // axios.get('/api/v2/discover/people')
.then((res) => { // .then((res) => {
let data = res.data; // let data = res.data;
this.people = data.people; // this.people = data.people;
if(this.people.length > 1) { // if(this.people.length > 1) {
$('.section-people .loader').hide(); // $('.section-people .loader').hide();
$('.section-people .row.d-none').removeClass('d-none'); // $('.section-people .row.d-none').removeClass('d-none');
} // }
}); // });
axios.get('/api/v2/discover/posts') axios.get('/api/v2/discover/posts')
.then((res) => { .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::get('notifications', 'InternalApiController@notifications');
Route::post('notifications', 'InternalApiController@notificationMarkAllRead'); Route::post('notifications', 'InternalApiController@notificationMarkAllRead');
Route::get('discover', 'InternalApiController@discover'); 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('discover/posts', 'InternalApiController@discoverPosts');
Route::get('profile/{username}/status/{postid}', 'PublicApiController@status'); Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments'); Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');