From 2f626c7875076e198a3cef959d26722d9fb90e04 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 20 Sep 2016 18:58:02 +0200 Subject: [PATCH] Vuex (#8041) * add vuex, cleanup client directory and create example components * disale sample unit test * disable import for non existing file * correct regexp for unit tests, add simple test to avoid error, add babel-polyfill for Vuex * add line wrongly removed, update regexp --- .eslintignore | 3 +- package.json | 3 +- test/client/unit/index.js | 8 ++- test/client/unit/specs/Hello.spec.js | 8 ++- website/README.md | 3 + website/client/.babelrc | 1 - website/client/README.md | 3 - website/client/assets/logo.png | Bin 6849 -> 0 bytes website/client/components/App.vue | 52 +++--------------- website/client/components/Sub.vue | 21 ------- website/client/components/app.vue | 30 ++++++++++ website/client/components/home.vue | 13 +++++ website/client/components/page.vue | 13 +++++ .../components/{Hello.vue => siteHeader.vue} | 13 ++--- website/client/main.js | 12 +++- website/client/router.js | 8 +-- website/client/vuex/store.js | 12 ++++ 17 files changed, 116 insertions(+), 87 deletions(-) create mode 100644 website/README.md delete mode 100644 website/client/README.md delete mode 100644 website/client/assets/logo.png delete mode 100644 website/client/components/Sub.vue create mode 100644 website/client/components/app.vue create mode 100644 website/client/components/home.vue create mode 100644 website/client/components/page.vue rename website/client/components/{Hello.vue => siteHeader.vue} (67%) create mode 100644 website/client/vuex/store.js diff --git a/.eslintignore b/.eslintignore index 3b8a16d08e..74a07acc20 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,10 +1,9 @@ # Compiled and vendored files -common/dist/ -common/transpiled-babel/ coverage/ database_reports/ website/build/ website/transpiled-babel/ +website/common/transpiled-babel/ dist/ # Not linted diff --git a/package.json b/package.json index 66c3852811..4fc1f58161 100644 --- a/package.json +++ b/package.json @@ -96,6 +96,8 @@ "vinyl-source-stream": "^1.1.0", "vue": "^2.0.0-rc.6", "vue-router": "^2.0.0-rc.5", + "vuex": "^2.0.0-rc.5", + "vuex-router-sync": "^3.0.0", "winston": "^2.1.0", "xml2js": "^0.4.4" }, @@ -135,7 +137,6 @@ "babel-core": "^6.0.0", "babel-eslint": "^6.0.0", "babel-loader": "^6.0.0", - "babel-plugin-transform-runtime": "^6.0.0", "chai": "^3.4.0", "chai-as-promised": "^5.1.0", "chalk": "^1.1.3", diff --git a/test/client/unit/index.js b/test/client/unit/index.js index 6458bdf6dc..6e35a2286d 100644 --- a/test/client/unit/index.js +++ b/test/client/unit/index.js @@ -1,7 +1,11 @@ +// TODO verify if it's needed, added because Vuex require Promise in the global scope +// and babel-runtime doesn't affect external libraries +require('babel-polyfill'); + // require all test files (files that ends with .spec.js) var testsContext = require.context('./specs', true, /\.spec$/); testsContext.keys().forEach(testsContext); // require all src files except main.js/ README.md / index.html for coverage. -var srcContext = require.context('../../../website/client', true, /^\.\/(?!(main\.js|README\.md|index\.html)?$)/); -srcContext.keys().forEach(srcContext); +var srcContext = require.context('../../../website/client', true, /^\.\/(?!(main(\.js)?)|(index(\.html)?)$)/); +srcContext.keys().forEach(srcContext); \ No newline at end of file diff --git a/test/client/unit/specs/Hello.spec.js b/test/client/unit/specs/Hello.spec.js index 8ddf243c34..4bba03c74e 100644 --- a/test/client/unit/specs/Hello.spec.js +++ b/test/client/unit/specs/Hello.spec.js @@ -1,12 +1,16 @@ import Vue from 'vue'; -import Hello from 'src/components/Hello'; +// import Hello from 'src/components/Hello'; describe('Hello.vue', () => { - it('should render correct contents', () => { + xit('should render correct contents', () => { const vm = new Vue({ el: document.createElement('div'), render: (h) => h(Hello), }); expect(vm.$el.querySelector('.hello h1').textContent).to.equal('Hello Vue!'); }); + + it('should make assertions', () => { + expect(true).to.equal(true); + }); }); diff --git a/website/README.md b/website/README.md new file mode 100644 index 0000000000..daf1b47aef --- /dev/null +++ b/website/README.md @@ -0,0 +1,3 @@ +`/website/client` contains the source files for the new client side that is being developed as part of the Habitica.com redesign. + +The old client side files can be found in `/website/client-old`, they are still used on Habitica.com while the redesign is in progress. \ No newline at end of file diff --git a/website/client/.babelrc b/website/client/.babelrc index 72e30cd75e..0595f3ffcc 100644 --- a/website/client/.babelrc +++ b/website/client/.babelrc @@ -1,5 +1,4 @@ { "presets": ["es2015"], - "plugins": ["transform-runtime"], "comments": false } \ No newline at end of file diff --git a/website/client/README.md b/website/client/README.md deleted file mode 100644 index 0ee3e69f93..0000000000 --- a/website/client/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This folder contains the source files for the new client side that is being developed. - -The old client side files can be found in /website/client-old, they are still used on Habitica.com while the redesign is in progress. \ No newline at end of file diff --git a/website/client/assets/logo.png b/website/client/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 #app - img.logo(src='../assets/logo.png') + site-header ul li router-link(to='/') Home li - router-link(to='/sub') Sub + router-link(to='/page') Another Page router-view.view - p Welcome to your Vue.js app! - p - | To get a better understanding of how this boilerplate works, check out - | its documentation. - | It is also recommended to go through the docs for - | Webpack and - | vue-loader. - | If you have any issues with the setup, please file an issue at this boilerplate's - | repository. - p - | You may also want to checkout - | vue-router for routing and - | vuex for state management. diff --git a/website/client/components/Sub.vue b/website/client/components/Sub.vue deleted file mode 100644 index 0235962373..0000000000 --- a/website/client/components/Sub.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/website/client/components/app.vue b/website/client/components/app.vue new file mode 100644 index 0000000000..cff6171fbf --- /dev/null +++ b/website/client/components/app.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/website/client/components/home.vue b/website/client/components/home.vue new file mode 100644 index 0000000000..7254a38615 --- /dev/null +++ b/website/client/components/home.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/website/client/components/page.vue b/website/client/components/page.vue new file mode 100644 index 0000000000..a5613badf3 --- /dev/null +++ b/website/client/components/page.vue @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/website/client/components/Hello.vue b/website/client/components/siteHeader.vue similarity index 67% rename from website/client/components/Hello.vue rename to website/client/components/siteHeader.vue index c3b9bce93d..ed2204514c 100644 --- a/website/client/components/Hello.vue +++ b/website/client/components/siteHeader.vue @@ -1,15 +1,14 @@ diff --git a/website/client/main.js b/website/client/main.js index 404761c025..a42b2c4a48 100644 --- a/website/client/main.js +++ b/website/client/main.js @@ -1,9 +1,19 @@ +// TODO verify if it's needed, added because Vuex require Promise in the global scope +// and babel-runtime doesn't affect external libraries +require('babel-polyfill'); + import Vue from 'vue'; -import App from './components/App'; +import VuexRouterSync from 'vuex-router-sync'; +import App from './components/app'; import router from './router'; +import store from './vuex/store'; + +// Sync Vuex and Router +VuexRouterSync.sync(store, router); new Vue({ // eslint-disable-line no-new router, + store, el: '#app', render: h => h(App), }); diff --git a/website/client/router.js b/website/client/router.js index 349d27e7ab..7ea6b34532 100644 --- a/website/client/router.js +++ b/website/client/router.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; -import Hello from './components/Hello'; -import Sub from './components/Sub'; +import Home from './components/home'; +import Page from './components/page'; Vue.use(VueRouter); @@ -9,7 +9,7 @@ export default new VueRouter({ mode: 'history', base: __dirname, routes: [ - { path: '/', component: Hello }, - { path: '/sub', component: Sub }, + { path: '/', component: Home }, + { path: '/page', component: Page }, ], }); \ No newline at end of file diff --git a/website/client/vuex/store.js b/website/client/vuex/store.js new file mode 100644 index 0000000000..6ee08f7a8b --- /dev/null +++ b/website/client/vuex/store.js @@ -0,0 +1,12 @@ +import Vue from 'vue'; +import Vuex from 'vuex'; + +Vue.use(Vuex); + +const state = { + title: 'Habitica', +}; + +export default new Vuex.Store({ + state, +}); \ No newline at end of file