Merge 4fb0f93 into 0fd5b9c

codebar · Apr 13, 2022 · 9eb620a · 9eb620a
2 parents 0fd5b9c + 4fb0f93
commit 9eb620a
Show file tree

Hide file tree

Showing 35 changed files with 4 additions and 682 deletions.
diff --git a/app/assets/stylesheets/partials/_colors.sass b/app/assets/stylesheets/partials/_colors.sass
@@ -31,7 +31,6 @@ $navigation-links-purple: #613789
 $title-side: #342552
 $our-mission-purple: #6f4a93
 $next-workshop-yellow: #fdcc38
-$next-course-green: #57ae3b
 $code-of-conduct-purple: #ccc0d6
 $meeting-title: #241A62
 

diff --git a/app/assets/stylesheets/partials/_events.scss b/app/assets/stylesheets/partials/_events.scss
@@ -23,14 +23,10 @@
   color: #968ae0;
 }
 
-.workshops.date  {
+.workshops.date {
   color: #ab97bb;
 }
 
-.course.date {
-  color: #d9699e;
-}
-
 .event.date {
   color: #138cd3;
 }
diff --git a/app/controllers/auth_services_controller.rb b/app/controllers/auth_services_controller.rb
@@ -1,7 +1,7 @@
 class AuthServicesController < ApplicationController
   def new
     referer_path = URI(request.referer).path
-    if Rails.application.routes.recognize_path(referer_path)[:controller].in?(%w[workshops events courses meetings])
+    if Rails.application.routes.recognize_path(referer_path)[:controller].in?(%w[workshops events meetings])
       session[:referer_path] = referer_path
     end
     redirect_to '/auth/github'

diff --git a/app/controllers/course/invitation_controller.rb b/app/controllers/course/invitation_controller.rb
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -83,10 +83,9 @@ def upcoming_events_for_user
   end
 
   def all_events(workshops)
-    course = Course.includes(:sponsor).next
     meeting = Meeting.includes(:venue).next
     events = Event.includes(:venue, :sponsors).upcoming.take(DEFAULT_UPCOMING_EVENTS)
 
-    [*workshops, course, *events, meeting].uniq.compact
+    [*workshops, *events, meeting].uniq.compact
   end
 end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -9,7 +9,6 @@ def index
     fresh_when(latest_model_updated, etag: latest_model_updated)
 
     events = [Workshop.past.includes(:chapter).joins(:chapter).merge(Chapter.active).limit(RECENT_EVENTS_DISPLAY_LIMIT)]
-    events << Course.past.limit(RECENT_EVENTS_DISPLAY_LIMIT)
     events << Meeting.past.includes(:venue).limit(RECENT_EVENTS_DISPLAY_LIMIT)
     events << Event.past.includes(:venue, :sponsors).limit(RECENT_EVENTS_DISPLAY_LIMIT)
     events = events.compact.flatten.sort_by(&:date_and_time).reverse.first(RECENT_EVENTS_DISPLAY_LIMIT)
@@ -20,7 +19,6 @@ def index
     end
 
     events = [Workshop.includes(:chapter).upcoming.joins(:chapter).merge(Chapter.active)]
-    events << Course.upcoming.all
     events << Meeting.upcoming.all
     events << Event.upcoming.includes(:venue, :sponsors).all
     events = events.compact.flatten.sort_by(&:date_and_time).group_by(&:date)
@@ -62,7 +60,6 @@ def rsvp
   def latest_model_updated
     [
       Workshop.maximum(:updated_at),
-      Course.maximum(:updated_at),
       Meeting.maximum(:updated_at),
       Event.maximum(:updated_at),
       Member.maximum(:updated_at)

diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
@@ -9,10 +9,6 @@ def index
                                              .joins(:workshop)
                                              .merge(Workshop.upcoming)
                                              .includes(workshop: :chapter)
-    upcoming_invitations += CourseInvitation.where(member: current_user)
-                                            .joins(:course)
-                                            .merge(Course.upcoming)
-                                            .includes(:course)
     @upcoming_invitations = InvitationPresenter.decorate_collection(upcoming_invitations)
 
     @attended_invitations = WorkshopInvitation.where(member: current_user)

diff --git a/app/mailers/course_invitation_mailer.rb b/app/mailers/course_invitation_mailer.rb
diff --git a/app/models/course.rb b/app/models/course.rb
diff --git a/app/models/course_invitation.rb b/app/models/course_invitation.rb
diff --git a/app/models/course_tutor.rb b/app/models/course_tutor.rb
diff --git a/app/models/invitation_manager.rb b/app/models/invitation_manager.rb
@@ -17,15 +17,6 @@ def send_monthly_attendance_reminder_emails(monthly)
   end
   handle_asynchronously :send_monthly_attendance_reminder_emails
 
-  def send_course_emails(course)
-    students = Member.in_group(course.chapter.groups.students)
-    students.each do |student|
-      invitation = CourseInvitation.new(course: course, member: student)
-      invitation.send(:email) if invitation.save
-    end
-  end
-  handle_asynchronously :send_course_emails
-
   def send_meeting_emails(meeting)
     meeting.invitees.not_banned.each do |invitee|
       invitation = MeetingInvitation.new(meeting: meeting, member: invitee, role: 'Participant')

diff --git a/app/presenters/course_presenter.rb b/app/presenters/course_presenter.rb
diff --git a/app/presenters/event_presenter.rb b/app/presenters/event_presenter.rb
@@ -1,6 +1,5 @@
 class EventPresenter < BasePresenter
   PRESENTER = { workshop: 'WorkshopPresenter',
-                course: 'CoursePresenter',
                 meeting: 'MeetingPresenter',
                 event: 'EventPresenter' }.freeze
 

diff --git a/app/views/course/invitation/show.html.haml b/app/views/course/invitation/show.html.haml