Merge pull request #30 from bitholla/testnet

1.0.2

.gitignore

@@ -22,3 +22,12 @@ web/yarn-debug.log*
 web/yarn-error.log*
 
 web/src/**/*.css
+
+#HollaEx CLI related
+templates/local/nginx/conf.d/*
+templates/local/logs/*
+templates/local/*.yaml
+templates/local/*.env.local
+templates/local/letsencrypt/*
+
+templates/kubernetes/config/*

settings/configmap

@@ -84,9 +84,22 @@ ENVIRONMENT_KUBERNETES_INFLUXDB_NODESELECTOR="{}"
 ENVIRONMENT_KUBERNETES_EXCHANGE_NODESELECTOR="{}"
 
 ENVIRONMENT_DOCKER_IMAGE_REGISTRY=bitholla/hollaex-core
-ENVIRONMENT_DOCKER_IMAGE_VERSION=1.19.7
+ENVIRONMENT_DOCKER_IMAGE_VERSION=1.19.8
 
-ENVIRONMENT_HOLLAEX_KIT_VERSION=1.0.1
+ENVIRONMENT_DOCKER_IMAGE_POSTGRESQL_REGISTRY=postgres
+ENVIRONMENT_DOCKER_IMAGE_POSTGRESQL_VERSION=10.9
+
+ENVIRONMENT_DOCKER_IMAGE_REDIS_REGISTRY=redis
+ENVIRONMENT_DOCKER_IMAGE_REDIS_VERSION=5.0.5-alpine
+
+ENVIRONMENT_DOCKER_IMAGE_INFLUXDB_REGISTRY=influxdb
+ENVIRONMENT_DOCKER_IMAGE_INFLUXDB_VERSION=1.7-alpine
+
+ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_REGISTRY=bitholla/nginx-with-certbot
+ENVIRONMENT_DOCKER_IMAGE_LOCAL_NGINX_VERSION=1.15.8
+
+ENVIRONMENT_LOCAL_NGINX_HTTP_PORT=80
+ENVIRONMENT_LOCAL_NGINX_HTTPS_PORT=443
 
 ENVIRONMENT_KUBERNETES_API_SERVER_REPLICAS=2
 

templates/local/nginx/nginx.conf

@@ -20,8 +20,7 @@ http {
     '"$request" $body_bytes_sent "$http_referer" '
     '"$http_user_agent" "$http_x_forwarded_for"';
 
-  limit_req_zone $remote_addr zone=api:1m rate=2r/s;
-  limit_req_zone $remote_addr zone=order:1m rate=5r/s;
+  limit_req_zone $remote_addr zone=api:1m rate=4r/s;
 
 server {
       listen       80;
@@ -39,15 +38,15 @@ server {
       }
 
       location /v1/order {
-        limit_req zone=order burst=3 nodelay;
+        limit_req zone=api burst=10 nodelay;
         limit_req_log_level info;
         limit_req_status 429;
 
         proxy_pass      http://api;
       }
 
       location /v1 {
-        limit_req zone=api burst=5 nodelay;
+        limit_req zone=api burst=10 nodelay;
         limit_req_log_level info;
         limit_req_status 429;
 

version

@@ -1 +1 @@
-1.0.1
+1.0.2

web/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-web",
-	"version": "1.19.0",
+	"version": "1.19.3",
 	"dependencies": {
 		"@material/button": "0.7.0",
 		"antd": "3.21.4",

web/src/components/AppBar/_AppBar.scss

@@ -26,7 +26,7 @@ $app-bar-pairs-up: $buy;
 			color: $dark-font-main-text-color !important;
 
 			svg {
-				.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon {
+				.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon, .hex-icon {
 					fill: $dark-font-main-text-color;
 				}
 				.tab-close, .plus, .double-arrow {
@@ -327,7 +327,7 @@ $app-bar-pairs-up: $buy;
 		top: 1px;
 
 		svg {
-			.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon {
+			.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon, .hex-icon {
 				fill: $colors-main-black;
 			}
 			.tab-close, .plus, .double-arrow {
@@ -369,7 +369,7 @@ $app-bar-pairs-up: $buy;
 	}
 
 	.app_bar-pair-content, .app-bar-tab-close, .app-bar-currency-icon, .app-bar-account-icon svg {
-		.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon {
+		.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon, .hex-icon {
 			fill: $app-bar-icon-inactive;
 		}
 		.tab-close, .plus {
@@ -819,7 +819,8 @@ $app-bar-pairs-up: $buy;
 				.eth0,
 				.eth1,
 				.bch-icon,
-				.xrp-icon {
+				.xrp-icon,
+				.hex-icon {
 					fill: $dark-font-main-text-color !important;
 				}
 				.st0 {
@@ -845,7 +846,7 @@ $app-bar-pairs-up: $buy;
 
 	.app-bar-tab-setting, .app-bar-add-tab-icons {
 		svg {
-			.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon {
+			.btc0, .btc1, .eth0, .eth1, .bch-icon, .xrp-icon, .hex-icon {
 				fill: $dark-font-sub-text-1-color !important;
 			}
 			.plus, .minus {
@@ -859,6 +860,9 @@ $app-bar-pairs-up: $buy;
 			.icon-check-1 {
 				stroke: $colors-white;
 			}
+			.hex-icon-1 {
+				fill: $dark-app-background-color !important;
+			}
 		}
 
 		.app-price-diff-down {