Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
fix: fixed fr translation
  • Loading branch information
Z-a-r-a-k-i committed Oct 1, 2019
2 parents 64c90dc + cc067bf commit 1f5f21c
Show file tree
Hide file tree
Showing 157 changed files with 7,119 additions and 6,479 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2
jobs:
test-node-11:
test-node-12:
working_directory: ~/new-desktop-wallet
docker:
- image: circleci/node:11-browsers
- image: circleci/node:12-browsers
steps:
- checkout
- run:
Expand Down Expand Up @@ -37,4 +37,4 @@ workflows:
version: 2
test:
jobs:
- test-node-11
- test-node-12
10 changes: 10 additions & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
exclude_paths:
- '__mocks__/**/*'
- '__tests__/**/*'
- 'src/renderer/styles/**/*'
- 'build/**/*'
- 'config/**/*'
- 'static/**/*'
- '*.sh'
- '*.md'
3 changes: 0 additions & 3 deletions .electron-vue/webpack.main.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ const path = require('path')
const { dependencies } = require('../package.json')
const webpack = require('webpack')

const BabiliWebpackPlugin = require('babili-webpack-plugin')

let mainConfig = {
entry: {
main: path.join(__dirname, '../src/main/index.js')
Expand Down Expand Up @@ -73,7 +71,6 @@ if (process.env.NODE_ENV !== 'production') {
*/
if (process.env.NODE_ENV === 'production') {
mainConfig.plugins.push(
new BabiliWebpackPlugin(),
new webpack.DefinePlugin({
'process.env.NODE_ENV': '"production"'
})
Expand Down
7 changes: 3 additions & 4 deletions .electron-vue/webpack.renderer.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const { dependencies } = require('../package.json')
const webpack = require('webpack')
const glob = require("glob-all")

const BabiliWebpackPlugin = require('babili-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const MiniCssExtractPlugin = require("mini-css-extract-plugin")
const HtmlWebpackPlugin = require('html-webpack-plugin')
Expand All @@ -22,7 +21,7 @@ const { VueLoaderPlugin } = require('vue-loader')
* that provide pure *.vue files that need compiling
* https://simulatedgreg.gitbooks.io/electron-vue/content/en/webpack-configurations.html#white-listing-externals
*/
let whiteListedModules = ['vue', 'portal-vue']
let whiteListedModules = ['vue', 'portal-vue', '@arkecosystem/client', 'got', '@arkecosystem/peers']

let rendererConfig = {
devtool: '#cheap-module-eval-source-map',
Expand Down Expand Up @@ -167,7 +166,8 @@ let rendererConfig = {
'@package.json': path.join(__dirname, '../package.json'),
'@config': path.join(__dirname, '../config'),
'@tests': path.join(__dirname, '../__tests__'),
'vue$': 'vue/dist/vue.esm.js'
'vue$': 'vue/dist/vue.esm.js',
'got$': path.join(__dirname, '../src/renderer/plugins/got.js')
},
extensions: ['.js', '.vue', '.json', '.css', '.node']
},
Expand All @@ -193,7 +193,6 @@ if (process.env.NODE_ENV === 'production') {
rendererConfig.devtool = ''

rendererConfig.plugins.push(
new BabiliWebpackPlugin(),
new CopyWebpackPlugin([
{
from: path.join(__dirname, '../static'),
Expand Down
2 changes: 0 additions & 2 deletions .electron-vue/webpack.web.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ process.env.BABEL_ENV = 'web'
const path = require('path')
const webpack = require('webpack')

const BabiliWebpackPlugin = require('babili-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const MiniCssExtractPlugin = require("mini-css-extract-plugin")
const HtmlWebpackPlugin = require('html-webpack-plugin')
Expand Down Expand Up @@ -131,7 +130,6 @@ if (process.env.NODE_ENV === 'production') {
webConfig.devtool = ''

webConfig.plugins.push(
new BabiliWebpackPlugin(),
new CopyWebpackPlugin([
{
from: path.join(__dirname, '../static'),
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tailwind.js
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_extends: .github
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ node_modules/

npm-debug.log
npm-debug.log.*
yarn-error.log

__tests__/*/.coverage

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
12
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
language: node_js
node_js:
- "12"

matrix:
include:
- os: linux
- os: osx
osx_image: xcode10.2
- os: windows
env:
- YARN_GPG=no
- CSC_IDENTITY_AUTO_DISCOVERY=false

cache:
yarn: true
directories:
- node_modules

before_install:
- 'if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install libudev-dev libusb-1.0-0-dev; fi'
- yarn global add node-gyp

before_script:
- 'if [ "$TRAVIS_OS_NAME" == "windows" ]; then unset CSC_LINK CSC_KEY_PASSWORD; fi'

script:
- |
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
yarn build:mac
elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
yarn build:win
else
yarn build:linux
fi
after_script:
- shasum -a 256 build/target/ark-desktop-wallet*.{exe,deb,zip,tar.gz,AppImage,dmg}

if: type IN (push, api)

branches:
only:
- master
16 changes: 7 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

![OSMOSE Desktop Wallet](./banner.jpg)

> Lead Maintainer: [Alex Barnsley](https://github.com/alexbarnsley)
## Download
[Latest Release](https://github.com/osmose-collective/desktop-wallet/releases)

Expand All @@ -19,13 +21,13 @@ sudo apt-get install libudev-dev libusb-1.0-0-dev
- Python 2.7
- Visual Studio 2017

#### Node 11
To download, head over to [here](https://nodejs.org/en/) and download Node 11.
#### Node 12
To download, head over to [here](https://nodejs.org/en/) and download Node 12.

If you already have npm installed, you can run
```
npm install -g n
sudo n 11
sudo n 12
```

#### Yarn
Expand Down Expand Up @@ -105,12 +107,8 @@ If you discover a security vulnerability within this project, please send an e-m

## Credits

- [Alex Barnsley](https://github.com/alexbarnsley)
- [ItsANameToo](https://github.com/ItsANameToo)
- [Juan A. Martín](https://github.com/j-a-m-l)
- [Lúcio Rubens](https://github.com/luciorubeens)
- [All Contributors](../../contributors)
This project exists thanks to all the people who [contribute](../../contributors).

## License

[MIT](LICENSE) © [ArkEcosystem](https://ark.io)
[MIT](LICENSE) © [ARK Ecosystem](https://ark.io)
2 changes: 1 addition & 1 deletion __tests__/e2e/app.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import welcomeSpecs from './pages/2-welcome.spec'
import profileNewSpecs from './pages/3-profile-new.spec'

describe('App', () => {
let scope = {}
const scope = {}

beforeAll(async () => {
await setup.startApp(scope)
Expand Down
5 changes: 4 additions & 1 deletion __tests__/unit.jest.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ const path = require('path')

module.exports = {
verbose: false,
globals: {
__static: __dirname
},
rootDir: path.resolve(__dirname, '../'),
moduleFileExtensions: [
'js',
Expand All @@ -15,7 +18,7 @@ module.exports = {
'^@config/(.*)$': '<rootDir>/config/$1',
'^@/(.*)$': '<rootDir>/src/renderer/$1',
'^@tests/(.*)$': '<rootDir>/__tests__/$1',
'vue$': '<rootDir>/node_modules/vue/dist/vue.common.js'
vue$: '<rootDir>/node_modules/vue/dist/vue.common.js'
},
transform: {
'^.+\\.js$': 'babel-jest',
Expand Down
2 changes: 2 additions & 0 deletions __tests__/unit/__fixtures__/store/network.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const network1 = {
id: 'main',
name: 'main',
symbol: 'm',
token: 'MAI',
subunit: 'mainito',
Expand All @@ -11,6 +12,7 @@ const network1 = {

const network2 = {
id: 'other',
name: 'other',
symbol: 'o',
token: 'OTH',
subunit: 'another',
Expand Down
57 changes: 39 additions & 18 deletions __tests__/unit/__fixtures__/store/peer.js
Original file line number Diff line number Diff line change
@@ -1,44 +1,53 @@
const goodPeer1 = {
ip: '1.1.1.1',
host: 'http://1.1.1.1',
port: 4001,
port: 4003,
p2pPort: null,
version: '1.3.1',
height: 6030358,
status: 'OK',
os: 'linux',
delay: 123,
latency: 123,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const goodPeer2 = {
ip: '2.2.2.2',
host: 'http://2.2.2.2',
port: 4001,
port: 4003,
p2pPort: null,
version: '1.3.1',
height: 6030358,
status: 'OK',
os: 'linux',
delay: 234,
latency: 234,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const goodPeer3 = {
ip: '3.3.3.3',
host: 'http://3.3.3.3',
port: 4001,
port: 4003,
p2pPort: null,
version: '1.3.1',
height: 6030358,
status: 'OK',
os: 'linux',
delay: 345,
latency: 345,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const goodPeer4 = {
ip: '4.4.4.4',
Expand All @@ -49,10 +58,13 @@ const goodPeer4 = {
height: 6030358,
status: 'OK',
os: 'linux',
delay: 345,
latency: 345,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const goodPeer5 = {
ip: '5.5.5.5',
Expand All @@ -63,10 +75,13 @@ const goodPeer5 = {
height: 6030358,
status: 'OK',
os: 'linux',
delay: 345,
latency: 345,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const goodPeer6 = {
ip: '6.6.6.6',
Expand All @@ -77,24 +92,30 @@ const goodPeer6 = {
height: 6030358,
status: 'OK',
os: 'linux',
delay: 345,
latency: 345,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4003
}
}
const badPeer1 = {
ip: '4.4.4.4',
host: 'http://4.4.4.4',
port: 4001,
port: 4003,
p2pPort: null,
version: '1.3.1',
height: 5000,
status: 'OK',
os: 'linux',
delay: 456,
latency: 456,
isCustom: false,
lastUpdated: null,
isHttps: false
isHttps: false,
ports: {
'@arkecosystem/core-api': 4001
}
}

export default [
Expand Down
7 changes: 6 additions & 1 deletion __tests__/unit/__fixtures__/store/profile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
const profile1 = {
id: 'profile1',
networkId: 'main'
networkId: 'main',
background: 'bg',
currency: 'usd',
language: 'en',
name: 'Profile 1',
theme: 'light'
}

export default {
Expand Down
3 changes: 2 additions & 1 deletion __tests__/unit/__mocks__/@/services/wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default {
getAddressFromPublicKey: jest.fn(address => `public key of ${address}`),
validateAddress: jest.fn(() => true),
validatePassphrase: jest.fn(() => true),
verifyPassphrase: jest.fn(() => true)
verifyPassphrase: jest.fn(() => true),
isBip39Passphrase: jest.fn(() => true)
}
Loading

0 comments on commit 1f5f21c

Please sign in to comment.