Merge branch 'development' into vedant-fix-assign-team-button-hover-a…

…t-smaller-resolutions

.circleci/config.yml

@@ -35,6 +35,9 @@ jobs:
       - run:
           name: Deploy app
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_PROD --project ./build
+      - run:
+          name: Deploy app
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_PROD1 --project ./build
       - save_cache:
           key: v1-prod-dependencies-{{ checksum "package-lock.json" }}
           paths:
@@ -80,6 +83,9 @@ jobs:
       - run:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
           command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV --project ./build
+      - run:
+          name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_DEV
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_DEV1 --project ./build
       - save_cache:
           key: v1.1-dependencies-{{ checksum "package-lock.json" }}
           paths:
@@ -120,10 +126,7 @@ jobs:
           command: cp build/index.html build/200.html
       - run:
           name: Deploy compiled app to surge.sh on $SURGE_DOMAIN_BETA
-          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_BETA --project ./build
-      - run:
-          name: Deploy compiled app to surge.sh on highestgood.com
-          command: ./node_modules/.bin/surge --domain highestgood.com --project ./build
+          command: ./node_modules/.bin/surge --domain $SURGE_DOMAIN_BETA --project ./build 
       - save_cache:
           key: v1-beta-dependencies-{{ checksum "package-lock.json" }}
           paths:

.eslintignore

@@ -20,9 +20,6 @@ src/components/AutoReload/**
 src/components/Badge/**
 src/components/common/**
 src/components/Header/**
-src/components/BMDashboard/BMHeader/**
-src/components/MonthlyEffort/**
-src/components/ProfileLinks/**
 src/components/Projects/**
 src/components/Reports/**
 src/components/SetupProfile/**

.prettierignore

@@ -21,9 +21,6 @@ src/components/AutoReload/**
 src/components/Header/**
 src/components/Inventory/**
 src/components/Memberships/**
-src/components/MonthlyEffort/**
-src/components/NewProfileLink/**
-src/components/ProfileLinks/**
 src/components/Projects/**
 src/components/Reports/**
 src/components/SetupProfile/**

.vscode/settings.json

@@ -0,0 +1,23 @@
+{
+  // other settings
+  // formatting using eslint
+  // let editor format using prettier for all other files
+  "editor.formatOnSave": true,
+  // disable editor formatting, so eslint can handle it
+  "[javascript]": {
+    "editor.formatOnSave": true
+  },
+  //"eslint.enable": true,
+  // available through eslint plugin in vscode
+  "eslint.alwaysShowStatus": true,
+  "editor.tabSize": 2,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "files.exclude": {
+    "**/.classpath": true,
+    "**/.project": true,
+    "**/.settings": true,
+    "**/.factorypath": true
+  }
+}

jest.config.js

@@ -14,11 +14,12 @@ module.exports = {
   // An array of file extensions your modules use
   moduleFileExtensions: ['js', 'json', 'jsx'],
 
-  // Bundle mapper for d3 import
+  // Bundle mapper for d3 import and other custom mocks
   moduleNameMapper: {
     d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
     'react-leaflet': '<rootDir>/src/_tests_/__mocks__/react-leaflet.js',
     'marker-cluster-group': '<rootDir>/src/_tests_/__mocks__/react-leaflet-cluster.js',
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy', // <-- Added to mock CSS/SCSS files
   },
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
@@ -38,6 +39,8 @@ module.exports = {
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   transformIgnorePatterns: ['/node_modules/(?!d3|d3-array|internmap|delaunator|robust-predicates)'],
+
+  // Include snapshot serializers
   snapshotSerializers: ['enzyme-to-json/serializer'],
 
   // Indicates whether each individual test should be reported during the run