Skip to content

Commit 49e8ed1

Browse files
authored
Merge pull request #6 from zoosky/v3-upgrade
V3 upgrade
2 parents c0bb760 + ddac926 commit 49e8ed1

File tree

4 files changed

+1396
-1348
lines changed

4 files changed

+1396
-1348
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "framework7-template-split-vue-webpack",
3-
"version": "2.3.0",
3+
"version": "3.1.0",
44
"scripts": {
55
"serve": "vue-cli-service serve",
66
"build": "vue-cli-service build",
@@ -12,12 +12,12 @@
1212
"release:note": "node scripts/gen-release-note.js"
1313
},
1414
"dependencies": {
15-
"framework7": "^2.3.0",
16-
"framework7-icons": "^0.8.9",
17-
"framework7-vue": "^2.2.5",
15+
"framework7": "^3.1.0",
16+
"framework7-icons": "^0.9.1",
17+
"framework7-vue": "^3.1.0",
1818
"material-design-icons": "^3.0.1",
1919
"register-service-worker": "^1.0.0",
20-
"vue": "^2.5.2",
20+
"vue": "^2.5.16",
2121
"vuex": "^3.0.1"
2222
},
2323
"devDependencies": {

src/App.vue

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<template>
2-
<div id="app">
2+
<f7-app :params="f7params">
3+
34
<!-- Statusbar -->
45
<f7-statusbar></f7-statusbar>
56
<panel-left></panel-left>
@@ -8,10 +9,13 @@
89
<home></home>
910
<pop-up></pop-up>
1011
<login-screen></login-screen>
11-
</div>
12+
</f7-app>
1213
</template>
1314

1415
<script>
16+
// Import Routes
17+
import Routes from "./routes.js";
18+
1519
import Home from "./pages/home.vue";
1620
import PanelLeft from "./pages/panel-left.vue";
1721
import PanelRight from "./pages/panel-right.vue";
@@ -25,6 +29,28 @@ export default {
2529
PanelRight,
2630
PopUp,
2731
LoginScreen
32+
},
33+
data() {
34+
return {
35+
// Framework7 parameters here
36+
f7params: {
37+
id: "io.framework7.testapp", // App bundle ID
38+
name: "Framework7 Split-View with Vuejs Components", // App name
39+
theme: "auto", // Automatic theme detection
40+
// App routes
41+
routes: Routes,
42+
// Enable panel left visibility breakpoint
43+
panel: {
44+
leftBreakpoint: 960
45+
},
46+
view: {
47+
// configuration examples
48+
iosDynamicNavbar: true, //default: true
49+
xhrCache: true, //default: true
50+
pushState: true //default: false
51+
}
52+
}
53+
};
2854
}
2955
};
3056
</script>

src/main.js

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,33 @@ import store from "./store";
44
import "./registerServiceWorker";
55

66
// Import F7
7-
import Framework7 from "framework7/dist/framework7.esm.bundle.js";
7+
import Framework7 from "framework7/framework7.esm.bundle.js";
88

99
// Import F7 Vue Plugin
10-
import Framework7Vue from "framework7-vue/dist/framework7-vue.esm.bundle.js";
10+
import Framework7Vue from "framework7-vue/framework7-vue.esm.bundle.js";
1111

1212
// Import F7 Styles
1313
// eslint-disable-next-line
14-
import Framework7Styles from "framework7/dist/css/framework7.css";
14+
import Framework7Styles from "framework7/css/framework7.css";
1515

1616
// Import Icons and App Custom Styles
1717
// eslint-disable-next-line
1818
import IconsStyles from "./assets/css/icons.css";
1919
// eslint-disable-next-line
2020
import AppStyles from "./assets/css/app.css";
2121

22-
// Import Routes
23-
import Routes from "./routes.js";
24-
2522
// Init F7 Vue Plugin
26-
Vue.use(Framework7Vue, Framework7);
23+
Framework7.use(Framework7Vue);
2724

2825
Vue.config.productionTip = false;
2926

3027
new Vue({
31-
// Init Framework7 by passing parameters here
32-
framework7: {
33-
id: "io.framework7.testapp", // App bundle ID
34-
name: "Framework7 Split-View with Vuejs Compnents", // App name
35-
theme: "auto", // Automatic theme detection
36-
// App routes
37-
routes: Routes,
38-
// Enable panel left visibility breakpoint
39-
panel: {
40-
leftBreakpoint: 960
41-
},
42-
view: {
43-
// configuration examples
44-
iosDynamicNavbar: true, //default: true
45-
xhrCache: true, //default: true
46-
pushState: true //default: false
47-
}
48-
},
4928
store,
50-
methods: {
51-
onF7Ready(f7) {
52-
// do some f7 related logic
53-
// f7.dialog.alert("App initialized");
29+
mounted() {
30+
this.$f7ready(f7 => {
31+
f7.dialog.alert("Component mounted");
5432
console.log("App initialized", f7, "Utils", this.$utils);
55-
},
56-
onF7RouteChange(newRoute, previousRoute, router) {
57-
console.log(
58-
"newRoute: ",
59-
newRoute,
60-
", previousRoute: ",
61-
previousRoute,
62-
", router: ",
63-
router
64-
);
65-
}
33+
});
6634
},
6735
render: h => h(App)
6836
}).$mount("#app");

0 commit comments

Comments
 (0)