From 3db4e39d099311b8242e456a009501acd029f93f Mon Sep 17 00:00:00 2001 From: ferro96 Date: Wed, 13 Nov 2024 14:36:00 -0600 Subject: [PATCH] Add some styling to the current courses and enrollments --- app/helpers/courses_helper.rb | 12 +++++-- app/models/course.rb | 2 +- app/views/courses/_course.html.haml | 50 ++++++++++++++++----------- app/views/courses/index.html.haml | 6 ++-- app/views/enrollments/index.html.haml | 8 +++-- app/views/layouts/_header.html.haml | 2 +- 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 61379aa..185b3a8 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -20,9 +20,17 @@ def review_button(course) if current_user if user_course.any? if user_course.pending_review.any? - link_to "Add a review", edit_enrollment_path(user_course.first) + link_to edit_enrollment_path(user_course.first) do + "".html_safe + "" + + "".html_safe + "" + + "Add a review" + end else - link_to "Thanks for reviewing! Your Review", enrollment_path(user_course.first) + link_to enrollment_path(user_course.first) do + "".html_safe + "" + + "".html_safe + "" + + "Thanks for reviewing! Your Review" + end end end end diff --git a/app/models/course.rb b/app/models/course.rb index 97578cf..224e1e0 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -1,7 +1,7 @@ class Course < ApplicationRecord validates :title, :short_description, :language, :price, :level, presence: true validates :description, presence: true, length: { minimum: 5 } - + validates :title, uniqueness: true belongs_to :user, counter_cache: true # User.find_each{ |user| User.reset_counters(user.id, :courses)} diff --git a/app/views/courses/_course.html.haml b/app/views/courses/_course.html.haml index 7af25fd..216397c 100644 --- a/app/views/courses/_course.html.haml +++ b/app/views/courses/_course.html.haml @@ -9,37 +9,45 @@ = enrollment_button(course) .row = review_button(course) - .card-footer - .text-warning.fa.fa-star - %b= course.average_rating - -# Enrollments count: - -# = course.enrollments.count - -# Counter cache enrollments count: - ( - .fa.fa-user-graduate - = course.enrollments_count - ) - .card-footer - .fa.fa-list-check - = course.lessons_count .card-footer .row .col-md-6 - .fa.fa-globe-africa - = course.language + .text-warning.fa.fa-star + %b= course.average_rating + -# Enrollments count: + -# = course.enrollments.count + -# Counter cache enrollments count: + ( + .fa.fa-user-graduate + = course.enrollments_count + ) + .fa.fa-list-check + = course.lessons_count .col-md-6 .text-end - .fa.fa-signal - = course.level + .fa.fa-chalkboard-teacher + = link_to course.user.username, user_path(course.user) + -# .card-footer + -# .fa.fa-list-check + -# = course.lessons_count .card-footer .row .col-md-6 - .fa.fa-clock - = course.created_at.strftime('%d-%b-%Y') + .fa.fa-globe-africa + = course.language .col-md-6 .text-end - .fa.fa-chalkboard-teacher - = link_to course.user.username, user_path(course.user) + .fa.fa-signal + = course.level + -# .card-footer + -# .row + -# .col-md-6 + -# .fa.fa-clock + -# = course.created_at.strftime('%d-%b-%Y') + -# .col-md-6 + -# .text-end + -# .fa.fa-chalkboard-teacher + -# = link_to course.user.username, user_path(course.user) - if current_user && policy(course).edit? .card-footer = link_to 'Edit', edit_course_path(course), class: 'btn btn-sm btn-warning' diff --git a/app/views/courses/index.html.haml b/app/views/courses/index.html.haml index 128c8cf..2d5e275 100644 --- a/app/views/courses/index.html.haml +++ b/app/views/courses/index.html.haml @@ -1,10 +1,12 @@ - content_for :title do E-learning \| - All Courses + = action_name.humanize + courses %h3.text-center - Courses + = action_name.humanize + courses .badge.bg-info = @courses.count diff --git a/app/views/enrollments/index.html.haml b/app/views/enrollments/index.html.haml index 7c10179..97eeba3 100644 --- a/app/views/enrollments/index.html.haml +++ b/app/views/enrollments/index.html.haml @@ -1,10 +1,12 @@ -content_for :title do E-learning \| - All Enrollments + = action_name.humanize + enrollments -%h3.text-center - Enrollments +%h3.text-center + = action_name.humanize + enrollments .badge.bg-info = @enrollments.count %p diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 7647599..73a464a 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -64,7 +64,7 @@ New Course = link_to created_courses_path, class: "dropdown-item" do .fa.fa-graduation-cap - My Courses + Created Courses .badge.bg-danger = current_user.courses_count = link_to my_students_enrollments_path, class: "dropdown-item" do