Skip to content

Commit e04bb19

Browse files
committed
v1.0.6 搜索结果页增加了最多搜索功能
1 parent f9fdafd commit e04bb19

File tree

10 files changed

+80
-12
lines changed

10 files changed

+80
-12
lines changed

app/Http/Controllers/ArticleController.php

+13-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use App\Visit;
1212
use App\Tag;
1313
use App\User;
14+
use App\Search;
1415
use Auth;
1516

1617
class ArticleController extends Controller
@@ -42,6 +43,16 @@ public function list()
4243
public function search(Request $request)
4344
{
4445
$key = $request->key;
46+
47+
// 保存(更新)搜索关键词
48+
$search = Search::where('name', $key)->first();
49+
if (!$search) {
50+
$search = new Search;
51+
$search->name = $key;
52+
$search->save();
53+
}
54+
$search->increment('search_num');
55+
4556
$articles = Article::when($key, function($query) use ($key){
4657
return $query->where('title', 'like', '%'.$key.'%');
4758
})->where('is_hidden', 0)->orderBy('created_at', 'desc')->paginate(10);
@@ -52,8 +63,8 @@ public function search(Request $request)
5263
$article->updated_at_diff = $article->updated_at->diffForHumans();
5364
}
5465

55-
$tags = Tag::all();
56-
return view('articles.list', compact('articles', 'tags'));
66+
$searches = Search::where('search_num', '>', 1)->orderBy('search_num')->limit(10)->get();
67+
return view('articles.list', compact('articles', 'searches'));
5768
}
5869

5970
/**

app/Search.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace App;
4+
5+
use Illuminate\Database\Eloquent\Model;
6+
7+
class Search extends Model
8+
{
9+
//
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?php
2+
3+
use Illuminate\Support\Facades\Schema;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Database\Migrations\Migration;
6+
7+
class CreateSearchesTable extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*
12+
* @return void
13+
*/
14+
public function up()
15+
{
16+
Schema::create('searches', function (Blueprint $table) {
17+
$table->increments('id');
18+
$table->string('name');//关键词名称
19+
$table->integer('search_num')->default(0);//搜索热度
20+
$table->timestamps();
21+
});
22+
}
23+
24+
/**
25+
* Reverse the migrations.
26+
*
27+
* @return void
28+
*/
29+
public function down()
30+
{
31+
Schema::dropIfExists('searches');
32+
}
33+
}

public/js/admin.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
基于 Laravel 5.5 和 react 的个人博客系统
44

55
演示地址:[http://dmmylove.cn](http://dmmylove.cn)
6-
版本:v1.0.5(2019-04-17)
6+
版本:v1.0.6(2019-04-17)
77

88
**前台:** 极简风格制作,注重移动端显示,只使用了最基础的 bootstrap,加载速度快:
99
1. 文章浏览:浏览量统计,标签功能

resources/assets/js/components/Main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const menu = (
121121
<Menu onClick={avatarOnClick}>
122122
<Menu.Item key="version">
123123
<Icon type="crown" />
124-
<span>版本 1.0.5</span>
124+
<span>版本 1.0.6</span>
125125
</Menu.Item>
126126
<Menu.Item key="personal">
127127
<Icon type="user" />

resources/views/articles/list.blade.php

+13-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,19 @@
77
<div class="row">
88
<div class="col-md-7 col-md-offset-1">
99
<div class="">
10-
<span>热门关键词:</span>
11-
@foreach($tags as $tag)
12-
<a href="{{ route('tags.show', $tag->name) }}"><span style="margin-right:10px">{{ $tag->name }}</span></a>
13-
@endforeach
10+
@isset($tags)
11+
<span>热门关键词:</span>
12+
@foreach($tags as $tag)
13+
<a href="{{ route('tags.show', $tag->name) }}"><span style="margin-right:10px">{{ $tag->name }}</span></a>
14+
@endforeach
15+
@endisset
16+
17+
@isset($searches)
18+
<span>搜索最多:</span>
19+
@foreach($searches as $search)
20+
<a href="{{ route('articles.search.get', $search->name) }}"><span style="margin-right:10px">{{ $search->name }}</span></a>
21+
@endforeach
22+
@endisset
1423
</div>
1524
@if(count($articles))
1625
@foreach ( $articles as $article)

resources/views/layouts/app.blade.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</a>
4545

4646
<div class="navbar-brand visible-xs-block" style="padding:4px 0 0 50px">
47-
<form class="navbar-form navbar-left search" style="margin:0;border:0;float:right" role="search" action="{{ route('articles.search') }}" method="post">
47+
<form class="navbar-form navbar-left search" style="margin:0;border:0;float:right" role="search" action="{{ route('articles.search.post') }}" method="post">
4848
{{ csrf_field() }}
4949
<div class="form-group">
5050
<span class="glyphicon glyphicon-search" style="line-height:inherit"></span>
@@ -64,7 +64,7 @@
6464
<!-- Right Side Of Navbar -->
6565
<ul class="nav navbar-nav navbar-right">
6666
<li class="hidden-xs" style="margin-top:6px">
67-
<form class="navbar-form navbar-left search" role="search" action="{{ route('articles.search') }}" method="post">
67+
<form class="navbar-form navbar-left search" role="search" action="{{ route('articles.search.post') }}" method="post">
6868
{{ csrf_field() }}
6969
<div class="form-group">
7070
<span class="glyphicon glyphicon-search"></span>

routes/web.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
Route::get('/', 'HomeController@home')->name('home');
1717
Route::get('/admin', 'AdminController@index')->name('admin');
1818

19-
Route::post('/articles/search', 'ArticleController@search')->name('articles.search');
19+
Route::get('/articles/search/{key}', 'ArticleController@search')->name('articles.search.get');
20+
Route::post('/articles/search', 'ArticleController@search')->name('articles.search.post');
2021
Route::get('/articles/list', 'ArticleController@list')->name('articles.list');
2122
Route::resource('/articles', 'ArticleController');
2223
Route::resource('/comments', 'CommentController');

update.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.0.6 (2019-04-17)
2+
3+
搜索结果页增加了最多搜索功能
4+
15
## 1.0.5 (2019-04-17)
26

37
修复了文章编辑页添加标签输入框下拉菜单没有备选项的BUG

0 commit comments

Comments
 (0)