Skip to content

Commit

Permalink
Merge pull request #133 from ZencashOfficial/feature/sign_message
Browse files Browse the repository at this point in the history
Release v2.1.0a
  • Loading branch information
cronicc authored Apr 10, 2020
2 parents dfb0f44 + 82ebe7a commit 400a0d6
Show file tree
Hide file tree
Showing 30 changed files with 5,358 additions and 7,694 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ typings/

.vscode/

*.zip
*.zip
48 changes: 27 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
os: linux
dist: bionic
language: node_js
node_js:
- "8"
- "10"
- "11"
- "12"
services:
- docker
before_install:
- version=`node --version | grep -oP '(?<=v)\d*?(?=\.)'`
- branch=`git branch | grep -oP "(?<=^ )(.*)(?=$)"`
- docker run --rm node:$version-alpine /bin/sh -c "cd /home/node && apk add --no-cache git build-base python2 && git clone https://github.com/ZencashOfficial/myzenwallet.git && cd myzenwallet && git checkout $branch && npm install && npm run build"
- npm install && npm run build
deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
keep_history: true
verbose: true
local_dir: build
on:
branch: master
tags: true
- lts/*
cache:
npm: false
notifications:
email: false
install:
- npm ci
jobs:
include:
- stage: "Build"
script:
- npm run build
deploy:
edge: true
provider: pages
strategy: git
cleanup: false
token: $GITHUB_TOKEN
fqdn: $CUSTOM_DOMAIN
keep_history: true
local_dir: ./dist
on:
tags: true
branch: master
condition: $TRAVIS_TAG =~ ^release.*$
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
myzenwallet.io
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
[![Build Status](https://travis-ci.com/ZencashOfficial/myzenwallet.svg?branch=master)](https://travis-ci.com/ZencashOfficial/myzenwallet) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/zencashofficial/myzenwallet)](https://github.com/ZencashOfficial/myzenwallet/releases/latest) [![GitHub All Releases](https://img.shields.io/github/downloads/zencashofficial/myzenwallet/total)](https://github.com/ZencashOfficial/myzenwallet/releases/latest)
# myzenwallet

MyZENWallet is a client-side browser-based wallet for Zen.

# Running locally
Download one of the releases, goto the `dist` folder and double click `index.html`
### Running locally
Download the latest release tarball [here](https://github.com/ZencashOfficial/myzenwallet/releases/latest), extract it, goto the `dist` folder and double click `index.html`

# Dev
### Dev
```shell
yarn watch # watch and regenerate files
yarn start # start local host server
npm ci
npm run watch # watch and regenerate files
npm run start # start local host server
npm run build # generate ./dist
```
19 changes: 19 additions & 0 deletions app/components/googleAnalytics.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';

export default class ZGoogleAnalytics extends React.Component {

componentDidMount(){
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

window.ga('create', 'UA-71060764-10', 'auto');
window.ga('send', 'pageview');
}

render () {
return null;
}

}
4 changes: 2 additions & 2 deletions app/components/guide.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export default class ZGuide extends React.Component {
<h3>2. Accessing an existing wallet</h3>
<ul>
<li>If you've created a wallet on <a href="https://myzenwallet.io">https://myzenwallet.io</a> via the secret phrase, simply re-enter the same phrase.</li>
<li>For those with a <code>wallet.dat</code> file generated by GUI wallets. Click <code>settings</code> (<MDSettings/>), select the <code>Load wallet.dat</code> option and load your <code>wallet.dat</code> file</li>
<li>To unlock a single address, Click <code>settings</code> (<MDSettings/>), select the <code>Paste private key</code> option, paste in your private key and click the 'Unlock Private Key' button</li>
<li>For those with a <code>wallet.dat</code> file generated by GUI wallets. Click <code>settings</code> (<MdSettings/>), select the <code>Load wallet.dat</code> option and load your <code>wallet.dat</code> file</li>
<li>To unlock a single address, Click <code>settings</code> (<MdSettings/>), select the <code>Paste private key</code> option, paste in your private key and click the 'Unlock Private Key' button</li>
</ul>
</Col>
</Row>
Expand Down
16 changes: 8 additions & 8 deletions app/components/navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ export default class ZNavbar extends React.Component {

render () {
return (
<Navbar color='faded' light toggleable>
<NavbarToggler right onClick={this.toggleNavbar} />
<Navbar color="light" light expand="md">
<NavbarBrand href='/'>
<img src="/favicon.ico" height={42}/>&nbsp;myzenwallet.io
<img src="/favicon.ico" alt="myzenwallet.io" height={42}/>&nbsp;myzenwallet.io
</NavbarBrand>
<NavbarToggler onClick={this.toggleNavbar} />
<Collapse isOpen={this.state.isOpen} navbar>
<Nav className='ml-auto' navbar>
<NavItem>
<NavLink href='http://getzen.cash'>
<Nav className="ml-auto" navbar>
<NavItem>
<NavLink href='https://getzen.cash'>
FREE ZEN
</NavLink>
</NavItem>
Expand All @@ -40,10 +40,10 @@ export default class ZNavbar extends React.Component {
<NavLink href='/guide.html'>
GETTING STARTED
</NavLink>
</NavItem>
</NavItem>
</Nav>
</Collapse>
</Navbar>
</Navbar>
)
}
}
Loading

0 comments on commit 400a0d6

Please sign in to comment.