Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

[PROD] Next Release #432

Merged
merged 87 commits into from
Aug 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
bb6acc2
feat: polish release - 2
cagdas001 Jul 27, 2021
b210ce1
Merge pull request #413 from cagdas001/milestone-19
nikolay83 Jul 27, 2021
354d948
fix: #397
yoution Jul 29, 2021
27c890e
Merge pull request #414 from yoution/issue-397
nikolay83 Jul 29, 2021
479a7ad
Reflect selected tab in URL for Position Details page when navigating…
mbaghel Jul 30, 2021
331ce66
Update role search timing to 1500ms per frame.
mbaghel Jul 31, 2021
47d1319
fix: issue #416 #412
yoution Aug 2, 2021
10f6ed3
Merge pull request #418 from yoution/fix-issues
nikolay83 Aug 2, 2021
145e71e
fix: issue #411
yoution Aug 2, 2021
67b1fef
Merge pull request #419 from yoution/issue-411
nikolay83 Aug 2, 2021
87b84cd
fix(create-new-team): remove `progress` folder
cagdas001 Aug 3, 2021
ee59470
fix(create-new-team): enhance the design of the progress card
cagdas001 Aug 3, 2021
fae436c
fix(create-new-team): center the customer logos
cagdas001 Aug 3, 2021
330eaf7
fix: issue #412
yoution Aug 4, 2021
d0585fa
Merge pull request #424 from cagdas001/dev
nikolay83 Aug 4, 2021
77753b1
Merge pull request #427 from yoution/issue-412
nikolay83 Aug 5, 2021
a339aab
Merge branch 'dev' into dev
mbaghel Aug 5, 2021
bc73650
Merge pull request #417 from mbaghel/dev
nikolay83 Aug 5, 2021
6110c93
Fix: Label copy updates
mbaghel Aug 6, 2021
ce3ff63
Merge pull request #429 from mbaghel/dev
nikolay83 Aug 6, 2021
800028d
Checkout page and Stripe integration
Aug 8, 2021
412d00d
Adding creating team modal for UX.
Aug 8, 2021
1859679
Merge pull request #430 from arpitchaudhari/roles-checkout
nikolay83 Aug 9, 2021
a0ddcba
Resolving merge conflict and removing file alias
Aug 9, 2021
2fd03c9
Merge branch 'roles-checkout' into dev
Aug 9, 2021
9db9444
Merge pull request #433 from arpitchaudhari/dev
nikolay83 Aug 9, 2021
ede777c
EnvVar for Stripe in docker
urwithat Aug 9, 2021
6b53579
EnvVar for Stripe in build.sh
urwithat Aug 9, 2021
b8b9224
Checkout and stripe follow-up
Aug 10, 2021
112273f
Updated logic for selecting rates based on hoursPerWeek
Aug 10, 2021
e990e40
Fixing Stripe Key, fixing teamObject and Updating logic for rates sel…
Aug 10, 2021
5e2cfe8
Merge pull request #437 from arpitchaudhari/roles-checkout
nikolay83 Aug 10, 2021
6e7fe5a
Merge pull request #438 from topcoder-platform/roles-checkout
nikolay83 Aug 10, 2021
c26bb71
#446
Aug 11, 2021
cdd5d90
Merge pull request #447 from arpitchaudhari/roles-checkout
nikolay83 Aug 11, 2021
d16d244
Merge pull request #448 from topcoder-platform/roles-checkout
nikolay83 Aug 11, 2021
68851db
#443
Aug 11, 2021
a650300
During checkout, data was not present in local storage. Resolving the…
Aug 11, 2021
4c1142a
#441
Aug 11, 2021
4720e5c
Merge branch 'roles-checkout' into dev
Aug 11, 2021
dde1282
Merge pull request #450 from arpitchaudhari/dev
nikolay83 Aug 11, 2021
9391d32
#444
Aug 11, 2021
254be39
Merge pull request #452 from arpitchaudhari/dev
nikolay83 Aug 11, 2021
bd62f71
fix(create-new-team): display spinner while searching inside progress…
cagdas001 Aug 11, 2021
f4a2219
fix(create-new-team): update the title & subtitle of SkillListPopup
cagdas001 Aug 11, 2021
41710bc
Merge pull request #457 from cagdas001/dev
nikolay83 Aug 11, 2021
099140a
fix: issues
yoution Aug 11, 2021
5aae139
Merge pull request #458 from yoution/yoution-issues
nikolay83 Aug 11, 2021
b0bc39b
fix: issue #462
yoution Aug 12, 2021
cf97c91
fix: issue #460
yoution Aug 12, 2021
f0199f7
Merge pull request #463 from yoution/issue-462
nikolay83 Aug 12, 2021
a6f9fc7
Merge pull request #465 from yoution/issue-460
nikolay83 Aug 12, 2021
444eb84
fix: #455
yoution Aug 12, 2021
48b7782
fix: #460
yoution Aug 12, 2021
f7a0a49
Merge pull request #468 from yoution/issue-455
nikolay83 Aug 12, 2021
5bd5a3a
Merge pull request #469 from yoution/issue-460
nikolay83 Aug 12, 2021
b083bdd
#442
Aug 12, 2021
ef17294
Merge branch 'dev' into dev
Aug 12, 2021
7e111c4
Merge pull request #470 from arpitchaudhari/dev
nikolay83 Aug 12, 2021
685aff5
fix: issue #461 #464
yoution Aug 12, 2021
5455a63
fix: issue #459
yoution Aug 12, 2021
671b49b
Merge pull request #471 from yoution/issue-461
nikolay83 Aug 12, 2021
ec92e6a
Merge pull request #472 from yoution/issue-459
nikolay83 Aug 12, 2021
215fc22
#445
Aug 12, 2021
3d70ade
#445
Aug 12, 2021
7f95bd2
Adding Modal and fixing Linting Issues
Aug 12, 2021
03127a5
Merge branch 'dev' into dev
Aug 12, 2021
52e07ad
fix(create-new-team): add padding to payment container
cagdas001 Aug 12, 2021
5b0fb45
Merge pull request #473 from arpitchaudhari/dev
nikolay83 Aug 12, 2021
d93b9b0
Merge pull request #474 from cagdas001/dev
nikolay83 Aug 12, 2021
a325677
#475, #467 & fixed liniting issues
Aug 12, 2021
daeeb06
Merge pull request #476 from arpitchaudhari/dev
nikolay83 Aug 12, 2021
99d5b57
fix(create-new-team): initialValue of MonthPicker on EditRoleForm
cagdas001 Aug 12, 2021
66e1dfe
fix(create-new-team): increase delay before redirection
cagdas001 Aug 12, 2021
868f780
Merge pull request #478 from cagdas001/dev
nikolay83 Aug 12, 2021
3e58045
fix: issue #462
yoution Aug 13, 2021
426fdd7
Merge pull request #480 from yoution/issue-462
nikolay83 Aug 13, 2021
0f1e537
fix: Show job title in No Results page
mbaghel Aug 13, 2021
42af432
Merge pull request #484 from mbaghel/dev
nikolay83 Aug 13, 2021
b100e77
Add job title to Result Card
mbaghel Aug 13, 2021
0b3ad3e
Merge pull request #485 from mbaghel/dev
nikolay83 Aug 13, 2021
daa5946
feat(create-new-team): post `intakeSource` in `createTeam` req.
cagdas001 Aug 13, 2021
50c61a0
Merge pull request #487 from cagdas001/dev
nikolay83 Aug 13, 2021
ad564eb
fix: issue #482, #483
yoution Aug 15, 2021
7f0629c
Merge pull request #488 from yoution/issue-482-483
nikolay83 Aug 15, 2021
4a21710
fix: issue #483
yoution Aug 15, 2021
aae6999
Merge pull request #489 from yoution/issue-482-483
urwithat Aug 16, 2021
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
59 changes: 32 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ TaaS App is done using Single SPA micro-frontend architecture https://single-spa
### Local Authentication

First of all, to authenticate locally we have to run a local authentication service.

- Clone this repository into `taas-app`.
- Inside the folder `taas-app/local/login-locally` run `npm run start`.
- You would need npm 5+ for it. This would start a local sever on port 5000 which could be used for local Authentication.
Expand All @@ -76,36 +77,36 @@ Some config files are using domain `local.topcoder-dev.com`. You can change it t

1. Run **Frame** App:

```sh
git clone https://github.com/topcoder-platform/micro-frontends-frame.git
cd micro-frontends-frame
# inside folder "micro-frontends-frame" run:
```sh
git clone https://github.com/topcoder-platform/micro-frontends-frame.git
cd micro-frontends-frame
# inside folder "micro-frontends-frame" run:

nvm use # or make sure to use Node 10
npm i # to install dependencies
nvm use # or make sure to use Node 10
npm i # to install dependencies

# set environment variables:
# set environment variables:

export APPMODE="development"
export APPENV="local-multi"
export APPMODE="development"
export APPENV="local-multi"

npm run local-server
npm run local-server

# this would start frame server on http://localhost:3000
```
# this would start frame server on http://localhost:3000
```

open one more terminal window in the same folder and run:
open one more terminal window in the same folder and run:

```sh
# set environment variables:
```sh
# set environment variables:

export APPMODE="development"
export APPENV="local-multi"
export APPMODE="development"
export APPENV="local-multi"

npm run local-client
npm run local-client

# this host frame client code on http://localhost:8080
```
# this host frame client code on http://localhost:8080
```

2. Run **Navbar** micro-app:

Expand Down Expand Up @@ -135,23 +136,27 @@ Some config files are using domain `local.topcoder-dev.com`. You can change it t
nvm use # or make sure to use Node 10
npm i # to install dependencies

# set environment variables:

export STRIPE_PUBLIC_KEY=""

npm run dev

# this host TaaS App as http://localhost:8501/taas-app/topcoder-micro-frontends-teams.js
```

4. Now we have to update the `micro-frontends-frame` app to show our local version of TaaS App, instead of remote one. Update file `micro-frontends-frame/config/micro-frontends-config-local.json`:

```js
// replace line
"@topcoder/micro-frontends-teams": "https://platform.topcoder-dev.com/taas-app/topcoder-micro-frontends-teams.js",
```js
// replace line
"@topcoder/micro-frontends-teams": "https://platform.topcoder-dev.com/taas-app/topcoder-micro-frontends-teams.js",

// with line:
"@topcoder/micro-frontends-teams": "http://localhost:8501/taas-app/topcoder-micro-frontends-teams.js",
```
// with line:
"@topcoder/micro-frontends-teams": "http://localhost:8501/taas-app/topcoder-micro-frontends-teams.js",
```

- Now open in the browser http://localhost:8080/taas/myteams.
- If you are not logged-in yet, you should be redirected to the login page.
- If you cannot see the application and redirect doesn't happen, make sure that file "http://local.topcoder-dev.com:8501/taas-app/topcoder-micro-frontends-teams.js" is loaded successfully in the Network tab.

Congratulations, you successfully run the project. If you had some issue, please, try to go through README of https://github.com/topcoder-platform/micro-frontends-frame and https://github.com/topcoder-platform/micro-frontends-navbar-app.
Congratulations, you successfully run the project. If you had some issue, please, try to go through README of https://github.com/topcoder-platform/micro-frontends-frame and https://github.com/topcoder-platform/micro-frontends-navbar-app.
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ APP_NAME=$1
UPDATE_CACHE=""

docker build -f docker/Dockerfile -t $APP_NAME:latest \
--build-arg STRIPE_PUBLIC_KEY=$STRIPE_PUBLIC_KEY \
--build-arg APPMODE=$APPMODE \
--build-arg APPENV=$APPENV .

Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ FROM node:10

ARG APPMODE
ARG APPENV
ARG STRIPE_PUBLIC_KEY

ENV APPMODE=$APPMODE
ENV APPENV=$APPENV
ENV STRIPE_PUBLIC_KEY=$STRIPE_PUBLIC_KEY

# Copy the current directory into the Docker image
COPY . /taas-app
Expand Down
4 changes: 0 additions & 4 deletions local/login-locally/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,3 @@
3. Now you can open http://localhost:5000 in browser and click login (wait it a little bit, it may take time to redirect you). After you login, you should be redirected back to http://localhost:3000

PS. You may also download latest version of `setupAuth0WithRedirect.js` file from here - https://github.com/topcoder-platform/tc-auth-lib/blob/dev/web-assets/js/setupAuth0WithRedirect.js




20 changes: 11 additions & 9 deletions local/login-locally/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<!DOCTYPE html>
<html>

<head>
<head>
<title>Auth0</title>
<meta charset="utf-8" />
<script language="javascript" type="text/javascript" src="./setupAuth0WithRedirect.js"></script>
</head>
<script
language="javascript"
type="text/javascript"
src="./setupAuth0WithRedirect.js"
></script>
</head>

<body>
<body>
Loaded...redirecting to auth0.(see browser console log)
<script>
window.onload = authSetup;
window.onload = authSetup;
</script>
<a href="?retUrl=http://localhost:3000" >Login</a>
</body>

<a href="?retUrl=http://localhost:3000">Login</a>
</body>
</html>
Loading