Merge pull request #1 from topcoder-platform/develop

latest

Author: Gauravseta

src/server/routes/mailchimp.js

@@ -11,6 +11,7 @@ const routes = express.Router();
 routes.use((req, res, next) => {
   res.set('Access-Control-Allow-Origin', '*');
   res.set('Access-Control-Allow-Headers', 'authorization, content-type');
+  res.set('Access-Control-Allow-Methods', 'GET,POST,PUT,OPTIONS');
   next();
 });
 

src/shared/components/Settings/Account/LinkedAccount/AddWebLink.jsx

@@ -70,8 +70,7 @@ export default class AddWebLink extends React.Component {
   isWebLinkValid() {
     const { webLink } = this.state;
     return !webLink
-    || (webLink.includes('www') && /^(http(s?):\/\/)?(www\.)[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)) /* eslint-disable-line no-useless-escape */
-    || (!webLink.includes('www') && /^(http(s?):\/\/)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+$/.test(webLink)); /* eslint-disable-line no-useless-escape */
+    || /^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/.test(webLink); /* eslint-disable-line no-useless-escape */
   }
 
   webLinkExist() {

src/shared/components/Settings/Account/LinkedAccount/index.jsx

@@ -179,7 +179,7 @@ export default class LinkedAccount extends React.Component {
       <div styleName={containerStyle}>
         <div styleName="linked-account-container">
           <h1>
-            Linked Account
+            Linked Accounts
           </h1>
           <div styleName="sub-title">
             Your linked accounts

src/shared/components/Settings/Account/MyAccount/index.jsx

@@ -65,17 +65,19 @@ export default class MyAccount extends React.Component {
   }
 
   componentDidMount() {
-    const { profile } = this.props;
+    const { profile, loadTabData } = this.props;
     const currentEmail = profile.email;
     this.setState({ currentEmail });
     this.updatePredicate();
     window.addEventListener('resize', this.updatePredicate);
+    loadTabData(this.props);
   }
 
   componentWillReceiveProps(nextProps) {
-    const {
-      profileState,
-    } = this.props;
+    const { profileState, profile } = this.props;
+    if (profile.email !== nextProps.profile.email) {
+      this.setState({ currentEmail: nextProps.profile.email });
+    }
     if (profileState.updatingPassword
       && !nextProps.profileState.updatingPassword
       && !nextProps.settingsPageState.incorrectPassword
@@ -462,7 +464,7 @@ export default class MyAccount extends React.Component {
                     </div>
                   </div>
 
-                  <div styleName="row">
+                  <div styleName="row button-group">
                     <div styleName={`button-change-email ${btnChangeEmailVisible ? 'active' : 'hide'}`}>
                       <PrimaryButton
                         styleName="white-label"
@@ -676,4 +678,5 @@ MyAccount.propTypes = {
   updatePassword: PT.func.isRequired,
   updateProfile: PT.func.isRequired,
   clearIncorrectPassword: PT.func.isRequired,
+  loadTabData: PT.func.isRequired,
 };

src/shared/components/Settings/Account/MyAccount/styles.scss

@@ -155,6 +155,10 @@
     align-content: space-between;
     justify-content: flex-start;
 
+    &.button-group {
+      justify-content: space-evenly;
+    }
+
     .field {
       @include upto-sm {
         display: block;
@@ -374,9 +378,6 @@
 }
 
 .button-cancel-change-email {
-  margin-left: auto;
-  margin-right: auto;
-
   button,
   a {
     @include roboto-medium;
@@ -404,9 +405,6 @@
 }
 
 .button-verification-email {
-  margin-left: auto;
-  margin-right: auto;
-
   button,
   a {
     @include roboto-medium;

src/shared/components/Settings/Profile/Skills/index.jsx

@@ -366,10 +366,16 @@ export default class Skills extends ConsentComponent {
     const currentTab = settingsUI.currentProfileTab;
     const containerStyle = currentTab === tabs.SKILL ? '' : 'hide';
     // All lookup skills
-    const lookupSkills = lookupData.skillTags ? _.sortBy(lookupData.skillTags, s => s.name) : [];
+    const allSkills = lookupData.skillTags ? lookupData.skillTags : [];
     const buttons = userSkills.slice(0, totalPage);
     const list = isMobileView ? indexList : userSkills;
 
+    // filter out already added skills
+    const lookupSkills = _.sortBy(
+      _.filter(allSkills, skill => _.findIndex(userSkills, l => l.id === skill.id) === -1),
+      s => s.name,
+    );
+
     return (
       <div styleName={containerStyle}>
         {

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

@@ -361,6 +361,7 @@
 
 .mobile-buttons {
   display: none;
+  margin-top: 10px;
 
   @include upto-sm {
     display: flex;

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

@@ -160,6 +160,12 @@
         @include upto-sm {
           width: 100%;
         }
+
+        > div {
+          @include upto-sm {
+            margin-top: 5px;
+          }
+        }
       }
 
       &.col-2 {

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

@@ -164,6 +164,12 @@
         @include upto-sm {
           width: 100%;
         }
+
+        > div {
+          @include upto-sm {
+            margin-top: 5px;
+          }
+        }
       }
 
       &.col-2 {

src/shared/components/Settings/Tools/Software/List/Item/styles.scss

@@ -24,6 +24,10 @@
   height: 49px;
   width: 49px;
   margin-right: 18px;
+
+  svg {
+    padding-top: 1px;
+  }
 }
 
 .software-parameters {

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

@@ -166,6 +166,12 @@
         @include upto-sm {
           width: 100%;
         }
+
+        > div {
+          @include upto-sm {
+            margin-top: 5px;
+          }
+        }
       }
 
       &.col-2 {