lesli_calendar 0.2.0 → 0.2.1

data/app/assets/stylesheets/lesli_calendar/application.css

@@ -1,5 +1,5 @@
 /*!************************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-23.use[1]!./node_modules/sass-loader/dist/cjs.js!../LesliCalendar/lib/scss/application.scss ***!
+  !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-27.use[1]!./node_modules/sass-loader/dist/cjs.js!../LesliCalendar/lib/scss/application.scss ***!
   \************************************************************************************************************************************************************/
 @charset "UTF-8";
 /*
@@ -128,36 +128,6 @@ body.lesli-calendar {
   /*
   Lesli
 
-  Copyright (c) 2022, Lesli Technologies, S. A.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-  LesliCSS - SCSS Utilities for websites, apps and web applications
-
-  Powered by https://www.lesli.tech
-  Building a better future, one line of code at a time.
-
-  @contact  <hello@lesli.tech>
-  @website  <https://lesli.tech>
-  @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
-
-  // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-  // · 
-  */
-  /*
-  Lesli
-
   Copyright (c) 2020, Lesli Technologies, S. A.
 
   This program is free software: you can redistribute it and/or modify

data/app/controllers/lesli_calendar/calendars_controller.rb

@@ -55,7 +55,7 @@ module LesliCalendar
         def set_calendar
 
             if params[:id].blank? || params[:id] == "default"
-                @calendar = CalendarService.new(current_user).find_default
+                @calendar = CalendarService.new(current_user,query).find_default
             elsif params[:id]
                 @calendar = CalendarService.new(current_user).find(params[:id])
             end

data/app/models/lesli_calendar/calendar.rb

@@ -1,5 +1,6 @@
 module LesliCalendar
     class Calendar < ApplicationRecord
         belongs_to :account
+        has_many :events, foreign_key: "calendar_id"
     end
 end

data/app/models/lesli_calendar/event.rb

@@ -1,4 +1,5 @@
 module LesliCalendar
-  class Event < ApplicationRecord
-  end
+    class Event < ApplicationRecord
+        belongs_to :calendar
+    end
 end

data/app/services/lesli_calendar/calendar_service.rb

@@ -48,8 +48,8 @@ module LesliCalendar
                 id: self.resource.id,
                 name: self.resource.name,
                 user_id: self.resource.user_id,
-                events: [],
-                events_support: LesliSupport::TicketService.new(current_user).with_deadline
+                events: EventService.new(current_user, query).index(),
+                events_support: [] # LesliSupport::TicketService.new(current_user).with_deadline
             }
         end
     end

data/app/services/lesli_calendar/event_service.rb

@@ -0,0 +1,57 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module LesliCalendar
+    class EventService < Lesli::ApplicationLesliService
+
+        def find calendar_id
+            #super(current_user.account.calendar.calendar.find_by(id: calendar_id))
+            super(current_user.account.calendar.calendars.first)
+        end
+
+        def index()
+            events = current_user.account.calendar.calendars.first.events
+            .select(:id, :title, :description, :date, :start, :end, :url, :location, :status, "'lesli-calendar' as classNames")
+
+            tickets = ::LesliSupport::TicketService.new(current_user, query).index.map do |ticket|
+                {
+                    id: ticket.id,
+                    title: ticket.subject,
+                    date: ticket.deadline,
+                    classNames: 'lesli-support'
+                }
+            end
+
+            return events + tickets
+        end
+    end
+end

data/db/seed/development.rb

@@ -15,3 +15,22 @@ For more information read the license file including with this software.
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
 =end
+
+current_user = ::Lesli::User.first
+calendar = LesliCalendar::Calendar.first
+
+10.times do |index|
+    LesliCalendar::Event.create!({
+        title: "Birthday party number: #{ index }", 
+        description: "Join us to celebrate John's milestone 30th birthday! We'll have a fun-filled evening with music, games, delicious food, and great company. Don't miss out on the birthday cake and the chance to make unforgettable memories. Please RSVP by [RSVP Date] to let us know if you can make it. Looking forward to seeing you there!",
+        date: index.day.from_now,
+        start: index.day.from_now,
+        end: index.day.from_now,
+        url: "",
+        location: "Guatemala",
+        status: "",
+        public: true,
+        calendar: calendar,
+        #user: current_user
+    })
+end

data/db/seeds.rb

@@ -21,7 +21,7 @@ For more information read the license file including with this software.
 # you must use the initializer method in the Engine account model
 if Rails.env.development? 
     L2.msg(
-        "Loading seeds for LesliCalendar environment", 
+        "LesliCalendar", 
         "Version: #{LesliCalendar::VERSION}", 
         "Build: #{LesliCalendar::BUILD}")
     load LesliCalendar::Engine.root.join("db", "seed", "#{ Rails.env.downcase }.rb")

data/lib/lesli_calendar/version.rb

@@ -1,4 +1,4 @@
 module LesliCalendar
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
   BUILD = "1713121383"
 end

data/lib/vue/application.js

@@ -37,7 +37,7 @@ import translation from "Lesli/vue/translation"
 
 
 // · Import engine translations
-import translations from "LesliBabel/vue/stores/translations.json"
+import translations from "LesliCalendar/vue/stores/translations.json"
 
 
 // · Import apps and components

data/lib/vue/components/calendar.vue

@@ -129,9 +129,7 @@ onMounted(() => {
     setTimeout(() => { storeCalendar.calendar.render(); }, 200)
 
 })
-
 </script>
-
 <template>
     <div id="lesli-calendar"></div>
 </template>

data/lib/vue/stores/calendar.js

@@ -94,10 +94,21 @@ export const useCalendar = defineStore("calendar.calendar", {
 
         getCalendar() {
             this.http.get(this.url.calendar("calendar")).then(result => {
-
                 this.calendarData = result
 
-                this.calendarData.events_support = this.calendarData.events_support.map(event => {
+                // Add calendar events 
+                this.calendarData.events.forEach(event => {
+                    this.calendar.addEvent({
+                        title: event.title,
+                        start: event.date,
+                        description: event.description,
+                        classNames: event.classNames
+                    })
+                })
+
+                return 
+
+                this.calendarData.events_support = this.calendarData.events.map(event => {
                     return {
                         title: event.subject,
                         start: event.deadline,
@@ -107,10 +118,6 @@ export const useCalendar = defineStore("calendar.calendar", {
                         classNames: "lesli-support"
                     }
                 })
-
-                result.events_support.forEach(event => {
-                    this.calendar.addEvent(event)
-                })
             }).catch(error => {
                 console.log(error)
             })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lesli_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - The Lesli Development Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - app/models/lesli_calendar/dashboard.rb
 - app/models/lesli_calendar/event.rb
 - app/services/lesli_calendar/calendar_service.rb
+- app/services/lesli_calendar/event_service.rb
 - app/views/lesli_calendar/calendars/_calendar.html.erb
 - app/views/lesli_calendar/calendars/_form.html.erb
 - app/views/lesli_calendar/calendars/edit.html.erb