Fix post UTM

.circleci/config.yml

@@ -0,0 +1,167 @@
+version: 2.1
+orbs:
+  k8s: circleci/[email protected]
+  slack: circleci/[email protected]
+commands:
+  git_checkout_from_cache:
+    description: "Git checkout and save cache"
+    steps:
+      - restore_cache:
+          name: Git restore cache
+          keys:
+            - source-v2-{{ .Branch }}-{{ .Revision }}
+            - source-v2-{{ .Branch }}-
+            - source-v2-
+      - run:
+          name: Fetch git tags
+          command: |
+            mkdir -p ~/.ssh
+            ssh-keyscan github.com >> ~/.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-v2-{{ .Branch }}-{{ .Revision }}
+          paths:
+            - ".git"
+  bundle_install:
+    description: "Bundle install"
+    steps:
+      - restore_cache:
+          name: Bundle modules cache restore
+          keys:
+            - bundle-v1-{{ checksum "Gemfile" }}
+            - bundle-v1-
+      - run:
+          name: Bundle install
+          command: |
+            bundle install --path ./modules
+      - save_cache:
+          name: Bundle modules cache save
+          key: bundle-v1-{{ checksum "Gemfile" }}
+          paths:
+            - "modules"
+  build:
+    description: "Build Jekyll site"
+    steps:
+      - restore_cache:
+          name: "Build cache restore"
+          keys:
+            - _site-v1-{{ .Revision }}
+            - _site-v1-
+      - run:
+          name: Building Jekyll site
+          command: bundle exec jekyll build --incremental
+      - save_cache:
+          name: Build cache save
+          key: _site-v1-{{ .Revision }}
+          paths:
+            - _site
+  docker_build_push:
+    description: "Build Docker image"
+    parameters:
+      docker_image_latest_tag:
+        type: string
+        default: "latest-staging"
+    steps:
+      - setup_remote_docker
+      - run:
+          name: Building docker image
+          command: |
+            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
+            docker build -t ${DOCKHUB_ORGANISATION}/binary-static-academy:${TAG} -t ${DOCKHUB_ORGANISATION}/binary-static-academy:<< parameters.docker_image_latest_tag >> .
+      - run:
+          name: Pushing Image to docker hub
+          command: |
+            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
+            echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
+            docker push ${DOCKHUB_ORGANISATION}/binary-static-academy:${TAG}
+            docker push ${DOCKHUB_ORGANISATION}/binary-static-academy:<< parameters.docker_image_latest_tag >>
+  k8s_deploy:
+    description: "Deploy to k8s cluster"
+    parameters:
+      k8s_version:
+        type: string
+        default: ${CIRCLE_SHA1}
+      k8s_namespace:
+        type: string
+        default: "academy-binary-com-staging"
+    steps:
+      - k8s/install-kubectl
+      - run:
+          name: Deploying to k8s cluster for service binary-academy
+          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 binary-static-academy << parameters.k8s_version >> ${TAG}
+  notify_slack:
+    description: "Notify slack"
+    steps:
+      - slack/status:
+          include_project_field: false
+          failure_message: "Release failed for Academy with version *$(cat _site/version)*"
+          success_message: "Release succeeded for Academy with version *$(cat _site/version)*"
+          webhook: ${SLACK_WEBHOOK} 
+jobs:
+  build:
+    docker:
+      - image: circleci/ruby:2.6.5
+    steps:
+      - git_checkout_from_cache
+      - bundle_install
+      - build
+  release_staging:
+    docker:
+      - image: circleci/ruby:2.6.5
+    steps:
+      - git_checkout_from_cache
+      - bundle_install
+      - build
+      - docker_build_push
+      #- k8s_deploy # devops will add staging k8s manifests
+      - notify_slack
+  release_production:
+    docker:
+      - image: circleci/ruby:2.6.5
+    steps:
+      - git_checkout_from_cache
+      - bundle_install
+      - build
+      - docker_build_push:
+          docker_image_latest_tag: "latest"
+      - k8s_deploy:
+          k8s_namespace: "academy-binary-com-production"
+      - notify_slack
+workflows:
+  build:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore: /^master$/
+            tags:
+              ignore: /.*/
+  release:
+    jobs:
+      - release_staging:
+          filters:
+            branches:
+              only: /^master$/
+      - release_production:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^production.*/
+          context: binary-frontend-artifact-upload
+

.gitignore

@@ -1,5 +1,59 @@
+# Project #
+###################
+node_modules
+dist
+upload
+deploy.log
+package-lock.json
+Gemfile.lock
+
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Custom #
+######################
+*.sass-cache*
+.cache/
+.jekyll-cache/
 _site
-.sass-cache
+/.idea
+secrets.json
 .jekyll-metadata
-CNAME
-Gemfile.lock
+.ruby-version
+.vscode/*
+CNAME

404.html

@@ -18,107 +18,6 @@ <h2>The page you requested does not exist.</h2>
 			</div>
 		</div>
 	</div>
-	<div class="section">
-		<div class="container center-text">
-			<div class="row">	
-				<div class="col">
-					<h2>Featured videos</h2>
-				</div>
-			</div>	
-			<div class="row">	
-				<div class="col-lg-4">			
-					<div class="video-container">
-						<iframe src="//www.youtube.com/embed/mXuR_SRP-XI" allowfullscreen></iframe>
-					</div>
-					<a href="https://www.youtube.com/watch?v=mXuR_SRP-XI"><h3>Introduction to the MT5 trading platform</h3></a>
-				</div>
-				<div class="col-lg-4">			
-					<div class="video-container">
-						<iframe src="//www.youtube.com/embed/ntu6pZRopq4" allowfullscreen></iframe>
-					</div>	
-					<a href="https://www.youtube.com/watch?v=ntu6pZRopq4"><h3>How to choose and subscribe to a trading signal</h3></a>
-				</div>
-				<div class="col-lg-4">			
-					<div class="video-container">
-						<iframe src="//www.youtube.com/embed/XVW_6X_uf8Q" allowfullscreen></iframe>
-					</div>
-					<a href="https://www.youtube.com/watch?v=XVW_6X_uf8Q"><h3>How to create a trading robot in the MQL5 Wizard</h3></a>
-				</div>
-			</div>
-			<div class="row">	
-				<div class="col">
-					<p><a href="{{ '/en/videos/' | prepend: SourceUrl }}" class="button"><span>See all videos</span></a></p>
-				</div>
-			</div>	
-		</div>
-	</div>
-	<div class="section">
-		<div class="container">
-			<div class="row">	
-				<div class="col center-text">
-					<h2>Recommended links</h2>
-				</div>
-			</div>
-			<div class="flex-row row">
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="{{ '/en/webinars/' | prepend: SourceUrl }}"><h3>Webinars</h3></a>
-							<p class="flex-text">Binary.com in collaboration with professional traders provides free training sessions for both beginners and advanced traders.</p>
-							<p><a href="{{ '/en/webinars/' | prepend: SourceUrl }}" class="button"><span>Read more</span></a></p>
-						</div>
-					</div>
-				</div>
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="https://shop.binary.com/"><h3>Binary.com Shop</h3></a>
-							<p class="flex-text">Grab apps, strategies, guides, gear, and more from Binary.com and other third-party sellers.</p>
-							<p><a href="https://shop.binary.com/" class="button"><span>Visit Shop</span></a></p>
-						</div>
-					</div>
-				</div>
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="{{ '/en/binary-tv/' | prepend: SourceUrl }}"><h3>Binary TV</h3></a>
-							<p class="flex-text text-muted">Firm believer of fundamental analysis? Keep up with headline news and trends from around the world.</p>
-							<p><a href="{{ '/en/binary-tv/' | prepend: SourceUrl }}" class="button"><span>Read more</span></a></p>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="flex-row row">
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="{{ '/en/downloads/' | prepend: SourceUrl }}"><h3>E-Books</h3></a>
-							<p class="flex-text">Check out our whole range of e-books and download your free trading guide to get started right away!</p>
-							<p><a href="{{ '/en/downloads/' | prepend: SourceUrl }}" class="button"><span>Read more</span></a></p>
-						</div>
-					</div>
-				</div>
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="{{ '/en/daily-report/' | prepend: SourceUrl }}"><h3>Daily Report</h3></a>
-							<p class="flex-text text-muted">Stay up-to-date with the latest financial news and trends from around the world, with Daily Market Reports written by professional trader, Dave Evans.</p>
-							<p><a href="{{ '/en/daily-report/' | prepend: SourceUrl }}" class="button"><span>Read more</span></a></p>
-						</div>
-					</div>
-				</div>
-				<div class="col-sm-4">
-					<div class="card thumbnail bottom-30">
-						<div class="caption">
-							<a href="{{ '/en/mellon-on-the-markets/' | prepend: SourceUrl }}"><h3>Mellon on the Markets</h3></a>
-							<p class="flex-text">Read through Jim Mellon's analysis of the global markets and learn how to determine whether you should or should not trade headline news driven events. Completely free of charge!</p>
-							<p><a href="{{ '/en/mellon-on-the-markets/' | prepend: SourceUrl }}" class="button"><span>Read more</span></a></p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
 	<div class="section">
 		<div class="container">
 			<div class="row">	

Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:alpine
+COPY ./_site /usr/share/nginx/html
+COPY ./academy.com.conf /etc/nginx/conf.d/default.conf

Gemfile

@@ -1,8 +1,7 @@
 source "https://rubygems.org"
-ruby '2.5.0'
 
-gem "jekyll", "3.8.4"
+gem "jekyll", "4.0.0"
 
 group :jekyll_plugins do
-   gem "jekyll-feed", "~> 0.9.2"
+   gem "jekyll-feed"
 end

README.md

@@ -1,11 +1,10 @@
-## Binary Academy
-
-[![Build Status](https://travis-ci.org/binary-com/academy.svg?branch=gh-pages)](https://travis-ci.org/binary-com/academy)
+# Binary Academy
+## :warning: Deprecation notice
+This repository is deprecated, it was used for [academy.binary.com](https://academy.binary.com) that is now deleted (end of 2022). 
 
+## README
 - Always add language to the permalink ( like this -> permalink: /en/some-text-for-prmalink }
 
-
-
 Why is this important?
 Blog is always listening url and looking for language value (/en/) in order to show correct language on the page for all elements (header, footer, sidebar..) 
 

_config.yml

@@ -11,4 +11,7 @@ future: true
 markdown: kramdown
 exclude:
   - Gemfile
-  - Gemfile.lock
+  - Gemfile.lock
+  - modules
+  - Dockerfile
+  - academy.com.conf