fix: profile and progress on dashboard

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a class="button-links" href="/user/{{member.username}}">
+<a class="button-links" href="/users/{{member.username}}">
   <span class="avatar {{ avatar_class }}" title="{{ member.full_name }}">
     {% if member.user_image %}
     <img class="avatar-frame standard-image" style="object-fit: cover;" src="{{ member.user_image }}" title="{{ member.full_name }}">

community/hooks.py

@@ -21,7 +21,7 @@ app_license = "AGPL"
 # include js, css files in header of web template
 web_include_css = "community.bundle.css"
 # web_include_css = "/assets/community/css/community.css"
-# web_include_js = "/assets/community/js/community.js"
+web_include_js = "website.bundle.js"
 
 # include custom scss in every website theme (without file extension ".scss")
 # website_theme_scss = "community/public/scss/website"
@@ -142,7 +142,8 @@ website_route_rules = [
 	{"from_route": "/courses/<course>/progress", "to_route": "batch/progress"},
 	{"from_route": "/courses/<course>/join", "to_route": "batch/join"},
 	{"from_route": "/discussions/<discussion>", "to_route": "discussions/discussion"},
-	{"from_route": "/user/<string(minlength=4):username>", "to_route": "profiles/profile"},
+	{"from_route": "/users/<string(minlength=4):username>", "to_route": "profiles/profile"},
+	{"from_route": "/users", "to_route": "profiles/profile"},
 ]
 
 website_redirects = [

community/lms/doctype/lms_course/lms_course.py

@@ -187,20 +187,6 @@ class LMSCourse(Document):
     def get_slugified_chapter_title(self, chapter):
         return slugify(chapter)
 
-    def get_course_progress(self):
-        """ Returns the course progress of the session user """
-        lesson_count = len(self.get_lessons())
-        completed_lessons = frappe.db.count("LMS Course Progress",
-                                {
-                                    "course": self.name,
-                                    "owner": frappe.session.user,
-                                    "status": "Complete"
-                                })
-        precision = cint(frappe.db.get_default("float_precision")) or 3
-        if not lesson_count:
-            return 0
-        return flt(((completed_lessons/lesson_count) * 100), precision)
-
     def get_batch(self, batch_name):
         return find("LMS Batch", name=batch_name, course=self.name)
 
@@ -340,6 +326,20 @@ class LMSCourse(Document):
                 },
                 ["status"])
 
+    def get_course_progress(self, member=None):
+        """ Returns the course progress of the session user """
+        lesson_count = len(self.get_lessons())
+        completed_lessons = frappe.db.count("LMS Course Progress",
+                                {
+                                    "course": self.name,
+                                    "owner": member or frappe.session.user,
+                                    "status": "Complete"
+                                })
+        precision = cint(frappe.db.get_default("float_precision")) or 3
+        if not lesson_count:
+            return 0
+        return flt(((completed_lessons/lesson_count) * 100), precision)
+
     def get_neighbours(self, current, lessons):
         current = flt(current)
         numbers = sorted(lesson.number for lesson in lessons)

community/lms/web_form/profile/profile.js

@@ -8,7 +8,7 @@ frappe.ready(function () {
 
   frappe.web_form.after_save = () => {
     setTimeout(() => {
-      window.location.href = `/user/${frappe.web_form.get_value(["username"])}`;
+      window.location.href = `/users/${frappe.web_form.get_value(["username"])}`;
     })
   }
 })

community/lms/web_template/course_cards/course_cards.html

@@ -3,7 +3,7 @@
   <div class="cards-parent mt-10">
     {% for course_row in courses %}
     {% set course = frappe.get_doc("LMS Course", course_row.course) %}
-    {{ widgets.CourseCard(course=course) }}
+    {{ widgets.CourseCard(course=course, show_progress_indicators=True) }}
     {% endfor %}
   </div>
 </div>

community/lms/widgets/BatchHeader.html

@@ -1,4 +0,0 @@
-<div class="p-5 batch-header">
-  <h3>{{batch_name}}</h3>
-  <div class="text-muted">{{member_count}} members</div>
-</div>

community/lms/widgets/CourseCard.html

@@ -1,6 +1,8 @@
+{% set membership = course.get_membership(frappe.session.user) %}
+
 <div class="common-card-style course-card">
-  <div class="course-image {% if not course.image %}default-image{% endif %}"
+  <div class="course-image {% if not course.image %}default-image{% endif %}" {% if course.image %}
-    {% if course.image %} style="background-image: url( {{ course.image }} );" {% endif %}>
+    style="background-image: url( {{ course.image }} );" {% endif %}>
     <div class="course-tags">
       {% for tag in course.get_tags() %}
       <div class="course-card-pills">{{ tag }}</div>
@@ -10,7 +12,9 @@
     <div class="default-image-text">{{ course.title[0] }}</div>
     {% endif %}
   </div>
+
   <div class="course-card-content">
+
     <div class="course-card-meta muted-text">
       {% if course.get_chapters() | length %}
       <span>
@@ -25,13 +29,32 @@
         {{ course.get_upcoming_batches() | length }} Open Batches
       </span>
       {% endif %}
+      {% set certificate = course.is_certified() %}
+      {% if certificate and show_progress_indicators %}
+      <a class="muted-text dark-links pull-right zindex" href="/courses/{{ course.name }}/{{ certificate }}">View
+        Certificate</a>
+      {% endif %}
     </div>
+
     <div class="course-card-title">{{ course.title }}</div>
+    {% if membership and show_progress_indicators %}
+    {% set progress = course.get_course_progress() %}
+    <div class="progress mb-5 zindex" title="{{ frappe.utils.rounded(progress) }}%">
+      <div class="progress-bar" role="progressbar" style="width: {{ progress }}%" aria-valuenow="{{ progress }}"
+        aria-valuemin="0" aria-valuemax="100"></div>
+    </div>
+    {% else %}
     <div class="card-divider"></div>
+    {% endif %}
+
     <div class="course-card-meta-2">
-      {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
+      <span class="zindex">
-      <span class="course-instructor">
+        {{ widgets.Avatar(member=course.get_instructor(), avatar_class="avatar-small") }}
-        {{ course.get_instructor().full_name }}
+        <a class="button-links" href="/users/{{ course.get_instructor().username}}">
+          <span class="course-instructor">
+            {{ course.get_instructor().full_name }}
+          </span>
+        </a>
       </span>
       <span class="course-student-count">
         {% if course.get_students() | length %}
@@ -42,14 +65,13 @@
         {% endif %}
         {% set avg_rating = course.get_average_rating() %}
         {% if avg_rating %}
-        <span>
+        <span class="">
           <img class="icon-background" src="/assets/community/icons/rating.svg" />
           {{ avg_rating }}
         </span>
         {% endif %}
       </span>
     </div>
-    {% set membership = course.get_membership(frappe.session.user) %}
 
     {% set lesson_index = course.get_lesson_index(membership.current_lesson) if membership and
     membership.current_lesson

community/lms/widgets/CourseTeaser.html

@@ -12,7 +12,7 @@
     {% endif %}
     <div class="course-author">
       {% with author = course.get_instructor() %}
-        {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="/user/{{author.username}}">{{ author.full_name }}</a>
+        {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="/users/{{author.username}}">{{ author.full_name }}</a>
       {% endwith %}
     </div>
   </div>

community/lms/widgets/InstructorSection.html

@@ -1,6 +0,0 @@
-<div class="instructor">
-  {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
-  <a class="ml-1 instructor-title" href="/user/{{instructor.username}}">{{ instructor.full_name }}</a>
-  <div class="instructor-subtitle">Course Creator</div>
-  <!-- <div class="instructor-subtitle">Created {{instructor.get_course_count()}} courses</div> -->
-</div>

community/lms/widgets/MemberCard.html

@@ -11,5 +11,5 @@
     Created {{ course_count }} {{ suffix }}
   </div>
   {% endif %}
-  <a class="stretched-link" href="/user/{{ member.username }}"></a>
+  <a class="stretched-link" href="/users/{{ member.username }}"></a>
 </div>

community/lms/widgets/Reviews.html

@@ -19,7 +19,7 @@
       <div class="review-card-footer">
         <div>
           {{ widgets.Avatar(member=review.owner_details, avatar_class="avatar-medium") }}
-          <a class="button-links" href="/user/{{review.owner_details.username}}">
+          <a class="button-links" href="/users/{{review.owner_details.username}}">
             <span class="course-instructor">
               {{ review.owner_details.full_name }}
             </span>

community/overrides/user.py

@@ -58,7 +58,7 @@ class CustomUser(User):
         """
         return frappe.get_all(
             'LMS Course', {
-                'owner': self.name,
+                'instructor': self.name,
                 'is_published': True
         })
 
@@ -124,3 +124,20 @@ class CustomUser(User):
                 mentored_courses.append(map)
 
         return mentored_courses
+
+    def get_enrolled_courses(self):
+        in_progress = []
+        completed = []
+        memberships = self.get_course_membership("Student");
+        for membership in memberships:
+            course = frappe.get_doc("LMS Course", membership.course)
+            progress = course.get_course_progress(member=self.name)
+            if progress < 100:
+                in_progress.append(course)
+            else:
+                completed.append(course)
+
+        return {
+            "in_progress": in_progress,
+            "completed": completed
+        }

community/public/css/style.css

@@ -1148,13 +1148,18 @@ input[type=checkbox] {
   }
 }
 
+.zindex {
+  position: relative;
+  z-index: 2;
+}
+
 .progress {
   width: 100%;
   height: 8px;
 }
 
 .progress-bar {
-  background-color: #318AD8;
+  background-color: var(--primary-color);
 }
 
 .progress-percentage {

community/public/js/profile.js

@@ -0,0 +1,6 @@
+frappe.ready(() => {
+  if (frappe.session.user == "Guest") {
+    var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+    link_array.length && $(link_array[0]).addClass("hide");
+  }
+})

community/public/js/website.bundle.js

@@ -0,0 +1 @@
+import "./profile.js"

community/templates/message_card.html

@@ -2,7 +2,7 @@
   <div class="mb-4">
     {% set member = frappe.get_doc("User", message.owner) %}
     {{ widgets.Avatar(member=member, avatar_class="avatar-small")}}
-    <a class="button-links" href="/user/{{ member.username }}">
+    <a class="button-links" href="/users/{{ member.username }}">
       <span class="message-author">{{ member.full_name }}</span>
     </a>
     <span class="muted-text pull-right">{{ frappe.utils.format_datetime(message.creation, "dd MMM hh:mm") }}</span>

community/www/courses/index.html

@@ -14,7 +14,7 @@
     </div>
     <div class="cards-parent">
       {% for course in courses %}
-      {{ widgets.CourseCard(course=course) }}
+      {{ widgets.CourseCard(course=course, show_progress_indicators=True) }}
       {% endfor %}
     </div>
   </div>

community/www/profiles/profile.html

@@ -139,19 +139,34 @@
 {% endmacro %}
 
 {% macro CoursesEnrolled(member) %}
-{% if member.get_course_membership("Student") | length %}
+{% set enrolled = member.get_enrolled_courses() %}
+{% set show_progress = member.name == frappe.session.user %}
+{% if enrolled.in_progress | length %}
 <div class="profile-courses">
   <div class="course-home-headings">
-    Courses Enrolled
+    Courses In Progress
   </div>
   <div class="cards-parent">
-    {% for membership in member.get_course_membership("Student") %}
+    {% for course in enrolled.in_progress %}
-    {% set course_details = frappe.get_doc("LMS Course", membership.course) %}
+    {{ widgets.CourseCard(course=course, show_progress_indicators=show_progress) }}
-    {{ widgets.CourseCard(course=course_details) }}
     {% endfor %}
   </div>
 </div>
 {% endif %}
+
+{% if enrolled.completed | length %}
+<div class="profile-courses">
+  <div class="course-home-headings">
+    Courses Completed
+  </div>
+  <div class="cards-parent">
+    {% for course in enrolled.completed %}
+    {{ widgets.CourseCard(course=course, show_progress_indicators=show_progress) }}
+    {% endfor %}
+  </div>
+</div>
+{% endif %}
+
 {% endmacro %}
 
 {% macro ProfileTabs(profile_tabs) %}
@@ -166,3 +181,16 @@
   {% endfor %}
 </div>
 {% endmacro %}
+
+{% block script %}
+<script>
+  frappe.ready(() => {
+    if ("{{ member.name }}" == frappe.session.user) {
+      setTimeout(() => {
+        var link_array = $('.nav-link').filter((i, elem) => $(elem).text().trim() === "My Profile");
+        link_array.length && $(link_array[0]).addClass("active");
+      }, 0)
+    }
+  })
+</script>
+{% endblock %}

community/www/profiles/profile.py

@@ -4,7 +4,14 @@ def get_context(context):
     context.no_cache = 1
 
     try:
-        context.member = frappe.get_doc("User", {"username": frappe.form_dict["username"]})
+        username = frappe.form_dict["username"]
+    except KeyError:
+        username = frappe.db.get_value("User", frappe.session.user, ["username"])
+        if username:
+            frappe.local.flags.redirect_location = "/users/" + username
+            raise frappe.Redirect
+    try:
+        context.member = frappe.get_doc("User", {"username": username})
     except:
         context.template = "www/404.html"
         return