refactor(site): make navbar scroll separately on webpage (#7)

webapp-suite · Sep 3, 2018 · 97efaa5 · 97efaa5
1 parent 26efcb2
commit 97efaa5
Show file tree

Hide file tree

Showing 48 changed files with 754 additions and 617 deletions.
diff --git a/config/webpack.config.site.js b/config/webpack.config.site.js
@@ -14,7 +14,7 @@ rimraf.sync(outputPath)
 
 const config = {
   entry: {
-    site: `${sitePath}/index.js`
+    site: `${sitePath}/router.js`
   },
   output: {
     path: outputPath,
@@ -62,7 +62,7 @@ const config = {
     ],
     alias: {
       'earth-ui/lib': `${sourcePath}/components`,
-      'public': `${sitePath}/public`,
+      'widgets': `${sitePath}/widgets`,
       'doc': `${sitePath}/loaders/doc`,
       'variable.less': `${sourcePath}/styles/variable.less`,
       'mixin.less': `${sourcePath}/styles/mixin.less`,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -108,6 +108,7 @@
     "postcss-loader": "^2.0.8",
     "prop-types": "^15.6.1",
     "react": "^15.6.2",
+    "react-custom-scrollbars": "^4.2.1",
     "react-dom": "^15.6.2",
     "react-hot-loader": "^4.0.0-rc.0",
     "react-router": "^2.8.1",

diff --git a/site/img/earth_text_black.png b/site/img/earth_text_black.png
diff --git a/site/img/earth_text_white.png b/site/img/earth_text_white.png
diff --git a/site/loaders/doc.js b/site/loaders/doc.js
@@ -57,8 +57,8 @@ module.exports = function (source) {
   // 依赖的公共模块
   imports.add(`import React, { Component } from 'react'`)
   imports.add(`import { Row, Col } from 'earth-ui/lib/Layout'`)
-  imports.add(`import Demo from 'public/Demo'`)
-  imports.add(`import Doc from 'public/Doc'`)
+  imports.add(`import Demo from 'widgets/Demo'`)
+  imports.add(`import Doc from 'widgets/Doc'`)
 
   // 获取 DEMO、文档数据
   const demos = []

diff --git a/site/pages/App/index.js b/site/pages/App/index.js