date_book 0.0.6 → 0.1.0

data/app/controllers/date_book/graphql_controller.rb

@@ -1,14 +1,17 @@
+# frozen_string_literal: true
+
 module DateBook
+  # Gives access to the GraphQL api
   class GraphqlController < DateBookController
     def execute
       variables = ensure_hash(params[:variables])
       query = params[:query]
       operation_name = params[:operationName]
-      context = {
-        # Query context goes here, for example:
-        current_user: current_user,
-      }
-      result = DateBookSchema.execute(query, variables: variables, context: context, operation_name: operation_name)
+      context = { current_user: current_user }
+      result = DateBookSchema.execute(
+        query, variables: variables, context: context,
+               operation_name: operation_name
+      )
       render json: result
     end
 
@@ -18,11 +21,7 @@ module DateBook
     def ensure_hash(ambiguous_param)
       case ambiguous_param
       when String
-        if ambiguous_param.present?
-          ensure_hash(JSON.parse(ambiguous_param))
-        else
-          {}
-        end
+        ambiguous_param.present? ? ensure_hash(JSON.parse(ambiguous_param)) : {}
       when Hash, ActionController::Parameters
         ambiguous_param
       when nil
@@ -32,4 +31,4 @@ module DateBook
       end
     end
   end
-end
+end

data/app/graphql/date_book_schema.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 DateBookSchema = GraphQL::Schema.define do
   # mutation(Types::MutationType)
   query(Types::QueryType)
-  resolve_type ->(type, obj, ctx) do
+  resolve_type(lambda do |_type, obj, _ctx|
     case obj
-    when Profile
-      Types::ProfileType
     when Calendar
       Types::CalendarType
     when Event
@@ -14,5 +14,5 @@ DateBookSchema = GraphQL::Schema.define do
     else
       raise("Unexpected object: #{obj}")
     end
-  end
+  end)
 end

data/app/graphql/types/calendar_type.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Types::CalendarType = GraphQL::ObjectType.define do
-  name "Calendar"
-  description "DateBook Calendars"
+  name 'Calendar'
+  description 'DateBook Calendars'
 
   field :id, types.ID
   field :name, types.String

data/app/graphql/types/date_time_type.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 Types::DateTimeType = GraphQL::ScalarType.define do
-  name "DateTime"
-  description "Date with Time"
+  name 'DateTime'
+  description 'Date with Time'
 
-  coerce_input ->(value, ctx) { Time.at(Float(value)) }
-  coerce_result ->(value, ctx) { "#{value.to_date} #{value.strftime('%I:%M %p')}" }
-end
+  coerce_input ->(value, _ctx) { Time.at(Float(value)) }
+  coerce_result(lambda do |value, _ctx|
+    "#{value.to_date} #{value.strftime('%I:%M %p')}"
+  end)
+end

data/app/graphql/types/event_occurrence_type.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Types::EventOccurrenceType = GraphQL::ObjectType.define do
-  name "Event Occurrences"
-  description "DateBook Event Occurrences"
+  name 'Event Occurrences'
+  description 'DateBook Event Occurrences'
 
   field :id, !types.ID
   field :event, Types::EventType

data/app/graphql/types/event_type.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Types::EventType = GraphQL::ObjectType.define do
-  name "Event"
-  description "DateBook Events"
+  name 'Event'
+  description 'DateBook Events'
 
   field :id, !types.ID
   field :calendar, Types::CalendarType

data/app/graphql/types/mutation_type.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Types::MutationType = GraphQL::ObjectType.define do
-  name "Mutation"
+  name 'Mutation'
 
   # TODO: Add Mutations as fields
 end

data/app/graphql/types/query_type.rb

@@ -1,23 +1,17 @@
+# frozen_string_literal: true
+
+# This defines the top-level queries that are available.
+# rubocop:disable Metrics/BlockLength
 Types::QueryType = GraphQL::ObjectType.define do
-  name "Date Book API"
+  name 'Date Book API'
   # Add root-level fields here.
   # They will be entry points for queries on your schema.
-
-  # Current user hack // Check GraphQL controller
-  field :profile do
-    type Types::ProfileType
-    description "Current signed in User"
-    resolve -> (obj, args, ctx) {
-      ctx[:current_user] ? ctx[:current_user] : User.new
-    }
-  end
-
   field :event_occurrences do
     type types[Types::EventOccurrenceType]
-    description "Find all event occurrences in range"
+    description 'Find all event occurrences in range'
     argument :ending_after, types.String # Start date
     argument :starting_before, types.String # End date
-    resolve ->(obj, args, ctx) {
+    resolve(lambda do |_obj, args, ctx|
       ending_after = (
       args[:ending_after]&.to_datetime ||
         Time.now.beginning_of_month
@@ -31,27 +25,19 @@ Types::QueryType = GraphQL::ObjectType.define do
         .as_occurrences
         .starting_before(starting_before)
         .ending_after(ending_after)
-    }
+    end)
   end
 
   field :calendar do
     type Types::CalendarType
-    description "Find a calendar by slug"
+    description 'Find a calendar by slug'
     argument :slug, types.String
-    resolve ->(obj, args, ctx) {
+    resolve(lambda do |_obj, args, ctx|
       Calendar
         .readable_by(ctx[:current_user])
         .friendly
         .find(args[:slug])
-    }
-  end
-
-  field :user do
-    type Types::ProfileType
-    description "Find user by name"
-    argument :name, types.String
-    resolve -> (obj, args, ctx) {
-      User.find_by_name(args[:name])
-    }
+    end)
   end
 end
+# rubocop:enable Metrics/BlockLength

data/app/helpers/date_book/application_helper.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
 module DateBook
+  # Global helpers, used mostly to format dates smartly
   module ApplicationHelper
     def date_book_scripts
       render partial: 'layouts/date_book_scripts'
     end
 
-    def render_date_range(start_date, end_date, all_day, duration)
+    def date_book_date_range(start_date, end_date, all_day, duration)
       render partial: 'date_book/application/date_range', locals: {
         start_date: start_date,
         end_date: end_date,
@@ -15,7 +16,7 @@ module DateBook
       }
     end
 
-    def render_date(date, all_day = false)
+    def date_book_date(date, all_day = false)
       format = if all_day
                  :human_date
                else
@@ -24,12 +25,8 @@ module DateBook
       I18n.localize date, format: format
     end
 
-    def render_time(date)
+    def date_book_time(date)
       I18n.localize date, format: :human_time
     end
-
-    def render_all_day_checkbox(schedule)
-      render partial: 'date_book/application/all_day_checkbox', locals: { schedule: schedule }
-    end
   end
 end

data/app/helpers/date_book/events_helper.rb

@@ -1,42 +1,62 @@
+# frozen_string_literal: true
+
 module DateBook
+  # Helpers used by the Events views
   module EventsHelper
-    def event_occurrence_dates(event)
-      render partial: 'date_book/events/occurrence_dates', locals: { event: event }
-    end
-
-    def event_popover(event)
-      render partial: 'date_book/events/popover', locals: {
-        event: event
-      }, formats: :html
+    def date_book_event_occurrence_dates(event)
+      render(
+        partial: 'date_book/events/occurrence_dates',
+        locals: { event: event }
+      )
     end
 
-    def render_rule_form_section(rule, schedule)
-      render partial: "date_book/events/rules/#{rule}", locals: { schedule: schedule }
+    def date_book_rule_form_section(rule, form_section)
+      render(
+        partial: "date_book/events/rules/#{rule}",
+        locals: { f: form_section }
+      )
     end
 
-    def render_date_field(schedule)
-      render partial: "date_book/events/fields/date", locals: { schedule: schedule }
+    def date_book_date_field(form_section)
+      render(
+        partial: 'date_book/events/fields/date',
+        locals: { f: form_section }
+      )
     end
 
-    def render_time_field(schedule)
-      render partial: "date_book/events/fields/time", locals: { schedule: schedule }
+    def date_book_time_field(form_section)
+      render(
+        partial: 'date_book/events/fields/time',
+        locals: { f: form_section }
+      )
     end
 
-    def render_duration_field(schedule)
-      render partial: "date_book/events/fields/duration", locals: { schedule: schedule }
+    def date_book_duration_field(form_section)
+      render(
+        partial: 'date_book/events/fields/duration',
+        locals: { f: form_section }
+      )
     end
 
-    def render_interval_field(unit, schedule)
-      render partial: "date_book/events/fields/interval", locals: { schedule: schedule, unit: unit }
+    def date_book_interval_field(unit, form_section)
+      render(
+        partial: 'date_book/events/fields/interval',
+        locals: { f: form_section, unit: unit }
+      )
     end
 
-    def render_day_field(schedule)
-      render partial: "date_book/events/fields/day", locals: { schedule: schedule }
+    def date_book_day_field(form_section)
+      render(
+        partial: 'date_book/events/fields/day',
+        locals: { f: form_section }
+      )
     end
 
-    def render_day_of_week_field(schedule)
-      render partial: "date_book/events/fields/day_of_week", locals: { schedule: schedule }
+    def date_book_day_of_week_field(form_section)
+      render(
+        partial: 'date_book/events/fields/day_of_week',
+        locals: { f: form_section }
+      )
     end
-
   end
 end

data/app/views/date_book/application/_date_range.html.haml

@@ -1,8 +1,8 @@
-= render_date start_date, all_day
+= date_book_date start_date, all_day
 - unless (all_day && duration == 1.day)
   —
   - if start_date.to_date === end_date.to_date
-    = render_time end_date
+    = date_book_time end_date
   - else
-    = render_date end_date, all_day
+    = date_book_date end_date, all_day
 

data/app/views/date_book/calendars/index.html.haml

@@ -1,17 +1,21 @@
 - add_title Calendar.model_name.human.pluralize
 = date_book_scripts
 .row
-  .col-md-9
-    #calendar-display
   .col-md-3
     %ul.calendars
       - @calendars.each do |calendar|
         %li.calendar{ class: calendar.css_class }
           = link_to calendar.name, calendar
+  .date-book--wrapper.col-md-9
+    .date-book--spinner
+      = icon 'spinning fa fa-spinner'
+    .date-book--calendar
 - add_footer_javascript do
   :javascript
     $(function() {
-      $('#calendar-display').fullCalendar({
+      var calendar = $('.date-book--calendar');
+      var spinner = $('.date-book--spinner');
+      calendar.fullCalendar({
         events: {
           url: '#{date_book.api_path format: :json}',
           type: 'POST',
@@ -24,5 +28,17 @@
         },
         eventRender: calendarEventRender,
         header: calendarEventHeader,
+        firstDay: #{DateBook.week_start_index},
+        loading: function( isLoading, view ) {
+            if(isLoading) {// isLoading gives boolean value
+                spinner.show();
+            } else {
+                //hide your loader here
+                spinner.hide();
+            }
+        },
+        eventAfterAllRender: function (view) {
+          spinner.hide();
+        }
       });
     });

data/app/views/date_book/calendars/show.html.haml

@@ -2,15 +2,28 @@
 = date_book_scripts
 .calendar{ class: @calendar.css_class }
   = link_to :calendar_events.l(calendar: @calendar.name), date_book.calendar_events_path(@calendar)
-  - if can? :create, @calendar.events.new
-    %p.float-right.margin-left= icon_link_to 'plus', :add_event.l, date_book.new_calendar_event_path(@calendar), class: 'btn btn-success'
+  .clearfix
+    .pull-right
+      - if can? :edit, @calendar
+        = icon_link_to 'pencil', :edit_item.l(item: @calendar.name), date_book.edit_calendar_path(@calendar), class: 'btn btn-info'
+      - if can? :delete, @calendar
+        = icon_link_to 'remove', :delete_item.l(item: @calendar.name), date_book.calendar_path(@calendar), class: 'btn btn-danger', method: :delete, data: { confirm: :are_you_sure.l }
+    .pull-left
+      - if can? :create, @calendar.events.new
+        = icon_link_to 'plus', :add_event.l, date_book.new_calendar_event_path(@calendar), class: 'btn btn-success'
+
   = @calendar.description.html_safe
   %hr
-  #calendar-display
+  .date-book--wrapper
+    .date-book--spinner
+      = icon 'spinning fa fa-spinner'
+    .date-book--calendar
 - add_footer_javascript do
   :javascript
     $(function() {
-      $('#calendar-display').fullCalendar({
+      var calendar = $('.date-book--calendar');
+      var spinner = $('.date-book--spinner');
+      calendar.fullCalendar({
         events: {
           url: '#{date_book.api_path format: :json}',
           type: 'POST',
@@ -24,5 +37,17 @@
         },
         eventRender: calendarEventRender,
         header: calendarEventHeader,
+        firstDay: #{DateBook.week_start_index},
+        loading: function( isLoading, view ) {
+            if(isLoading) {// isLoading gives boolean value
+                spinner.show();
+            } else {
+                //hide your loader here
+                spinner.hide();
+            }
+        },
+        eventAfterAllRender: function (view) {
+          spinner.hide();
+        }
       });
     });

data/app/views/date_book/events/_event.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.occurrence_id event.occurrence_id
 json.slug event.slug
 json.url date_book.event_path(event.slug, occurrence_id: event.occurrence_id)
@@ -9,4 +11,4 @@ json.start event.start_moment
 json.end event.end_moment
 json.duration event.duration
 json.allDay event.all_day
-json.popover_url date_book.popover_event_path(event.slug, format: :html)
+json.popover_url date_book.popover_event_path(event.slug, format: :html)

data/app/views/date_book/events/_form.html.haml

@@ -5,15 +5,15 @@
   = f.text_field :name
   = f.text_area :description, class: 'date-book--wysiwyg'
   = f.text_field :css_class
-  = f.color_field :text_color
-  = f.color_field :background_color
-  = f.color_field :border_color
+  = f.color_field :text_color, control_class: 'col-sm-2'
+  = f.color_field :background_color, control_class: 'col-sm-2'
+  = f.color_field :border_color, control_class: 'col-sm-2'
   = f.fields_for :schedule do |schedule|
     = schedule.form_group :rule, label: { text: :recurrence.l } do
       - DateBook.configuration.rules.each do |rule|
         = schedule.radio_button :rule, rule, label: rule.titleize, class: 'event-schedule-rule'
         :javascript
-          sections['#{rule}'] = '#{escape_javascript render_rule_form_section rule, schedule}';
+          sections['#{rule}'] = '#{escape_javascript date_book_rule_form_section rule, schedule}';
     .event-schedule-rule-section
 
   = f.submit :save_model.l(model: Event.model_name.human)