diff --git a/app/Http/Controllers/Web/Follow/FollowsController.php b/app/Http/Controllers/Web/Follow/FollowsController.php index 486ad24..1d280d6 100644 --- a/app/Http/Controllers/Web/Follow/FollowsController.php +++ b/app/Http/Controllers/Web/Follow/FollowsController.php @@ -4,7 +4,6 @@ use App\Http\Controllers\Controller; use App\Models\User; -use Illuminate\Http\Request; class FollowsController extends Controller { @@ -14,7 +13,7 @@ public function follow(User $user) { 'status' => true ]); } - + auth()->user()->toggleFollow($user); return response()->json([ diff --git a/app/Http/Controllers/Web/Search/SearchController.php b/app/Http/Controllers/Web/Search/SearchController.php new file mode 100644 index 0000000..e3de7f2 --- /dev/null +++ b/app/Http/Controllers/Web/Search/SearchController.php @@ -0,0 +1,22 @@ +get('q'); + + if(!$query || strlen($query) < 1 || strlen($query) > 255) return redirect('/'); + + $data = User::where('username', 'like', "%$query%") + ->orWhere('name', 'like', "%$query%") + ->limit(30)->get(); + + return view('pages/other/search', compact('data'), ['query' => $query]); + } +} diff --git a/public/js/script.js b/public/js/script.js index d1274e3..a10bb7d 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -375,31 +375,32 @@ function parsePostDate(date) { return formatter.format(date); } -new Tabs( - [ +if(window.location.pathname === '/profile') { + new Tabs( + [ + { + id: 'main', + triggerEl: document.querySelector('#main_tab-tab'), + targetEl: document.querySelector('#main_tab') + }, + { + id: 'follows', + triggerEl: document.querySelector('#follows_tab-tab'), + targetEl: document.querySelector('#follows_tab') + }, + { + id: 'followers', + triggerEl: document.querySelector('#followers_tab-tab'), + targetEl: document.querySelector('#followers_tab') + }, + ], { - id: 'main', - triggerEl: document.querySelector('#main_tab-tab'), - targetEl: document.querySelector('#main_tab') - }, - { - id: 'follows', - triggerEl: document.querySelector('#follows_tab-tab'), - targetEl: document.querySelector('#follows_tab') - }, - { - id: 'followers', - triggerEl: document.querySelector('#followers_tab-tab'), - targetEl: document.querySelector('#followers_tab') - }, - ], - { - defaultTabId: 'follows', - activeClasses: 'border-b-4 dark:border-cyan-300', - inactiveClasses: '_', - } -); - + defaultTabId: 'main', + activeClasses: 'border-b-4 dark:border-cyan-300', + inactiveClasses: '_', + } + ); +} function createToast(data) { let toasts_block = $("#toasts"); diff --git a/resources/assets/js/tabs.js b/resources/assets/js/tabs.js index 0c59967..2f6d504 100644 --- a/resources/assets/js/tabs.js +++ b/resources/assets/js/tabs.js @@ -1,25 +1,26 @@ -new Tabs( - [ +if(window.location.pathname === '/profile') { + new Tabs( + [ + { + id: 'main', + triggerEl: document.querySelector('#main_tab-tab'), + targetEl: document.querySelector('#main_tab') + }, + { + id: 'follows', + triggerEl: document.querySelector('#follows_tab-tab'), + targetEl: document.querySelector('#follows_tab') + }, + { + id: 'followers', + triggerEl: document.querySelector('#followers_tab-tab'), + targetEl: document.querySelector('#followers_tab') + }, + ], { - id: 'main', - triggerEl: document.querySelector('#main_tab-tab'), - targetEl: document.querySelector('#main_tab') - }, - { - id: 'follows', - triggerEl: document.querySelector('#follows_tab-tab'), - targetEl: document.querySelector('#follows_tab') - }, - { - id: 'followers', - triggerEl: document.querySelector('#followers_tab-tab'), - targetEl: document.querySelector('#followers_tab') - }, - ], - { - defaultTabId: 'follows', - activeClasses: 'border-b-4 dark:border-cyan-300', - inactiveClasses: '_', - } -); - + defaultTabId: 'main', + activeClasses: 'border-b-4 dark:border-cyan-300', + inactiveClasses: '_', + } + ); +} diff --git a/resources/views/includes/_follows-list.blade.php b/resources/views/includes/_follows-list.blade.php index 75de6e7..9d7a25c 100644 --- a/resources/views/includes/_follows-list.blade.php +++ b/resources/views/includes/_follows-list.blade.php @@ -1,20 +1,22 @@
Ничего не найдено
+ @endforelse +