Merge branch 'develop'

MilesPong · Mar 16, 2018 · 5e44eec · 5e44eec
2 parents d7c5ee3 + daa868b
commit 5e44eec
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 41 deletions.
diff --git a/.env.example b/.env.example
@@ -38,8 +38,6 @@ YOUDAO_APP_KEY=
 YOUDAO_APP_SECRET=
 
 GOOGLE_ANALYTICS_ID=
-#ENABLE_DATA_CACHE=
-ENABLE_VISITOR_LOG=
 
 COMMENT_DRIVER=
 DISQUS_SHORT_NAME=

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -5,6 +5,8 @@
 use App\Console\Commands\SaveCounter;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Models\Post;
+use App\Models\Page;
 
 class Kernel extends ConsoleKernel
 {
@@ -26,7 +28,7 @@ protected function schedule(Schedule $schedule)
     {
         // $schedule->command('inspire')
         //          ->hourly();
-        $schedule->command(SaveCounter::class)->hourly()->appendOutputTo(storage_path() . '/logs/counter.log');
+        $schedule->command(SaveCounter::class, [Post::class, Page::class])->hourly()->appendOutputTo(storage_path() . '/logs/counter.log');
         $schedule->command('backup:clean')->dailyAt('01:00');
         $schedule->command('backup:run')->dailyAt('02:00');
         $schedule->command('backup:monitor')->twiceMonthly();

diff --git a/package.json b/package.json
@@ -1,35 +1,35 @@
 {
-    "private": true,
-    "scripts": {
-        "dev": "npm run development",
-        "development": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "prod": "npm run production",
-        "production": "cross-env process.env.section=frontend NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "admin-dev": "npm run admin-development",
-        "admin-development": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "admin-watch": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "admin-watch-poll": "npm run admin-watch -- --watch-poll",
-        "admin-hot": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "admin-prod": "npm run admin-production",
-        "admin-production": "cross-env process.env.section=backend NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
-    },
-    "devDependencies": {
-        "axios": "^0.17.1",
-        "bootstrap-sass": "^3.3.7",
-        "browser-sync": "^2.18.13",
-        "browser-sync-webpack-plugin": "^1.2.0",
-        "cross-env": "^5.1.1",
-        "jquery": "^3.2",
-        "laravel-mix": "^1.0",
-        "less": "^2.7.3",
-        "less-loader": "^4.17.4",
-        "lodash": "^4.17.4",
-        "materialize-css": "^1.0.0-alpha.4",
-        "simplemde": "^1.11.2",
-        "sweetalert2": "^7.0.10",
-        "vue": "^2.5.7"
-    }
+  "private": true,
+  "scripts": {
+    "dev": "npm run development",
+    "development": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "watch-poll": "npm run watch -- --watch-poll",
+    "hot": "cross-env process.env.section=frontend NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "prod": "npm run production",
+    "production": "cross-env process.env.section=frontend NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "admin-dev": "npm run admin-development",
+    "admin-development": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "admin-watch": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "admin-watch-poll": "npm run admin-watch -- --watch-poll",
+    "admin-hot": "cross-env process.env.section=backend NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+    "admin-prod": "npm run admin-production",
+    "admin-production": "cross-env process.env.section=backend NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+  },
+  "devDependencies": {
+    "axios": "^0.17.1",
+    "bootstrap-sass": "^3.3.7",
+    "browser-sync": "^2.18.13",
+    "browser-sync-webpack-plugin": "^1.2.0",
+    "cpx": "^1.5.0",
+    "cross-env": "^5.1.1",
+    "jquery": "^3.2",
+    "laravel-mix": "^1.0",
+    "less": "^2.7.3",
+    "lodash": "^4.17.4",
+    "materialize-css": "^1.0.0-alpha.4",
+    "simplemde": "^1.11.2",
+    "sweetalert2": "^7.0.10",
+    "vue": "^2.5.7"
+  }
 }
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
@@ -58,4 +58,8 @@ code:not([class]) {
   hyphens: none;
   position: relative;
   font-size: 1.1rem;
+}
+
+strong {
+  font-weight: 600;
 }
diff --git a/resources/assets/sass/modules/article.scss b/resources/assets/sass/modules/article.scss
@@ -48,7 +48,7 @@
     line-height: 1.8;
 
     h1,h2,h3,h4,h5,h6 {
-        font-weight: 500;
+        font-weight: 600;
     }
 
     h2 {

diff --git a/resources/assets/sass/modules/navbar.scss b/resources/assets/sass/modules/navbar.scss
@@ -27,5 +27,6 @@ nav {
 
     form {
         margin-right: 5px;
+        height: 42px;
     }
 }
diff --git a/webpack.mix.backend.js b/webpack.mix.backend.js
@@ -1,5 +1,5 @@
 const { mix } = require('laravel-mix');
-
+const cpx = require('cpx');
 /*
  |--------------------------------------------------------------------------
  | Mix Asset Management
@@ -15,9 +15,6 @@ mix.setPublicPath(path.normalize('public/backend'))
     .js('resources/assets/admin/js/admin.js', 'js')
     .sass('resources/assets/admin/sass/admin.scss', 'css');
 
-mix.copy('node_modules/simplemde/dist/simplemde.min.css', 'public/css')
-    .copy('node_modules/simplemde/dist/simplemde.min.js', 'public/js');
-
 // Vendor extraction
 mix.extract(['lodash', 'jquery', 'materialize-css', 'vue', 'axios']);
 
@@ -27,4 +24,9 @@ if (!mix.inProduction()) {
     mix.version();
 }
 
+mix.then(() => {
+    cpx.copy('node_modules/simplemde/dist/simplemde.min.css', 'public/css');
+    cpx.copy('node_modules/simplemde/dist/simplemde.min.js', 'public/js');
+});
+
 mix.browserSync('indigo.dev');
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,5 +27,6 @@ nav { @@
         form {
             margin-right: 5px;
+            height: 42px;
         }
     }