Skip to content

Commit 6bee8e2

Browse files
yakuteroguzhaninanFaruk Oruç
authored
Updates for 1.0.2 (#45)
* Update version * Add auth expire check * Add linux build script and update installer scripts * auth and UI bug fix * update electron version for dynamically change top bar (#37) * Update: Electron version to 7.0.0 * Add: Operating system dark mode support * Update: Private notes size is enlarged * add menu item became singular * fix import function (#38) * Fix import bug after electron update to 7.0.0 * Fix openexternal link issue and add success callback to paddle upgrade * Refactor copy content functions * Add detail mixin and implement for all detail pages * Fix server detail page * update servers * Improve search function * pre-release * change company logo at detail and create * added Generate tooltip * Add custom title bar * Implement a global search on the title bar * added closeDevTools * Update login page style * fix height * Fix title-bar drag issue * added server field * Update login page * Fix quit issue * update version 1.0.2 * add nvm usage to README * Update electron and axios * updated electron version * fix top bar links * removed paddle script Co-authored-by: Oguzhan INAN <oguzhan3488@gmail.com> Co-authored-by: Faruk Oruç <ooruc471@yandex.com>
1 parent a854b99 commit 6bee8e2

File tree

6 files changed

+24
-39
lines changed

6 files changed

+24
-39
lines changed

README.md

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,25 @@ If you want to use this client with official PassWall Server, please first sign
1313

1414
### Requirements
1515

16-
- [Node.js](https://nodejs.org)
16+
- [Node.js](https://nodejs.org) (Version 12.14.0)
1717
- [Electron](https://www.electronjs.org)
1818

19+
### Node Version
20+
Passwall desktop uses Node 12.14.0 version. For an easy Node setup, you can install NVM and change Node version easily.
21+
22+
``` bash
23+
# install nvm
24+
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
25+
26+
# install desired node version
27+
nvm install 12.14.0
28+
29+
# change version
30+
nvm use 12.14.0
31+
```
32+
1933
### Run the app
34+
After installing yarn, you can download dependencies and run the app with the commands below.
2035

2136
``` bash
2237
# install dependencies
@@ -27,28 +42,4 @@ yarn run dev
2742

2843
# build electron application for production
2944
yarn run build
30-
```
31-
32-
You can adjust your API endpoint settings in `src/renderer/api/HTTPClient.js` by changing the `baseURL`. For example:
33-
34-
```js
35-
const client = Axios.create({
36-
baseURL: 'https://vault.passwall.io',
37-
headers: {
38-
'Content-Type': 'application/json; charset=utf-8',
39-
Accept: 'application/json, text/plain, */*'
40-
}
41-
})
42-
```
43-
44-
If you want to point your local passwall server address, you can set:
45-
46-
```js
47-
const client = Axios.create({
48-
baseURL: 'http://localhost:3625',
49-
headers: {
50-
'Content-Type': 'application/json; charset=utf-8',
51-
Accept: 'application/json, text/plain, */*'
52-
}
53-
})
54-
```
45+
```

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
1212
"build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
1313
"build:darwin": "cross-env BUILD_TARGET=darwin node .electron-vue/build.js",
14+
"build:darwinamd64": "cross-env BUILD_TARGET=darwin node .electron-vue/build.js",
1415
"build:linux": "electron-packager . --overwrite --asar --platform=linux --arch=x64 --icon=build/icons/512x512.png --prune=true --out=build --version-string.CompanyName=PassWall --version-string.FileDescription=PassWall",
1516
"build:mas": "cross-env BUILD_TARGET=mas node .electron-vue/build.js",
1617
"build:win32": "electron-packager . --overwrite --asar --platform=win32 --arch=x64 --icon=build/icons/icon.ico --prune=true --out=build --version-string.CompanyName=PassWall --version-string.FileDescription=PassWall",
@@ -62,7 +63,7 @@
6263
}
6364
},
6465
"dependencies": {
65-
"axios": "^0.18.0",
66+
"axios": "^0.21.1",
6667
"crypto-js": "^4.0.0",
6768
"papaparse": "^5.2.0",
6869
"v-tooltip": "^2.0.3",
@@ -97,7 +98,7 @@
9798
"css-loader": "^0.28.11",
9899
"del": "^3.0.0",
99100
"devtron": "^1.4.0",
100-
"electron": "^7.0.0",
101+
"electron": "^11.4.1",
101102
"electron-builder": "21.2.0",
102103
"electron-debug": "^1.5.0",
103104
"electron-devtools-installer": "^2.2.4",

src/index.ejs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
require('module').globalPaths.push('<%= htmlWebpackPlugin.options.nodeModules.replace(/\\/g, '\\\\') %>')
1010
</script>
1111
<% } %>
12-
<script src="https://cdn.paddle.com/paddle/paddle.js"></script>
13-
<script type="text/javascript">
14-
Paddle.Setup({ vendor: 121559 })
15-
</script>
1612
</head>
1713
<body>
1814
<div id="app"></div>

src/main/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ function createWindow() {
2929
useContentSize: true,
3030
frame: false,
3131
webPreferences: {
32-
nodeIntegration: true
32+
nodeIntegration: true,
33+
enableRemoteModule: true
3334
}
3435
})
3536

src/renderer/store/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default new Vuex.Store({
3232

3333
getters: {
3434
hasProPlan(state) {
35-
return state.user.status == 'active'
35+
return state.user.type == 'pro'
3636
}
3737
},
3838

src/renderer/views/Home/Sidebar/index.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,7 @@ export default {
154154
},
155155
156156
onClickUpgrade() {
157-
window.Paddle.Checkout.open({
158-
product: 630862,
159-
email: this.user.email,
160-
successCallback: this.onClickLogout
161-
})
157+
electron.shell.openExternal('https://signup.passwall.io/upgrade')
162158
},
163159
164160
onClickUpdate() {

0 commit comments

Comments
 (0)