Course Wishlist

assets/src/js/v3/shared/icons/types.ts

@@ -318,8 +318,9 @@ export const icons = [
   'sortMinor',
   'spinner',
   'spreadsheet',
-  'star',
-  'star2',
+  'starFill',
+  'starHalf',
+  'starLine',
   'stepper',
   'stopwatch',
   'storeEye',

assets/src/scss/frontend/components/_index.scss

@@ -1,7 +1,6 @@
 // Components styles index
 // Import all shared UI components
 
-@forward 'course-card';
 @forward 'lesson-item';
 @forward 'progress-bar';
 @forward 'quiz-question';

assets/src/scss/frontend/dashboard/_course-card.scss

@@ -6,31 +6,30 @@
 
 .tutor-course-card {
   height: 100%;
-  display: block;
   @include tutor-transition(background-color);
 
   &:hover {
     background-color: $tutor-surface-l1-hover;
   }
 
-  &-thumbnail {
-    position: relative;
-    width: 100%;
-    overflow: hidden;
-    border-radius: $tutor-radius-sm;
-    margin-bottom: $tutor-spacing-4;
-
-    .tutor-ratio {
-      width: 100%;
-    }
-
-    img {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
-      object-position: center;
-    }
-  }
+	&-thumbnail {
+		position: relative;
+		width: 100%;
+		overflow: hidden;
+		border-radius: $tutor-radius-sm;
+		margin-bottom: $tutor-spacing-4;
+
+		.tutor-ratio {
+			width: 100%;
+		}
+
+		img {
+			width: 100%;
+      border-radius: $tutor-radius-sm;
+			object-fit: cover;
+			object-position: center;
+		}
+	}
 
   &-badge {
     position: absolute;
@@ -39,6 +38,14 @@
     z-index: $tutor-z-positive;
   }
 
+	&-separator {
+		display: inline-block;
+		width: 4px;
+		height: 4px;
+		background: $tutor-text-subdued;
+		border-radius: $tutor-radius-lg;
+	}
+
   &-rating {
     margin-bottom: $tutor-spacing-2;
 
@@ -63,7 +70,7 @@
   }
 
   &-title {
-    @include tutor-typography('p2', 'medium', 'primary');
+    @include tutor-typography('small', 'medium', 'primary');
     margin-bottom: $tutor-spacing-2;
   }
 
@@ -78,6 +85,10 @@
     padding-top: $tutor-spacing-4;
     @include tutor-flex(row, center, flex-start);
     gap: $tutor-spacing-5;
+    @include tutor-typography('small', 'medium', 'primary');
+    del {
+      @include tutor-typography('tiny', 'regular', 'subdued');
+    }
   }
 
   &-price {
@@ -89,3 +100,11 @@
   }
 }
 
+@media (max-width: $tutor-breakpoint-sm) {
+  .tutor-dashboard-page-card-body {
+    &.tutor-dashboard-wishlist-wrapper {
+      margin: 10px;
+      border: unset;
+    }
+  }
+}

assets/src/scss/frontend/dashboard/_progress-card.scss

@@ -19,7 +19,7 @@
 		background-color: $tutor-surface-l1-hover;
 	}
 
-	.tutor-courses-thumb {
+	.tutor-progress-card-thumbnail {
 		position: relative;
 		flex: 0 0 200px;
 		aspect-ratio: 16 / 9;
@@ -133,11 +133,10 @@
 			background-color: transparent;
 		}
 
-		.tutor-courses-thumb {
+		.tutor-progress-card-thumbnail {
 			width: 100%;
 			max-width: 100%;
 			margin-bottom: $tutor-spacing-4;
-			aspect-ratio: 16 / 9;
 		}
 
 		&-kebab-overlay {

classes/Assets.php

@@ -851,7 +851,6 @@ public static function add_frontend_editor_button() {
 	public function enqueue_scripts() {
 		$is_dashboard     = tutor_utils()->is_dashboard_page();
 		$is_learning_area = tutor_utils()->is_learning_area();
-		$is_course_list   = tutor_utils()->is_course_list_page();
 
 		$core_css_url          = tutor()->assets_url . 'css/tutor-core.min.css';
 		$dashboard_css_url     = tutor()->assets_url . 'css/tutor-dashboard.min.css';
@@ -863,7 +862,7 @@ public function enqueue_scripts() {
 
 		$version = TUTOR_ENV === 'DEV' ? time() : TUTOR_VERSION;
 
-		if ( $is_dashboard || $is_learning_area || $is_course_list ) {
+		if ( $is_dashboard || $is_learning_area ) {
 			$localize_data = apply_filters( 'tutor_localize_data', $this->get_default_localized_data() );
 
 			// Core.

classes/Icon.php

@@ -334,8 +334,9 @@ final class Icon {
 	const SORT_MINOR                 = 'sort-minor';
 	const SPINNER                    = 'spinner';
 	const SPREADSHEET                = 'spreadsheet';
-	const STAR                       = 'star';
-	const STAR_2                     = 'star-2';
+	const STAR_FILL                  = 'star-fill';
+	const STAR_HALF                  = 'star-half';
+	const STAR_LINE                  = 'star-line';
 	const STEPPER                    = 'stepper';
 	const STOPWATCH                  = 'stopwatch';
 	const STORE_EYE                  = 'store-eye';

classes/Student.php

@@ -381,6 +381,20 @@ public function get_courses_tab( $active_tab, $post_type_args, $enrolled_course_
 					),
 				),
 			),
+			array(
+				'type' => 'link',
+				'label'  => __( 'Wishlist', 'tutor' ),
+				'icon'   => Icon::WISHLIST,
+				'url'    => esc_url( tutor_utils()->tutor_dashboard_url( 'courses/wishlist' ) ),
+				'active' => 'courses/wishlist' === $active_tab ? true : false,
+			),
+			array(
+				'type' => 'link',
+				'label'  => __( 'Quiz Attempts', 'tutor' ),
+				'icon'   => Icon::QUIZ_2,
+				'url'    => esc_url( tutor_utils()->tutor_dashboard_url( 'courses/my-quiz-attempts' ) ),
+				'active' => 'courses/my-quiz-attempts' === $active_tab ? true : false,
+			),
 		);
 
 		return $courses_tab;

classes/Utils.php

@@ -2228,21 +2228,37 @@ public function get_completed_courses_ids_by_user( $user_id = 0 ) {
 	 *
 	 * @since 1.0.0
 	 *
-	 * @param int $user_id user id.
+	 * @param int     $user_id user id.
+	 *
+	 * @param boolean $with_bundle_enrolled_courses including bundle courses.
 	 *
 	 * @return array
 	 */
-	public function get_enrolled_courses_ids_by_user( $user_id = 0 ) {
+	public function get_enrolled_courses_ids_by_user( $user_id = 0, $with_bundle_enrolled_courses = true ) {
 		global $wpdb;
-		$user_id    = $this->get_user_id( $user_id );
+		$user_id = $this->get_user_id( $user_id );
+
+		$with_bundle_enrolled_courses_clause = '';
+		if ( ! $with_bundle_enrolled_courses ) {
+			$with_bundle_enrolled_courses_clause = $wpdb->prepare(
+				"AND NOT EXISTS (
+					SELECT 1
+					FROM wp_postmeta pm
+					WHERE pm.post_id = e.ID
+						AND pm.meta_key = %s
+				)",
+				'_tutor_bundle_id'
+			);
+		}
 		$course_ids = $wpdb->get_col(
 			$wpdb->prepare(
-				"SELECT DISTINCT post_parent
-			FROM 	{$wpdb->posts}
-			WHERE 	post_type = %s
-					AND post_status = %s
-					AND post_author = %d
-				ORDER BY post_date DESC;
+				"SELECT DISTINCT e.post_parent, e.post_date
+			FROM 	{$wpdb->posts} e
+			WHERE 	e.post_type = %s
+					AND e.post_status = %s
+					AND e.post_author = %d
+					{$with_bundle_enrolled_courses_clause}
+				ORDER BY e.post_date DESC;
 			",
 				'tutor_enrolled',
 				'completed',
@@ -5576,23 +5592,6 @@ public function is_dashboard_page( $subpage = null ): bool {
 		);
 	}
 
-	/**
-	 * Check if the current page is the frontend's course list page
-	 *
-	 * @since 4.0.0
-	 *
-	 * @return bool
-	 */
-	public function is_course_list_page(): bool {
-		$current_url    = trailingslashit( UrlHelper::current() );
-		$is_course_list = $this->course_archive_page_url() === $current_url;
-
-		return apply_filters(
-			'tutor_is_course_list_page',
-			$is_course_list
-		);
-	}
-
 	/**
 	 * Check if the current page is the part of learning area
 	 *

models/CourseModel.php

@@ -1268,7 +1268,7 @@ public static function get_completed_courses_by_user( $user_id = 0, $offset = 0,
 	public static function get_active_courses_by_user( $user_id = 0, $offset = 0, $posts_per_page = -1, $args = array() ) {
 		$user_id             = tutor_utils()->get_user_id( $user_id );
 		$course_ids          = tutor_utils()->get_completed_courses_ids_by_user( $user_id );
-		$enrolled_course_ids = tutor_utils()->get_enrolled_courses_ids_by_user( $user_id );
+		$enrolled_course_ids = tutor_utils()->get_enrolled_courses_ids_by_user( $user_id, false );
 		$active_courses      = array_diff( $enrolled_course_ids, $course_ids );
 
 		if ( count( $active_courses ) ) {
@@ -1308,7 +1308,7 @@ public static function get_active_courses_by_user( $user_id = 0, $offset = 0, $p
 	 */
 	public static function get_enrolled_courses_by_user( $user_id = 0, $post_status = 'publish', $offset = 0, $posts_per_page = -1, $args = array() ) {
 		$user_id    = tutor_utils()->get_user_id( $user_id );
-		$course_ids = array_unique( tutor_utils()->get_enrolled_courses_ids_by_user( $user_id ) );
+		$course_ids = array_unique( tutor_utils()->get_enrolled_courses_ids_by_user( $user_id, false ) );
 
 		if ( count( $course_ids ) ) {
 			$course_post_type = tutor()->course_post_type;