Abodmicheal fist batch phase 2

.travis.yml

@@ -2,17 +2,24 @@ language: node_js
 node_js:
     - 12
 
+services:
+  - docker
+
+before_install:
+  #install heroku CLI
+  - wget -qO- https://toolbelt.heroku.com/install.sh | sh
+
 script:
-  - yarn run test
+  - docker build -t registry.heroku.com/scotbuild/web .
+
+deploy:
+  provider: script
+  script:
+    bash docker_push
+  on:
+    branch: scotty_build2
 
 # safelist
 branches:
   only:
-  - master
-  - scotty_aaa
-  - scotty_actnearn
-  - scotty_bloque64
-  - scotty_pal
-  - scotty_spt
-  - scotty_steemcoinpan
-  - scotty_weedcash
+  - scotty_build2

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.16.2 as development
+FROM node:16.9.1 as development
 
 WORKDIR /var/app
 
@@ -19,7 +19,7 @@ FROM development as dependencies
 RUN yarn install --non-interactive --frozen-lockfile --ignore-optional --production
 
 ### BUILD MINIFIED PRODUCTION ##
-FROM node:12.16.2-alpine as production
+FROM node:16.9.1 as production
 
 WORKDIR /var/app
 

add_new.sh

@@ -0,0 +1,122 @@
+
+echo $1 # lowercase token
+echo $2 # app name
+
+mkdir -p src/app/assets/static/$1
+cp src/app/assets/static/dunk/manifest.json src/app/assets/static/$1/manifest.json
+sed -i -e "s!dunk!$1!" src/app/assets/static/$1/manifest.json
+sed -i -e "s!DunkSocial!$2!" src/app/assets/static/$1/manifest.json
+
+THEMES=$(cat <<END_HEREDOC
+\$themes: (
+  $1-light: (
+    colorAccent: \$color-$1,
+    colorAccentHover: \$color-$1,
+    colorAccentReverse: \$color-blue-black,
+    colorWhite: \$color-white,
+    backgroundColor: \$color-background-off-white,
+    backgroundColorEmphasis: \$color-background-almost-white,
+    backgroundColorOpaque: \$color-background-off-white,
+    backgroundTransparent: transparent,
+    moduleBackgroundColor: \$color-white,
+    menuBackgroundColor: \$color-background-dark,
+    moduleMediumBackgroundColor: \$color-transparent,
+    navBackgroundColor: \$color-white,
+    highlightBackgroundColor: #f3faf0,
+    tableRowEvenBackgroundColor: #f4f4f4,
+    border: 1px solid \$color-border-light,
+    borderLight: 1px solid \$color-border-light-lightest,
+    borderDark: 1px solid \$color-text-gray,
+    borderAccent: 1px solid \$color-$1,
+    borderDotted: 1px dotted \$color-border-light,
+    borderTransparent: transparent,
+    iconColorSecondary: #cacaca,
+    textColorPrimary: \$color-text-dark,
+    textColorSecondary: \$color-text-gray,
+    textColorAccent: \$color-$1,
+    textColorAccentHover: \$color-$1,
+    textColorError: \$color-text-red,
+    contentBorderAccent: \$color-$1,
+    buttonBackground: \$color-blue-black,
+    buttonBackgroundHover: \$color-$1,
+    buttonText: \$color-text-white,
+    buttonTextShadow: 0 1px 0 rgba(0,0,0,0.20),
+    buttonTextHover: \$color-white,
+    buttonBoxShadow: \$color-$1,
+    buttonBoxShadowHover: \$color-blue-black,
+    modalBackgroundColor: \$color-white,
+    modalTextColorPrimary: \$color-text-dark,
+  ),
+  $1-dark: (
+    colorAccent: \$color-$1,
+    colorAccentHover: \$color-$1,
+    colorAccentReverse: \$color-white,
+    colorWhite: \$color-white,
+    backgroundColor: \$color-background-dark,
+    backgroundColorEmphasis: \$color-background-super-dark,
+    backgroundColorOpaque: \$color-blue-dark,
+    moduleBackgroundColor: \$color-background-dark,
+    backgroundTransparent: transparent,
+    menuBackgroundColor: \$color-blue-dark,
+    moduleMediumBackgroundColor: \$color-background-dark,
+    navBackgroundColor: \$color-background-dark,
+    highlightBackgroundColor: \$color-blue-black-darkest,
+    tableRowEvenBackgroundColor: #212C33,
+    border: 1px solid \$color-border-dark,
+    borderLight: 1px solid \$color-border-dark-lightest,
+    borderDark: 1px solid \$color-text-gray-light,
+    borderAccent: 1px solid \$color-$1,
+    borderDotted: 1px dotted \$color-border-dark,
+    borderTransparent: transparent,
+    iconColorSecondary: \$color-text-gray-light,
+    textColorPrimary: \$color-text-white,
+    textColorSecondary: \$color-text-gray-light,
+    textColorAccent: \$color-$1,
+    textColorAccentHover: \$color-$1,
+    textColorError: \$color-text-red,
+    contentBorderAccent: \$color-$1,
+    buttonBackground: \$color-white,
+    buttonBackgroundHover: \$color-$1,
+    buttonText: \$color-blue-dark,
+    buttonTextShadow: 0 1px 0 rgba(0,0,0,0),
+    buttonTextHover: \$color-white,
+    buttonBoxShadow: \$color-$1,
+    buttonBoxShadowHover: \$color-white,
+    inputPriceWarning: rgba(255, 153, 0, 0.83),
+    modalBackgroundColor: \$color-white,
+    modalTextColorPrimary: \$color-text-dark,
+  ),
+END_HEREDOC
+)
+
+sed -i -e "s!\$themes: (!$(echo "$THEMES" | sed ':a;N;$!ba;s/\n/\\n/g')!" src/app/assets/stylesheets/_themes.scss
+
+THEMES2=$(cat <<END_HEREDOC
+
+.theme-$1-light {
+  background-color: \$white;
+  color: \$color-text-dark;
+  @include MQ(M) {
+    background-color: \$color-background-off-white;
+  }
+}
+
+.theme-$1-dark {
+  background-color: \$color-background-dark;
+  color: \$color-text-white;
+  .button.hollow {
+    &:hover, &:focus {
+      border-color: \$color-$1;
+      color: \$color-$1;
+      outline-color: \$color-$1;
+    }
+  }
+}
+END_HEREDOC
+)
+
+echo "$THEMES2" >> src/app/assets/stylesheets/_themes.scss
+
+echo "Find and place color in src/app/assets/stylesheets/_variables.scss"
+
+

clean_config.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+git checkout HEAD src/app/client_config.js
+
+git rm -rf src/app/assets/images
+git checkout HEAD src/app/assets/images
+git rm -rf src/app/assets/static
+git checkout HEAD src/app/assets/static
+git checkout HEAD src/app/assets/stylesheets

config/custom-environment-variables.json

@@ -17,6 +17,7 @@
     }
   },
   "img_proxy_prefix": "SDC_IMAGE_PROXY_PREFIX",
+  "hive_img_proxy_prefix": "SDC_HIVE_IMAGE_PROXY_PREFIX",
   "mixpanel": "SDC_MIXPANEL",
   "notify": {
     "gcm_key": "SDC_NOTIFY_GCM_KEY"

config/default.json

@@ -5,9 +5,9 @@
   "helmet": {
     "directives": {
       "childSrc": "'self' 3speak.tv emb.d.tube player.twitch.tv www.youtube.com staticxx.facebook.com w.soundcloud.com player.vimeo.com",
-      "connectSrc": "wss://ws.beechat.hive-engine.com https://beechat.hive-engine.com https://accounts.hive-engine.com https://history.steem-engine.net https://servedby.revive-adserver.net https://anyx.io https://steemd.minnowsupportproject.org https://cdn.snax.one https://api.hive-engine.com https://ha.herpc.dtools.dev https://api.steem-engine.net https://scot-api.hive-engine.com https://scot-api.steem-engine.net https://steemitimages.com https://images.hive.blog securepubads.g.doubleclick.net 'self' steemit.com https://api.steemit.com https://api.hive.blog api.blocktrades.us https://hivesigner.com https://pagead2.googlesyndication.com http://adservice.google.com https://www.google-analytics.com https://api.openhive.network https://www.reddit.com https://gist.github.com",
+      "connectSrc": "wss://ws.beechat.hive-engine.com https://beechat.hive-engine.com https://accounts.hive-engine.com https://history.steem-engine.net https://servedby.revive-adserver.net https://anyx.io https://steemd.minnowsupportproject.org https://cdn.snax.one https://smtscot.cryptoempirebot.com https://ha.smt-api.dtools.dev https://api.hive-engine.com https://api2.hive-engine.com https://ha.herpc.dtools.dev https://api.steem-engine.net https://hetest.cryptoempirebot.com https://scot-api.hive-engine.com https://scot-api.steem-engine.net https://steemitimages.com https://images.hive.blog securepubads.g.doubleclick.net 'self' steemit.com https://api.steemit.com https://api.hive.blog api.blocktrades.us https://hivesigner.com https://pagead2.googlesyndication.com http://adservice.google.com https://www.google-analytics.com https://api.openhive.network https://www.reddit.com https://gist.github.com",
       "defaultSrc": "tpc.googlesyndication.com 'self' img.3speakcontent.online emb.d.tube www.youtube.com staticxx.facebook.com player.vimeo.com *.streamrail.com",
-      "fontSrc": "data: fonts.gstatic.com cdn.embedly.com",
+      "fontSrc": "data: 'self' fonts.gstatic.com cdn.embedly.com",
       "frameAncestors": "'none'",
       "frameSrc": "'self' googleads.g.doubleclick.net https:",
       "imgSrc": "* data:",
@@ -21,6 +21,7 @@
     "setAllHeaders": true
   },
   "img_proxy_prefix": "https://images.hive.blog/",
+  "hive_img_proxy_prefix": "https://images.hive.blog/",
   "ipfs_prefix": false,
   "mixpanel": false,
   "notify": {
@@ -35,14 +36,15 @@
   "session_cookie_key": "hive-dev",
   "session_key": "haRYmEDmAndOgRempfLetIVI",
   "site_domain": "hive.blog",
-  "upload_image": false,
-  "steemd_connection_client": "https://api.steemit.com",
-  "steemd_connection_server": "https://api.steemit.com",
+  "upload_image": "https://images.hive.blog",
+  "hive_upload_image": "https://images.hive.blog",
+  "steemd_connection_client": "https://api.hive.blog",
+  "steemd_connection_server": "https://api.hive.blog",
   "hive_connection_client": "https://api.hive.blog",
   "hive_connection_server": "https://api.hive.blog",
   "steemd_use_appbase": true,
   "chain_id": "0000000000000000000000000000000000000000000000000000000000000000",
-  "alternative_api_endpoints": "https://api.openhive.network https://api.hive.blog https://anyx.io",
+  "alternative_api_endpoints": "https://api.openhive.network https://api.hive.blog",
   "failover_threshold": 3,
   "address_prefix": "STM",
   "conveyor_posting_wif": false,

deploy.sh

@@ -0,0 +1,5 @@
+sudo docker build -t registry.heroku.com/scotbuild/web .
+
+sudo docker push registry.heroku.com/scotbuild/web:latest
+
+heroku container:release web --app scotbuild

docker_push

@@ -0,0 +1,7 @@
+#!/bin/bash
+echo "Docker Login"
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin registry.heroku.com
+echo "Docker Push"
+docker push registry.heroku.com/scotbuild/web:latest
+echo "Heroku Release"
+heroku container:release web --app scotbuild

package.json

@@ -50,6 +50,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.12.1",
     "@babel/runtime": "^7.12.5",
+    "@hive-engine/sscjs": "^0.0.9",
     "@hiveio/hive-js": "^2.0.4",
     "@hiveio/hivescript": "^1.2.0",
     "@livechat/ui-kit": "0.2.13",
@@ -145,7 +146,6 @@
     "slate-trailing-block": "0.2.4",
     "speakingurl": "9.0.0",
     "squarify": "1.1.0",
-    "@hive-engine/sscjs": "^0.0.9",
     "statsd-client": "0.4.2",
     "steem": "0.7.9",
     "steemscript": "1.1.1",
@@ -212,7 +212,7 @@
     "koa-webpack-hot-middleware": "1.0.3",
     "lint-staged": "6.0.0",
     "mock-local-storage": "1.0.5",
-    "node-sass": "4.13.1",
+    "node-sass": "6.x.x",
     "node-watch": "0.5.5",
     "picturefill": "3.0.2",
     "prettier": "1.8.2",
@@ -233,7 +233,7 @@
     "webpack-livereload-plugin": "1"
   },
   "engines": {
-    "node": "12.x",
+    "node": "16.x",
     "yarn": "1.x"
   },
   "lint-staged": {

src/app/Main.js

@@ -112,7 +112,7 @@ function runApp(initial_state) {
     });
 
     window.$STM_Config = config;
-    plugins(config);
+    plugins(config, initial_state.app.hostConfig);
     if (initial_state.offchain.serverBusy) {
         window.$STM_ServerBusy = true;
     }
@@ -153,11 +153,11 @@ if (!window.Intl) {
             window.IntlPolyfill = window.Intl = require('intl/dist/Intl');
             require('intl/locale-data/jsonp/en-US.js');
             require('intl/locale-data/jsonp/es.js');
-            require('intl/locale-data/jsonp/ru.js');
             require('intl/locale-data/jsonp/fr.js');
             require('intl/locale-data/jsonp/it.js');
-            require('intl/locale-data/jsonp/ko.js');
             require('intl/locale-data/jsonp/ja.js');
+            require('intl/locale-data/jsonp/ko.js');
+            require('intl/locale-data/jsonp/ru.js');
             Iso.bootstrap(runApp);
         },
         'IntlBundle'

src/app/Translator.js

@@ -42,6 +42,9 @@ tt.registerTranslations('pl', require('app/locales/pl.json'));
 tt.registerTranslations('ja', require('app/locales/counterpart/ja'));
 tt.registerTranslations('ja', require('app/locales/ja.json'));
 
+tt.registerTranslations('ua', require('app/locales/counterpart/ua'));
+tt.registerTranslations('ua', require('app/locales/ua.json'));
+
 if (process.env.NODE_ENV === 'production') {
     tt.setFallbackLocale('en');
 }