Skip to content

Commit 2761b83

Browse files
committed
Merge branch 'dev' into talent-search
# Conflicts: # src/apps/platform/src/platform.routes.tsx # yarn.lock
2 parents 7119297 + 01d58cb commit 2761b83

File tree

238 files changed

+7935
-937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+7935
-937
lines changed

.circleci/config.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ deploy_steps: &deploy_steps
136136
./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
137137
138138
jobs:
139-
# lint-dev:
140-
# <<: *defaults
141-
# environment:
142-
# DEPLOY_ENV: "DEV"
143-
# LOGICAL_ENV: "dev"
144-
# APPNAME: "platform-ui-mvp"
145-
# steps: *lint_steps
139+
lint-dev:
140+
<<: *defaults
141+
environment:
142+
DEPLOY_ENV: "DEV"
143+
LOGICAL_ENV: "dev"
144+
APPNAME: "platform-ui-mvp"
145+
steps: *lint_steps
146146

147147
# lint-prod:
148148
# <<: *defaults
@@ -216,12 +216,12 @@ workflows:
216216
version: 2
217217
build:
218218
jobs:
219-
# - lint-dev:
220-
# context : org-global
221-
# filters:
222-
# branches:
223-
# ignore:
224-
# - master
219+
- lint-dev:
220+
context : org-global
221+
filters:
222+
branches:
223+
ignore:
224+
- master
225225

226226
# - lint-prod:
227227
# context : org-global
@@ -237,13 +237,15 @@ workflows:
237237
ignore:
238238
- master
239239
- qa
240+
- profiles-app
240241

241242
- build-qa:
242243
context : org-global
243244
filters:
244245
branches:
245246
only:
246247
- qa
248+
- profiles-app
247249

248250
- build-prod:
249251
context : org-global
@@ -269,6 +271,7 @@ workflows:
269271
branches:
270272
only:
271273
- qa
274+
- profiles-app
272275

273276
- deployProd:
274277
context : org-global

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"build": "export CI=false && craco build --mode ${REACT_APP_HOST_ENV:-prod}",
1010
"build:dev": "craco build --mode ${REACT_APP_HOST_ENV:-dev}",
1111
"demo": "npx http-server --port 443 -a 0.0.0.0 -S -C ./ssl/rootCA.crt -K ./ssl/rootCA.key -P https://local.topcoder-dev.com? --proxy-options.secure false ./build",
12-
"lint": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx}'",
13-
"lint:fix": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx}' --fix",
12+
"lint": "eslint -c ./src/.eslintrc.js 'src/**/*.{ts,tsx,js,jsx}'",
13+
"lint:fix": "yarn lint --fix",
1414
"test": "craco test --watchAll",
1515
"test:no-watch": "craco test --watchAll=false --passWithNoTests",
1616
"cy:run": "cypress run --reporter junit",
@@ -37,6 +37,7 @@
3737
"country-calling-code": "0.0.3",
3838
"crypto-js": "^4.1.1",
3939
"customize-cra": "^1.0.0",
40+
"date-fns": "^2.30.0",
4041
"dompurify": "^2.4.0",
4142
"draft-js": "^0.10.4",
4243
"draft-js-export-html": "^1.2.0",
@@ -154,6 +155,8 @@
154155
"@types/react-redux-toastr": "^7.6.2",
155156
"@types/react-router-dom": "^5.3.3",
156157
"@types/redux-actions": "2.6.2",
158+
"@types/redux-logger": "^3.0.9",
159+
"@types/redux-promise": "^0.5.29",
157160
"@types/sanitize-html": "^2.6.2",
158161
"@types/segment-analytics": "^0.0.34",
159162
"@types/systemjs": "^6.1.1",

0 commit comments

Comments
 (0)