Skip to content

Commit

Permalink
Merge branch 'release/0.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
romansemko committed Apr 9, 2018
2 parents 923bafe + 38d7c05 commit be6ae88
Show file tree
Hide file tree
Showing 40 changed files with 1,389 additions and 599 deletions.
26 changes: 23 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,36 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [0.1.5] - 2018-04-09

### Added

* Multi-destination transfers (up to 5 + donation)
* Manual address input selection.
* Responsive, mobile support.
* Mobile App icons and colors.
* FavIcon

### Changed

* Improved address menu to hide QR code on old/used addresses.
* Improved address menu descriptions/tooltips.
* Improved sync speed of pages and creation of new ones on big ledgers.
* Improved UI response times.

## [0.1.3] - 2018-04-07

### Added
- Checksum to QR-Code

* Checksum to QR-Code

### Changed
- Faster remote-sync on initial load.
- Zero-value transactions.

* Faster remote-sync on initial load.
* Zero-value transactions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Download the latest release from the releases tab.

You can use command-line tools on your OS or upload the file at [OnlineMD5](http://onlinemd5.com/)

**NOTE**: Safari is currently NOT supported!

## How to compile locally

Clone or download the repository. Then run:
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "romeo.html",
"version": "0.1.3",
"version": "0.1.5",
"description": "Lightweight Ledger built on top of IOTA",
"main": "index.js",
"author": "Roman Semko",
"license": "ISC",
"scripts": {
"fix": "prettier --single-quote --write src/**/* src/js/**/* package.json *.md",
"fix":
"prettier --single-quote --write src/**/* src/js/**/* package.json *.md",
"clean": "rimraf dist",
"dist": "parcel build src/index.html --public-url \"/\"",
"pack": "yarn run build && node ./pack.js",
Expand All @@ -31,6 +32,7 @@
"babel-polyfill": "^6.26.0",
"better-queue": "^3.8.6",
"copy-to-clipboard": "^3.0.8",
"fast-deep-equal": "^1.1.0",
"history": "^4.7.2",
"pretty-ms": "^3.1.0",
"qrcode.react": "^0.8.0",
Expand All @@ -43,7 +45,7 @@
"react-toastify": "^3.4.3",
"redux": "^3.7.2",
"redux-thunk": "^2.2.0",
"romeo.lib": "0.1.3",
"romeo.lib": "0.1.5",
"semantic-ui-css": "^2.3.1",
"semantic-ui-react": "^0.79.0"
}
Expand Down
Binary file added resources/logo-big-white.afdesign
Binary file not shown.
Binary file added resources/logo-big-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/logo.afdesign
Binary file not shown.
Binary file added src/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/android-chrome-384x384.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="mstile-150x150.png"/>
<TileColor>#9f00a7</TileColor>
</tile>
</msapplication>
</browserconfig>
1 change: 1 addition & 0 deletions src/browserconfig.xml.base64
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGJyb3dzZXJjb25maWc+CiAgICA8bXNhcHBsaWNhdGlvbj4KICAgICAgICA8dGlsZT4KICAgICAgICAgICAgPHNxdWFyZTE1MHgxNTBsb2dvIHNyYz0ibXN0aWxlLTE1MHgxNTAucG5nIi8+CiAgICAgICAgICAgIDxUaWxlQ29sb3I+IzlmMDBhNzwvVGlsZUNvbG9yPgogICAgICAgIDwvdGlsZT4KICAgIDwvbXNhcHBsaWNhdGlvbj4KPC9icm93c2VyY29uZmlnPgo=
36 changes: 36 additions & 0 deletions src/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,39 @@ html,
overflow: hidden;
text-overflow: ellipsis;
}

.dont-break-out {
/* These are technically the same, but use both */
overflow-wrap: break-word;
word-wrap: break-word;

-ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */
word-break: break-all;
/* Instead use this non-standard one: */
word-break: break-word;

/* Adds a hyphen where the word breaks, if supported (No Blink) */
-ms-hyphens: auto;
-moz-hyphens: auto;
-webkit-hyphens: auto;
hyphens: auto;
}

.romeoLogo {
display: inline-block;
width: 45px;
height: 45px;
background: url(../img/logo.png) no-repeat center center;
background-size: 45px auto;
}

.romeoLogoContainer .content {
position: relative;
top: 4px;
left: 5px;
}

.romeoLogoContainer .romeoLogo {
background-size: 35px auto;
}
Binary file added src/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/favicon.ico
Binary file not shown.
Binary file added src/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
<link rel="manifest" href="data:text/plain;base64,ewogICAgIm5hbWUiOiAiQ2FycklPVEEgUm9tZW8iLAogICAgInNob3J0X25hbWUiOiAiQ2FycklPVEEgUm9tZW8iLAogICAgImljb25zIjogWwogICAgICAgIHsKICAgICAgICAgICAgInNyYyI6ICJhbmRyb2lkLWNocm9tZS0xOTJ4MTkyLnBuZyIsCiAgICAgICAgICAgICJzaXplcyI6ICIxOTJ4MTkyIiwKICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UvcG5nIgogICAgICAgIH0sCiAgICAgICAgewogICAgICAgICAgICAic3JjIjogImFuZHJvaWQtY2hyb21lLTM4NHgzODQucG5nIiwKICAgICAgICAgICAgInNpemVzIjogIjM4NHgzODQiLAogICAgICAgICAgICAidHlwZSI6ICJpbWFnZS9wbmciCiAgICAgICAgfQogICAgXSwKICAgICJ0aGVtZV9jb2xvciI6ICIjNzMyMzhkIiwKICAgICJiYWNrZ3JvdW5kX2NvbG9yIjogIiM3MzIzOGQiLAogICAgImRpc3BsYXkiOiAic3RhbmRhbG9uZSIKfQo=">
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#a333c8">
<meta name="msapplication-TileColor" content="#9f00a7">
<meta name="theme-color" content="#73238d">
<title>CarrIOTA Romeo</title>
</head>
<body>
<div id="app" class="main"></div>
Expand Down
33 changes: 23 additions & 10 deletions src/js/components/address-menu-item.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Menu, Icon, Header, Label, Popup } from 'semantic-ui-react';
import { get } from '../romeo';
import { formatIOTAAmount } from '../utils';
import { copyData } from './current-page-menu-item';
import deepHoc from './deep-hoc';

import classes from './page-menu-item.css';

Expand All @@ -16,6 +17,8 @@ class AddressMenuItem extends React.Component {
currentPage,
selected,
history,
anySelected,
latestAddress,
match: { params }
} = this.props;
const romeo = get();
Expand Down Expand Up @@ -46,31 +49,36 @@ class AddressMenuItem extends React.Component {
<Header as="h5" color="red">
NOT usable!
</Header>
Spent address! Do not send funds here!
Spent address! Do not send funds here!&nbsp;
{!currentPage && 'This page is archived, any way!'}
</span>
)
) : balance > 0 ? (
rawBalance > 0 ? (
<span>
<Header as="h5" color="green">
Usable!
<Header as="h5" color={currentPage ? 'green' : 'yellow'}>
{currentPage ? 'Usable!' : 'Archived page address'}
</Header>
Address has positive balance, but has not been spent.
Address has positive balance, but has not been spent.&nbsp;
{!currentPage &&
'You should transfer these funds to the current page!'}
</span>
) : (
<span>
<Header as="h5" color="red">
NOT usable!
</Header>
An outgoing transaction is pending. Do not send funds here!
An outgoing transaction is pending. Do not send funds here!&nbsp;
{!currentPage && 'This page is archived, any way!'}
</span>
)
) : (
<span>
<Header as="h5" color="green">
Usable!
<Header as="h5" color={currentPage ? 'green' : 'yellow'}>
{currentPage ? 'Usable!' : 'Archived page address'}
</Header>
Empty address with no balance.
Empty address with no balance.&nbsp;
{!currentPage && 'However, this page is archived. So do not use!'}
</span>
);

Expand All @@ -83,12 +91,17 @@ class AddressMenuItem extends React.Component {
</span>
);
const qrcode =
selected && (!spent || spa) ? (
(selected || (!anySelected && latestAddress)) &&
(!spent || spa) &&
currentPage ? (
<Popup
position="left center"
trigger={
<div className="qrcode" onClick={copyAddress}>
<QRCode value={romeo.iota.utils.addChecksum(address)} size={256} />
<QRCode
value={romeo.iota.utils.addChecksum(address)}
size={256}
/>
</div>
}
content="Click to copy the address!"
Expand Down
9 changes: 7 additions & 2 deletions src/js/components/address-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React from 'react';
import { Icon, Header, Menu } from 'semantic-ui-react';
import { get, isCurrentIndex } from '../romeo';
import AddressMenuItem from './address-menu-item';
import deepHoc from './deep-hoc';

export default class AddressMenu extends React.Component {
class AddressMenu extends React.Component {
constructor(props) {
super(props);
this.addNewAddress = this.addNewAddress.bind(this);
Expand Down Expand Up @@ -35,11 +36,13 @@ export default class AddressMenu extends React.Component {
return (
<Menu vertical style={{ width: '100%' }}>
{addButton}
{addresses.map(address => (
{addresses.map((address, i) => (
<AddressMenuItem
address={address}
key={address.address}
currentPage={page.page.isCurrent}
anySelected={!!selectedAddress}
latestAddress={i === 0}
selected={
selectedAddress &&
selectedAddress.slice(0, 81) === address.address
Expand All @@ -58,3 +61,5 @@ export default class AddressMenu extends React.Component {
pageObject.getNewAddress();
}
}

export default deepHoc(AddressMenu);
Loading

0 comments on commit be6ae88

Please sign in to comment.