From 4bc028b1cc61ee291bf69043f072832a433e0488 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Mon, 3 Jun 2019 13:47:12 +0800 Subject: [PATCH] chore: many changes, such as structure, add layout comp... --- demo/components/sideMenuDemo.vue | 21 +++ demo/index.js | 32 ++++- demo/index.tpl | 4 +- demo/indexUsingCss.js | 10 +- package.json | 4 +- packages/{ => common}/Card/index.js | 0 packages/{ => common}/Card/src/main.vue | 0 packages/{ => common}/Icon/index.js | 0 packages/{ => common}/Icon/src/main.vue | 0 packages/nimbus/Layout/index.js | 7 + packages/nimbus/Layout/src/main.vue | 144 ++++++++++++++++++++ packages/nimbus/Layout/src/toggleButton.svg | 1 + packages/nimbus/SideMenu/index.js | 7 + packages/nimbus/SideMenu/src/main.vue | 78 +++++++++++ styles/base.scss | 1 + 15 files changed, 293 insertions(+), 16 deletions(-) create mode 100644 demo/components/sideMenuDemo.vue rename packages/{ => common}/Card/index.js (100%) rename packages/{ => common}/Card/src/main.vue (100%) rename packages/{ => common}/Icon/index.js (100%) rename packages/{ => common}/Icon/src/main.vue (100%) create mode 100644 packages/nimbus/Layout/index.js create mode 100644 packages/nimbus/Layout/src/main.vue create mode 100644 packages/nimbus/Layout/src/toggleButton.svg create mode 100644 packages/nimbus/SideMenu/index.js create mode 100644 packages/nimbus/SideMenu/src/main.vue diff --git a/demo/components/sideMenuDemo.vue b/demo/components/sideMenuDemo.vue new file mode 100644 index 000000000..a72d30905 --- /dev/null +++ b/demo/components/sideMenuDemo.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/demo/index.js b/demo/index.js index c57fff36e..7fadadce7 100644 --- a/demo/index.js +++ b/demo/index.js @@ -1,11 +1,33 @@ -import Vue from 'vue' +import Vue from 'vue/dist/vue' +import VueRouter from 'vue-router' import '../styles/index.scss' -// import '../dist/lib/index.css' import Demo from './demo.vue' -import Card from 'packages/Card' -import Icon from 'packages/Icon' +import Card from 'packages/common/Card' +import Icon from 'packages/common/Icon' +import SideMenu from 'packages/nimbus/SideMenu' +import Layout from 'packages/nimbus/Layout' + +import sideMenuDemo from './components/sideMenuDemo' + +Vue.use(VueRouter) Card.install(Vue) Icon.install(Vue) +SideMenu.install(Vue) +Layout.install(Vue) -;(new Vue(Demo)).$mount('#app') \ No newline at end of file +const routes = [ + { path: '/sidemenu', component: sideMenuDemo } +] + +const router = new VueRouter({ + routes +}) + + + +;(new Vue({ + router +})).$mount('#app') + +console.log('...') \ No newline at end of file diff --git a/demo/index.tpl b/demo/index.tpl index 1ff18b20f..8a303271c 100644 --- a/demo/index.tpl +++ b/demo/index.tpl @@ -5,6 +5,8 @@ 2s design -
+
+ +
\ No newline at end of file diff --git a/demo/indexUsingCss.js b/demo/indexUsingCss.js index 8e8771bf8..f1ed24837 100644 --- a/demo/indexUsingCss.js +++ b/demo/indexUsingCss.js @@ -1,10 +1,2 @@ -import Vue from 'vue' import '../dist/lib/index.css' -import Demo from './demo.vue' -import Card from 'packages/Card' -import Icon from 'packages/Icon' - -Card.install(Vue) -Icon.install(Vue) - -;(new Vue(Demo)).$mount('#app') \ No newline at end of file +import './index.js' \ No newline at end of file diff --git a/package.json b/package.json index 41ac1c352..f3daf617f 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,10 @@ "description": "", "main": "index.js", "scripts": { - "build": "", + "build": "cross-env NODE_ENV=development & gulp --gulpfile build/gulpfile.js build", "demo": "cross-env NODE_ENV=development & gulp --gulpfile build/gulpfile.js build & webpack-dev-server --config build/webpack.demo.js", "dev": "cross-env NODE_ENV=development webpack-dev-server --config build/webpack.dev.js", + "serve": "npm run dev", "test": "cross-env NODE_ENV=development karma start test/unit/karma.conf.js" }, "author": "", @@ -47,6 +48,7 @@ "url-loader": "^1.1.2", "vue": "^2.6.10", "vue-loader": "^15.7.0", + "vue-router": "^3.0.6", "vue-template-compiler": "^2.6.10", "webpack": "^4.30.0", "webpack-cli": "^3.3.2", diff --git a/packages/Card/index.js b/packages/common/Card/index.js similarity index 100% rename from packages/Card/index.js rename to packages/common/Card/index.js diff --git a/packages/Card/src/main.vue b/packages/common/Card/src/main.vue similarity index 100% rename from packages/Card/src/main.vue rename to packages/common/Card/src/main.vue diff --git a/packages/Icon/index.js b/packages/common/Icon/index.js similarity index 100% rename from packages/Icon/index.js rename to packages/common/Icon/index.js diff --git a/packages/Icon/src/main.vue b/packages/common/Icon/src/main.vue similarity index 100% rename from packages/Icon/src/main.vue rename to packages/common/Icon/src/main.vue diff --git a/packages/nimbus/Layout/index.js b/packages/nimbus/Layout/index.js new file mode 100644 index 000000000..bafa7766c --- /dev/null +++ b/packages/nimbus/Layout/index.js @@ -0,0 +1,7 @@ +import Layout from './src/main.vue' + +Layout.install = function (Vue) { + Vue.component(Layout.name, Layout) +} + +export default Layout \ No newline at end of file diff --git a/packages/nimbus/Layout/src/main.vue b/packages/nimbus/Layout/src/main.vue new file mode 100644 index 000000000..f1d2d0f15 --- /dev/null +++ b/packages/nimbus/Layout/src/main.vue @@ -0,0 +1,144 @@ + + + + + + diff --git a/packages/nimbus/Layout/src/toggleButton.svg b/packages/nimbus/Layout/src/toggleButton.svg new file mode 100644 index 000000000..1fbdebd94 --- /dev/null +++ b/packages/nimbus/Layout/src/toggleButton.svg @@ -0,0 +1 @@ +Folde &amp; Unfold \ No newline at end of file diff --git a/packages/nimbus/SideMenu/index.js b/packages/nimbus/SideMenu/index.js new file mode 100644 index 000000000..9ae081963 --- /dev/null +++ b/packages/nimbus/SideMenu/index.js @@ -0,0 +1,7 @@ +import SideMenu from './src/main.vue' + +SideMenu.install = function (Vue) { + Vue.component(SideMenu.name, SideMenu) +} + +export default SideMenu \ No newline at end of file diff --git a/packages/nimbus/SideMenu/src/main.vue b/packages/nimbus/SideMenu/src/main.vue new file mode 100644 index 000000000..cdf01d940 --- /dev/null +++ b/packages/nimbus/SideMenu/src/main.vue @@ -0,0 +1,78 @@ + + + + + + diff --git a/styles/base.scss b/styles/base.scss index 2cdd9fc6b..c0f4f9d81 100644 --- a/styles/base.scss +++ b/styles/base.scss @@ -1,5 +1,6 @@ @import './fonts/OpenSans.scss'; body { + margin: 0; font-family: 'Open Sans'; } \ No newline at end of file