Moved certificate and webinar to pro and Updated Webinar styles

assets/src/scss/frontend/learning-area/pages/_index.scss

@@ -5,5 +5,4 @@
 @forward './qna';
 @forward './quiz-intro';
 @forward './resources';
-@forward './webinar';
 @forward './quiz-summary';

classes/Template.php

@@ -10,6 +10,8 @@
 
 namespace TUTOR;
 
+use Tutor\Helpers\UrlHelper;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
@@ -178,7 +180,6 @@ public function load_single_course_template( $template ) {
 		}
 
 		return $template;
-
 	}
 
 	/**
@@ -536,32 +537,25 @@ public static function make_learning_area_sub_page_nav_items( $base_url = '' ):
 
 		$menu_items = array(
 			'resources'   => array(
-				'title' => esc_html__( 'Resources', 'tutor' ),
-				'icon'  => Icon::RESOURCES,
-				'url'   => esc_url( add_query_arg( 'subpage', 'resources', $base_url ) ),
+				'title'    => __( 'Resources', 'tutor' ),
+				'icon'     => Icon::RESOURCES,
+				'url'      => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'resources' ) ),
+				'template' => tutor_get_template( 'learning-area.subpages.resources' ),
 			),
 			'qna'         => array(
-				'title' => esc_html__( 'Q&A', 'tutor' ),
+				'title' => __( 'Q&A', 'tutor' ),
 				'icon'  => Icon::QA,
-				'url'   => esc_url( add_query_arg( 'subpage', 'qna', $base_url ) ),
+				'url'   => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'qna' ) ),
+				'template' => tutor_get_template( 'learning-area.subpages.qna' ),
 			),
 			'course-info' => array(
-				'title' => esc_html__( 'Course Info', 'tutor' ),
+				'title' => __( 'Course Info', 'tutor' ),
 				'icon'  => Icon::INFO_OCTAGON,
-				'url'   => esc_url( add_query_arg( 'subpage', 'course-info', $base_url ) ),
-			),
-			'webinar'     => array(
-				'title' => esc_html__( 'Webinar', 'tutor' ),
-				'icon'  => Icon::VIDEO_CAMERA_2,
-				'url'   => esc_url( add_query_arg( 'subpage', 'webinar', $base_url ) ),
-			),
-			'certificate' => array(
-				'title' => esc_html__( 'Certificate', 'tutor' ),
-				'icon'  => Icon::CERTIFICATE_2,
-				'url'   => esc_url( add_query_arg( 'subpage', 'certificate', $base_url ) ),
+				'url'   => UrlHelper::add_query_params( $base_url, array( 'subpage' => 'course-info' ) ),
+				'template' => tutor_get_template( 'learning-area.subpages.course-info' ),
 			),
 		);
 
-		return apply_filters( 'tutor_learning_area_sub_page_nav_item', $menu_items );
+		return apply_filters( 'tutor_learning_area_sub_page_nav_item', $menu_items, $base_url );
 	}
 }

helpers/DateTimeHelper.php

@@ -122,6 +122,17 @@ public function sub( $number, $interval ) {
 		return $this;
 	}
 
+	/**
+	 * Get DateTime obj.
+	 *
+	 * @since 4.0.0
+	 *
+	 * @return DateTime
+	 */
+	public function get() {
+		return $this->datetime;
+	}
+
 	/**
 	 * Check date time is past
 	 *

templates/dashboard/components/quiz-attempt-row.php

@@ -27,7 +27,7 @@
 $show_course     = $show_course ?? false;
 $attempt_number  = $attempt_number ?? null;
 $attempts_count  = $attempts_count ?? 0;
-$badge           = Badge::make()->label( 'Failed' )->variant( Variant::CANCELLED )->rounded();
+$badge           = Badge::make()->label( 'Failed' )->variant( Badge::ERROR )->rounded();
 $kebab_button    = Button::make()
 					->icon( Icon::THREE_DOTS_VERTICAL )
 					->attr( 'x-ref', 'trigger' )
@@ -131,12 +131,12 @@
 		if ( QuizModel::RESULT_PASS === $attempt['result'] ) {
 			$badge
 				->label( __( 'Passed', 'tutor' ) )
-				->variant( Variant::COMPLETED )
+				->variant( Badge::SUCCESS )
 				->render();
 		} elseif ( QuizModel::RESULT_PENDING === $attempt['result'] ) {
 			$badge
 				->label( __( 'Pending', 'tutor' ) )
-				->variant( Variant::PENDING )
+				->variant( Badge::WARNING )
 				->render();
 		} else {
 			$badge->render();

templates/learning-area/index.php

@@ -12,10 +12,12 @@
 use TUTOR\Course_List;
 use TUTOR\Icon;
 use TUTOR\Input;
+use TUTOR\Template;
 
 wp_head();
 
 $current_user_id = get_current_user_id();
+$subpages        = Template::make_learning_area_sub_page_nav_items();
 
 // Tutor global variable for using inside learning area.
 $tutor_current_post_type    = get_post_type();
@@ -41,11 +43,11 @@
 				$subpage = Input::get( 'subpage' );
 
 				if ( $subpage ) {
-					$subpage_template = tutor_get_template( 'learning-area.subpages.' . $subpage );
-					if ( file_exists( $subpage_template ) ) {
-						tutor_load_template( 'learning-area.subpages.' . $subpage );
+					$template         = $subpages[ $subpage ]['template'] ?? '';
+					if ( file_exists( $template ) ) {
+						tutor_load_template_from_custom_path( $template );
 					} else {
-						do_action( 'tutor_single_content_' . $tutor_post_type );
+						do_action( 'tutor_single_content_' . $tutor_current_post_type );
 					}
 				} else {
 					do_action( 'tutor_single_content_' . $tutor_current_post_type, $tutor_current_post );