1
0
Эх сурвалжийг харах

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

Frontend ui refactor
daniel 6 жил өмнө
parent
commit
27b12d9f74

+ 4 - 9
app/Http/Controllers/ProfileController.php

@@ -19,7 +19,10 @@ class ProfileController extends Controller
 {
 {
     public function show(Request $request, $username)
     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) {
         if($user->status != null) {
             return $this->accountCheck($user);
             return $this->accountCheck($user);
         } else {
         } else {
@@ -252,12 +255,4 @@ class ProfileController extends Controller
         return view('profile.bookmarks', compact('user', 'profile', 'settings', 'owner', 'following', 'timeline', 'is_following', 'is_admin'));
         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)
-    {
-    }
 }
 }

BIN
public/js/status.js


BIN
public/mix-manifest.json


+ 0 - 1
resources/assets/js/components/PostComponent.vue

@@ -156,7 +156,6 @@
                               <p class="">
                               <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>
                                 <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 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>
                               </p>
                             </div>
                             </div>
                           </div>
                           </div>