From 85291df5b377433817ca910d61f6b2b0b19d7a20 Mon Sep 17 00:00:00 2001 From: fthvgb1 Date: Mon, 1 Jan 2018 14:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CategoriesController.php | 15 ++ app/Http/Controllers/TopicsController.php | 2 +- app/Models/Category.php | 6 + app/Models/Topic.php | 11 + composer.json | 2 + composer.lock | 194 +++++++++++++++++- public/css/app.css | 39 ++++ resources/assets/sass/app.scss | 31 +++ resources/views/categories/show.blade.php | 0 resources/views/layouts/_header.blade.php | 11 +- resources/views/topics/_sidebar.blade.php | 3 + resources/views/topics/_topic_list.blade.php | 54 +++++ resources/views/topics/index.blade.php | 93 +++------ routes/web.php | 4 +- 14 files changed, 392 insertions(+), 73 deletions(-) create mode 100644 app/Http/Controllers/CategoriesController.php create mode 100644 resources/views/categories/show.blade.php create mode 100644 resources/views/topics/_sidebar.blade.php create mode 100644 resources/views/topics/_topic_list.blade.php diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php new file mode 100644 index 0000000..2529540 --- /dev/null +++ b/app/Http/Controllers/CategoriesController.php @@ -0,0 +1,15 @@ +id)->with('user', 'category')->paginate(); + return view('topics.index', compact('topics', 'category')); + } +} diff --git a/app/Http/Controllers/TopicsController.php b/app/Http/Controllers/TopicsController.php index f7cb3e1..6880c76 100644 --- a/app/Http/Controllers/TopicsController.php +++ b/app/Http/Controllers/TopicsController.php @@ -14,7 +14,7 @@ class TopicsController extends Controller public function index() { - $topics = Topic::paginate(); + $topics = Topic::with('user', 'category')->paginate(); return view('topics.index', compact('topics')); } diff --git a/app/Models/Category.php b/app/Models/Category.php index 8c802f7..07a5f91 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -5,4 +5,10 @@ namespace App\Models; class Category extends BaseModel { protected $guarded = ['id']; + + + public function topics() + { + return $this->hasMany(Topic::class); + } } diff --git a/app/Models/Topic.php b/app/Models/Topic.php index 7e9d8c6..f6b20e2 100644 --- a/app/Models/Topic.php +++ b/app/Models/Topic.php @@ -5,4 +5,15 @@ namespace App\Models; class Topic extends Model { protected $fillable = ['"title', 'body', 'user_id', 'category_id', 'reply_count', 'view_count', 'last_reply_user_id', 'order', 'excerpt', 'slug']; + + + public function user() + { + return $this->belongsTo(User::class); + } + + public function category() + { + return $this->belongsTo(Category::class); + } } diff --git a/composer.json b/composer.json index e8dd343..4596b88 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "php": ">=7.0.0", "doctrine/dbal": "^2.6", "fideloper/proxy": "~3.3", + "hieu-le/active": "~3.5", "intervention/image": "^2.4", "laravel/framework": "5.5.*", "laravel/tinker": "~1.0", @@ -18,6 +19,7 @@ "overtrue/laravel-lang": "^3.0" }, "require-dev": { + "barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-ide-helper": "^2.4", "filp/whoops": "~2.0", "fzaninotto/faker": "~1.4", diff --git a/composer.lock b/composer.lock index e3d2e9e..449405c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f7f5fa291c48b559f95e91f3fa42fa80", + "content-hash": "73e54cd6d859f37c0a770ee17406a293", "packages": [ { "name": "caouecs/laravel-lang", @@ -781,6 +781,69 @@ ], "time": "2017-03-20T17:10:46+00:00" }, + { + "name": "hieu-le/active", + "version": "3.5.1", + "source": { + "type": "git", + "url": "https://github.com/letrunghieu/active.git", + "reference": "42d0f50be74b89d730bb4c0ee8c32447630506c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/letrunghieu/active/zipball/42d0f50be74b89d730bb4c0ee8c32447630506c6", + "reference": "42d0f50be74b89d730bb4c0ee8c32447630506c6", + "shasum": "" + }, + "require": { + "laravel/framework": "^5.5", + "php": ">=7.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "dev-master", + "orchestra/testbench": "^3.1", + "phpunit/phpunit": "~6.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "HieuLe\\Active\\ActiveServiceProvider" + ], + "aliases": { + "Active": "HieuLe\\Active\\Facades\\Active" + } + } + }, + "autoload": { + "psr-4": { + "HieuLe\\Active\\": "src/", + "HieuLe\\ActiveTest\\": "tests/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Hieu Le", + "email": "letrunghieu.cse09@gmail.com", + "homepage": "https://www.hieule.info" + } + ], + "description": "The helper class for Laravel (4/5) applications to get active class base on current route", + "homepage": "https://www.hieule.info/tag/laravel-active/", + "keywords": [ + "active", + "laravel", + "routing" + ], + "time": "2017-09-07T02:36:51+00:00" + }, { "name": "intervention/image", "version": "2.4.1", @@ -2926,6 +2989,74 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v3.1.0", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "01a859752094e00aa8548832312366753272f8af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/01a859752094e00aa8548832312366753272f8af", + "reference": "01a859752094e00aa8548832312366753272f8af", + "shasum": "" + }, + "require": { + "illuminate/routing": "5.5.x", + "illuminate/session": "5.5.x", + "illuminate/support": "5.5.x", + "maximebf/debugbar": "~1.14.0", + "php": ">=7.0", + "symfony/debug": "^3", + "symfony/finder": "^3" + }, + "require-dev": { + "illuminate/framework": "5.5.x" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facade" + } + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "time": "2017-09-18T13:32:46+00:00" + }, { "name": "barryvdh/laravel-ide-helper", "version": "v2.4.1", @@ -3261,6 +3392,67 @@ ], "time": "2016-01-20T08:20:44+00:00" }, + { + "name": "maximebf/debugbar", + "version": "v1.14.1", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/64251a392344e3d22f3d21c3b7c531ba96eb01d2", + "reference": "64251a392344e3d22f3d21c3b7c531ba96eb01d2", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/log": "^1.0", + "symfony/var-dumper": "^2.6|^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0|^5.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.14-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "time": "2017-09-13T12:19:36+00:00" + }, { "name": "mockery/mockery", "version": "1.0", diff --git a/public/css/app.css b/public/css/app.css index d24ece9..7439dca 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -8419,3 +8419,42 @@ body { margin-bottom: 0px; } +/* Topic Index Page */ + +.topics-index-page .topic-list .nav > li > a, +.categories-show-page .topic-list .nav > li > a { + position: relative; + display: block; + padding: 5px 14px; + font-size: 0.9em; +} + +.topics-index-page .topic-list a, +.categories-show-page .topic-list a { + color: #444444; +} + +.topics-index-page .topic-list .meta, +.categories-show-page .topic-list .meta { + font-size: 0.9em; + color: #b3b3b3; +} + +.topics-index-page .topic-list .meta a, +.categories-show-page .topic-list .meta a { + color: #b3b3b3; +} + +.topics-index-page .topic-list .badge, +.categories-show-page .topic-list .badge { + background-color: #d8d8d8; +} + +.topics-index-page .topic-list hr, +.categories-show-page .topic-list hr { + margin-top: 12px; + margin-bottom: 12px; + border: 0; + border-top: 1px solid #dcebf5; +} + diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index cc37b2d..a53ef44 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -72,4 +72,35 @@ body { margin-bottom: 0px; } } +} + +/* Topic Index Page */ +.topics-index-page, .categories-show-page { + .topic-list { + .nav > li > a { + position: relative; + display: block; + padding: 5px 14px; + font-size: 0.9em; + } + a { + color: #444444; + } + .meta { + font-size: 0.9em; + color: #b3b3b3; + a { + color: #b3b3b3; + } + } + .badge { + background-color: #d8d8d8; + } + hr { + margin-top: 12px; + margin-bottom: 12px; + border: 0; + border-top: 1px solid #dcebf5; + } + } } \ No newline at end of file diff --git a/resources/views/categories/show.blade.php b/resources/views/categories/show.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/_header.blade.php b/resources/views/layouts/_header.blade.php index 3adecb7..95a3289 100644 --- a/resources/views/layouts/_header.blade.php +++ b/resources/views/layouts/_header.blade.php @@ -20,7 +20,16 @@