fix: remove references to old styles in the hooks

Old styles were removed in #157, but a reference to it was hanging
around in the hooks.

community/hooks.py

@@ -19,7 +19,6 @@ app_license = "AGPL"
 # app_include_js = "/assets/community/js/community.js"
 
 # 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"
 

community/lms/doctype/chapter/chapter.json

@@ -9,6 +9,7 @@
   "course",
   "title",
   "description",
+  "locked",
   "index_"
  ],
  "fields": [
@@ -23,6 +24,12 @@
    "fieldtype": "Markdown Editor",
    "label": "Description"
   },
+  {
+   "default": "0",
+   "fieldname": "locked",
+   "fieldtype": "Check",
+   "label": "Locked"
+  },
   {
    "fieldname": "course",
    "fieldtype": "Link",
@@ -45,7 +52,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2021-07-23 19:03:57.946831",
+ "modified": "2021-05-13 21:05:20.531890",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Chapter",

community/lms/doctype/lms_course/lms_course.json

@@ -21,14 +21,14 @@
  "engine": "InnoDB",
  "field_order": [
   "title",
+  "short_code",
   "video_link",
-  "image",
   "column_break_3",
-  "tags",
   "is_published",
-  "upcoming",
   "disable_self_learning",
+  "image",
   "section_break_5",
+  "tags",
   "short_introduction",
   "description"
  ],
@@ -53,6 +53,11 @@
    "fieldtype": "Check",
    "label": "Published"
   },
+  {
+   "fieldname": "short_code",
+   "fieldtype": "Data",
+   "label": "Short Code"
+  },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
@@ -87,12 +92,6 @@
    "fieldname": "tags",
    "fieldtype": "Data",
    "label": "Tags"
-  },
-  {
-   "default": "0",
-   "fieldname": "upcoming",
-   "fieldtype": "Check",
-   "label": "Is an Upcoming Course"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -119,7 +118,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2021-07-23 19:01:29.765570",
+ "modified": "2021-07-09 15:05:05.372430",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
@@ -142,5 +141,6 @@
  "sort_field": "creation",
  "sort_order": "DESC",
  "title_field": "title",
- "track_changes": 1
+ "track_changes": 1,
+ "track_views": 1
 }

community/lms/doctype/lms_quiz/lms_quiz.json

@@ -27,13 +27,12 @@
    "fieldname": "lesson",
    "fieldtype": "Link",
    "label": "Lesson",
-   "options": "Lesson",
-   "read_only": 1
+   "options": "Lesson"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-23 19:06:12.551633",
+ "modified": "2021-06-23 17:58:57.642873",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",

community/lms/widgets/ChapterTeaser.html

@@ -8,11 +8,9 @@
 
   <div class="chapter-content collapse navbar-collapse" id="{{ chapter.get_slugified_chapter_title() }}">
 
-    {% if chapter.description %}
     <div class="chapter-description muted-text">
       {{ chapter.description }}
     </div>
-    {% endif %}
 
     <div class="lessons">
 

community/lms/widgets/CourseCard.html

@@ -53,19 +53,15 @@
 
     {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %}
 
-    {% if course.upcoming %}
-    <div class="view-course-link is-default">
-      Upcoming Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
-    </div>
-    <a class="stretched-link" href="/courses/{{ course.name }}"></a>
+    {% if membership %}
 
-    {% elif membership %}
     <div class="view-course-link is-primary">
       Continue Course <img class="ml-3" src="/assets/community/icons/white-arrow.svg" />
     </div>
     <a class="stretched-link" href="{{ course.get_learn_url(lesson_index) }}{{ query_parameter }}"></a>
 
     {% else %}
+
     <div class="view-course-link">
       View Course <img class="ml-3" src="/assets/community/icons/black-arrow.svg" />
     </div>

community/overrides/user.py

@@ -10,8 +10,7 @@ class CustomUser(User):
         """
         return frappe.get_all(
             'LMS Course', {
-                'owner': self.name,
-                'is_published': True
+                'owner': self.name
         })
 
     def get_palette(self):
@@ -63,16 +62,9 @@ class CustomUser(User):
 
     def get_mentored_courses(self):
         """ Returns all courses mentored by this user """
-        mentored_courses = []
-        mapping = frappe.get_all("LMS Course Mentor Mapping",
+        return frappe.get_all("LMS Course Mentor Mapping",
                     {
-                        "mentor": self.name,
+                        "mentor": self.name
                     },
                     ["name", "course"]
                 )
-
-        for map in mapping:
-            if frappe.db.get_value("LMS Course", map.course, "is_published"):
-                mentored_courses.append(map)
-
-        return mentored_courses

community/public/css/style.css

@@ -390,7 +390,7 @@ input[type=checkbox] {
   letter-spacing: -0.0175em
 }
 
-@media (min-width: 576px) and (max-width: 992px) {
+@media (min-width: 576px) {
   .container {
     padding-left: 1rem;
     padding-right: 1rem;
@@ -653,14 +653,9 @@ div.custom-checkbox>label>input:checked+img {
   color: #FFFFFF;
 }
 
-.is-default {
-  background-color: white;
-  border: 1px solid #C8CFD5;
-  box-sizing: border-box;
-}
-
 .course-home-outline {
   margin-top: 3rem;
+  flex: 1;
 }
 
 .small-title {
@@ -678,7 +673,6 @@ div.custom-checkbox>label>input:checked+img {
 .chapter-description {
   height: fit-content;
   padding-left: 1rem;
-  padding-right: 1rem;
 }
 
 .chapter-icon {
@@ -686,39 +680,26 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .course-outline-instructor-parent {
-  display: grid;
-  grid-gap: 2rem;
-  grid-template-columns: 4fr 1fr;
-}
-
-@media (max-width: 768px) {
-  .course-outline-instructor-parent {
-    grid-gap: 1rem;
-  }
+  display: flex;
+  justify-content: space-between;
 }
 
 @media (max-width: 600px) {
   .course-outline-instructor-parent {
+    flex-direction: column;
     padding: 0px 24px 0px;
-    grid-template-columns: none;
   }
 }
 
+
 .profile-parent-section {
-  display: grid;
-  grid-gap: 2rem;
-  grid-template-columns: 4fr 1fr;
-}
-
-@media (max-width: 768px) {
-  .profile-parent-section {
-    grid-gap: 1rem;
-  }
+  display: flex;
+  justify-content: space-between;
 }
 
 @media (max-width: 600px) {
   .profile-parent-section {
-    grid-template-columns: none;
+    flex-direction: column;
   }
 }
 
@@ -750,6 +731,18 @@ div.custom-checkbox>label>input:checked+img {
   margin-top: 3rem;
 }
 
+@media (min-width: 1024px) {
+  .course-overview-section {
+    margin-left: 2rem;
+  }
+}
+
+@media (min-width: 600px) {
+  .course-overview-section {
+    margin-left: 1rem;
+  }
+}
+
 .lesson-info {
   font-size: 16px;
   line-height: 250%;
@@ -907,18 +900,14 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .description-card {
-  padding: 1.5rem;
+  padding: 24px;
   flex-direction: column;
 }
 
 .overview-card {
-  padding: 1.5rem;
+  padding: 24px 26px 24px;
   width: 256px;
   flex-direction: column;
-  display: grid;
-  -moz-column-gap: 1rem;
-  column-gap: 1rem;
-  row-gap: 1rem;
 }
 
 @media (max-width: 768px) {
@@ -951,6 +940,10 @@ div.custom-checkbox>label>input:checked+img {
   }
 }
 
+.overtime-item {
+  margin: 16px 0px 16px;
+}
+
 .view-all-mentors {
   width: 100%;
   display: flex;
@@ -1019,7 +1012,8 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .course-details-outline {
-  margin-top: 1rem;
+  margin-top: 16px;
+  flex: 1;
 }
 
 .lesson-content-card {
@@ -1028,15 +1022,14 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .course-content-parent {
-  display: grid;
-  grid-gap: 2rem;
-  grid-template-columns: 2fr minmax(600px, 5fr);
+  display: flex;
+  justify-content: space-between;
 }
 
-@media (max-width: 1024px) {
+@media (max-width: 768px) {
   .course-content-parent {
-    display: flex;
     flex-direction: column-reverse;
+    justify-content: center;
   }
 }
 
@@ -1051,7 +1044,8 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .lesson-pagination-parent {
-  margin-top: 1rem;
+  margin: 1rem 0px 0px 2rem;
+  flex: 3;
 }
 
 @media (max-width: 768px) {
@@ -1135,7 +1129,7 @@ div.custom-checkbox>label>input:checked+img {
   line-height: 156%;
   letter-spacing: -0.0175em;
   text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.64);
-  padding: 1.5rem;
+  padding: 20px;
 }
 
 @media (max-width: 375px) {
@@ -1159,7 +1153,7 @@ div.custom-checkbox>label>input:checked+img {
   height: fit-content;
   box-shadow: 0px 1px 1px rgb(0 0 0 / 16%);
   border-radius: 4px;
-  margin-top: 2rem;
+  margin-top: 25px;
 }
 
 @media (max-width: 375px) {
@@ -1175,7 +1169,6 @@ div.custom-checkbox>label>input:checked+img {
   left: 174px;
   font-size: 12px;
   line-height: 165%;
-  width: fit-content;
 }
 
 @media (max-width: 500px) {
@@ -1193,6 +1186,7 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .social-icons {
+  float: right;
   margin: 16px;
 }
 
@@ -1222,6 +1216,12 @@ div.custom-checkbox>label>input:checked+img {
   flex-direction: column;
 }
 
+@media (min-width: 600px) {
+  .course-creator-progress-parent {
+    margin-left: 2rem;
+  }
+}
+
 .course-creator-section {
   margin-top: 3rem;
 }

community/www/profiles/profile.html

@@ -20,36 +20,34 @@
 {% macro ProfileBanner(member) %}
 <div class="">
   <div class="profile-banner" style="background-image: url(/assets/community/images/profile-banner.png)">
-    <div class="profile-avatar">
-      {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }}
-      <div class="profile-name"> {{ member.full_name }} </div>
-      {% if member.get_authored_courses() | length %}
-      <div class="creator-badge"> Creator </div>
-      {% endif %}
-    </div>
+  <div class="profile-avatar">
+    {{ widgets.Avatar(member=member, avatar_class="avatar-xl") }}
+    <div class="profile-name"> {{ member.full_name }} </div>
+    {% if member.get_authored_courses() | length %}
+    <div class="creator-badge"> Creator </div>
+    {% endif %}
+   </div>
   </div>
   <div class="profile-info">
-    <div class="profile-profession">
-      {% if member.profession %}
-      <span class=""> {{ member.profession }} </span>
+    {% if member.profession %}
+    <span class="profile-profession"> {{ member.profession }} </span>
+    {% endif %}
+    <div class="social-icons">
+      {% if member.linkedin %}
+      <a class="linkedin" href="{{ member.linkedin }}">
+        <img src="/assets/community/images/linkedin.png">
+      </a>
+      {% endif %}
+      {% if member.medium %}
+      <a class="medium" href="{{ member.medium}}">
+        <img src="/assets/community/icons/medium.svg">
+      </a>
+      {% endif %}
+      {% if member.github %}
+      <a class="github" href="{{ member.github }}">
+        <img src="/assets/community/icons/github.svg">
+      </a>
       {% endif %}
-      <span class="social-icons">
-        {% if member.linkedin %}
-        <a class="linkedin" href="{{ member.linkedin }}">
-          <img src="/assets/community/images/linkedin.png">
-        </a>
-        {% endif %}
-        {% if member.medium %}
-        <a class="medium" href="{{ member.medium}}">
-          <img src="/assets/community/icons/medium.svg">
-        </a>
-        {% endif %}
-        {% if member.github %}
-        <a class="github" href="{{ member.github }}">
-          <img src="/assets/community/icons/github.svg">
-        </a>
-        {% endif %}
-      </span>
     </div>
   </div>
 </div>