Merge pull request #64 from Hojagulyyev/dev

chore: update default redirect url to overview page
Hojagulyyev · Nov 14, 2023 · 10f43d0 · 10f43d0
2 parents b0520a9 + 17149a0
commit 10f43d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/apps/authentication/interactors.py b/apps/authentication/interactors.py
@@ -65,7 +65,7 @@ def signin(request):
         )
 
     login(request, user)
-    return redirect('diaries:newsfeed_view')
+    return redirect('clans:overview')
 
 
 @login_required

diff --git a/rp2/urls.py b/rp2/urls.py
@@ -6,7 +6,7 @@
 
 
 def default_view(request):
-    return redirect("diaries:newsfeed_view")
+    return redirect("clans:overview")
 
 
 urlpatterns = [

diff --git a/templates/clans/overview.html b/templates/clans/overview.html
@@ -48,7 +48,7 @@ <h2 class="section-title">Overview</h2>
                 <!-- /BAR PROGRESS INFO -->
 
                 <!-- PROGRESS STAT INFO -->
-                <p class="progress-stat-info">{{ user.account.get_xp_total|intcomma }} total exp points received</p>
+                <p class="progress-stat-info">{{ user.account.get_xp_total|intcomma }} total xp points received</p>
                 <!-- /PROGRESS STAT INFO -->
             </div>
             <!-- /BAR PROGRESS WRAP -->
@@ -91,23 +91,23 @@ <h2 class="section-title">Overview</h2>
                     <!-- TABLE HEADER COLUMN -->
                     <div class="table-header-column centered padded">
                         <!-- TABLE HEADER TITLE -->
-                        <p class="table-header-title">Diaries</p>
+                        <p class="table-header-title">Commits</p>
                         <!-- /TABLE HEADER TITLE -->
                     </div>
                     <!-- /TABLE HEADER COLUMN -->
 
                     <!-- TABLE HEADER COLUMN -->
                     <div class="table-header-column centered padded">
                         <!-- TABLE HEADER TITLE -->
-                        <p class="table-header-title">Commits</p>
+                        <p class="table-header-title">Total XP</p>
                         <!-- /TABLE HEADER TITLE -->
                     </div>
                     <!-- /TABLE HEADER COLUMN -->
 
                     <!-- TABLE HEADER COLUMN -->
                     <div class="table-header-column centered padded">
                         <!-- TABLE HEADER TITLE -->
-                        <p class="table-header-title">XP</p>
+                        <p class="table-header-title">Diaries</p>
                         <!-- /TABLE HEADER TITLE -->
                     </div>
                     <!-- /TABLE HEADER COLUMN -->
@@ -146,7 +146,7 @@ <h2 class="section-title">Overview</h2>
                                 <!-- /USER STATUS TITLE -->
 
                                 <!-- USER STATUS TEXT -->
-                                <p class="user-status-text small">{{ account.get_full_name }}</p>
+                                <p class="user-status-text small">{{ account.xp }} XP</p>
                                 <!-- /USER STATUS TEXT -->
                             </div>
                             <!-- /USER STATUS -->
@@ -164,23 +164,23 @@ <h2 class="section-title">Overview</h2>
                         <!-- TABLE COLUMN -->
                         <div class="table-column centered padded">
                             <!-- TABLE TITLE -->
-                            <p class="table-title">{{ account.diaries_count }}</p>
+                            <p class="table-title">{{ account.diary_commits_count }}</p>
                             <!-- /TABLE TITLE -->
                         </div>
                         <!-- /TABLE COLUMN -->
 
                         <!-- TABLE COLUMN -->
                         <div class="table-column centered padded">
                             <!-- TABLE TITLE -->
-                            <p class="table-title">{{ account.diary_commits_count }}</p>
+                            <p class="table-title">{{ account.get_xp_total|intcomma }}</p>
                             <!-- /TABLE TITLE -->
                         </div>
                         <!-- /TABLE COLUMN -->
 
                         <!-- TABLE COLUMN -->
                         <div class="table-column centered padded">
                             <!-- TABLE TITLE -->
-                            <p class="table-title">{{ account.get_xp_total|intcomma }}</p>
+                            <p class="table-title">{{ account.diaries_count }}</p>
                             <!-- /TABLE TITLE -->
                         </div>
                         <!-- /TABLE COLUMN -->
@@ -241,8 +241,8 @@ <h2 class="section-title">Overview</h2>
         stop: {{ user.account.xp }}
     },
     linkText: true,
-    linkUnits: 'exp',
-    invertedProgress: false,
+    linkUnits: 'xp',
+    invertedProgress: true,
     animateOnScroll: true
 });