...

.env.example

@@ -1,9 +1,5 @@
 MIX_API_URL=http://yike.test/api/
 
-// Auth client id
-MIX_AUTH_CLIENT_ID=4
-MIX_AUTH_CLIENT_SECRET=aZCeyP3Sg5dUp3Pevx3q3V8ESNRqDi72TmGMDkfU
-
 # 腾讯防水墙配置
 MIX_CAPTCHA_ID_REGISTER=
 MIX_CAPTCHA_ID_PUBLISH=

.gitignore

@@ -1,7 +1,7 @@
 .DS_Store
 node_modules
-yarn.lock
 /dist
+package-lock.json
 
 # local env files
 .env

.travis.yml

@@ -3,4 +3,5 @@ node_js: stable
 install:
   - npm install
 script:
-  - npm run lint
+  - npm run lint
+  - npm run prod

deploy.php

@@ -34,15 +34,15 @@
 
 desc('Run build.');
 
-task('npm:install-and-compile', function(){
+task('yarn:install-and-compile', function(){
 //    if (has('previous_release')) {
 //        run('cp -R {{previous_release}}/node_modules {{release_path}}/node_modules');
 //    }
 
     within('{{release_path}}', function () {
 //        run('npm install --registry=http://registry.npm.taobao.org ');
-        run('npm install');
-        run('npm run prod');
+        run('yarn install');
+        run('yarn run prod');
     });
 });
 
@@ -56,7 +56,7 @@
     'deploy:release',
     'deploy:update_code',
     'deploy:shared',
-    'npm:install-and-compile',
+    'yarn:install-and-compile',
     'deploy:writable',
     'deploy:clear_paths',
     'deploy:symlink',

package.json

@@ -11,17 +11,24 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "dependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
     "animate.css": "^3.7.2",
     "axios": "^0.18.1",
+    "babel-loader": "^8.0.6",
     "bootstrap": "^4.3.1",
     "brace": "^0.11.1",
     "clipboard": "^2.0.4",
     "codemirror": "^5.48.0",
+    "css-loader": "^3.1.0",
+    "dayjs": "^1.8.15",
     "element-ui": "^2.10.1",
     "emojify.js": "^1.1.0",
     "emojione": "^4.5.0",
+    "extract-text-webpack-plugin": "2.1.2",
+    "file-loader": "^4.1.0",
     "jquery": "^3.4.1",
-    "laravel-mix": "^4.1.2",
+    "laravel-mix": "^4.0.16",
     "localforage": "^1.7.3",
     "lodash": "^4.17.11",
     "mo-js": "^0.288.2",
@@ -32,14 +39,17 @@
     "qrcode": "^1.3.3",
     "sass-loader": "^7.1.0",
     "tributejs": "^3.7.1",
-    "typeface-ubuntu-mono": "0.0.72",
+    "typeface-ubuntu-mono": "^0.0.72",
     "vue": "^2.6.10",
-    "vue-avatar-cropper": "1.0.5",
+    "vue-avatar-cropper": "^1.0.5",
+    "vue-loader": "^15.7.1",
     "vue-material-design-icons": "^3.3.1",
     "vue-router": "^3.0.4",
     "vue-template-compiler": "^2.6.10",
     "vuex": "^3.1.1",
-    "vuex-router-sync": "^5.0.0"
+    "vuex-router-sync": "^5.0.0",
+    "webpack": "^4.38.0",
+    "webpack-cli": "^3.3.6"
   },
   "eslintConfig": {
     "root": true,
@@ -79,7 +89,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^5.2.3",
-    "resolve-url-loader": "3.1.0",
+    "resolve-url-loader": "^3.1.0",
     "standard": "*"
   }
 }

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="/yike.png" />
-    <link rel="stylesheet" href="app.css" />
+    <link rel="stylesheet" href="/css/app.css" />
     <title>一刻 | 高品质微信开发者社区</title>
 
     <style>
@@ -22,6 +22,6 @@
     <!-- built files will be auto injected -->
     <script async src="https://ssl.captcha.qq.com/TCaptcha.js"></script>
 
-    <script src="app.js"></script>
+    <script src="/js/app.js"></script>
   </body>
 </html>

readme.md

@@ -44,13 +44,6 @@ cp .env.example .env.local
 cp .env.example .env.production
 ```
 
-其中有两个变量是你在安装后端时 `passport:install` 得到的 **Password Grant Client** 的 `id` 与 `secret`：
-
-```
-VUE_APP_AUTH_CLIENT_ID=
-VUE_APP_AUTH_CLIENT_SECRET=
-```
-
 如果你忘记了，就去找 `oauth_clients` 表中找吧。
 
 
@@ -59,8 +52,8 @@ VUE_APP_AUTH_CLIENT_SECRET=
 
 ```env
 # 腾讯防水墙配置
-VUE_APP_CAPTCHA_ID_REGISTER=
-VUE_APP_CAPTCHA_ID_PUBLISH=
+MIX_CAPTCHA_ID_REGISTER=
+MIX_CAPTCHA_ID_PUBLISH=
 ```
 
 

src/app.js

@@ -1,7 +1,5 @@
 import http from '$utils/http'
 import { Message } from 'element-ui'
-import 'element-ui/lib/theme-chalk/icon.css'
-import 'element-ui/lib/theme-chalk/message.css'
 import Vue from 'vue'
 import { sync } from 'vuex-router-sync'
 import './bootstrap'

src/bootstrap.js

@@ -12,10 +12,7 @@ try {
   window.$ = window.jQuery = $
 
   import('bootstrap')
-  import('prismjs/themes/prism.css')
-  import('animate.css')
   import('typeface-ubuntu-mono')
-  import('vue-material-design-icons/styles.css')
 } catch (e) {
   throw e
 }

src/components/editor/at-completer.js

@@ -1,7 +1,7 @@
 import http from '$utils/http'
 import CodeMirror from 'codemirror'
 
-require('codemirror/addon/hint/show-hint.css')
+// require('codemirror/addon/hint/show-hint.css')
 require('codemirror/addon/hint/show-hint')
 require('codemirror/addon/hint/html-hint')
 

src/components/editor/emoji-completer.js

@@ -1,6 +1,6 @@
 import CodeMirror from 'codemirror'
 
-require('codemirror/addon/hint/show-hint.css')
+// require('codemirror/addon/hint/show-hint.css')
 require('codemirror/addon/hint/show-hint')
 require('codemirror/addon/hint/html-hint')
 

src/components/editor/src/Editor.vue

@@ -68,14 +68,14 @@ import FormatListBulletedIcon from '$icons/FormatListBulleted'
 import FormatListNumbersIcon from '$icons/FormatListNumbered'
 import MarkdownBody from '$components/markdown-body'
 
-require('codemirror/mode/gfm/gfm')
-require('codemirror/addon/edit/continuelist')
-require('codemirror/addon/edit/matchbrackets')
-require('codemirror/addon/edit/closebrackets')
-require('codemirror/addon/edit/matchtags')
-require('codemirror/addon/display/placeholder')
-require('codemirror/keymap/sublime')
-require('../theme/yike.css')
+import 'codemirror/mode/gfm/gfm'
+import 'codemirror/addon/edit/continuelist'
+import 'codemirror/addon/edit/matchbrackets'
+import 'codemirror/addon/edit/closebrackets'
+import 'codemirror/addon/edit/matchtags'
+import 'codemirror/addon/display/placeholder'
+import 'codemirror/keymap/sublime'
+// import '../theme/yike.css'
 
 export default {
   name: 'editor',

src/components/editor/theme/yike.css

@@ -4,9 +4,6 @@
   font-weight: 400;
 }
 
-.CodeMirror-lines {
-}
-
 .CodeMirror pre {
   padding: 0 4px;
   font-family: 'Ubuntu Mono', 'Operator Mono', Monaco, PingFang SC, Hiragino Sans GB, Arial, Microsoft YaHei, Helvetica Neue, sans-serif;

src/components/empty-state.vue

@@ -34,6 +34,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/guest-login-guide.vue

@@ -16,7 +16,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .guest-login-guide {
   background: url("/banners/technology.jpg");
   background-size: 160%;

src/components/hot-tags.vue

@@ -33,6 +33,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/markdown-body.vue

@@ -38,6 +38,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/new-users.vue

@@ -36,6 +36,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/quick-docs.vue

@@ -56,6 +56,3 @@ export default {
   components: { DocsIcon }
 }
 </script>
-
-<style scoped>
-</style>

src/components/socialite-login.vue

@@ -91,6 +91,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/threads-list.vue

@@ -93,6 +93,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/user-list-card.vue

@@ -33,6 +33,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/user-profile-card.vue

@@ -46,6 +46,3 @@ export default {
   components: { UserMedia, FollowBtn, PlusIcon, UserSocialBtns }
 }
 </script>
-
-<style scoped>
-</style>

src/components/user-ranking.vue

@@ -42,6 +42,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/components/user-social-btns.vue

@@ -98,15 +98,15 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.user-social-btns {
-  @each $size in 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-    19, 20
-  {
-    .spacing-#{$size} {
-      margin-left: #{$size}px;
-      margin-right: #{$size}px;
-      margin-bottom: #{$size}px;
-    }
-  }
-}
+// .user-social-btns {
+//   @each $size in 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+//     19, 20
+//   {
+//     .spacing-#{$size} {
+//       margin-left: #{$size}px;
+//       margin-right: #{$size}px;
+//       margin-bottom: #{$size}px;
+//     }
+//   }
+// }
 </style>

src/components/wechat-qrcode.vue

@@ -28,6 +28,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/modules/auth/oauth.vue

@@ -32,6 +32,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/modules/auth/routes.js

@@ -2,12 +2,12 @@ export default [
   {
     path: 'auth/login',
     name: 'auth.login',
-    component: () => import('./login')
+    component: () => import('./login').default
   },
   {
     path: 'auth/register',
     name: 'auth.register',
-    component: () => import('./register')
+    component: () => import('./register').default
   },
   {
     path: 'auth/oauth-redirect/:platform',
@@ -16,7 +16,7 @@ export default [
       navbar: false,
       container: false
     },
-    component: () => import('./oauth')
+    component: () => import('./oauth').default
   },
   {
     path: 'auth/oauth-callback/:platform',
@@ -25,16 +25,16 @@ export default [
       navbar: false,
       container: false
     },
-    component: () => import('./oauth')
+    component: () => import('./oauth').default
   },
   {
     path: '/user/forget-password',
     name: 'auth.forget-password',
-    component: () => import('./forget-password')
+    component: () => import('./forget-password').default
   },
   {
     path: '/user/reset-password',
     name: 'auth.reset-password',
-    component: () => import('./reset-password')
+    component: () => import('./reset-password').default
   }
 ]