Merge pull request #182 from fossunited/profile-urls

fix: profile urls

community/community/widgets/Avatar.html

@@ -1,5 +1,5 @@
 {% set color = member.get_palette() %}
-<a class="button-links" href="/{{member.username}}">
+<a class="button-links" href="/user/{{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

@@ -130,7 +130,7 @@ fixtures = ["Custom Field"]
 # auto_cancel_exempted_doctypes = ["Auto Repeat"]
 
 # Add all simple route rules here
-primary_rules = [
+website_route_rules = [
     {"from_route": "/sketches/<sketch>", "to_route": "sketches/sketch"},
     {"from_route": "/courses/<course>", "to_route": "courses/course"},
     {"from_route": "/courses/<course>/<certificate>", "to_route": "courses/certificate"},
@@ -146,40 +146,10 @@ primary_rules = [
     {"from_route": "/courses/<course>/about", "to_route": "batch/about"},
     {"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": "/discussions/<discussion>", "to_route": "discussions/discussion"},
+    {"from_route": "/user/<string(minlength=4):username>", "to_route": "profiles/profile"}
 ]
 
-# Any frappe default URL is blocked by profile-rules, add it here to unblock it
-whitelist = [
-    "/home",
-    "/login",
-    "/update-password",
-    "/update-profile",
-    "/third-party-apps",
-    "/website_script.js",
-    "/courses",
-    "/sketches",
-    "/admin",
-    "/socket.io",
-    "/hackathons",
-    "/dashboard",
-    "/join-request",
-    "/add-a-new-batch",
-    "/new-sign-up",
-    "/message",
-    "/about",
-    "/edit-profile",
-    "/discussions"
-]
-whitelist_rules = [{"from_route": p, "to_route": p[1:]} for p in whitelist]
-
-# regex rule to match all profiles
-profile_rules = [
-    {"from_route": "/<string(minlength=4):username>", "to_route": "profiles/profile"},
-]
-
-website_route_rules = primary_rules + whitelist_rules + profile_rules
-
 website_redirects = [
     {"source": "/update-profile", "target": "/edit-profile"},
 ]

community/lms/web_form/profile/profile.js

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

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="/{{author.username}}">{{ author.full_name }}</a>
+        {{ widgets.Avatar(member=author, avatar_class="avatar-medium") }} <a href="/user/{{author.username}}">{{ author.full_name }}</a>
       {% endwith %}
     </div>
   </div>

community/lms/widgets/InstructorSection.html

@@ -1,6 +1,6 @@
 <div class="instructor">
   {{ widgets.Avatar(member=instructor, avatar_class="avatar-medium") }}
-  <a class="ml-1 instructor-title" href="/{{instructor.username}}">{{ instructor.full_name }}</a>
+  <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="/{{ member.username }}"></a>
+  <a class="stretched-link" href="/user/{{ member.username }}"></a>
 </div>

community/lms/widgets/Reviews.html

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

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="/{{ member.username }}">
+    <a class="button-links" href="/user/{{ 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/certificate.html

@@ -13,10 +13,12 @@
       <a class="dark-links" href="/courses/{{ course.name }}">{{ course.title }}</a>
     </div>
 
+    {% if certificate.student == frappe.session.user %}
     <div class="comment-footer mb-5">
       <div class="button is-secondary pull-right" id="export-as-pdf" data-certificate="{{ certificate.name }}"
         data-certificate-name="{{ student.full_name }} - {{ course.title }}">Export</div>
     </div>
+    {% endif %}
     {% include "community/templates/certificate.html" %}
   </div>
 </div>

community/www/new-sign-up.html

@@ -67,4 +67,4 @@
 	})
 </script>
 
-{% endblock %}
+{% endblock %}