Merge pull request #4139 from topcoder-platform/develop

PR for private-settings tickets

Author: sushilshinde

.circleci/config.yml

@@ -174,7 +174,7 @@ workflows:
           filters:
             branches:
               only:
-                - hot-fix-image-issue
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      

src/shared/components/Settings/Profile/BasicInfo/ImageInput/styles.scss

@@ -52,7 +52,6 @@
 
       .file-upload {
         align-self: center;
-        color: $tc-white;
         margin: 0;
 
         div:first-child {

src/shared/components/Settings/Profile/Education/styles.scss

@@ -100,7 +100,7 @@ label {
   margin-bottom: 130px;
   position: absolute;
   display: inline-block;
-  bottom: 0;
+  bottom: auto;
 
   @include upto-sm {
     margin-bottom: 10px;

src/shared/components/Settings/Profile/Work/styles.scss

@@ -49,7 +49,7 @@ label {
   margin-bottom: 125px;
   position: absolute;
   display: inline-block;
-  bottom: 0;
+  bottom: auto;
 
   @include upto-sm {
     margin-bottom: 10px;

src/shared/components/Settings/Tools/Subscriptions/styles.scss

@@ -184,7 +184,6 @@
     }
 
     .complete {
-      color: $tc-white;
       height: 40px;
       font-size: 15px;
       font-weight: 500;

src/shared/components/tc-communities/Header/index.jsx

@@ -75,7 +75,7 @@ function Header(props) {
         title: 'Payments',
       }, {
         icon: <IconNavSettings />,
-        link: `${BASE_URL}/settings/profile`,
+        link: `${meta ? _.replace(BASE_URL, 'www', meta.subdomains[0]) : BASE_URL}/settings/profile`,
         title: 'Settings',
       }, {
         icon: <IconNavExit />,

src/shared/components/tc-communities/communities/wipro/theme/buttons/default.scss

@@ -32,6 +32,7 @@
   width: 250px;
   text-align: center;
   vertical-align: top;
+  color: #00a2e0 !important;
 
   a,
   &,

src/shared/routes/Communities/Blockchain/Routes.jsx

@@ -23,6 +23,7 @@ import Submission from 'routes/Submission';
 import SubmissionManagement from 'routes/SubmissionManagement';
 import Profile from 'routes/Profile';
 import ProfileStats from 'routes/ProfileStats';
+import Settings from 'routes/Settings';
 import TermsDetail from 'routes/TermsDetail';
 import { Route, Switch } from 'react-router-dom';
 import { ThemeProvider } from 'react-css-super-themr';
@@ -130,6 +131,10 @@ export default function Blockchain({ base, member, meta }) {
                 exact
                 path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`}
               />
+              <Route
+                component={() => <Settings base={`${base}/settings`} />}
+                path={`${base}/settings`}
+              />
               <Route
                 component={() => <Learn baseUrl={base} />}
                 exact

src/shared/routes/Communities/CS/Routes.jsx

@@ -19,6 +19,7 @@ import SubmissionManagement from 'routes/SubmissionManagement';
 import TermsDetail from 'routes/TermsDetail';
 import Profile from 'routes/Profile';
 import ProfileStats from 'routes/ProfileStats';
+import Settings from 'routes/Settings';
 import theme from 'components/tc-communities/communities/cs/theme';
 import { ThemeProvider } from 'react-css-super-themr';
 import { Route, Switch } from 'react-router-dom';
@@ -92,6 +93,10 @@ export default function CS({ base, meta }) {
                 exact
                 path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`}
               />
+              <Route
+                component={() => <Settings base={`${base}/settings`} />}
+                path={`${base}/settings`}
+              />
               <Route
                 component={FAQ}
                 exact

src/shared/routes/Communities/Cognitive/Routes.jsx

@@ -18,7 +18,7 @@ import Submission from 'routes/Submission';
 import SubmissionManagement from 'routes/SubmissionManagement';
 import Profile from 'routes/Profile';
 import ProfileStats from 'routes/ProfileStats';
-
+import Settings from 'routes/Settings';
 import socialImage from 'assets/images/communities/cognitive/social.jpg';
 
 import TermsDetail from 'routes/TermsDetail';
@@ -108,6 +108,10 @@ export default function Cognitive({ base, member, meta }) {
               exact
               path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`}
             />
+            <Route
+              component={() => <Settings base={`${base}/settings`} />}
+              path={`${base}/settings`}
+            />
             <Route
               component={() => <Resources baseUrl={base} member={member} />}
               exact

src/shared/routes/Communities/Veterans/Routes.jsx

@@ -19,6 +19,7 @@ import SubmissionManagement from 'routes/SubmissionManagement';
 import TermsDetail from 'routes/TermsDetail';
 import Profile from 'routes/Profile';
 import ProfileStats from 'routes/ProfileStats';
+import Settings from 'routes/Settings';
 import { ThemeProvider } from 'react-css-super-themr';
 import { Route, Switch } from 'react-router-dom';
 import { BUCKETS, registerBucket } from 'utils/challenge-listing/buckets';
@@ -114,6 +115,10 @@ export default function Veterans({ base, member, meta }) {
                 exact
                 path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`}
               />
+              <Route
+                component={() => <Settings base={`${base}/settings`} />}
+                path={`${base}/settings`}
+              />
               <Route
                 component={() => <Leaderboard meta={meta} />}
                 exact

src/shared/routes/Communities/Wipro/Routes.jsx

@@ -19,6 +19,7 @@ import SubmissionManagement from 'routes/SubmissionManagement';
 import TermsDetail from 'routes/TermsDetail';
 import Profile from 'routes/Profile';
 import ProfileStats from 'routes/ProfileStats';
+import Settings from 'routes/Settings';
 import theme from 'components/tc-communities/communities/wipro/theme';
 import { ThemeProvider } from 'react-css-super-themr';
 import { Route, Switch } from 'react-router-dom';
@@ -81,6 +82,10 @@ export default function Wipro({ base, meta }) {
                 exact
                 path={`${base}/members/:handle([\\w\\-\\[\\].{}]{2,15})/details`}
               />
+              <Route
+                component={() => <Settings base={`${base}/settings`} />}
+                path={`${base}/settings`}
+              />
               <Route
                 component={TermsDetail}
                 exact