Merge branch 'sprint' into 'master'

Sprint to Master

See merge request open-platform/api!204

Author: evgeny-krylov

.gitlab-ci.yml

@@ -150,6 +150,7 @@ package-docker:
                  -e "ETHEREUM_PRIVATE_KEY=${ETHEREUM_PRIVATE_KEY}" \
                  -e "OPEN_TOKEN_ADDRESS=${OPEN_TOKEN_ADDRESS}" \
                  -e "EVENT_SUBSCRIPTION=${EVENT_SUBSCRIPTION}" \
+                 -e "WIDGET_HOST=${WIDGET_HOST}" \
                  ${IMAGE_NAME}:${IMAGE_TAG}
     "
 
@@ -171,6 +172,7 @@ deploy-development:
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_DEV
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_DEV
     EVENT_SUBSCRIPTION: "true"
+    WIDGET_HOST: "https://api.open-platform.zensoft.io"
     IMAGE_TAG: sprint
   before_script: *prepare_key
   script: *deploy_to_host
@@ -200,6 +202,7 @@ deploy-production:
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_PROD
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_PROD
     EVENT_SUBSCRIPTION: "true"
+    WIDGET_HOST: "https://api.openfuture.io"
     IMAGE_TAG: latest
   before_script: *prepare_key
   script: *deploy_to_host
@@ -237,7 +240,6 @@ certificates-development:
     DEPLOY_HOST: $DEPLOY_HOST_DEV
     DEPLOY_KEY: $DEPLOY_KEY_DEV
     SERVER_NAME: "api.open-platform.zensoft.io"
-    WIDGET_HOST: "https://api.open-platform.zensoft.io"
   before_script: *prepare_key
   script: *update_certificates
   only:
@@ -251,7 +253,6 @@ certificates-production:
     DEPLOY_HOST: $DEPLOY_HOST_PROD
     DEPLOY_KEY: $DEPLOY_KEY_PROD
     SERVER_NAME: "api.openfuture.io"
-    WIDGET_HOST: "https://api.openfuture.io"
   before_script: *prepare_key
   script: *update_certificates
   only:

CHANGELOG.md

@@ -4,7 +4,10 @@ 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]
+## [2.6.1] - 2018-08-03
+### Fixed
+- Scaffold Creation: Validation on special characters
+- Fixed OPEN-widget links to different sources depending on the environment
 
 ## [2.6.0] - 2018-08-02
 ### Added

build.gradle

@@ -11,7 +11,7 @@ plugins {
 apply plugin: "io.spring.dependency-management"
 
 group = "io.openfuture.api"
-version = "2.6.0"
+version = "2.6.1"
 sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {

frontend/src/utils/messageTexts.js

@@ -21,7 +21,7 @@ const messageTextMap = {
   'open key is required': 'A Open Key is required.',
   'dev address is required': 'A developer address is required.',
   'scaffold title is required': 'A scaffold title is required.',
-  'special characters are forbidden': 'special characters are forbidden',
+  'special characters are forbidden': 'Special characters are forbidden',
   'currency is required': 'Currency is required.',
   'low balance': 'Minimum balance: 0,0087 Eth. Change MetaMask account or top up the balance.',
 

frontend/src/utils/validation.js

@@ -18,11 +18,7 @@ export const validateScaffoldProperties = values => {
 
     if (field.name) {
       if (field.name[0].match(/[a-z]/) === null) scaffoldFieldsErrors.push(t('first letter must be lowercase'));
-      /* eslint-disable */
-      if (field.name.match(/[\s\/\\]/) !== null)
-        /* eslint-enable */
-        scaffoldFieldsErrors.push(t('space forbidden'));
-      if (field.name.match(/^[a-zA-Z0-9]+$/g) === null) {
+      if (field.name.match(/^[a-zA-Z0-9_]+$/g) === null) {
         scaffoldFieldsErrors.push(t('special characters are forbidden'));
       }
       if (solidityReservedWords.includes(field.name))

widget/README.md

@@ -1,23 +1,23 @@
 # Open-widget
-This is a payment widget that you can embed to your site for processing payments from customers in the Cryptocurrency via  [OPEN platform](https://api.openfuture.io/) API.
+This is a payment widget that you can embed to your site for processing payments from customers in the Cryptocurrency via  [OPEN Platform](https://api.openfuture.io/) API.
 
-This widget requires [Metamask wallet](https://metamask.io/).
+This widget requires [Metamask Wallet](https://metamask.io/).
 
 [![](http://joxi.net/VrwNex4COodeMA.png)]()
 
 ### How to use a widget
 
 Paste the code below to a location at your site where you'd like to use this widget and set the width and height parameters.
-You also have to put your scaffold address in the src element: 'https://www.openfuture.io/widget/your_scaffold_address'
+You also have to put your scaffold address in the src element: 'https://openfuture.io/widget/your_scaffold_address'
 The best solution is to do it dynamically, especially if you have created a lot of scaffolds.
 
 
  ```html
- <iframe id="open-widget-iframe" src="https://www.openfuture.io/widget/your_scaffold_address_here" width="400" height="600" scrolling="no" frameborder="0" allowfullscreen></iframe>
+ <iframe id="open-widget-iframe" src="https://openfuture.io/widget/your_scaffold_address_here" width="400" height="600" scrolling="no" frameborder="0" allowfullscreen></iframe>
 
  ```
 
 
 The widget can contain a maximum of 9 fields of 3 types (string, number, boolean). 
-Field names and types are set in a [personal OPEN-platform account](https://api.open-platform.zensoft.io/scaffolds/new) during a smart contract creation.
+Field names and types are set in a [personal OPEN-platform account](https://api.openfuture.io/scaffolds/new) during a smart contract creation.
 

widget/src/index.js

@@ -1,4 +1,5 @@
 import * as internalWeb3 from 'web3';
+import * as style from './style.css';
 
 const _web3 = new internalWeb3(internalWeb3.givenProvider);
 let   windgetData;