Jon Solow commited on
Commit
6f8c9cb
·
1 Parent(s): b7e6b42

Replace lists with divs

Browse files
Files changed (2) hide show
  1. src/css/Player.css +0 -6
  2. src/pages/11_Scoreboard.py +11 -11
src/css/Player.css CHANGED
@@ -15,12 +15,6 @@
15
  }
16
 
17
 
18
- div[class*='st-emotion-cache'] li {
19
- margin: var(--medium) 0;
20
- padding: var(--medium);
21
- }
22
-
23
-
24
  .player__position {
25
  font-family: var(--font-2);
26
  font-size: 1.2rem;
 
15
  }
16
 
17
 
 
 
 
 
 
 
18
  .player__position {
19
  font-family: var(--font-2);
20
  font-size: 1.2rem;
src/pages/11_Scoreboard.py CHANGED
@@ -55,9 +55,9 @@ def get_roster_html_str(week: int, user_map: dict[str, PlayerOption]) -> str:
55
  player = user_map.get(week_pos_label, PlayerOption.empty_player(week=week))
56
  player_stats = get_stats_map().get(week, {}).get(player.gsis_id, {})
57
  players_str += get_player_html_str(player, player_stats)
58
- roster_str = f"""<ul className='user__roster'>
59
  {players_str}
60
- </ul>"""
61
  return roster_str
62
 
63
 
@@ -82,7 +82,7 @@ def get_player_html_str(player_opt: PlayerOption, player_stats: dict[str, float]
82
  if not (player_image_url := player_opt.headshot_url):
83
  player_image_url = "https://static.www.nfl.com/w_200,h_200,c_fill/league/suxzfdslsj5vpwbin5t8"
84
 
85
- player_str = f"""<li className='{player_classes}'>
86
  <div className="player__position">{player_opt.position}</div>
87
  <div className={image_classes}>
88
  <img className="player__img" src={player_image_url} alt='{player_opt.full_name}' />
@@ -94,16 +94,16 @@ def get_player_html_str(player_opt: PlayerOption, player_stats: dict[str, float]
94
  <span className="player__game-status">{game_status}</span>
95
  <span className="player__game-score">{game_score}</span>
96
  {player_stats_str}
97
- </li>"""
98
 
99
  return player_str
100
 
101
 
102
  def get_stat_list_item_html_str(stat_key: str, stat_value: str | float) -> str:
103
- return f"""<li className="stat">
104
  <div className="stat__key">{stat_key}</div>
105
  <div className="stat__value">{stat_value}</div>
106
- </li>"""
107
 
108
 
109
  def get_player_stats_html_str(stats_dict: dict[str, float]) -> str:
@@ -113,7 +113,7 @@ def get_player_stats_html_str(stats_dict: dict[str, float]) -> str:
113
  max_stats = 4
114
  stat_items_str = "\n".join([get_stat_list_item_html_str(s, v) for s, v in sorted_stat_tuple[:max_stats]])
115
 
116
- stats_str = f"""<ul className="player-stats">{stat_items_str}</ul>"""
117
  return stats_str
118
 
119
 
@@ -126,14 +126,14 @@ def get_user_html_str(week: int, user_name: str, user_map: dict[str, PlayerOptio
126
  week_score = 0
127
  roster_html_str = get_roster_html_str(week, user_map)
128
  user_str += f"""
129
- <li className="user">
130
  <span className="user__place">{place}</span>
131
  <span className="user__username">{user_name}</span>
132
  <span className="user__username">{user_name}</span>
133
  <span className="user__score-type">{score_type}</span>
134
  <span className="user__score-number">{week_score}</span>
135
  {roster_html_str}
136
- </li>"""
137
  return user_str
138
 
139
 
@@ -143,12 +143,12 @@ def display_masked_rosters(week: int):
143
 
144
  scoreboard_str = ""
145
 
146
- scoreboard_str += """<ol className="scoreboard">"""
147
  for row in users.itertuples():
148
  user_roster_map = rosters.get(row.user_id, {})
149
  scoreboard_str += get_user_html_str(week, row.name, user_roster_map)
150
 
151
- scoreboard_str += """</ol>"""
152
 
153
  st.markdown(scoreboard_str, unsafe_allow_html=True)
154
 
 
55
  player = user_map.get(week_pos_label, PlayerOption.empty_player(week=week))
56
  player_stats = get_stats_map().get(week, {}).get(player.gsis_id, {})
57
  players_str += get_player_html_str(player, player_stats)
58
+ roster_str = f"""<div className='user__roster'>
59
  {players_str}
60
+ </div>"""
61
  return roster_str
62
 
63
 
 
82
  if not (player_image_url := player_opt.headshot_url):
83
  player_image_url = "https://static.www.nfl.com/w_200,h_200,c_fill/league/suxzfdslsj5vpwbin5t8"
84
 
85
+ player_str = f"""<div className='{player_classes}'>
86
  <div className="player__position">{player_opt.position}</div>
87
  <div className={image_classes}>
88
  <img className="player__img" src={player_image_url} alt='{player_opt.full_name}' />
 
94
  <span className="player__game-status">{game_status}</span>
95
  <span className="player__game-score">{game_score}</span>
96
  {player_stats_str}
97
+ </div>"""
98
 
99
  return player_str
100
 
101
 
102
  def get_stat_list_item_html_str(stat_key: str, stat_value: str | float) -> str:
103
+ return f"""<div className="stat">
104
  <div className="stat__key">{stat_key}</div>
105
  <div className="stat__value">{stat_value}</div>
106
+ </div>"""
107
 
108
 
109
  def get_player_stats_html_str(stats_dict: dict[str, float]) -> str:
 
113
  max_stats = 4
114
  stat_items_str = "\n".join([get_stat_list_item_html_str(s, v) for s, v in sorted_stat_tuple[:max_stats]])
115
 
116
+ stats_str = f"""<div className="player-stats">{stat_items_str}</div>"""
117
  return stats_str
118
 
119
 
 
126
  week_score = 0
127
  roster_html_str = get_roster_html_str(week, user_map)
128
  user_str += f"""
129
+ <div className="user">
130
  <span className="user__place">{place}</span>
131
  <span className="user__username">{user_name}</span>
132
  <span className="user__username">{user_name}</span>
133
  <span className="user__score-type">{score_type}</span>
134
  <span className="user__score-number">{week_score}</span>
135
  {roster_html_str}
136
+ </div>"""
137
  return user_str
138
 
139
 
 
143
 
144
  scoreboard_str = ""
145
 
146
+ scoreboard_str += """<div className="scoreboard">"""
147
  for row in users.itertuples():
148
  user_roster_map = rosters.get(row.user_id, {})
149
  scoreboard_str += get_user_html_str(week, row.name, user_roster_map)
150
 
151
+ scoreboard_str += """</div>"""
152
 
153
  st.markdown(scoreboard_str, unsafe_allow_html=True)
154