mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-03-04 10:39:08 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-05-20 22:07:23 -06:00 • committed by GitHub
commit 27b12d9f74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Http/Controllers/ProfileController.php
View file

@ -19,7 +19,10 @@ class ProfileController extends Controller
{
public function show(Request $request, $username)
{
$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
$user = Profile::whereUsername($username)->firstOrFail();
if($user->domain) {
return redirect($user->remote_url);
}
if($user->status != null) {
return $this->accountCheck($user);
} else {
@ -252,12 +255,4 @@ class ProfileController extends Controller
return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin'));
}
public function createCollection(Request $request)
{
}
public function collections(Request $request)
{
}
}

2
public/js/status.js vendored
View file

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View file

@ -10,6 +10,6 @@
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=71deeec272baa24f40b8",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=3d0c5388cf99ae6770a6",
"/js/status.js": "/js/status.js?id=c5b5bf2e6e51acc3631e",
"/js/timeline.js": "/js/timeline.js?id=72baaa5174d61a5decde"
}

1
resources/assets/js/components/PostComponent.vue
View file

@ -156,7 +156,6 @@
<p class="">
<a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(s.created_at)" :href="s.url"></a>
<span v-if="s.favourites_count" class="text-muted comment-reaction font-weight-bold mr-3">{{s.favourites_count == 1 ? '1 like' : s.favourites_count + ' likes'}}</span>
<span class="text-muted comment-reaction font-weight-bold cursor-pointer" v-on:click="replyFocus(s, sindex)">Reply</span>
</p>
</div>
</div>