Skip to content

Commit 2f88ae0

Browse files
authored
Merge pull request #24 from SpringRoll/feature/presistent-state
Feature/presistent state
2 parents bb2e69c + 6ee24fc commit 2f88ae0

File tree

11 files changed

+329
-28
lines changed

11 files changed

+329
-28
lines changed

package-lock.json

Lines changed: 125 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"serve": "vue-cli-service serve",
88
"build": "vue-cli-service build",
99
"lint": "eslint --ext .js,.vue src",
10+
"dev": "npm run electron:serve",
1011
"electron:build": "vue-cli-service electron:build",
1112
"electron:serve": "vue-cli-service electron:serve",
1213
"postinstall": "electron-builder install-app-deps",
@@ -18,14 +19,17 @@
1819
"main": "background.js",
1920
"dependencies": {
2021
"core-js": "^3.6.5",
21-
"vue": "^2.6.11"
22+
"electron-store": "^6.0.0",
23+
"vue": "^2.6.11",
24+
"vuex": "^3.5.1"
2225
},
2326
"devDependencies": {
2427
"@vue/cli-plugin-babel": "~4.4.0",
2528
"@vue/cli-service": "~4.4.0",
2629
"babel-eslint": "^10.1.0",
2730
"chai": "^4.2.0",
2831
"css-loader": "^4.0.0",
32+
"deepmerge": "^4.2.2",
2933
"electron": "^9.0.0",
3034
"electron-devtools-installer": "^3.1.0",
3135
"eslint": "^6.7.2",

src/main/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import { app, protocol, BrowserWindow } from 'electron';
44
import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
55
import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
6+
67
const isDevelopment = process.env.NODE_ENV !== 'production';
78

89
// Keep a global reference of the window object, if you don't, the window will

src/renderer/App.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
<template>
22
<div id="app">
3-
<div class="test">This is a test</div>
3+
<div class="test">{{ test }} : This is a test</div>
44
<img alt="Vue logo" src="./assets/logo.png" />
55
<HelloWorld msg="Welcome to Your Vue.js App" />
66
</div>
77
</template>
88

99
<script>
1010
import HelloWorld from './components/HelloWorld.vue';
11+
import { mapState } from 'vuex';
1112
1213
export default {
1314
name: 'App',
1415
components: {
1516
HelloWorld
17+
},
18+
computed: {
19+
...mapState({
20+
test: state => state.projectInfo.test
21+
})
1622
}
1723
};
1824
</script>

src/renderer/main.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import Vue from 'vue';
22
import App from './App.vue';
3+
import store from './store';
34

45
Vue.config.productionTip = false;
56

67
new Vue({
8+
store,
79
render: h => h(App),
810
}).$mount('#app');

0 commit comments

Comments
 (0)