Merge branch 'dev' into search-bot

Author: sam-binary

.travis.yml

@@ -10,3 +10,4 @@ before_install:
     - npm i -g npm@6.9.0
     - npm install -g grunt-cli
 install: npm ci
+script: travis_retry npm test

src/assets/icons/ic-stage-1.svg

@@ -13,4 +13,8 @@ $FONT_STACK: roboto, sans-serif;
     -webkit-text-size-adjust: 100%;
     -ms-text-size-adjust: 100%;
     box-sizing: border-box;
+}
+
+html {
+    font-size: 62.5%;
 }

src/assets/icons/ic-stage-2.svg

@@ -18,13 +18,27 @@ $category-colours: (
     tick-analysis   : #2e7d32,
     candle          : #5e35b1,
     miscellaneous   : #ffb300,
+    trade_parameters   : #30409f,
+    purchase_conditions: #00897b,
+    sell_conditions    : #78909c,
+    trade_results      : #d81a60,
+    technical_analysis : #689e38,
+    utility            : #8e25aa,
+    math               : #fc8b01,
+    text               : #5d4037,
+    logic              : #1876d2,
+    lists              : #e53836,
+    custom_functions   : #00acc1,
+    variables          : #616161,
+    loops              : #afb42b,
 );
 
 .toolbox {
-    $toolbox  : &;
-    $white    : #fff;
-    $lightgrey: #ebebeb;
-    $grey     : #f4f4f6;
+    $toolbox         : &;
+    $white           : #fff;
+    $lightgrey       : #ebebeb;
+    $grey            : #f4f4f6;
+    $category-text-spacing: 15px;
 
     background-color: $white;
     border: 1px solid $lightgrey;
@@ -37,81 +51,113 @@ $category-colours: (
     overflow: hidden;
     position: absolute;
     user-select: none;
-    z-index: 99 !important;
+    z-index: 1;
+    width: 250px;
 
     &__header {
+        padding: 0.5em;
+        position: relative;
         font-weight: bold;
+        font-size: 1.6em;
         background-color: $grey;
+        text-align: center;
+    }
+    &__item {
+        display: flex;
+        flex-direction: row;
+    }
+    &__category-arrow {
+        display: flex;
+        margin: auto;
+
+        &--back {
+            margin-left: $category-text-spacing;
+            fill: $white;
+            @include vendor(transform, rotate(90deg));
+        }
+        &--open {
+            margin-right: $category-text-spacing;
+            @include vendor(transform, rotate(270deg));
+        }
+    }
+    &__category-colour {
+        width: 5px;
+        flex-shrink: 0;
     }
+    @each $category, $colour in $category-colours {
+        &__category {
+            &--#{$category} {
+                #{$toolbox}__category-colour {
+                    background-color: $colour;
+                }
+            }
+        }
+        &__category-return {
+            #{$toolbox}__category {
+                &--#{$category} {
+                    background-color: $colour;
+                }
+            }
+        }
+    }
+
     &__category-menu {
         display: flex;
         flex-direction: column;
         flex-grow: 1;
         min-height: 0;
         overflow: auto;
     }
-    &__row {
-        cursor: pointer;
-        border-top: 1px solid $lightgrey;
-    }
-    &__header, &__label {
-        font-size: 1em;
-        padding: 0.6em 1em;
-    }
-    &__title {
-        margin-right: 0.6em;
-    }
-    &__arrow {
+    &__category-return {
         cursor: pointer;
-        position: absolute;
-        top: 0.6em;
-        right: 0.6em;
-        @include vendor(transform, rotate(90deg));
-        @include vendor(transition, transform 0.25s ease);
+        color: $white;
+        text-align: center;
+
+        #{$toolbox}__label {
+            margin-left: -($category-text-spacing * 2);
+        }
     }
-    &__item {
-        position: relative;
+    &__category-text {
+        align-self: center;
+        margin: $category-text-spacing;
+        width: 100%;
     }
-    &__color {
-        position: absolute;
-        left: 0;
-        width: 4px;
-        height: 100%;
+    &__description {
+        font-size: 1.3em;
     }
-    &--collapsed {
-        #{$toolbox}__header, #{$toolbox}__item {
-            padding: 0.6em;
-        }
-        #{$toolbox}__color {
-            position: relative;
-            width: 20px;
-            height: 20px;
-            border-radius: 50%;
-        }
-        #{$toolbox}__title, #{$toolbox}__label {
-            display: none;
-        }
-        #{$toolbox}__arrow {
-            position: relative;
-            @include vendor(transform, rotate(270deg));
-            margin-top: -2px;
-            top: 0;
-            right: -2px;
-        }
-        #{$toolbox}__row {
-            border-top: none;
+    &__icon {
+        display: flex;
+        align-self: center;
+        margin-right: $category-text-spacing;
+
+        > svg {
+            height: 25px;
+            width: 25px;
         }
     }
-    @each $category, $category-colour in $category-colours {
-        &__category--#{$category}#{&}__category--selected {
-            background-color: transparentize($category-colour, 0.9);
+    &__label {
+        font-weight: bold;
+        font-size: 1.6em;
+    }
+    &__row {
+        cursor: pointer;
+        border-top: 1px solid $lightgrey;
+
+        &:last-of-type {
+            border-bottom: 1px solid $lightgrey;
         }
-        &__category--#{$category} {
-            &:hover {
-                background-color: transparentize($category-colour, 0.95);
-            }
-            & > #{$toolbox}__color {
-                background-color: $category-colour;
+
+        @each $category, $colour in $category-colours {
+            #{$toolbox}__category {
+                &--#{$category} {
+                    &:hover:not(#{$toolbox}__category--selected) {
+                        background-image: linear-gradient(to right, $white 25%, transparentize($colour, 0.8) 100%);
+                    }
+                }
+                &--#{$category}#{$toolbox}__category--selected {
+                    background-color: transparentize($colour, 0.9);
+                    @include vendor(transition, background-color 0.25s ease);
+                }
             }
         }
     }
@@ -122,4 +168,9 @@ $category-colours: (
         border: solid $grey 1px;
         margin: 3px;
     }
+      
+    &__separator {
+        padding: 20px 0;
+        border-top: 1px solid $lightgrey;
+    }
 }

src/assets/icons/ic-stage-3.svg

@@ -2,6 +2,10 @@ import React        from 'react';
 import arrow        from '../assets/icons/ic-arrow.svg';
 import logo         from '../assets/icons/ic-logo.svg';
 import tradeActive  from '../assets/icons/ic-trade-active.svg';
+import stage1       from '../assets/icons/ic-stage-1.svg';
+import stage2       from '../assets/icons/ic-stage-2.svg';
+import stage3       from '../assets/icons/ic-stage-3.svg';
+import stage4       from '../assets/icons/ic-stage-4.svg';
 
 /* eslint-disable react/display-name */
 export const Icon = svgItem => (props) => {
@@ -18,3 +22,7 @@ export const Icon = svgItem => (props) => {
 export const LogoIcon = Icon(logo);
 export const TradeActive = Icon(tradeActive);
 export const ArrowIcon = Icon(arrow);
+export const Stage1Icon = Icon(stage1);
+export const Stage2Icon = Icon(stage2);
+export const Stage3Icon = Icon(stage3);
+export const Stage4Icon = Icon(stage4);