Merge pull request #161 from fossunited/upcoming-courses

fix: upcoming course and doctype cleanup

community/lms/doctype/chapter/chapter.json

@@ -9,7 +9,6 @@
   "course",
   "title",
   "description",
-  "locked",
   "index_"
  ],
  "fields": [
@@ -24,12 +23,6 @@
    "fieldtype": "Markdown Editor",
    "label": "Description"
   },
-  {
-   "default": "0",
-   "fieldname": "locked",
-   "fieldtype": "Check",
-   "label": "Locked"
-  },
   {
    "fieldname": "course",
    "fieldtype": "Link",
@@ -52,7 +45,7 @@
    "link_fieldname": "chapter"
   }
  ],
- "modified": "2021-05-13 21:05:20.531890",
+ "modified": "2021-07-23 19:03:57.946831",
  "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",
-  "column_break_3",
-  "is_published",
-  "disable_self_learning",
   "image",
-  "section_break_5",
+  "column_break_3",
   "tags",
+  "is_published",
+  "upcoming",
+  "disable_self_learning",
+  "section_break_5",
   "short_introduction",
   "description"
  ],
@@ -53,11 +53,6 @@
    "fieldtype": "Check",
    "label": "Published"
   },
-  {
-   "fieldname": "short_code",
-   "fieldtype": "Data",
-   "label": "Short Code"
-  },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Column Break"
@@ -92,6 +87,12 @@
    "fieldname": "tags",
    "fieldtype": "Data",
    "label": "Tags"
+  },
+  {
+   "default": "0",
+   "fieldname": "upcoming",
+   "fieldtype": "Check",
+   "label": "Is an Upcoming Course"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -118,7 +119,7 @@
    "link_fieldname": "course"
   }
  ],
- "modified": "2021-07-09 15:05:05.372430",
+ "modified": "2021-07-23 19:01:29.765570",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
@@ -141,6 +142,5 @@
  "sort_field": "creation",
  "sort_order": "DESC",
  "title_field": "title",
- "track_changes": 1,
- "track_views": 1
+ "track_changes": 1
 }

community/lms/doctype/lms_quiz/lms_quiz.json

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

community/lms/widgets/ChapterTeaser.html

@@ -8,9 +8,11 @@
 
   <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,15 +53,19 @@
 
     {% set query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" %}
 
-    {% if membership %}
+    {% 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>
 
+    {% 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/public/css/style.css

@@ -653,6 +653,12 @@ 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;
 }
@@ -1129,7 +1135,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: 20px;
+  padding: 1.5rem;
 }
 
 @media (max-width: 375px) {
@@ -1153,7 +1159,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: 25px;
+  margin-top: 2rem;
 }
 
 @media (max-width: 375px) {
@@ -1169,6 +1175,7 @@ div.custom-checkbox>label>input:checked+img {
   left: 174px;
   font-size: 12px;
   line-height: 165%;
+  width: fit-content;
 }
 
 @media (max-width: 500px) {
@@ -1186,7 +1193,6 @@ div.custom-checkbox>label>input:checked+img {
 }
 
 .social-icons {
-  float: right;
   margin: 16px;
 }
 

community/www/profiles/profile.html

@@ -20,34 +20,36 @@
 {% 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">
-    {% 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>
+    <div class="profile-profession">
+      {% if member.profession %}
+      <span class=""> {{ member.profession }} </span>
       {% 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>