Merge pull request hexlet-codebattle#1059 from glebmanov/modify_profile_page

Vitaly · web-flow · commit fe1b98656725 · 2021-09-24T11:04:07.000+03:00
fix achievements and joined at
diff --git a/services/app/assets/css/style.scss b/services/app/assets/css/style.scss
@@ -258,9 +258,9 @@ a {
   padding: 5px;
 }
 .cb-profile .cb-polyglot {
-  width: 200px;
-  height: 200px;
-  padding: 12px;
+  width: 50px;
+  height: 50px;
+  padding: 2px;
 }
 
 .cb-user-avatar {
diff --git a/services/app/assets/js/widgets/containers/UserProfile.jsx b/services/app/assets/js/widgets/containers/UserProfile.jsx
@@ -43,15 +43,15 @@ const UserProfile = () => {
       const langs = achievement.split('?').pop().split('_');
 
       return (
-        <div className="cb-polyglot" title={achievement}>
+        <div className="cb-polyglot mr-1 mb-1" title={achievement}>
           <div className="d-flex h-75 flex-wrap align-items-center justify-content-around">
             {langs.map(lang => (
               <img
                 src={`/assets/images/achievements/${lang}.png`}
                 alt={lang}
                 title={lang}
-                width="38"
-                height="38"
+                width="10"
+                height="10"
                 key={lang}
               />
             ))}
@@ -61,7 +61,7 @@ const UserProfile = () => {
     }
     return (
       <img
-        className="mr-1"
+        className="mr-1 mb-1"
         src={`/assets/images/achievements/${achievement}.png`}
         alt={achievement}
         title={achievement}
@@ -192,7 +192,7 @@ const UserProfile = () => {
           <h3 className="my-2">{`Lang: ${stats.user.lang}`}</h3>
           <hr />
           <p className="small text-monospace text-muted mb-2">
-            {'inserted at '}
+            {'joined at '}
             {dateParse(stats.user.insertedAt)}
           </p>
           <h1 className="my-2">
@@ -210,7 +210,7 @@ const UserProfile = () => {
               <>
                 <hr className="mt-2" />
                 <h5 className="text-break">Achievements</h5>
-                <div className="col d-flex justify-content-start cb-profile mt-3 pl-0">
+                <div className="col d-flex flex-wrap justify-content-start cb-profile mt-3 pl-0">
                   {stats.user.achievements.map(achievement => (
                     <div key={achievement}>{renderAchievemnt(achievement)}</div>
                   ))}

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,9 @@ a {`
`258`	`258`	`padding: 5px;`
`259`	`259`	`}`
`260`	`260`	`.cb-profile .cb-polyglot {`
`261`		`- width: 200px;`
`262`		`- height: 200px;`
`263`		`- padding: 12px;`
	`261`	`+ width: 50px;`
	`262`	`+ height: 50px;`
	`263`	`+ padding: 2px;`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`.cb-user-avatar {`