8000 Merge branch 'master' into master · etherscan-io/electron-vue@c435570 · GitHub
[go: up one dir, main page]
Skip to content

Commit c435570

Browse files
XanderLucianoXanderLuciano
authored
Merge branch 'master' into master
2 parents c0b741c + 57f4993 commit c435570

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1435
-129
lines changed

‎README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,30 @@ Make sure to take a look at the [documentation](https://simulatedgreg.gitbooks.i
8282

8383

8484
## Made with electron-vue
85-
Take a look at some of the amazing projects built with electron-vue. Want to have your own project listed? Feel free to submit a pull request.
85+
Take a look at some of the amazing projects built with electron-vue. Want to have your own project listed? Feel free add your project to the bottom of the list below then submit a pull request.
8686

8787
* [**Surfbird**](https://github.com/surfbirdapp/surfbird): A Twitter client built on Electron and Vue
8888
* [**Lulumi-browser**](https://github.com/qazbnm456/lulumi-browser): Lulumi-browser is a light weight browser coded with Vue.js 2 and Electron
8989
* [**Space-Snake**](https://github.com/ilyagru/Space-Snake): A Desktop game built with Electron and Vue.js.
9090
* [**Forrest**](https://github.com/stefanjudis/forrest): An npm scripts desktop client
9191
* [**miikun**](https://github.com/hiro0218/miikun): A Simple Markdown Editor
92-
* [**Dakika**](https://github.com/Madawar/Dakika): A minute taking application that makes writing minutes a breeze
92+
* [**Dakika**](< F438 span class="pl-corl">https://github.com/raj347/Dakika): A minute taking application that makes writing minutes a breeze
9393
* [**Dynamoc**](https://github.com/ieiayaobb/dynamoc): Dynamoc is a GUI client for dynamodb-local, dynalite and AWS dynamodb
9494
* [**Dockeron**](https://github.com/dockeron/dockeron): A dockeron project, built on Electron + Vue.js for Docker
9595
* [**Easysubs**](https://github.com/matiastucci/easysubs): Download subtitles in a very fast and simple way
9696
* [**adminScheduler**](https://github.com/danieltoorani/adminScheduler): An application leveraging electron for cross platform compatibility, Vue.js for lightning fast UI and full-calendar.io to deliver a premium calendar interface.
9797
* [**Backlog**](https://github.com/czytelny/backlog): Simple app for storing TODOs, ideas or backlog items. You can organize them with boards. Sleek flow. Built with Electron + Vue.js + iView
98+
* [**Opshell**](https://github.com/ricktbaker/opshell): Ops tool to make life easier working with AWS instances.
99+
* [**GitHoard**](https://github.com/jojobyte/githoard): Hoard git repositories with ease.
100+
* [**Data-curator**](https://github.com/ODIQueensland/data-curator): Share usable open data.
101+
* [**Bookmark**](https://github.com/mrgodhani/bookmark): Desktop app to manage bookmarked links using Atom Electron and Vue.js
102+
* [**Uber Run**](https://github.com/break-enter/uberrun): Simple automation desktop app to download and organize your tax invoices from Uber.
103+
* [**Netsix**](https://github.com/pulsardev/netsix): Share videos with your friends in a real peer-to-peer manner using WebRTC.
104+
* [**code-notes**](https://github.com/lauthieb/code-notes): A simple code snippet manager for developers built with Electron & Vue.js.
105+
* [**Pomotroid**](https://github.com/Splode/pomotroid): A simple and visually-pleasing Pomodoro timer
106+
* [**MarkText**](https://github.com/marktext/marktext): Mark Text is a realtime Markdown Editor.
107+
* [**vue-design**](https://github.com/L-Chris/vue-design): the best website visualization builder with Vue and Electron
108+
* [**ImapSync Client**](https://github.com/ridaamirini/ImapSyncClient): It's only an Internet Message Access Protocol Synchronization Client
109+
* [**Hve**](https://github.com/hellohve/hve): A static blog client tool you may like.
110+
* [**MarkdownFox**](https://github.com/lx4r/markdownfox): A simple Markdown viewer with auto update and PDF export.
111+
* [**Cleaver**](https://getcleaver.com/): Cleaver helps you provision servers ready for deploying your web apps with zero downtime - for free!

‎docs/LANGS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
* [日本語](ja/)
33
* [中文](cn/)
44
* [Português](pt_BR/)
5+
* [대한민국](ko/)

‎docs/cn/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ vue init simulatedgreg/electron-vue#1.0 my-project
8181
* [**Dynamoc**](https://github.com/ieiayaobb/dynamoc): Dynamoc 是一个 dynamodb-local、 dynalite 和 AWS dynamodb 的图形化界面客户端
8282
* [**Dockeron**](https://github.com/dockeron/dockeron): Dockeron 项目, 基于 Electron + Vue.js 的 Docker 桌面客户端
8383
* [**Easysubs**](https://github.com/matiastucci/easysubs): 快速简单地下载字幕
84+
* [ EF5E **Data-curator**](https://github.com/ODIQueensland/data-curator)：分享可用的開放數據。

‎docs/cn/end-to-end_testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ my-project
4040

4141
### 关于 Spectron
4242

43-
Spectron 是使用 [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) 和 [WebDriverIO](http://webdriver.io/) 来操作 DOM 元素的 [electron]（http://electron.atom.io）官方测试框架。
43+
Spectron 是使用 [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) 和 [WebDriverIO](http://webdriver.io/) 来操作 DOM 元素的 [electron](http://electron.atom.io) 官方测试框架。
4444

4545
#### WebDriverIO 的使用
4646

‎docs/cn/npm_scripts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NPM 脚本
22

3-
为了帮助n你消除开发过程中的冗余任务，请注意一些可用的 NPM 脚本。以下命令应该运行在项目的根目录下。当然，你可以使用 `yarn run <command>` 的方式运行下列任何命令。
3+
为了帮助你消除开发过程中的冗余任务，请注意一些可用的 NPM 脚本。以下命令应该运行在项目的根目录下。当然，你可以使用 `yarn run <command>` 的方式运行下列任何命令。
44

55
### `npm run build`
66

‎docs/cn/renderer-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ src/renderer/components
4646

4747
### vuex 模块
4848

49-
描述 `vuex` 并不是简单的事情，所以请阅读 [这里](http://vuex.vuejs.org/en/intro.html)，以便更好地了解它试图解决的问题及其工作原理。
49+
描述 `vuex` 并不是简单的事情，所以请阅读 [这里](https://vuex.vuejs.org/zh/)，以便更好地了解它试图解决的问题及其工作原理。
5050

5151
electron-vue 利用 `vuex` 的模块结构创建多个数据存储，并保存在 `src/renderer/store/modules` 中。
5252

‎docs/cn/using_pre-processors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ npm install --save-dev sass-loader node-sass
3838

3939
相同的原理适用于任何其他预处理器。那么，也许你的 JS 需要 coffeescript？只需安装 [coffeescript-loader](https://github.com/webpack/coffee-loader)，并将属性 `lang=“coffeescript”` 应用到你的 `<script>` 标签上。
4040

41-
要获得该功能更高级的使用情况，请转到 [vue-loader 的文档](http://vue-loader.vuejs.org/en/configurations/pre-processors.html) 了解更多信息。
41+
要获得该功能更高级的使用情况，请转到 [vue-loader 的文档](https://vue-loader.vuejs.org/zh/guide/pre-processors.html) 了解更多信息。
4242

4343
## Sass/SCSS 全局变量的使用
4444

‎docs/en/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,4 @@ Take a look at some of the amazing projects built with electron-vue. Want to hav
8181
* [**Dockeron**](https://github.com/dockeron/dockeron): A dockeron project, built on Electron + Vue.js for Docker
8282
* [**Easysubs**](https://github.com/matiastucci/easysubs): Download subtitles in a very fast and simple way
8383
* [**adminScheduler**](https://github.com/danieltoorani/adminScheduler): An application leveraging electron for cross platform compatibility, Vue.js for lightning fast UI and full-calendar.io to deliver a premium calendar interface.
84-
85-
86-
84+
* [**Data-curator**](https://github.com/ODIQueensland/data-curator): Share usable open data.

‎docs/en/project_structure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Project Structure
22

3-
When it comes to making electron apps, project structure is a little different. If you have used the official [`vuejs-templates/webpack`](https://github.com/vuejs-templates/webpack) setup before, then the structure should feel quite familiar. The documentation in this section attempts to explain a general overview of how the boilerplate works and the differences when your application in built.
3+
When it comes to making electron apps, project structure is a little different. If you have used the official [`vuejs-templates/webpack`](https://github.com/vuejs-templates/webpack) setup before, then the structure should feel quite familiar. The documentation in this section attempts to explain a general overview of how the boilerplate works and the differences when your application is built.
44

55
### Single `package.json` Setup
66

‎docs/en/renderer-process.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ src/renderer/components
2626

2727
### vue routes
2828

29-
For more information about `vue-router` click [here](https://github.com/vuejs/vue-router). In short, it is encouraged to use `vue-router` as creating a Single Page Application is much more practical when making electron applications. Do you really want to manage a bunch of BrowserWindows and then communicating information between everything? Probably not.
29+
For more information about `vue-router` click [here](https://github.com/vuejs/vue-router). In short, it is encouraged to use `vue-router` as creating a Single Page Application is much more practical when making Electron applications. Do you really want to manage a bunch of BrowserWindows and then communicating information between everything? Probably not.
3030

3131
Routes are held in `src/renderer/router/index.js` and defined like so...
3232

@@ -42,13 +42,12 @@ Routes are held in `src/renderer/router/index.js` and defined like so...
4242

4343
##### Notice
4444

45-
When using `vue-router`, do not use [**HTML5 History Mode**](http://router.vuejs.org/en/essentials/history-mode.html). This mode is strictly meant for serving files over the `http` protocol and does not work properly with the `file` protocol that electron serves files with in production builds. The default `hash` mode is just what we need.
45+
When using `vue-router`, do not use [**HTML5 History Mode**](http://router.vuejs.org/en/essentials/history-mode.html). This mode is strictly meant for serving files over the `http` protocol and does not work properly with the `file` protocol that Electron serves files with in production builds. The default `hash` mode is just what we need.
4646

4747
### vuex modules
4848

49-
Describing `vuex` is not the easiest thing to do, so please read [this](http://vuex.vuejs.org/en/intro.html) for a better understanding of what problem it tries to solve and how it works.
49+
Describing `vuex` is not the easiest thing to do, so please read [this](https://vuex.vuejs.org/guide/) for a better understanding of what problem it tries to solve and how it works.
5050

51-
electron-vue takes advantage of `vuex`'s module structure to create multiple data stores and are saved in `src/renderer/store/modules`.
52-
53-
Having multiple data stores can be great for organization, but can also be annoying to have to import each and every one. But don't fret, as `src/renderer/store/modules/index.js` does the dirty work for us! This little script let's `src/renderer/store/index.js` import all of our modules in a one-shot manner. If all that didn't make since, just know you can easily duplicate the given `Counter.js` module and it will be loaded in "magically".
51+
electron-vue takes advantage of `vuex`'s module structure to create multiple data stores, which are saved in `src/renderer/store/modules`.
5452

53+
Having multiple data stores can be great for organization, but it can also be annoying to have to import each and every one. But don't fret, as `src/renderer/store/modules/index.js` does the dirty work for us! This little script lets `src/renderer/store/index.js` import all of our modules in a one-shot manner. If all that didn't make sense, just know you can easily duplicate the given `Counter.js` module and it will be loaded in "magically".

‎docs/en/using-electron-builder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ At this point, everything should be setup. Travis CI/AppVeyor by default will wa
8181

8282
#### Auto Updating
8383

84-
Enabling your application to receive automatic updates is a super nice feature to have, but know that [**Code Signing**](https://github.com/electron-userland/electron-builder/wiki/Code-Signing) is required. You can setup code signing by adding a few more environment variables based on what `electron-builder` needs described [here](https://github.com/electron-userland/electron-builder/wiki/Code-Signing). Once you have your certificates setup, you can then install `electron-updater` and comment out the chunk of code at the bottom of `src/main/index.js` to enable auto updating.
84+
Enabling your application to receive automatic updates is a super nice feature to have, but know that [**Code Signing**](https://github.com/electron-userland/electron-builder/wiki/Code-Signing) is required. You can setup code signing by adding a few more environment variables based on what `electron-builder` needs described [here](https://www.electron.build/code-signing). Once you have your certificates setup, you can then install `electron-updater` and comment out the chunk of code at the bottom of `src/main/index.js` to enable auto updating.
8585

8686
If you are like most people and do not have a fancy code signing certificate, then you can always use the GitHub API to check for new releases. When a new release is detected, provide a notification within your application to point users to a download page where they can download and install the new build. Thanks to the amazing installer that `electron-builder` provides, user's do not have to uninstall the current version and the new installation will replace the old while still persisting any web storage or `userData` files.
8787

‎docs/en/vue_accessories.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ electron-vue comes packed with the following `vue` plugins that can be installed
1313

1414
> Promise based HTTP client for the browser and node.js
1515
16-
If you are familiar with `vue-resource`, then `axios` will feel very familiar as most of the API is nearly identical. You can easily import `axios` in your `main` process scripts or use with `this.$http` & `Vue.http` in the `renderer` process.
16+
If you are familiar with `vue-resource`, then `axios` will feel very familiar as most of the API is nearly identical. You can easily import `axios` in your `main` process scripts or use with `this.$http` & `Vue.http` in the `renderer` process. Please note that during development you may run into issues with CORS since requests are passed through `webpack-dev-server`. As a small workaround, you can disable [`webSecurity`](https://electronjs.org/docs/api/browser-window#new-browserwindowoptions) within the BrowserWindow configuration, but please do remember to only disable this during development. Disabling this in production is highly not recommended and can create a serious security risk for your final application!
1717

1818
### [`vue-electron`](https://github.com/SimulatedGREG/vue-electron)
1919

‎docs/en/webpack-configurations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Targets electron's `renderer` process. This configuration handles your Vue appli
1212

1313
##### White-listing Externals
1414

15-
One important thing to consider about this config is that you can whitelist specific modules to not treat as webpack `externals`. There aren't many use cases where this functionality is need, but for the case of Vue UI libraries that provide raw `*.vue` components they will need to be whitelisted, so `vue-loader` is able to compile them. Another use case would be using webpack `alias`es, such as setting `vue` to import the full Compiler + Runtime build. Because of this, `vue` is already in the whitelist.
15+
One important thing to consider about this config is that you can whitelist specific modules to not treat as webpack `externals`. There aren't many use cases where this functionality is needed, but for the case of Vue UI libraries that provide raw `*.vue` components they will need to be whitelisted, so `vue-loader` is able to compile them. Another use case would be using webpack `alias`es, such as setting `vue` to import the full Compiler + Runtime build. Because of this, `vue` is already in the whitelist.
1616

1717
### `.electron-vue/webpack.web.config.js`
1818

‎docs/ja/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,4 @@ electron-vue で作られたいくつかの素晴らしいプロジェクトを
7979
- [**Dynamoc**](https://github.com/ieiayaobb/dynamoc): Dynamoc は dynamodb-local、 dynalite と AWS dynamodb のための GUI クライアントです
8080
- [**Dockeron**](https://github.com/dockeron/dockeron): Docker のために Electron と Vue.js で作られた dockeron プロジェクト
8181
- [**Easysubs**](https://github.com/matiastucci/easysubs): 字幕を早く簡単な方法でダウンロードする
82+
- [**Data-curator**](https://github.com/ODIQueensland/data-curator)：利用可能な公開データを共有します。

0 commit comments

Comments
 (0)
0