Merge branch 'develop'

ygrdsj · May 2, 2019 · 98d86bf · 98d86bf
2 parents 28c825d + b58cebb
commit 98d86bf
Show file tree

Hide file tree

Showing 102 changed files with 43,760 additions and 98 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,4 @@
-APP_NAME=Laravel
+APP_NAME=WebStack
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 一个开源的网址导航网站项目，具备完整的前后台，您可以拿来制作自己的网址导航。
 
-![首页](public/screen/01.JPG)
+![首页](public/screen/01.png)
 
 
 
@@ -17,14 +17,13 @@ git clone https://github.com/hui-ho/WebStack-Laravel.git
 安装依赖：
 
 ```shell
-composer install
-php artisan key:generate  
+$ composer install
 ```
 
 编辑配置：
 
 ```
-cp .env.example .env
+$ cp .env.example .env
 ```
 
 ```
@@ -35,6 +34,12 @@ DB_PASSWORD=password
 ...
 ```
 
+生成 KEY：
+
+```shell
+$ php artisan key:generate  
+```
+
 迁移数据：
 
 ```shell
@@ -44,7 +49,7 @@ php artisan migrate:refresh --seed
 开启服务：
 
 ```shell
-php artisan serve
+$ php artisan serve
 ```
 
 安装完成：http://127.0.0.1:8000
@@ -59,9 +64,11 @@ php artisan serve
 
 默认密码：admin
 
-![分类](public/screen/02.JPG)
+![主页](public/screen/02.png)
+
+![分类](public/screen/03.png)
 
-![网站](public/screen/03.JPG)
+![网站](public/screen/04.png)
 
 
 

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -10,7 +10,7 @@ class HomeController extends Controller
     public function index()
     {
         return view('index', [
-            'categories' => Category::with('children', 'sites')->get(),
+            'categories' => Category::with('children', 'sites')->orderBy('order')->get(),
         ]);
     }
 

diff --git a/database/seeds/AdminMenuTableSeeder.php b/database/seeds/AdminMenuTableSeeder.php
@@ -35,11 +35,11 @@ public function run()
                 'parent_id' => 0,
                 'order' => 4,
                 'title' => '后台管理',
-                'icon' => 'fa-tasks',
+                'icon' => 'fa-cogs',
                 'uri' => NULL,
                 'permission' => NULL,
                 'created_at' => NULL,
-                'updated_at' => '2019-01-21 14:39:48',
+                'updated_at' => '2019-05-02 12:08:17',
             ),
             2 => 
             array (
@@ -107,23 +107,23 @@ public function run()
                 'parent_id' => 0,
                 'order' => 2,
                 'title' => '分类管理',
-                'icon' => 'fa-bars',
+                'icon' => 'fa-archive',
                 'uri' => 'categories',
                 'permission' => NULL,
                 'created_at' => '2019-01-21 12:07:46',
-                'updated_at' => '2019-01-21 14:39:48',
+                'updated_at' => '2019-05-02 12:06:59',
             ),
             8 => 
             array (
                 'id' => 9,
                 'parent_id' => 0,
                 'order' => 3,
                 'title' => '网站管理',
-                'icon' => 'fa-bars',
+                'icon' => 'fa-edge',
                 'uri' => 'sites',
                 'permission' => NULL,
                 'created_at' => '2019-01-21 14:39:27',
-                'updated_at' => '2019-01-21 14:39:48',
+                'updated_at' => '2019-05-02 12:07:54',
             ),
         ));