feat: reorganization

app.py

@@ -270,17 +270,17 @@ def usatt_rating_analyzer(file_obj):
             peak_rating,
             n_competitions_played,
             n_matches_played,
-            matches_per_competition_fig,
-            opponent_name_word_cloud_fig,
-            competition_name_word_cloud_fig,
-            most_frequent_opponents,
+            rating_over_time_fig,
+            opponent_rating_distr_fig,
+            opponent_rating_dist_over_time_fig,
             best_wins,
             biggest_upsets,
+            most_frequent_opponents,
             highest_rated_opponent,
-            rating_over_time_fig,
             match_with_longest_game,
-            opponent_rating_distr_fig,
-            opponent_rating_dist_over_time_fig,
+            opponent_name_word_cloud_fig,
+            competition_name_word_cloud_fig,
+            matches_per_competition_fig,
             )
 
 
@@ -296,12 +296,22 @@ with gr.Blocks() as demo:
     3. Under 'Tournaments' or 'Leagues', click *Download Tournament/League Match History*.
     ## Usage
     1. Simply add your tournament/league match history CSV file and click the "{analyze_btn_title}" button.
+    
+    ---
+    
     """)
     with gr.Row():
         with gr.Column():
             input_file = gr.File(label='USATT Results File', file_types=['file'])
             btn = gr.Button(analyze_btn_title)
 
+    gr.Markdown("""<br />
+    
+    ## Overview
+    
+    <br />
+    """)
+
     with gr.Group():
         with gr.Row():
             with gr.Column():
@@ -316,31 +326,48 @@ with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
                 rating_over_time_plot = gr.Plot(show_label=False)
-            with gr.Column():
-                matches_per_comp_plot = gr.Plot(show_label=False)
 
         with gr.Row():
             with gr.Column():
-                opponent_names_plot = gr.Plot(label="Opponent names")
+                opponent_rating_dist_plot = gr.Plot(show_label=False)
             with gr.Column():
-                comp_names_plot = gr.Plot(label="Competition names")
+                opponent_rating_dist_over_time_plot = gr.Plot(show_label=False)
+
+        gr.Markdown("""<br />
+
+        ## Best Matches
+
+        <br />
+        """)
 
         with gr.Row():
             with gr.Column():
-                most_frequent_opponents_gdf = gr.Dataframe(label="Most frequent opponents", max_rows=5)
                 best_wins_gdf = gr.Dataframe(label="Best wins (matches won sorted by opponent post-competition rating)",
                                              max_rows=5)
                 biggest_upsets_gdf = gr.Dataframe(label="Biggest upsets (matches won sorted by rating - opponent post-competition rating)",
                                                   max_rows=5)
-                highest_rated_opponent_gdf = gr.Dataframe(label="Best opponent", max_rows=1)
 
-        match_longest_game_gdf = gr.Dataframe(label="Match with longest game", max_rows=1)
+        gr.Markdown("""<br />
+        
+        ## Fun Facts
+        
+        <br />
+        """)
 
         with gr.Row():
             with gr.Column():
-                opponent_rating_dist_plot = gr.Plot(show_label=False)
+                most_frequent_opponents_gdf = gr.Dataframe(label="Most frequent opponents", max_rows=5)
+                highest_rated_opponent_gdf = gr.Dataframe(label="Best opponent", max_rows=1)
+                match_longest_game_gdf = gr.Dataframe(label="Match with longest game", max_rows=1)
+
+        with gr.Row():
             with gr.Column():
-                opponent_rating_dist_over_time_plot = gr.Plot(show_label=False)
+                opponent_names_plot = gr.Plot(label="Opponent names")
+            with gr.Column():
+                comp_names_plot = gr.Plot(label="Competition names")
+            with gr.Column():
+                matches_per_comp_plot = gr.Plot(show_label=False)
+
 
     inputs = [input_file]
     outputs = [
@@ -348,17 +375,17 @@ with gr.Blocks() as demo:
         peak_rating_box,
         num_comps_box,
         num_matches_box,
-        matches_per_comp_plot,
-        opponent_names_plot,
-        comp_names_plot,
-        most_frequent_opponents_gdf,
+        rating_over_time_plot,
+        opponent_rating_dist_plot,
+        opponent_rating_dist_over_time_plot,
         best_wins_gdf,
         biggest_upsets_gdf,
+        most_frequent_opponents_gdf,
         highest_rated_opponent_gdf,
-        rating_over_time_plot,
         match_longest_game_gdf,
-        opponent_rating_dist_plot,
-        opponent_rating_dist_over_time_plot,
+        opponent_names_plot,
+        comp_names_plot,
+        matches_per_comp_plot,
     ]
 
     btn.click(usatt_rating_analyzer, inputs=inputs, outputs=outputs)