Bump version to 0.3.0

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vrobbler"
-version = "0.2.2"
+version = "0.3.0"
 description = ""
 authors = ["Colin Powell <colin@unbl.ink>"]
 

vrobbler/apps/scrobbles/views.py

@@ -75,7 +75,7 @@ class RecentScrobbleList(ListView):
     def get_queryset(self):
         return Scrobble.objects.filter(
             track__isnull=False, in_progress=False
-        ).order_by('-timestamp')[:25]
+        ).order_by('-timestamp')[:15]
 
 
 @csrf_exempt

vrobbler/templates/scrobbles/scrobble_list.html

@@ -3,7 +3,7 @@
 
 
 {% block content %}
-<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4">
+<main class="col-md-4 ms-sm-auto col-lg-10 px-md-4">
     <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
         <h1 class="h2">Dashboard</h1>
         <div class="btn-toolbar mb-2 mb-md-0">
@@ -18,11 +18,26 @@
         </div>
     </div>
 
-    <canvas class="my-4 w-100" id="myChart" width="900" height="380"></canvas>
+    <canvas class="my-4 w-100" id="myChart" width="900" height="220"></canvas>
 
     <div class="container">
+
+        <div class="row">
+            <p>Today <b>{{counts.today}}</b> | This Week <b>{{counts.week}}</b> | This Month <b>{{counts.month}}</b> | This Year <b>{{counts.year}}</b> | All Time <b>{{counts.alltime}}</b></p>
+        </div>
         <div class="row">
             <div class="col-md">
+                <ul class="nav nav-tabs" id="myTab" role="tablist">
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#artists-week" type="button" role="tab" aria-controls="home" aria-selected="true">Weekly Artists</button>
+                    </li>
+                    <li class="nav-item" role="presentation">
+                        <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#tracks-week" type="button" role="tab" aria-controls="profile" aria-selected="false">Weekly Tracks</button>
+                    </li>
+                </ul>
+
+                <div class="tab-content" id="myTabContent">
+                    <div class="tab-pane fade show" id="artists-week" role="tabpanel" aria-labelledby="artists-week-tab">
                         <h2>Top artists this week</h2>
                         <div class="table-responsive">
                             <table class="table table-striped table-sm">
@@ -43,7 +58,8 @@
                             </table>
                         </div>
                     </div>
-            <div class="col-lg">
+
+                    <div class="tab-pane fade show active" id="tracks-week" role="tabpanel" aria-labelledby="tracks-week-tab">
                         <h2>Top tracks this week</h2>
                         <div class="table-responsive">
                             <table class="table table-striped table-sm">
@@ -68,11 +84,19 @@
                     </div>
                 </div>
             </div>
-    <div class="container">
+        <div class="col-md">
-        <div class="row">
+            <ul class="nav nav-tabs" id="myTab" role="tablist">
-            <div class="col-lg">
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#latest-listened" type="button" role="tab" aria-controls="home" aria-selected="true">Latest Listened</button>
+                </li>
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#latest-watched" type="button" role="tab" aria-controls="profile" aria-selected="false">Latest Watched</button>
+                </li>
+            </ul>
+
+            <div class="tab-content" id="myTabContent2">
+                <div class="tab-pane fade show active" id="latest-listened" role="tabpanel" aria-labelledby="latest-listened-tab">
                     <h2>Latest listened</h2>
-                <p>Today <b>{{counts.today}}</b> | This Week <b>{{counts.week}}</b> | This Month <b>{{counts.month}}</b> | This Year <b>{{counts.year}}</b> | All Time <b>{{counts.alltime}}</b></p>
                     <div class="table-responsive">
                         <table class="table table-striped table-sm">
                         <thead>
@@ -80,7 +104,6 @@
                             <th scope="col">Time</th>
                             <th scope="col">Track</th>
                             <th scope="col">Artist</th>
-                        <th scope="col">Source</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -89,7 +112,6 @@
                                 <td>{{scrobble.timestamp|naturaltime}}</td>
                                 <td>{{scrobble.track.title}}</td>
                                 <td>{{scrobble.track.artist.name}}</td>
-                            <td>{{scrobble.source}}</td>
                             </tr>
                             {% endfor %}
                         </tbody>
@@ -97,7 +119,7 @@
                     </div>
                 </div>
 
-            <div class="col-lg">
+                <div class="tab-pane fade show" id="latest-watched" role="tabpanel" aria-labelledby="latest-watched-tab">
                     <h2>Latest watched</h2>
                     <div class="table-responsive">
                         <table class="table table-striped table-sm">
@@ -124,5 +146,6 @@
                 </div>
             </div>
         </div>
+    </div>
 </main>
 {% endblock %}