Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions app/controllers/api/regular_events_controller.rb

This file was deleted.

6 changes: 5 additions & 1 deletion app/controllers/regular_events_controller.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# frozen_string_literal: true

class RegularEventsController < ApplicationController
class RegularEventsController < ApplicationController # rubocop:disable Metrics/ClassLength
before_action :set_regular_event, only: %i[edit update destroy]

def index
@regular_events = RegularEvent.list
.fetch_target_events(params[:target])
.page(params[:page])

@upcoming_events_groups = UpcomingEvent.upcoming_events_groups
end

Expand Down
136 changes: 0 additions & 136 deletions app/javascript/components/RegularEvent.jsx

This file was deleted.

135 changes: 0 additions & 135 deletions app/javascript/components/RegularEvents.jsx

This file was deleted.

15 changes: 15 additions & 0 deletions app/models/regular_event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ class RegularEvent < ApplicationRecord # rubocop:disable Metrics/ClassLength
scope :scheduled_on, ->(date) { holding.filter { |event| event.scheduled_on?(date) } }
scope :scheduled_on_without_ended, ->(date) { holding.filter { |event| event.scheduled_on?(date) && !event.ended?(date) } }

scope :fetch_target_events, lambda { |target|
case target
when 'not_finished'
not_finished
else
all
end
}

scope :list, lambda {
with_avatar
.includes(:comments, :users, :regular_event_repeat_rules)
.order(created_at: :desc)
}

belongs_to :user
has_many :organizers, dependent: :destroy
has_many :users, through: :organizers
Expand Down
11 changes: 0 additions & 11 deletions app/views/api/regular_events/_regular_event.json.jbuilder

This file was deleted.

2 changes: 0 additions & 2 deletions app/views/api/regular_events/index.json.jbuilder

This file was deleted.

Loading