Skip to content

Feat/settings v5 upgrade #5963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 10, 2022
Merged

Feat/settings v5 upgrade #5963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5df9930
update profile and skills to v5
Dec 21, 2021
1a6b531
Merge pull request #5941 from CDharmateja/update-profile-and-skills-t…
rakibansary Jan 3, 2022
68ccb0b
ci: deploy to dev
rakibansary Jan 3, 2022
1338606
fix: update test snaps
rakibansary Jan 3, 2022
102d813
feat: add reg-source to signup action in login modal on gigs page
rakibansary Jan 3, 2022
c43e31b
fix: primaryInterestsInTopcoder not showing
rakibansary Jan 3, 2022
a289295
fix: add regSource to registration routes from gigs page
rakibansary Jan 4, 2022
2c01ef7
fix: v3 member search failing to unmarshall obj
rakibansary Jan 5, 2022
2d61598
fix: issue #5950 and issue #5947
rakibansary Jan 5, 2022
b621f8c
ci: dev deployment
rakibansary Jan 10, 2022
0813a75
fix: add regSource to registration routes from gigs page
rakibansary Jan 4, 2022
d740726
Merge branch 'fix/v5-settings' into feat/settings-v5-upgrade
rakibansary Jan 10, 2022
3ae9e4b
fix: save basic info
rakibansary Jan 10, 2022
178100d
Added missing package-lock.json
luizrrodrigues Jan 10, 2022
36aeced
Revert changes in package-lock.json
luizrrodrigues Jan 10, 2022
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
2 changes: 1 addition & 1 deletion __tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ exports[`Matches shallow shapshot 1`] = `
<span
className="src-shared-components-TopcoderFooter-___style__copyright-notice___24f5v"
>
© 2021 Topcoder
© 2022 Topcoder
<a
className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
href="https://www.topcoder-dev.com/policy"
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/components/challenge-listing/Sidebar/__snapshots__/Footer.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ exports[`Matches shallow shapshot 1`] = `
className="src-shared-components-challenge-listing-Sidebar-Footer-___style__copyright___ghkHg"
>
Topcoder ©
2021
2022
</p>
</div>
`;
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"supertest": "^3.1.0",
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
"tc-ui": "^1.0.12",
"topcoder-react-lib": "1.2.4",
"topcoder-react-lib": "1000.28.11",
"topcoder-react-ui-kit": "2.0.1",
"topcoder-react-utils": "0.7.8",
"turndown": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Gigs/GigApply/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export default function GigApply(props) {
<div styleName="cta-buttons">
<Link to={`${config.URL.AUTH}/member?retUrl=${encodeURIComponent(retUrl)}`} styleName="primaryBtn">Login</Link>
</div>
<p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`}>here</a>.</p>
<p styleName="regTxt">Not a member? Register <a href={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing&regSource=gigs`}>here</a>.</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Gigs/LoginModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function LoginModal({ retUrl, onCancel, utmSource }) {
<div className={modalStyle.ctaButtons}>
<PrimaryButton
onClick={() => {
window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=${utmSource}`;
window.location = `${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utmSource=${utmSource}&regSource=gigs`;
}}
theme={{
button: buttonThemes.tc['primary-green-md'],
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Gigs/ReferralModal/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function ReferralModal({
>
LOGIN
</PrimaryButton>
<Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
<Link to={`${config.URL.AUTH}/member/registration?retUrl=${encodeURIComponent(retUrl)}&mode=signUp&utm_source=gig_listing&regSource=gigs`} className={buttonThemes.tc['primary-white-md']} openNewTab="true">REGISTER</Link>
</div>
<p className={modalStyle.regTxt}>Find out how the referral program works <a href={HELP_INFO_LINK} target="_blank" rel="noreferrer">here</a>.</p>
</div>
Expand Down
Loading