Merge pull request #24 from dalvarez2596/lesson68

Some styles improvement
dalvarez2596 · Oct 30, 2024 · c34d8f0 · c34d8f0
2 parents 4203a1a + c3661e4
commit c34d8f0
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 14 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -34,7 +34,7 @@ def assign_default_role
     if User.count == 1
       self.add_role(:admin) if self.roles.blank?
       self.add_role(:teacher)
-      self.add_role(:stuent)
+      self.add_role(:student)
     else
       self.add_role(:student) if self.roles.blank?
       self.add_role(:teacher)  # to allow any user to create own courses

diff --git a/app/views/courses/_course.html.haml b/app/views/courses/_course.html.haml
@@ -8,7 +8,7 @@
     .text-center 
       = number_to_currency(course.price)
   .card-footer
-    .fa.fa-book
+    .fa.fa-list-check
       = course.lessons.count
   .card-footer
     .row

diff --git a/app/views/courses/edit.html.haml b/app/views/courses/edit.html.haml
@@ -1,6 +1,8 @@
 .card
   .card-header
-    %h1 Editing course
+    %h3
+      .fa.fa-graduation-cap
+      Editing course
   .card-body
     = render 'form'
   .card-footer

diff --git a/app/views/courses/new.html.haml b/app/views/courses/new.html.haml
@@ -1,6 +1,8 @@
 .card
   .card-header
-    %h1 New course
+    %h3
+      .fa.fa-graduation-cap
+      New course
   .card-body
     = render 'form'
   .card-footer

diff --git a/app/views/lessons/_form.html.haml b/app/views/lessons/_form.html.haml
@@ -8,10 +8,11 @@
     = f.label :content
     = f.rich_text_area :content
     %small= f.error :content, class: "text-danger"
+    %p 
     -# como estaba 
     -# = f.association :course
     -# Esto de abajo asigno el input del html por defecto si ya es un lesson o por params. as: :hidden hide the input
     -# = f.input :course_id, input_html: {value: @course.id || params[:course_id]}, as: :hidden
 
   .form-actions
-    = f.button :submit, {class: "btn btn-success mb-2 mt-2"}
+    = f.button :submit, {class: "btn btn-success"}
diff --git a/app/views/lessons/_lesson.html.haml b/app/views/lessons/_lesson.html.haml
@@ -1,10 +1,10 @@
 .card
   .card-header
+    .far.fa-check-square
     = link_to lesson.title, [@course, lesson]
   - if policy(lesson).show?
     .card-body
       = lesson.content
-      = lesson.course
   - if policy(lesson).edit?
     .card-footer
       = link_to 'Edit', edit_course_lesson_path(@course, lesson), class: 'btn btn-sm btn-warning'

diff --git a/app/views/lessons/edit.html.haml b/app/views/lessons/edit.html.haml
@@ -1,6 +1,17 @@
+= link_to 'Courses', courses_path
+\/
+= link_to @lesson.course.title, course_path(@course)
+\/
+= link_to @lesson.title, course_lesson_path(@course, @lesson)
+\/
+edit
+%p
+
 .card
   .card-header
-    %h1 Editing lesson
+    %h3
+      .far.fa-check-square 
+      Editing lesson
   .card-body
     = render 'form'
   .card-footer

diff --git a/app/views/lessons/new.html.haml b/app/views/lessons/new.html.haml
@@ -1,6 +1,15 @@
+= link_to 'Courses', courses_path
+\/
+= link_to @course.title, course_path(@course)
+\/
+new
+%p
+
 .card
   .card-header
-    %h1 New lesson
+    %h3
+      .far.fa-check-square 
+      New lesson
   .card-body
     = render 'form'
   .card-footer

diff --git a/app/views/lessons/show.html.haml b/app/views/lessons/show.html.haml
@@ -3,6 +3,7 @@
 = link_to @lesson.course.title, course_path(@course)
 \/
 = link_to @lesson.title, course_lesson_path(@course, @lesson)
+%p
 
 = render 'lessons/lesson', lesson: @lesson
 

diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -3,10 +3,10 @@
   .badge.bg-info
     = @users.count
 
-.row.row-cols-lg-4
-  - @users.each do |user|
-    .col
-      = render 'users/user', user: user
+-# .row.row-cols-lg-4
+-#   - @users.each do |user|
+-#     .col
+-#       = render 'users/user', user: user
 
 %form.row.align-items-center.my-3
   = search_form_for @q do |f|
@@ -31,6 +31,8 @@
       %th= 'last_sign_in_at'.humanize
       %th= 'current_sign_in_ip'.humanize
       %th= 'last_sign_in_ip'.humanize
+      %th Confirmed?
+      %th Roles
   %tbody
     - @users.each do |user|
       %tr 
@@ -42,4 +44,11 @@
         %td= user.last_sign_in_at
         %td= user.current_sign_in_ip
         %td= user.last_sign_in_ip
+        %td= user.confirmed?
+        %td
+          - user.roles.each do |role|
+            .badge.bg-info
+              = role.name
+          - if policy(user).edit?
+            = link_to 'Edit roles', edit_user_path(user), class: 'btn btn-sm btn-warning'
 
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
@@ -1,3 +1 @@
-= link_to 'Users', users_path
-
 = render 'users/user', user: @user
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -1,4 +1,12 @@
 # User.create!(email: 'admin@admin.com', password: 'Password1234', password_confirmation: 'Password1234')
+# this way we dont sent the confirmation email with devise
+# user = User.new(
+#   email: 'admin@example.com',
+#   password: 'admin@example.com',
+#   password_confirmation: 'admin@example.com'
+# )
+# user.skip_confirmation!
+# user.save!
 
 30.times do
   Course.create!([ {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     = link_to @lesson.course.title, course_path(@course)
     \/
     = link_to @lesson.title, course_lesson_path(@course, @lesson)
+    %p
     = render 'lessons/lesson', lesson: @lesson
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		= link_to 'Users', users_path

		= render 'users/user', user: @user