Merge master into dev

.circleci/config.yml

@@ -0,0 +1,179 @@
+version: 2.1
+orbs:
+  k8s: circleci/kubernetes@0.7.0
+commands:
+  git_checkout_from_cache:
+    description: "Git checkout and save cache"
+    steps:
+      - restore_cache:
+          name: Git restore cache
+          keys:
+            - source-v1-{{ .Branch }}-{{ .Revision }}
+            - source-v1-{{ .Branch }}-
+            - source-v1-
+      - run:
+          name: Fetch git tags
+          command: |
+            mkdir -p ~/.ssh
+            echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== ' >> ~/.ssh/known_hosts
+            # Fetch tags if git cache is present
+            if [ -e /home/circleci/project/.git ]
+            then
+              git fetch origin --tags
+            fi
+      - checkout
+      - run:
+          name: Compress git objects
+          command: git gc
+      - save_cache:
+          name: Git save cache
+          key: source-v1-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ".git"
+  npm_install:
+    description: "Install npm modules"
+    steps:
+      - restore_cache:
+          name: Restore npm cache
+          keys:
+            - npm-v1-{{ checksum "package.json" }}
+            - npm-v1-
+      - run:
+          name: Install npm modules
+          command: npm install && ./node_modules/.bin/bower install
+      - save_cache:
+          name: Save NPM cache
+          key: npm-v1-{{ checksum "package.json" }}
+          paths:
+            - "node_modules"
+  build:
+    description: "Build"
+    steps:
+      - run:
+          name: "gulp build"
+          command: npx gulp build
+      - run:
+          name: "upload apk to www folder"
+          command: cp -r download www/
+  deploy:
+    description: "Deploy to static branches"
+    parameters:
+      target_branch:
+        type: string
+    steps:
+      - checkout
+      - attach_workspace:
+          at: www
+      - run:
+          name: Tag build
+          command: echo "<< parameters.target_branch >> $(date)" > www/version
+      - run:
+          name: Install and configure dependencies
+          command: |
+            sudo npm install -g gh-pages@2.0.1
+            git config user.email "ci-build@binary.com"
+            git config user.name "ci-build"
+      - add_ssh_keys:
+          fingerprints:
+            - "01:67:4a:6d:26:9c:70:c4:1a:60:91:88:d9:dd:f0:83"
+      - run:
+          name: Deploy docs to gh-pages branch
+          command: gh-pages -d www --branch << parameters.target_branch >> --message '[skip ci]'
+  docker_build_push:
+    description: "Build and Push image to docker hub"
+    steps:
+      - setup_remote_docker
+      - run:
+          name: Building docker image for production
+          command: |
+            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-ticktrade:${CIRCLE_TAG} -t ${DOCKHUB_ORGANISATION}/binary-static-ticktrade:latest .
+      - run:
+          name: Pushing Image to docker hub
+          command: |
+            echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
+            docker push ${DOCKHUB_ORGANISATION}/binary-static-ticktrade
+  k8s_deploy:
+    description: "Deploy to k8s cluster"
+    parameters:
+      k8s_namespace:
+        type: string
+        default: "ticktrade-binary-com-production"
+      k8s_service:
+        type: string
+        default: "binary-static-ticktrade"
+    steps:
+      - k8s/install-kubectl
+      - run:
+          name: Deploying to k8s cluster for service ticktrade-binary-com
+          command: |
+            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
+            export NAMESPACE=<< parameters.k8s_namespace >>
+            git clone https://github.com/binary-com/devops-ci-scripts
+            cd devops-ci-scripts/k8s-build_tools
+            echo $CA_CRT | base64 --decode > ca.crt
+            ./release.sh << parameters.k8s_service >> ${TAG}
+
+jobs:
+  test:
+    docker:
+      - image: circleci/node:8.10.0-stretch
+    steps:
+      - git_checkout_from_cache
+      - npm_install
+      - build
+  release_beta:
+    docker:
+      - image: circleci/node:8.10.0-stretch
+    steps:
+      - git_checkout_from_cache
+      - npm_install
+      - build
+      - deploy:
+          target_branch: "staging"
+
+  release_production:
+    docker:
+      - image: circleci/node:8.10.0-stretch
+    steps:
+      - git_checkout_from_cache
+      - npm_install
+      - build
+      - deploy:
+          target_branch: "production"
+
+  release_aws_production:
+    docker:
+      - image: circleci/node:8.10.0-stretch
+    steps:
+      - git_checkout_from_cache
+      - npm_install
+      - build
+      - docker_build_push
+      - k8s_deploy 
+
+workflows:
+  test:
+    jobs:
+      - test:
+          filters:
+            branches:
+              ignore: /^master$/
+  release:
+    jobs:
+      - release_beta:
+          filters:
+            branches:
+              only: /^master$/
+      - release_production:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^production.*/
+      - release_aws_production:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^production.*/
+          context: binary-frontend-artifact-upload

.dockerignore

@@ -0,0 +1,2 @@
+.git
+Dockerfile

Dockerfile

@@ -0,0 +1,4 @@
+
+FROM nginx:alpine
+COPY ./www /usr/share/nginx/html
+COPY ./default.conf /etc/nginx/conf.d/default.conf

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="205000" id="com.binary.ticktrade" version="2.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="206020" id="com.binary.ticktrade" version="2.6.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Tick Trade</name>
     <description>
     Enjoy fast-paced binary options trading with the Binary.com Tick Trade App. Trade Forex and more in seconds with our mobile application.
@@ -29,6 +29,7 @@
     <hook src="scripts/after_prepare/es5-compatible.js" type="after_prepare" />
     <platform name="android">
         <hook src="scripts/after_prepare/011_add_cert_fingerprint.js" type="after_prepare" />
+        <preference name="AndroidLaunchMode" value="singleInstance" />
         <preference name="CodePushDeploymentKey" value="RsETRgKn7ZenvRAozwUYOcUwXEi6V1eFOQxYg" />
         <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />

default.conf

@@ -0,0 +1,22 @@
+server {
+    listen 80;
+    server_name  localhost;
+
+    add_header Cache-Control "public, max-age=7200, s-maxage=600, must-revalidate";
+    charset UTF-8;
+
+    error_page 404 /404.html;
+
+    location @custom_error_503 {
+        return 503;
+    }
+
+    location ~ /\.git {
+        return 404;
+    }
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+}

gulpfile.js

@@ -121,39 +121,38 @@ gulp.task('deploy-apk', (done) => {
     const remoteUrl = getRemoteUrl(remote);
 
     // remove last tmp directory if it exists
-    sh.rm('-rf', 'tmp');
+    // sh.rm('-rf', 'tmp');
 
     // make a tmp directory
-    sh.mkdir('tmp');
+    // sh.mkdir('tmp');
     if(sh.error()){
         console.log(gutil.colors.red(`Error: ${  sh.error()}`));
         process.exit(1);
     }
 
-    sh.cd('tmp');
-    console.log('Fetching gh-pages ...');
-    sh.config.silent = false;
-    sh.exec(`git clone ${ remoteUrl } -b gh-pages ./`);
-    sh.config.silent = true;
+    // sh.cd('tmp');
+    // console.log('Fetching gh-pages ...');
+    // sh.config.silent = false;
+    // sh.exec(`git clone ${ remoteUrl } -b gh-pages ./`);
+    // sh.config.silent = true;
 
     console.log('Copying latest verison of APK ...');
     sh.rm('-rf', 'download');
     sh.mkdir('download');
-    sh.cp('../platforms/android/app/build/outputs/apk/release/ticktrade-app.apk','download/ticktrade-app.apk');
+    sh.cp('./platforms/android/app/build/outputs/apk/release/ticktrade-app.apk','download/ticktrade-app.apk');
 
-    console.log('Pushing changes to gh-pages ...');
+    console.log('Pushing changes to origin ...');
     sh.config.silent = false;
     sh.exec('git config user.name "Morteza Tavanarad"');
     sh.exec('git config user.email "morteza@binary.com"');
     sh.exec('git add .');
     sh.exec(`git commit -m "Deployed new version of APK - ${new Date().toUTCString()}"`);
-    sh.exec('git push origin gh-pages:gh-pages');
+    sh.exec('git push origin master:master');
     sh.config.silent = true;
 
     console.log('Cleaning workspace ...');
     // remove tmp directory to clean workspace
-    sh.cd('../');
-    sh.rm('-rf', 'tmp');
+    // sh.rm('-rf', 'tmp');
     return done();
 });
 gulp.task('code-push', (done) => {
@@ -188,13 +187,14 @@ gulp.task('code-push', (done) => {
 
     console.log(`  ${  gutil.colors.blue('Preparing files ...')}`);
     sh.sed('-i', '.otherwise("/")', '.otherwise("/update")', 'www/js/configs/states.config.js');
+    sh.exec('ionic cordova prepare');
 
     console.log(`  ${  gutil.colors.blue('Run code-push ...')}`);
     sh.exec(`code-push release-cordova ${  app  } ${  platform  } --deploymentName ${  deployment  }${targetVersion    } --mandatory`);
 
     console.log(`  ${  gutil.colors.blue('Rolling back dump changes ...')}`);
     sh.sed('-i', '.otherwise("/update")', '.otherwise("/")', 'www/js/configs/states.config.js');
-    sh.exec('ionic prepare');
+    sh.exec('ionic cordova prepare');
 
     done();
 });
@@ -271,10 +271,10 @@ gulp.task('release-qa', () => {
 
     const gitResult = sh.exec('echo | git branch | grep "*"');
 
-    if (gitResult && gitResult.output && gitResult.output.indexOf('qa_version') < 0) {
-        console.log("You're not in qa_version branch");
-        process.exit(-1);
-    }
+    // if (gitResult && gitResult.output && gitResult.output.indexOf('qa_version') < 0) {
+    //     console.log("You're not in qa_version branch");
+    //     process.exit(-1);
+    // }
 
     const qaMachine = getArgvBySwitchName('--qa_machine');
 
@@ -292,6 +292,38 @@ gulp.task('release-qa', () => {
     }
 
 
+});
+
+gulp.task('run-qa', () => {
+
+    /**
+     * Usage gulp release-qa --qa_machine qaurl1,qaurl2,...
+     *
+     */
+
+    const gitResult = sh.exec('echo | git branch | grep "*"');
+
+    // if (gitResult && gitResult.output && gitResult.output.indexOf('qa_version') < 0) {
+    //     console.log("You're not in qa_version branch");
+    //     process.exit(-1);
+    // }
+
+    const qaMachine = getArgvBySwitchName('--qa_machine');
+
+    if (qaMachine) {
+        sh.exec(`ionic cordova run android -- --qa_machine=${  qaMachine}`);
+    }
+
+    const qaMachineFile = getArgvBySwitchName('--qa_machine_file');
+
+    if (qaMachineFile) {
+        const qaMachineList = require(qaMachineFile);
+        if (qaMachineList && qaMachineList.length) {
+            sh.exec(`ionic cordova run android -- --qa_machine=${  qaMachineList.join(',')}`);
+        }
+    }
+
+
 });
 
 

package.json

@@ -29,7 +29,7 @@
     "cordova-plugin-whitelist": "^1.3.3",
     "cordova-plugin-zip": "^3.1.0",
     "express": "^4.13.3",
-    "gulp": "^3.5.6",
+    "gulp": "^3.9.1",
     "gulp-concat": "^2.2.0",
     "gulp-minify-css": "^0.3.0",
     "gulp-rename": "^1.2.0",

scripts/after_prepare/011_add_cert_fingerprint.js

@@ -8,6 +8,7 @@ module.exports = function (context) {
     const platformPath = path.join(rootDir, 'platforms');
 
     const qaMachines = context.opts.options.qa_machine ? context.opts.options.qa_machine.split(',') : [];
+    console.log(qaMachines);
 
     run();
 
@@ -18,20 +19,20 @@ module.exports = function (context) {
 
         const currentBranch = shell.exec("echo | git branch | grep '*'");
 
-        if(currentBranch && currentBranch.stdout && currentBranch.stdout.indexOf('qa_version') > -1) {
-            const qaFP = [];
+        // if(currentBranch && currentBranch.stdout && currentBranch.stdout.indexOf('qa_version') > -1) {
+        const qaFP = [];
 
-            qaMachines.forEach((m) => {
-                const cert = {
-                    url: m,
-                    fp : retriveFP(m),
-                };
+        qaMachines.forEach((m) => {
+            const cert = {
+                url: m,
+                fp : retriveFP(m),
+            };
 
-                cert.fp ? qaFP.push(cert) : null;
-            });
+            cert.fp ? qaFP.push(cert) : null;
+        });
 
-            writeFP(qaFP, 'qaMachinesCertFP');
-        }
+        writeFP(qaFP, 'qaMachinesCertFP');
+        // }
     }
 
     function retriveFP(url, variableName) {