Skip to content

Commit 4aa880f

Browse files
committed
Vue 2.0 compatibility
1 parent a796672 commit 4aa880f

File tree

30 files changed

+526
-1080
lines changed

30 files changed

+526
-1080
lines changed

.meteor/packages

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
meteor-base@1.0.4 # Packages every Meteor app needs to have
88
mobile-experience@1.0.4 # Packages for a great mobile UX
9-
mongo@1.1.11 # The database Meteor supports right now
9+
mongo@1.1.12 # The database Meteor supports right now
1010
reactive-var@1.0.10 # Reactive variable for tracker
1111
jquery@1.11.9 # Helpful client-side library
1212
tracker@1.1.0 # Meteor's client-side reactive programming library
@@ -28,7 +28,6 @@ akryum:vue
2828
akryum:vue-component
2929
akryum:vue-router
3030
akryum:vuex
31-
akryum:vue-apollo
3231
akryum:vue-i18n
3332
akryum:vue-i18n-ui
3433
akryum:vue-less
@@ -38,4 +37,4 @@ akryum:vue-jade
3837
akryum:vue-coffee
3938

4039
use-vue-component
41-
shell-server
40+
shell-server@0.2.1

.meteor/release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.4.1
1+
METEOR@1.4.1.1

.meteor/versions

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
accounts-base@1.2.11
22
akryum:npm-check@0.0.3
3-
akryum:vue@1.0.4
4-
akryum:vue-apollo@0.0.9
3+
akryum:vue@1.0.5
54
akryum:vue-coffee@0.0.2
6-
akryum:vue-component@0.6.6
7-
akryum:vue-component-dev-client@0.0.8
8-
akryum:vue-component-dev-server@0.0.1
5+
akryum:vue-component@0.7.0
6+
akryum:vue-component-dev-client@0.2.0
7+
akryum:vue-component-dev-server@0.0.2
98
akryum:vue-i18n@0.0.3
109
akryum:vue-i18n-ui@0.0.5
1110
akryum:vue-jade@0.0.1
@@ -15,22 +14,22 @@ akryum:vue-sass@0.0.4
1514
akryum:vue-stylus@0.0.4
1615
akryum:vuex@0.3.0
1716
allow-deny@1.0.5
18-
apollo@0.0.3
17+
apollo@0.1.1
1918
autoupdate@1.3.11
2019
babel-compiler@6.9.1
2120
babel-runtime@0.1.11
2221
base64@1.0.9
2322
binary-heap@1.0.9
24-
blaze@2.1.8
25-
blaze-tools@1.0.9
26-
boilerplate-generator@1.0.9
23+
blaze@2.1.9
24+
blaze-tools@1.0.10
25+
boilerplate-generator@1.0.10
2726
caching-compiler@1.1.7
28-
caching-html-compiler@1.0.6
27+
caching-html-compiler@1.0.7
2928
callback-hook@1.0.9
3029
ccorcos:subs-cache@0.1.0
3130
check@1.2.3
3231
chuangbo:cookie@1.1.0
33-
coffeescript@1.2.4
32+
coffeescript@1.2.4_1
3433
ddp@1.2.5
3534
ddp-client@1.3.1
3635
ddp-common@1.2.6
@@ -45,8 +44,8 @@ es5-shim@4.6.14
4544
fastclick@1.0.12
4645
geojson-utils@1.0.9
4746
hot-code-push@1.0.4
48-
html-tools@1.0.10
49-
htmljs@1.0.10
47+
html-tools@1.0.11
48+
htmljs@1.0.11
5049
http@1.2.9
5150
id-map@1.0.8
5251
jquery@1.11.9
@@ -56,7 +55,7 @@ localstorage@1.0.11
5655
logging@1.1.15
5756
meteor@1.2.17
5857
meteor-base@1.0.4
59-
meteorhacks:fast-render@2.14.0
58+
meteorhacks:fast-render@2.16.0
6059
meteorhacks:inject-data@2.0.0
6160
meteorhacks:meteorx@1.4.1
6261
meteorhacks:picker@1.0.3
@@ -67,12 +66,12 @@ mobile-experience@1.0.4
6766
mobile-status-bar@1.0.12
6867
modules@0.7.6
6968
modules-runtime@0.7.6
70-
mongo@1.1.11
69+
mongo@1.1.12
7170
mongo-id@1.0.5
72-
npm-mongo@1.5.46
71+
npm-mongo@1.5.49
7372
observe-sequence@1.0.12
7473
ordered-dict@1.0.8
75-
promise@0.8.4
74+
promise@0.8.7
7675
random@1.0.10
7776
rate-limit@1.0.5
7877
reactive-var@1.0.10
@@ -81,15 +80,15 @@ retry@1.0.8
8180
routepolicy@1.0.11
8281
service-configuration@1.0.10
8382
shell-server@0.2.1
84-
spacebars@1.0.12
85-
spacebars-compiler@1.0.12
83+
spacebars@1.0.13
84+
spacebars-compiler@1.0.13
8685
standard-minifier-css@1.2.0
8786
standard-minifier-js@1.2.0
88-
static-html@1.1.12
89-
templating-tools@1.0.4
87+
static-html@1.1.13
88+
templating-tools@1.0.5
9089
tmeasday:check-npm-versions@0.3.1
9190
tracker@1.1.0
92-
ui@1.0.11
91+
ui@1.0.12
9392
underscore@1.0.9
9493
url@1.0.10
9594
use-vue-component@0.0.1

client/main.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
// Libs
22
import {Meteor} from 'meteor/meteor';
3-
import {Vue} from 'meteor/akryum:vue';
3+
import Vue from 'vue';
44
import {Router} from 'meteor/akryum:vue-router';
5+
import ApolloClient from 'apollo-client';
6+
import { meteorClientConfig } from 'meteor/apollo';
7+
import gql from 'graphql-tag';
8+
import VueApollo from 'vue-apollo';
9+
10+
// Apollo
11+
const apolloClient = new ApolloClient(meteorClientConfig());
12+
window.gql = gql;
13+
Vue.use(VueApollo, {
14+
apolloClient,
15+
});
516

617
// Api
718
import '/imports/api/methods';

imports/ui/AppLayout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default {
3434

3535
<style>
3636
body, input {
37-
font-family: sans-serif;
37+
font-family: 'Roboto', sans-serif;
3838
font-size: 12pt;
3939
}
4040

imports/ui/Home.vue

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
img.logo(src="/img/meteor.png")
88

99
p
10-
button2(:label="$t('pages.home.button')", @action="clicked=true", v-if="!clicked")
10+
button2(:label="$t('pages.home.button')", @action="handleClick", v-if="!clicked")
11+
.counter {{ count }}
1112
</template>
1213

1314
<script>
1415
export default {
1516
data: () => ({
16-
clicked: false
17-
})
18-
}
17+
count: 0,
18+
}),
19+
methods: {
20+
handleClick() {
21+
this.count += 42;
22+
},
23+
},
24+
};
1925
</script>
2026

2127
<style scoped lang="stylus">
@@ -27,4 +33,8 @@ export default {
2733
img.logo
2834
max-width 101px
2935
margin margin
36+
37+
.counter
38+
color grey
39+
margin-top 32px
3040
</style>

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,19 @@
66
},
77
"devDependencies": {
88
"apollo-client": "^0.4.4",
9-
"apollo-server": "^0.1.5",
9+
"apollo-server": "^0.2.1",
10+
"body-parser": "^1.15.2",
1011
"express": "^4.13.4",
1112
"faker": "^3.1.0",
12-
"graphql": "^0.6.1",
13+
"graphql": "^0.7.0",
1314
"graphql-tag": "^0.1.9",
1415
"graphql-tools": "^0.6.0",
1516
"js-cookie": "^2.1.2",
1617
"locale": "^0.1.0",
1718
"vue": "^1.0.24",
1819
"vue-i18n": "^4.0.1",
1920
"vue-router": "^0.7.13",
21+
"vue-apollo": "^1.0.0-beta.11",
2022
"vuex": "^1.0.0-rc.2"
2123
}
22-
}
24+
}

packages/vue-apollo/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/vue-apollo/CHANGELOG.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)