Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4d2d702
deyarn
cakasuma Mar 5, 2019
f57ac34
fix node sass error
cakasuma Mar 20, 2019
2316cfe
upgrade grunt contrib compress
cakasuma Mar 20, 2019
ce39d5e
remove grunt contrib compress
cakasuma Mar 20, 2019
5e92dc2
add package lock
cakasuma Mar 20, 2019
f06a867
fix author
cakasuma Mar 20, 2019
343cb4a
Merge pull request #1422 from cakasuma/amam/yarn_to_npm_again
oskar-binary Mar 21, 2019
c5933fe
add description and preload for index html
cakasuma Mar 27, 2019
b769d98
refactor html and add trade navigation click
cakasuma Mar 27, 2019
3910de5
handle click outside
cakasuma Mar 27, 2019
b511198
fix dialog hide when click outside
cakasuma Mar 28, 2019
17ed7c0
get for all selectors
cakasuma Mar 28, 2019
fef15a0
add comment
cakasuma Mar 28, 2019
abf4cb7
fix navigation selector
cakasuma Mar 28, 2019
969b40b
Merge pull request #1424 from cakasuma/amam/navbar_hover_fix
ashkanx Mar 29, 2019
a5e7ac2
add semicolon spaces and trailing comma
cakasuma Mar 29, 2019
4921ba3
spaces import
cakasuma Mar 29, 2019
a8d5351
add spaces
cakasuma Mar 29, 2019
93c77ff
change double to single quote
cakasuma Mar 29, 2019
fdb4a92
add trailing and colon
cakasuma Mar 29, 2019
7b08760
add space
cakasuma Apr 1, 2019
a027ce8
follow code rules
cakasuma Apr 1, 2019
95708db
add space
cakasuma Apr 1, 2019
4ed25fe
Merge pull request #1425 from cakasuma/amam/add_semicolon
oskar-binary Apr 1, 2019
5f6ee68
revert preload
cakasuma Apr 1, 2019
117c18c
added both preload
cakasuma Apr 1, 2019
bcc3aa9
Merge pull request #1426 from cakasuma/amam/remove_preload
oskar-binary Apr 1, 2019
f6e1d92
revert both preloader
cakasuma Apr 1, 2019
fb3e2ad
Merge pull request #1427 from cakasuma/amam/revert_both_preload
oskar-binary Apr 1, 2019
79508d0
add binary com style
cakasuma Apr 2, 2019
01bb452
Khalid/added 18+ underage sign to footer
Apr 2, 2019
250dfa7
Merge pull request #1428 from cakasuma/amam/fix_binary_style
oskar-binary Apr 2, 2019
bff3748
Merge branch 'development' of github.com:binary-com/webtrader into un…
Apr 2, 2019
e74da29
made footer responsive
Apr 2, 2019
e8c5444
removed extra tabs
Apr 2, 2019
8395396
removed underage sign for non-EU
Apr 2, 2019
8736d36
fixed grunt version
Apr 2, 2019
c230231
fixed npm version
Apr 2, 2019
c74e9c7
fixed the disappearance of 18+ sign for iOS
Apr 3, 2019
f85b0d6
fixed 18+ sign width
Apr 3, 2019
a841683
removed non-eu css
Apr 3, 2019
f7d61a4
package.json resloved
Apr 4, 2019
5047fb5
aded space
Apr 4, 2019
805b981
Merge pull request #1429 from Khalidxx/underage
oskar-binary Apr 4, 2019
3b527d2
change to fadeToggle
cakasuma Apr 4, 2019
12300f9
Merge pull request #1430 from cakasuma/amam/fade_toggle
oskar-binary Apr 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ matrix:
fast_finish: true
language: node_js
node_js:
- '9'
- '10'
dist: trusty
branches:
only:
- master
- development
before_install:
- yarn
- npm install -g npm@6.7.0
- npm ci
install:
- yarn build
- npm run build
after_success:
- git config --global user.email "oskar@binary.com"
- git config --global user.name "OskarAhl"
- yarn deploy-gh-pages
- npm run deploy-gh-pages
env:
global:
- secure: VkC8JcM0fpaYehywEI5kiP/1Ui+lfVfHRWSNMAbJqIeumpzdYLc8x9ws3DJLkufiohmDv+e2lArpwU5rMTKCELquhdWzKPKQT4Dkt58CC45TggE6rEDqeR9lNQpvNwircJ3y4rvlDrpPNuZ2G7HH+2l+JUrwAOwS1/UOKdSkghci1eGX/OlqyE84nEKHBlD0JnvkS7tQquhhAtMtT/+1ENK4Ku6oMUQpgABjaxoquCCOnzFvTYJKa3aPQ6p1yNQgP9KJCnMTjvJ+1p8RngunnYbeT5Eyvndb7IY68/3uFQgJTenfGA9sT3Nh5Roy6sO7Sk/jhqndxPXmku50otW0XwMPC+lHmBNi9u+5k3NwVzGfho9/vwdr1M9sRd9PWx1OjOcwsXw7xu6pU541pgGEbsW0qBKZ9gt3atR3EBsseovCQUagORtpb4GcXJRShrnrRlPIq6iZNIs+CQVy9iJqQEz+6UODJNNFL5NuhTvfgdw1qrHqO0gUybXcDC6HZPVJx0NqrM6F2TgLnusN5HaO7PEiPM90DCkwSpyKFyx7O4GUw8vGPQG2AYzUitO5pyUc4sLRX7v/MsU9kypqa8UWONam7DhofHJonLhbNpnS2yeSrGZ+DRJlIhmOX7FWpJooSZoi/hZoW8Mt3uGYgSMIe6IRu+cJXwJHGa9lAkKLrTU=
27 changes: 15 additions & 12 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"use strict";
const sass = require('node-sass');

module.exports = function (grunt) {

Expand Down Expand Up @@ -328,18 +329,20 @@ module.exports = function (grunt) {
}
},
sass: {
// options: { sourceMap: true },
dist: {
files: [
{
expand: true,
cwd: "src/",
src: ["**/*.scss"],
dest: "dist/uncompressed/v<%=pkg.version%>",
ext: ".css"
}
]
}
options: {
implementation: sass
},
dist: {
files: [
{
expand: true,
cwd: "src/",
src: ["**/*.scss"],
dest: "dist/uncompressed/v<%=pkg.version%>",
ext: ".css"
}
]
}
},
babel: {
options: {
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ The goal of this project is to create a full-screen trading interface for [Binar

* git
* node JS
* yarn
* npm

## How to work with this project

$ git clone https://github.com/binary-com/webtrader.git
$ cd webtrader
$ yarn install
$ yarn build #compiles the project
$ yarn start #Start a local server and serve the compiled files
$ npm install
$ npm run build #compiles the project
$ npm start #Start a local server and serve the compiled files

Running this command will launch local server at http://localhost:9001

Expand All @@ -42,11 +42,11 @@ Now you can debug your app on https://webtrader.local/ locally.

To bump release version, run

$ yarn major-rel
$ npm major-rel
or
$ yarn minor-rel
$ npm minor-rel
or
$ yarn patch-rel
$ npm patch-rel

Every check-in or merge into master will trigger travis-ci build and do a release to production.

Expand All @@ -58,7 +58,7 @@ Translation related files are in `/translations` folder.

To extract text for translation:

$ yarn build
$ npm run build
$ cd ./translations
$ python extract.py
$ extract.py # extracts string literals from `dist/uncompressed` (from *.html and *.js)
Expand Down
Loading