Merge pull request #2674 from appirio-tech/dev

RishiRajSahu · web-flow · commit 9699868aeb48 · 2018-11-05T14:19:33.000+05:30
[PROD] Merging changes to handle undefined categoryName and country fields for basic_info trait
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/api/users.js b/src/api/users.js
@@ -61,6 +61,21 @@ export const updateMemberTraits = (handle, updatedTraits) => {
     .then(resp => _.get(resp.data, 'result.content', {}))
 }
 
+/**
+ * Create member traits
+ * 
+ * @param {String} handle member handle
+ * @param {Array}  traits list of traits to create
+ * 
+ * @returns {Promise<Array>} member traits
+ */
+export const createMemberTraits = (handle, traits) => {
+  return axios.post(`${TC_API_URL}/v3/members/${handle}/traits`, {
+    param: traits
+  })
+    .then(resp => _.get(resp.data, 'result.content', {}))
+}
+
 /**
  * Update member photo
  * 
diff --git a/src/components/Home/Home.scss b/src/components/Home/Home.scss
@@ -97,7 +97,7 @@
       }
 
       h1 {
-        @include tc-heading-extra-large;
+        @include tc-heading-large;
         @include roboto-medium;
         color: $tc-black;
         letter-spacing: 0;
diff --git a/src/components/NoResults/NoResults.scss b/src/components/NoResults/NoResults.scss
@@ -9,7 +9,7 @@
   
     p {
       margin-bottom: 50px;
-      @include tc-heading-large;
+      @include tc-heading;
       font-weight: 300;
     }
   
diff --git a/src/components/TopBar/ProjectToolBar.scss b/src/components/TopBar/ProjectToolBar.scss
@@ -106,7 +106,7 @@
         overflow: hidden;
 
         span {
-          @include tc-heading;
+          @include tc-heading-small;
           color: $tc-gray-10;
           display: block;
           text-overflow: ellipsis;
diff --git a/src/components/TopBar/ProjectsToolBar.scss b/src/components/TopBar/ProjectsToolBar.scss
@@ -21,7 +21,7 @@
       }
 
       .projects-title-mobile {
-        @include tc-heading;
+        @include tc-heading-small;
         color: $tc-gray-10;
         font-size: 15px;
         line-height: 50px;
diff --git a/src/components/User/UsernameAndDetails.scss b/src/components/User/UsernameAndDetails.scss
@@ -5,7 +5,7 @@
     max-width: 225px;
   
     .username {
-      @include tc-heading;
+      @include tc-heading-small;
       color: $tc-gray-80;
       text-overflow: ellipsis;
       overflow: hidden;
diff --git a/src/projects/create/components/ProductCard.scss b/src/projects/create/components/ProductCard.scss
@@ -32,7 +32,7 @@
     }
 
     h3 {
-      @include tc-heading;
+      @include tc-heading-small;
       @include roboto-bold;
       font-size: 15px;
       line-height: 20px;
diff --git a/src/projects/create/components/SelectProjectTemplate.scss b/src/projects/create/components/SelectProjectTemplate.scss
@@ -25,7 +25,7 @@
       + h2 {
         font-size: 15px;
         line-height: 20px;
-        @include tc-heading;
+        @include tc-heading-small;
         @include roboto-bold;
         color: $tc-gray-80;
         margin-bottom: 13px;
diff --git a/src/projects/create/components/WizardHeader.scss b/src/projects/create/components/WizardHeader.scss
@@ -5,7 +5,7 @@
     min-width: 700px;
     text-align: center;
     h1 {
-      @include tc-heading;
+      @include tc-heading-small;
       color: $tc-gray-50;
       margin-bottom: 20px;
     }
diff --git a/src/projects/create/components/_layout.scss b/src/projects/create/components/_layout.scss
@@ -46,7 +46,7 @@ $minimumPageWidth: 984px;
   }
 
   .wizardHeadline {
-    @include tc-heading;
+    @include tc-heading-small;
     width: 100%;
     text-align: center;
     margin: 0 0 50px;
diff --git a/src/projects/detail/components/FeatureSelector/FeatureForm.scss b/src/projects/detail/components/FeatureSelector/FeatureForm.scss
@@ -22,7 +22,7 @@
       border-bottom: 1px solid $tc-gray-10;
   
       .title {
-        @include tc-heading;
+        @include tc-heading-small;
         @include roboto-medium;
         flex: 1;
         color: $tc-black;
diff --git a/src/projects/detail/components/FeatureSelector/FeaturePicker.scss b/src/projects/detail/components/FeatureSelector/FeaturePicker.scss
@@ -111,7 +111,7 @@
         padding: 8 * $base-unit;
 
         h3 {
-          @include tc-heading;
+          @include tc-heading-small;
         }
 
         p {
diff --git a/src/routes/settings/actions/index.js b/src/routes/settings/actions/index.js
diff --git a/src/routes/settings/constants/settings.js b/src/routes/settings/constants/settings.js
diff --git a/src/routes/settings/helpers/settings.js b/src/routes/settings/helpers/settings.js
diff --git a/src/routes/settings/routes/profile/components/ProfileSettingsForm.jsx b/src/routes/settings/routes/profile/components/ProfileSettingsForm.jsx
diff --git a/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss b/src/routes/settings/routes/profile/components/ProfileSettingsForm.scss

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`h1 {`
`100`		`- @include tc-heading-extra-large;`
	`100`	`+ @include tc-heading-large;`
`101`	`101`	`@include roboto-medium;`
`102`	`102`	`color: $tc-black;`
`103`	`103`	`letter-spacing: 0;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`p {`
`11`	`11`	`margin-bottom: 50px;`
`12`		`- @include tc-heading-large;`
	`12`	`+ @include tc-heading;`
`13`	`13`	`font-weight: 300;`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`.projects-title-mobile {`
`24`		`- @include tc-heading;`
	`24`	`+ @include tc-heading-small;`
`25`	`25`	`color: $tc-gray-10;`
`26`	`26`	`font-size: 15px;`
`27`	`27`	`line-height: 50px;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`h3 {`
`35`		`- @include tc-heading;`
	`35`	`+ @include tc-heading-small;`
`36`	`36`	`@include roboto-bold;`
`37`	`37`	`font-size: 15px;`
`38`	`38`	`line-height: 20px;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`min-width: 700px;`
`6`	`6`	`text-align: center;`
`7`	`7`	`h1 {`
`8`		`- @include tc-heading;`
	`8`	`+ @include tc-heading-small;`
`9`	`9`	`color: $tc-gray-50;`
`10`	`10`	`margin-bottom: 20px;`
`11`	`11`	`}`