Skip to content

Commit 0b3f29d

Browse files
vas3avas3a
authored
Merge pull request #623 from topcoder-platform/uof-dev-merge
UOF & codebase refactoring -> dev
2 parents 37dd8c9 + 577e0bc commit 0b3f29d

File tree

2,392 files changed

+98087
-25061
lines changed

Some content is hidden

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

2,392 files changed

+98087
-25061
lines changed

‎.babelrc.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sourceType": "unambiguous",
3+
"presets": ["@babel/preset-env", "@babel/preset-typescript", [
4+
"@babel/preset-react", {"runtime": "automatic"}
5+
]],
6+
"plugins": ["@babel/plugin-transform-runtime"]
7+
}

‎.circleci/config.yml‎

Lines changed: 54 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ running_yarn_build: &running_yarn_build
5454
yarn install
5555
yarn build
5656
57+
running_yarn_sb_build: &running_yarn_sb_build
58+
name: Running Yarn Storybook Build
59+
command: |
60+
source buildenvvar
61+
yarn sb:build
62+
5763
running_yarn_test: &running_yarn_test
5864
name: Running Yarn Test Build
5965
command: |
@@ -91,6 +97,7 @@ build_steps: &build_steps
9197
- run: *install_deploysuite
9298
- run: *build_configuration_fetch
9399
- run: *running_yarn_build
100+
- run: *running_yarn_sb_build
94101
- persist_to_workspace: *workspace_persist
95102

96103
test_steps: &test_steps
@@ -129,13 +136,13 @@ deploy_steps: &deploy_steps
129136
./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
130137
131138
jobs:
132-
lint-dev:
133-
<<: *defaults
134-
environment:
135-
DEPLOY_ENV: "DEV"
136-
LOGICAL_ENV: "dev"
137-
APPNAME: "platform-ui-mvp"
138-
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
139146

140147
# lint-prod:
141148
# <<: *defaults
@@ -153,6 +160,14 @@ jobs:
153160
APPNAME: "platform-ui-mvp"
154161
steps: *build_steps
155162

163+
build-qa:
164+
<<: *defaults
165+
environment:
166+
DEPLOY_ENV: "QA"
167+
LOGICAL_ENV: "qa"
168+
APPNAME: "platform-ui-mvp"
169+
steps: *build_steps
170+
156171
build-prod:
157172
<<: *defaults
158173
environment:
@@ -179,6 +194,15 @@ jobs:
179194
APPNAME: "platform-ui-mvp"
180195
steps: *deploy_steps
181196

197+
deployQa:
198+
<<: *deploy_defaults
199+
environment:
200+
DEPLOY_ENV: "QA"
201+
LOGICAL_ENV: "qa"
202+
ENABLE_CACHE: true
203+
APPNAME: "platform-ui-mvp"
204+
steps: *deploy_steps
205+
182206
deployProd:
183207
<<: *deploy_defaults
184208
environment:
@@ -192,12 +216,12 @@ workflows:
192216
version: 2
193217
build:
194218
jobs:
195-
- lint-dev:
196-
context : org-global
197-
filters:
198-
branches:
199-
ignore:
200-
- master
219+
# - lint-dev:
220+
# context : org-global
221+
# filters:
222+
# branches:
223+
# ignore:
224+
# - master
201225

202226
# - lint-prod:
203227
# context : org-global
@@ -212,6 +236,14 @@ workflows:
212236
branches:
213237
ignore:
214238
- master
239+
- qa
240+
241+
- build-qa:
242+
context : org-global
243+
filters:
244+
branches:
245+
only:
246+
- qa
215247

216248
- build-prod:
217249
context : org-global
@@ -229,6 +261,15 @@ workflows:
229261
only:
230262
- dev
231263

264+
- deployQa:
265+
context : org-global
266+
requires:
267+
- build-qa
268+
filters:
269+
branches:
270+
only:
271+
- qa
272+
232273
- deployProd:
233274
context : org-global
234275
requires:

‎.environments/.env.dev‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
REACT_APP_HOST_ENV=dev
2+
3+
REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
4+
5+
# Stripe configs
6+
REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
7+
REACT_APP_STRIPE_API_VERSION=2020-08-27
8+
# not really used anywhere
9+
REACT_APP_STRIPE_ADMIN_TOKEN=
10+
REACT_APP_STRIPE_CUSTOMER_TOKEN=
11+
12+
# Vanilla Forums
13+
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
14+
15+
# DataDogLogging
16+
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
17+
18+
REACT_APP_MEMBER_VERIFY_LOOKER=3322
19+
20+
REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
21+
22+
# Filestack configuration for uploading Submissions
23+
REACT_APP_FILESTACK_API_KEY='AzFINuQoqTmqw0QEoaw9az'
24+
REACT_APP_FILESTACK_REGION='us-east-1'
25+
REACT_APP_FILESTACK_SUBMISSION_CONTAINER='topcoder-dev-submissions-dmz'

‎.environments/.env.prod‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
REACT_APP_HOST_ENV=prod
2+
3+
REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
4+
5+
# Stripe configs
6+
REACT_APP_STRIPE_API_KEY=pk_live_m3bCBVSfkfMOEp3unZFRsHXi
7+
REACT_APP_STRIPE_API_VERSION=2020-08-27
8+
# not really used anywhere
9+
REACT_APP_STRIPE_ADMIN_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIiwiYWRtaW5pc3RyYXRvciJdLCJpc3MiOiJodHRwczovL2FwaS50b3Bjb2Rlci1kZXYuY29tIiwiaGFuZGxlIjoidGVzdDEiLCJleHAiOjI1NjMwNzY2ODksInVzZXJJZCI6IjQwMDUxMzMzIiwiaWF0IjoxNDYzMDc2MDg5LCJlbWFpbCI6InRlc3RAdG9wY29kZXIuY29tIiwianRpIjoiYjMzYjc3Y2QtYjUyZS00MGZlLTgzN2UtYmViOGUwYWU2YTRhIn0.wKWUe0-SaiFVN-VR_-GwgFlvWaDkSbc8H55ktb9LAVw
10+
REACT_APP_STRIPE_CUSTOMER_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJyb2xlcyI6WyJUb3Bjb2RlciBVc2VyIl0sImlzcyI6Imh0dHBzOi8vYXBpLnRvcGNvZGVyLWRldi5jb20iLCJoYW5kbGUiOiJ0ZXN0MSIsImV4cCI6MjU2MzA3NjY4OSwidXNlcklkIjoiNDAwNTEzMzMiLCJpYXQiOjE0NjMwNzYwODksImVtYWlsIjoidGVzdEB0b3Bjb2Rlci5jb20iLCJqdGkiOiJiMzNiNzdjZC1iNTJlLTQwZmUtODM3ZS1iZWI4ZTBhZTZhNGEifQ.jl6Lp_friVNwEP8nfsfmL-vrQFzOFp2IfM_HC7AwGcg
11+
12+
# Vanilla Forums
13+
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
14+
15+
# DataDogLogging
16+
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
17+
18+
REACT_APP_MEMBER_VERIFY_LOOKER=3322
19+
20+
REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
21+
22+
# Filestack configuration for uploading Submissions
23+
REACT_APP_FILESTACK_API_KEY=
24+
REACT_APP_FILESTACK_REGION=
25+
REACT_APP_FILESTACK_SUBMISSION_CONTAINER=

‎.environments/.env.qa‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
REACT_APP_HOST_ENV=qa
2+
3+
REACT_APP_ENABLE_TCA_CERT_MONETIZATION=false
4+
5+
# Stripe configs
6+
REACT_APP_STRIPE_API_KEY=pk_test_rfcS49MHRVUKomQ9JgSH7Xqz
7+
REACT_APP_STRIPE_API_VERSION=2020-08-27
8+
# not really used anywhere
9+
REACT_APP_STRIPE_ADMIN_TOKEN=
10+
REACT_APP_STRIPE_CUSTOMER_TOKEN=
11+
12+
# Vanilla Forums
13+
REACT_APP_VANILLA_ACCESS_TOKEN=va.JApNvUOx3549h20I6tnl1kOQDc75NDIp.0jG3dA.EE3gZgV
14+
15+
# DataDogLogging
16+
REACT_APP_DATADOG_PUBLIC_TOKEN=puba0825671e469d16f940c5a30dc738f11
17+
18+
REACT_APP_MEMBER_VERIFY_LOOKER=3322
19+
20+
REACT_APP_SPRIG_ENV_ID=bUcousVQ0-yF
21+
22+
# Filestack configuration for uploading Submissions
23+
REACT_APP_FILESTACK_API_KEY=
24+
REACT_APP_FILESTACK_REGION=
25+
REACT_APP_FILESTACK_SUBMISSION_CONTAINER=

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Related JIRA Ticket:
2+
https://topcoder.atlassian.net/browse/<!-- JIRA TICKET ID -->
3+
4+
# What's in this PR?
5+
<!-- Please add a brief description of what this PR accomplishes -->
6+
7+
<!-- SEE [Pull Requests](../README.md#pull-requests) for more details about opening a PR -->

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
22

33
# dependencies
4-
/node_modules
4+
node_modules
55
/.pnp
66
.pnp.js
77

@@ -18,11 +18,11 @@
1818
# misc
1919
.DS_Store
2020
.env.local
21-
.env.development.local
22-
.env.test.local
23-
.env.production.local
21+
.env.*.local
2422
.env
2523

2624
npm-debug.log*
2725
yarn-debug.log*
2826
yarn-error.log*
27+
28+
storybook-static

‎.storybook/main.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";
2+
import type { StorybookConfig } from "@storybook/react-webpack5";
3+
4+
import cracoConfig from '../craco.config';
5+
6+
const config: StorybookConfig = {
7+
stories: ["../src/**/*.docs.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
8+
addons: [
9+
"@storybook/addon-links",
10+
"@storybook/addon-essentials",
11+
"@storybook/preset-create-react-app",
12+
"@storybook/addon-interactions",
13+
],
14+
framework: {
15+
name: "@storybook/react-webpack5",
16+
options: {},
17+
},
18+
docs: {
19+
autodocs: "tag",
20+
},
21+
staticDirs: ["../public"],
22+
webpackFinal: async (config, { configType }) => {
23+
24+
if (config.resolve) {
25+
config.resolve.plugins = [
26+
...(config.resolve.plugins ?? []),
27+
new TsconfigPathsPlugin()
28+
];
29+
config.resolve.alias = {
30+
...config.resolve.alias,
31+
...cracoConfig.webpack.alias,
32+
};
33+
}
34+
35+
return config;
36+
}
37+
};
38+
export default config;

‎.storybook/manager-head.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<style>
2+
[data-item-id*='-hidden-']{display: none !important}
3+
</style>

‎.storybook/preview-head.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<style>
2+
.innerZoomElementWrapper {
3+
display: flex;
4+
flex-direction: column;
5+
}
6+
</style>

0 commit comments

Comments
 (0)