Skip to content

Commit

Permalink
Update to v0.2.0
Browse files Browse the repository at this point in the history
New:
- added Sync progress field
- added Notifications for incoming transactions
- added Elections

Changed:
- added 1 API entrypoint

Bugs:
- fixed invisible Labels in create Contact
- fixed a bug for QRCode Reader
  • Loading branch information
exploshot committed May 7, 2019
1 parent 495fb5a commit daf17df
Show file tree
Hide file tree
Showing 54 changed files with 1,764 additions and 750 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ src/model/blockchain/*.js
src/pages/*.js
src/providers/*.js
src/utils/*.js
src/workers/*.js
src/workers/*.js
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
language: android

node_js:
- 5.5

notifications:
email: false

sudo: false

os:
- linux
- osx
node_js:
- '6'
- '8'
- '10'

branches:
only:
- master

install:
- npm cache clean
- npm install
- npm install -g cordova
- echo y | android update sdk -u --filter android-22,android-23
Expand Down
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## v0.2.0

### ![Generic Badge](https://img.shields.io/badge/New-%20-brightgreen.svg)
- added Sync progress field
- added Notifications for incoming transactions
- added Elections

### ![Generic Badge](https://img.shields.io/badge/Changes-%20-blue.svg)
- added 1 API entrypoint

### ![Generic Badge](https://img.shields.io/badge/Bugs-%20-red.svg)
- fixed invisible Labels in create Contact
- fixed a bug for QRCode Reader
---
## v0.1.3

### ![Generic Badge](https://img.shields.io/badge/New-%20-brightgreen.svg)
Expand All @@ -16,6 +30,5 @@


---

## v0.1.1
First Version
34 changes: 34 additions & 0 deletions build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright (c) 2018, Gnock
* Copyright (c) 2018, The Masari Project
*
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

const workboxBuild = require('workbox-build');

// NOTE: This should be run *AFTER* all your assets are built
const buildSW = () => {
// This will return a Promise
return workboxBuild.injectManifest({
swSrc: 'src/service-worker-raw.js',
swDest: 'src/service-worker.js',
globDirectory: 'src',
globPatterns: [
'**\/*.{js,css,html,json,png,ico,jpg}',
],
globIgnores: [
'd/Vue.js', 'src/service-worker-raw.js'
]
});
};

buildSW();
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="org.qwertycoin.wallet" version="0.1.3" xmlns="http://www.w3.org/ns/widgets"
<widget id="org.qwertycoin.wallet" version="0.2.0" xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Qwertycoin</name>
<description>
Expand Down
9 changes: 5 additions & 4 deletions config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ var global = typeof window !== 'undefined' ? window : self;
global.config = {
apiUrl: [
"https://01.cache.myqwertycoin.com/",
"https://02.cache.myqwertycoin.com/"
"https://02.cache.myqwertycoin.com/",
"https://03.cache.myqwertycoin.com/"
],
electionApiUrl: "https://voting.qwertycoin.org/?api",
websiteApiUrl: "https://www.qwertycoin.org/wp-json",
electionApiUrl: "https://voting.qwertycoin.org/api",
websiteApiUrl: "https://www.qwertycoin.org/wp-json",
mainnetExplorerUrl: "https://explorer.qwertycoin.org/",
mainnetExplorerUrlHash: "https://explorer.qwertycoin.org/?hash={ID}#blockchain_transaction",
mainnetExplorerUrlBlock: "https://explorer.qwertycoin.org/?hash={ID}#blockchain_block",
Expand Down Expand Up @@ -36,4 +37,4 @@ global.config = {
coinUriPrefix: 'qwertycoin:',
avgBlockTime: 120,
maxBlockNumber: 500000000,
};
};
14 changes: 11 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
{
"name": "qwertycoinmobileapp",
"displayName": "Qwertycoin Mobile App",
"version": "0.1.3",
"version": "0.2.0",
"description": "Qwertycoin wallet for mobile devices",
"scripts": {},
"author": "ExploShot - Qwertycoin Team",
"license": "BSD-3",
"dependencies": {
"cordova-android": "^7.1.4",
"cordova-plugin-app-version": "^0.1.9",
"cordova-plugin-background-mode": "git+https://github.com/8bhsolutions/cordova-plugin-background-mode.git",
"cordova-plugin-badge": "^0.8.8",
"cordova-plugin-device": "^2.0.2",
"cordova-plugin-file": "^6.0.1",
"cordova-plugin-local-notification": "git+https://github.com/Steffaan/cordova-plugin-local-notifications.git",
"cordova-plugin-nativestorage": "^2.3.2",
"cordova-plugin-qrscanner": "^3.0.1",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3",
"phonegap-nfc": "^1.0.3"
"phonegap-nfc": "^1.0.3",
"workbox-build": "^3.6.3"
},
"cordova": {
"plugins": {
Expand All @@ -26,7 +31,10 @@
"cordova-plugin-statusbar": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-file": {},
"cordova-plugin-app-version": {}
"cordova-plugin-app-version": {},
"cordova-plugin-local-notification": {
"ANDROID_SUPPORT_V4_VERSION": "26.+"
}
},
"platforms": [
"android"
Expand Down
80 changes: 77 additions & 3 deletions src/assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ body.native .hideOnNonNative {
#topBar {
height: 36px;
line-height: 36px;
position: fixed;
position: fixed;
top: 0;
background: #252565;
color: rgba(255, 174, 0, 1);
Expand All @@ -148,7 +148,7 @@ body.native .hideOnNonNative {
}

#topBar a.toggleMenu {
color: rgba(255, 174, 0, 1) !important;
color: white !important;
display: inline-block;
height: 100%;
padding: 0 15px;
Expand Down Expand Up @@ -401,6 +401,47 @@ body.transparent #copyright {
cursor: pointer;
}

.elections .election {
margin-bottom: 3vh;
}

.elections table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}

#nElections {
padding: 10px 35px;
}

.elections table tr {
border-top: 0 none;
margin-bottom: 8vh;
}

.elections election td {
padding: 8px 0;
}

.elections .election .electiondescription {
width: 100%;
font-size: 5vw;
margin-left: 2vw;
margin-bottom: 25px;
}

.elections .election .electionLink {
width: 100%;
font-size: 5vw;
margin-left: 2vw;
margin-bottom: 25px;
}

.elections table .election .electionLink a {
padding-top: 1vh;
}

.transactions table {
width: 100%;
border-collapse: collapse;
Expand Down Expand Up @@ -1277,6 +1318,14 @@ body {
font-size: 1.71428571rem;
}

.btn.full {
width: 80%;
margin: 0 auto;
color: rgba(255, 174, 0, 1) !important;
background: #252565 !important;
border: 2px solid #252565 !important;
}


/*==================FORMS===================*/
.field {
Expand Down Expand Up @@ -1517,7 +1566,8 @@ body {
display: block;
position: relative;
width: 0;
min-width: 2em;
min-width: 2.5em;
max-width: 100%;
background: rgba(255, 174, 0, 1);
border-radius: .28571429rem;
-webkit-transition: width .1s ease, background-color .1s ease;
Expand Down Expand Up @@ -1575,4 +1625,28 @@ body {
.swal2-popup .swal2-styled.swal2-confirm {
background: #252565 !important;
color: rgba(255, 174, 0, 1) !important;
}

/*===================ACCORDION=================*/
.accordion {
background-color: #eee;
color: #444;
cursor: pointer;
padding: 18px;
width: 100%;
text-align: left;
border: none;
outline: none;
transition: 0.4s;
}

.active .accordion:hover {
background-color: #ccc;
}

.acc-panel {
padding: 0 18px;
background-color: white;
display: none;
overflow: hidden;
}
5 changes: 3 additions & 2 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ let global: any = typeof window !== 'undefined' ? window : self;
global.config = {
apiUrl: [
"https://01.cache.myqwertycoin.com/",
"https://02.cache.myqwertycoin.com/"
"https://02.cache.myqwertycoin.com/",
"https://03.cache.myqwertycoin.com/"
],
electionApiUrl: "https://voting.qwertycoin.org/?api",
electionApiUrl: "https://voting.qwertycoin.org/api",
websiteApiUrl: "https://www.qwertycoin.org/wp-json",
mainnetExplorerUrl: "https://explorer.qwertycoin.org/",
mainnetExplorerUrlHash: "https://explorer.qwertycoin.org/?hash={ID}#blockchain_transaction",
Expand Down
2 changes: 1 addition & 1 deletion src/d/FileSaver.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
declare function saveAs(block : any, filename:string) : void;
declare function saveAs(block: any, filename: string): void;
2 changes: 1 addition & 1 deletion src/d/JSBigInt.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
declare var JSBigInt : any;
declare var JSBigInt: any;
37 changes: 23 additions & 14 deletions src/d/Vue.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,33 @@
type VueConstructObject = {el:string,data:any, watch?:any, computed?:any, updated?:any, mounted?:any, methods?:any, i18n?:any};
type VueConstructObject = {
el: string,
data: any,
watch ? : any,
computed ? : any,
updated ? : any,
mounted ? : any,
methods ? : any,
i18n ? : any
};
type VueComponentObject = {
template:string,
props?:Array<string>,
data?:Function,
computed:any
template: string,
props ? : Array < string > ,
data ? : Function,
computed: any
}


// declare var Vue : any;
class Vue{
constructor(any : VueConstructObject|string|null){}
class Vue {
constructor(any: VueConstructObject | string | null) {}

$nextTick(callback : Function){}
$forceUpdate(){}
$nextTick(callback: Function) {}
$forceUpdate() {}

static component(componentName : string, data : VueComponentObject) : void{}
static filter(name : string, callback : Function) : void{}
static component(componentName: string, data: VueComponentObject): void {}
static filter(name: string, callback: Function): void {}

static options : {
components:any,
filters:any
static options: {
components: any,
filters: any
};
}
Loading

0 comments on commit daf17df

Please sign in to comment.