Merge branch 'subs' of github.com:odota/web into subs

odota · Jul 11, 2022 · 6e5e554 · 6e5e554
2 parents db73e16 + 5bf6fa5
commit 6e5e554
Show file tree

Hide file tree

Showing 14 changed files with 469 additions and 234 deletions.
diff --git a/public/assets/images/dire.png b/public/assets/images/dire.png
diff --git a/public/assets/images/dota2/gold.png b/public/assets/images/dota2/gold.png
diff --git a/public/assets/images/radiant.png b/public/assets/images/radiant.png
diff --git a/src/actions/index.js b/src/actions/index.js
@@ -59,7 +59,7 @@ export const getPlayerMatches = (accountId, params) => action('playerMatches', p
   significant: 0,
   project: [
     'duration', 'game_mode', 'lobby_type', // needed since significant = 0 excludes these fields when used with project field
-    'start_time', 'hero_id', 'start_time', 'version', 'kills', 'deaths', 'assists', 'skill', 'leaver_status', 'party_size', // default fields when querying without project field
+    'start_time', 'hero_id', 'start_time', 'version', 'kills', 'deaths', 'assists', 'skill', 'leaver_status', 'party_size', 'average_rank', // default fields when querying without project field
     'item_0', 'item_1', 'item_2', 'item_3', 'item_4', 'item_5', 'backpack_0', // additional fields required for items
   ] }, transformPlayerMatches({ ...querystring.parse(params.substring(1)) }));
 export const getPlayerPeers = (accountId, params) => action('playerPeers', process.env.REACT_APP_API_HOST, `api/players/${accountId}/peers`, paramsWithTurbo(params));

diff --git a/src/components/Icons/Lightning.svg b/src/components/Icons/Lightning.svg
diff --git a/src/components/Icons/Sword.svg b/src/components/Icons/Sword.svg
diff --git a/src/components/ItemTooltip/index.jsx b/src/components/ItemTooltip/index.jsx
@@ -35,8 +35,9 @@ const Header = styled.div`
   
   .header-content {
     height: 50px;
-    padding: 13px 13px 13px 13px;
+    padding: 13px;
     white-space: nowrap;
+    display: flex;
   }
 
   #item-img {
@@ -67,6 +68,7 @@ const HeaderText = styled.div`
   & #gold {
     color: ${constants.colorGolden};
     font-weight: normal;
+    font-size: ${constants.fontSizeSmall};
 
     & img {
       height: 13px;
@@ -190,7 +192,7 @@ const ItemTooltip = ({ item, inflictor }) => (
         <img id="item-img" src={`${process.env.REACT_APP_IMAGE_CDN}${item.img}`} alt="" />
         <HeaderText>
           <div>{item.dname}</div>
-          <div id="gold">{<img src={`${process.env.REACT_APP_IMAGE_CDN}/apps/dota2/images/dota_react/tooltips/gold.png`} alt="" />}{item.cost}</div>
+          <div id="gold">{item.tier ? "Neutral item" : <><img src={`${process.env.REACT_APP_IMAGE_CDN}/apps/dota2/images/dota_react/tooltips/gold.png`} alt="" />{item.cost}</>}</div>
         </HeaderText>
       </div>
     </Header>

diff --git a/src/components/Match/MatchHeader/MatchHeader.jsx b/src/components/Match/MatchHeader/MatchHeader.jsx
@@ -44,6 +44,7 @@ const Styled = styled.header`
     margin-right: 30px;
     margin-left: 30px;
     justify-self: flex-end;
+    font-weight: 700;
 
     @media only screen and (max-width: 1023px) {
       flex-basis: 100%;