diff --git a/.github/labeler.yml b/.github/labeler.yml index 0d9e7b3a4f3..e126e97832e 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -106,9 +106,9 @@ discourse-gamification: - changed-files: - any-glob-to-any-file: plugins/discourse-gamification/**/* -discourse-calendar: +discourse-events: - changed-files: - - any-glob-to-any-file: plugins/discourse-calendar/**/* + - any-glob-to-any-file: plugins/discourse-events/**/* discourse-policy: - changed-files: diff --git a/.gitignore b/.gitignore index 5152d134384..fed34449ded 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,7 @@ !/plugins/discourse-subscriptions !/plugins/discourse-captcha !/plugins/discourse-gamification -!/plugins/discourse-calendar +!/plugins/discourse-events !/plugins/discourse-policy !/plugins/discourse-github !/plugins/discourse-adplugin diff --git a/.skills/discourse-admin-ui/references/content-patterns.md b/.skills/discourse-admin-ui/references/content-patterns.md index b66488e98aa..89dc759c71b 100644 --- a/.skills/discourse-admin-ui/references/content-patterns.md +++ b/.skills/discourse-admin-ui/references/content-patterns.md @@ -113,7 +113,7 @@ Current examples: - Core table and empty list: `frontend/discourse/admin/templates/admin-permalinks/index.gjs` - Plugin table: `plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs` -- Toggle rows: `plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs` +- Toggle rows: `plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list-item.gjs` ## Empty lists diff --git a/.streerc b/.streerc index a286bcf70a6..2e74613017e 100644 --- a/.streerc +++ b/.streerc @@ -1,3 +1,3 @@ --print-width=100 --plugins=plugin/trailing_comma,plugin/disable_auto_ternary ---ignore-files=plugins/discourse-calendar/vendor/* +--ignore-files=plugins/discourse-events/vendor/* diff --git a/config/official_plugins.json b/config/official_plugins.json index e703e6a8597..45b2930ebc0 100644 --- a/config/official_plugins.json +++ b/config/official_plugins.json @@ -10,7 +10,7 @@ "discourse-bbcode", "discourse-bbcode-color", "discourse-cakeday", - "discourse-calendar", + "discourse-events", "discourse-categories-suppressed", "discourse-category-experts", "discourse-characters-required", diff --git a/docs/developer-guides/docs/03-code-internals/22-app-events-triggers.md b/docs/developer-guides/docs/03-code-internals/22-app-events-triggers.md index 7eb12760a54..aa40961e918 100644 --- a/docs/developer-guides/docs/03-code-internals/22-app-events-triggers.md +++ b/docs/developer-guides/docs/03-code-internals/22-app-events-triggers.md @@ -134,7 +134,7 @@ No arguments passed to this event. ### calendar -#### calendar:create-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L70) +#### calendar:create-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L70) | Position | Argument | Type | Always Present | Description | | -------- | ----------------- | -------- | -------------- | ----------- | @@ -142,7 +142,7 @@ No arguments passed to this event. | - | objectArg1.status | variable | True | - | | - | objectArg1.postId | property | True | - | -#### calendar:invitee-left-event [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L42) +#### calendar:invitee-left-event [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L42) | Position | Argument | Type | Always Present | Description | | -------- | ------------------ | -------- | -------------- | ----------- | @@ -150,7 +150,7 @@ No arguments passed to this event. | - | objectArg1.invitee | variable | True | - | | - | objectArg1.postId | property | True | - | -#### calendar:update-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L56) +#### calendar:update-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L56) | Position | Argument | Type | Always Present | Description | | -------- | ----------------- | -------- | -------------- | ----------- | @@ -1050,70 +1050,70 @@ No arguments passed to this event. | - | objectArg1.currentRouteName | property | - | | - | objectArg1.replacedOnlyQueryParams | variable | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#37 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L37) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#37 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L37) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#53 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L53) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#53 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L53) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#93 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L93) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#93 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L93) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#124 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L124) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#124 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L124) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#141 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L141) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#141 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L141) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#153 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L153) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#153 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L153) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#172 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L172) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#172 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L172) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#201 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L201) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#201 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L201) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#218 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L218) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#218 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L218) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | | 1 | objectArg1 | object | - | | - | objectArg1.url | string | - | -##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#239 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L239) +##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#239 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L239) | Position | Argument | Type | Description | | -------- | -------------- | ------ | ----------- | diff --git a/migrations/core/config/intermediate_db.yml b/migrations/core/config/intermediate_db.yml index 9a3ba06048f..ab38bda9a33 100644 --- a/migrations/core/config/intermediate_db.yml +++ b/migrations/core/config/intermediate_db.yml @@ -589,10 +589,10 @@ plugins: - "discourse-apple-auth" - "discourse-assign" - "discourse-cakeday" - - "discourse-calendar" - "discourse-chat-integration" - "discourse-data-explorer" - "discourse-details" + - "discourse-events" - "discourse-gamification" - "discourse-github" - "discourse-graphviz" diff --git a/migrations/tooling/config/schema/intermediate_db/ignored.rb b/migrations/tooling/config/schema/intermediate_db/ignored.rb index 94c69636968..6969a5233b9 100644 --- a/migrations/tooling/config/schema/intermediate_db/ignored.rb +++ b/migrations/tooling/config/schema/intermediate_db/ignored.rb @@ -7,8 +7,8 @@ Migrations::Tooling::Schema.ignored do plugin :discourse_adplugin, "Not migrated yet" plugin :discourse_ai, "Not migrated yet" plugin :discourse_assign, "Not migrated yet" - plugin :discourse_calendar, "Not migrated yet" plugin :discourse_data_explorer, "Not migrated yet" + plugin :discourse_events, "Not migrated yet" plugin :discourse_gamification, "Not migrated yet" plugin :discourse_github, "Not migrated yet" plugin :discourse_oauth2_basic, "Not migrated yet" diff --git a/migrations/tooling/config/schema/plugin_manifest.yml b/migrations/tooling/config/schema/plugin_manifest.yml index c2825e2539f..c02cf990b67 100644 --- a/migrations/tooling/config/schema/plugin_manifest.yml +++ b/migrations/tooling/config/schema/plugin_manifest.yml @@ -110,7 +110,13 @@ plugins: - assignable_level user_options: - notification_level_when_assigned - discourse-calendar: + discourse-data-explorer: + tables: + - data_explorer_queries + - data_explorer_query_groups + - data_explorer_query_stats + columns: {} + discourse-events: tables: - calendar_events - discourse_calendar_disabled_holidays @@ -119,12 +125,6 @@ plugins: - discourse_post_event_invitees - livestream_topic_chat_channels columns: {} - discourse-data-explorer: - tables: - - data_explorer_queries - - data_explorer_query_groups - - data_explorer_query_stats - columns: {} discourse-gamification: tables: - gamification_leaderboard_scores @@ -228,10 +228,10 @@ plugin_checksums: discourse-ai: 4ff4f60e8c1744603f7f8590f8f99447 discourse-assign: 7a7a36e8ac0214e8a6aca1a1ed9899aa discourse-cakeday: a5bb91366c8dc8d267088eb0c2679187 - discourse-calendar: 6a305b06fa9121f17245cefbc726ce20 discourse-captcha: fd538c1338062354276ccfda4cbafd55 discourse-chat-integration: ffa3bf5dba9089491d2fc02971eb96f8 discourse-data-explorer: fb71ab79dbe07af481ba147ea526406f + discourse-events: 6a305b06fa9121f17245cefbc726ce20 discourse-gamification: 633256e241b030fddcc059076f7474f8 discourse-github: 3bd17b2c09828e232e7565edbf2c746f discourse-graphviz: 8a1835520fbf8f7f5d1ef8a25d737e20 diff --git a/plugins/discourse-calendar/.prettierignore b/plugins/discourse-events/.prettierignore similarity index 100% rename from plugins/discourse-calendar/.prettierignore rename to plugins/discourse-events/.prettierignore diff --git a/plugins/discourse-calendar/README.md b/plugins/discourse-events/README.md similarity index 98% rename from plugins/discourse-calendar/README.md rename to plugins/discourse-events/README.md index e5e5819a166..e65b5f8cdd5 100644 --- a/plugins/discourse-calendar/README.md +++ b/plugins/discourse-events/README.md @@ -1,4 +1,4 @@ -# Discourse Calendar +# Discourse Events Adds the ability to create a dynamic calendar in the first post of a topic. diff --git a/plugins/discourse-calendar/about.json b/plugins/discourse-events/about.json similarity index 100% rename from plugins/discourse-calendar/about.json rename to plugins/discourse-events/about.json diff --git a/plugins/discourse-calendar/app/controllers/admin/discourse_calendar/admin_holidays_controller.rb b/plugins/discourse-events/app/controllers/admin/discourse_calendar/admin_holidays_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/admin/discourse_calendar/admin_holidays_controller.rb rename to plugins/discourse-events/app/controllers/admin/discourse_calendar/admin_holidays_controller.rb diff --git a/plugins/discourse-calendar/app/controllers/discourse_calendar/livestream_controller.rb b/plugins/discourse-events/app/controllers/discourse_calendar/livestream_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/discourse_calendar/livestream_controller.rb rename to plugins/discourse-events/app/controllers/discourse_calendar/livestream_controller.rb diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/discourse_post_event_controller.rb b/plugins/discourse-events/app/controllers/discourse_post_event/discourse_post_event_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/discourse_post_event/discourse_post_event_controller.rb rename to plugins/discourse-events/app/controllers/discourse_post_event/discourse_post_event_controller.rb diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb b/plugins/discourse-events/app/controllers/discourse_post_event/events_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb rename to plugins/discourse-events/app/controllers/discourse_post_event/events_controller.rb diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb b/plugins/discourse-events/app/controllers/discourse_post_event/invitees_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/discourse_post_event/invitees_controller.rb rename to plugins/discourse-events/app/controllers/discourse_post_event/invitees_controller.rb diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/upcoming_events_controller.rb b/plugins/discourse-events/app/controllers/discourse_post_event/upcoming_events_controller.rb similarity index 100% rename from plugins/discourse-calendar/app/controllers/discourse_post_event/upcoming_events_controller.rb rename to plugins/discourse-events/app/controllers/discourse_post_event/upcoming_events_controller.rb diff --git a/plugins/discourse-calendar/app/models/calendar_event.rb b/plugins/discourse-events/app/models/calendar_event.rb similarity index 100% rename from plugins/discourse-calendar/app/models/calendar_event.rb rename to plugins/discourse-events/app/models/calendar_event.rb diff --git a/plugins/discourse-calendar/app/models/discourse_calendar/disabled_holiday.rb b/plugins/discourse-events/app/models/discourse_calendar/disabled_holiday.rb similarity index 100% rename from plugins/discourse-calendar/app/models/discourse_calendar/disabled_holiday.rb rename to plugins/discourse-events/app/models/discourse_calendar/disabled_holiday.rb diff --git a/plugins/discourse-calendar/app/models/discourse_calendar/livestream/topic_chat_channel.rb b/plugins/discourse-events/app/models/discourse_calendar/livestream/topic_chat_channel.rb similarity index 100% rename from plugins/discourse-calendar/app/models/discourse_calendar/livestream/topic_chat_channel.rb rename to plugins/discourse-events/app/models/discourse_calendar/livestream/topic_chat_channel.rb diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb b/plugins/discourse-events/app/models/discourse_post_event/event.rb similarity index 100% rename from plugins/discourse-calendar/app/models/discourse_post_event/event.rb rename to plugins/discourse-events/app/models/discourse_post_event/event.rb diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event_date.rb b/plugins/discourse-events/app/models/discourse_post_event/event_date.rb similarity index 100% rename from plugins/discourse-calendar/app/models/discourse_post_event/event_date.rb rename to plugins/discourse-events/app/models/discourse_post_event/event_date.rb diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/invitee.rb b/plugins/discourse-events/app/models/discourse_post_event/invitee.rb similarity index 100% rename from plugins/discourse-calendar/app/models/discourse_post_event/invitee.rb rename to plugins/discourse-events/app/models/discourse_post_event/invitee.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/basic_event_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/basic_event_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/event_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/event_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_stats_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/event_stats_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/event_stats_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/event_stats_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_topic_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/event_topic_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/event_topic_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/event_topic_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/invitee_list_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/invitee_list_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/invitee_list_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/invitee_list_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/invitee_serializer.rb b/plugins/discourse-events/app/serializers/discourse_post_event/invitee_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/discourse_post_event/invitee_serializer.rb rename to plugins/discourse-events/app/serializers/discourse_post_event/invitee_serializer.rb diff --git a/plugins/discourse-calendar/app/serializers/user_timezone_serializer.rb b/plugins/discourse-events/app/serializers/user_timezone_serializer.rb similarity index 100% rename from plugins/discourse-calendar/app/serializers/user_timezone_serializer.rb rename to plugins/discourse-events/app/serializers/user_timezone_serializer.rb diff --git a/plugins/discourse-calendar/app/services/discourse_calendar/categories/types/events.rb b/plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_calendar/categories/types/events.rb rename to plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb diff --git a/plugins/discourse-calendar/app/services/discourse_calendar/holiday.rb b/plugins/discourse-events/app/services/discourse_calendar/holiday.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_calendar/holiday.rb rename to plugins/discourse-events/app/services/discourse_calendar/holiday.rb diff --git a/plugins/discourse-calendar/app/services/discourse_calendar/livestream/prepare_zoom_join.rb b/plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_calendar/livestream/prepare_zoom_join.rb rename to plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb diff --git a/plugins/discourse-calendar/app/services/discourse_calendar/livestream/zoom_payload_builder.rb b/plugins/discourse-events/app/services/discourse_calendar/livestream/zoom_payload_builder.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_calendar/livestream/zoom_payload_builder.rb rename to plugins/discourse-events/app/services/discourse_calendar/livestream/zoom_payload_builder.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/action/expand_occurrences.rb b/plugins/discourse-events/app/services/discourse_post_event/action/expand_occurrences.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/action/expand_occurrences.rb rename to plugins/discourse-events/app/services/discourse_post_event/action/expand_occurrences.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/action/parse_invitees_csv.rb b/plugins/discourse-events/app/services/discourse_post_event/action/parse_invitees_csv.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/action/parse_invitees_csv.rb rename to plugins/discourse-events/app/services/discourse_post_event/action/parse_invitees_csv.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/bulk_invite.rb b/plugins/discourse-events/app/services/discourse_post_event/bulk_invite.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/bulk_invite.rb rename to plugins/discourse-events/app/services/discourse_post_event/bulk_invite.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/chat_channel_sync.rb b/plugins/discourse-events/app/services/discourse_post_event/chat_channel_sync.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/chat_channel_sync.rb rename to plugins/discourse-events/app/services/discourse_post_event/chat_channel_sync.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb b/plugins/discourse-events/app/services/discourse_post_event/create_invitee.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/create_invitee.rb rename to plugins/discourse-events/app/services/discourse_post_event/create_invitee.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/csv_bulk_invite.rb b/plugins/discourse-events/app/services/discourse_post_event/csv_bulk_invite.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/csv_bulk_invite.rb rename to plugins/discourse-events/app/services/discourse_post_event/csv_bulk_invite.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/destroy_event.rb b/plugins/discourse-events/app/services/discourse_post_event/destroy_event.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/destroy_event.rb rename to plugins/discourse-events/app/services/discourse_post_event/destroy_event.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb b/plugins/discourse-events/app/services/discourse_post_event/destroy_invitee.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/destroy_invitee.rb rename to plugins/discourse-events/app/services/discourse_post_event/destroy_invitee.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/event/action/attributes_from_raw.rb b/plugins/discourse-events/app/services/discourse_post_event/event/action/attributes_from_raw.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/event/action/attributes_from_raw.rb rename to plugins/discourse-events/app/services/discourse_post_event/event/action/attributes_from_raw.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/event/action/resolve_image_upload.rb b/plugins/discourse-events/app/services/discourse_post_event/event/action/resolve_image_upload.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/event/action/resolve_image_upload.rb rename to plugins/discourse-events/app/services/discourse_post_event/event/action/resolve_image_upload.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/event/sync_from_post.rb b/plugins/discourse-events/app/services/discourse_post_event/event/sync_from_post.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/event/sync_from_post.rb rename to plugins/discourse-events/app/services/discourse_post_event/event/sync_from_post.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/invite.rb b/plugins/discourse-events/app/services/discourse_post_event/invite.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/invite.rb rename to plugins/discourse-events/app/services/discourse_post_event/invite.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rb b/plugins/discourse-events/app/services/discourse_post_event/list_invitees.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rb rename to plugins/discourse-events/app/services/discourse_post_event/list_invitees.rb diff --git a/plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb b/plugins/discourse-events/app/services/discourse_post_event/update_invitee.rb similarity index 100% rename from plugins/discourse-calendar/app/services/discourse_post_event/update_invitee.rb rename to plugins/discourse-events/app/services/discourse_post_event/update_invitee.rb diff --git a/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb b/plugins/discourse-events/app/views/discourse_post_event/events/index.ics.erb similarity index 100% rename from plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb rename to plugins/discourse-events/app/views/discourse_post_event/events/index.ics.erb diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-adapter.js b/plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-adapter.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-adapter.js rename to plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-adapter.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-event.js b/plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-event.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-event.js rename to plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-event.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-invitee.js b/plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-invitee.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-invitee.js rename to plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-invitee.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-nested-adapter.js b/plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-nested-adapter.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-nested-adapter.js rename to plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-nested-adapter.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-reminder.js b/plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-reminder.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/adapters/discourse-post-event-reminder.js rename to plugins/discourse-events/assets/javascripts/discourse/adapters/discourse-post-event-reminder.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/admin-calendar-route-map.js b/plugins/discourse-events/assets/javascripts/discourse/admin-calendar-route-map.js similarity index 57% rename from plugins/discourse-calendar/assets/javascripts/discourse/admin-calendar-route-map.js rename to plugins/discourse-events/assets/javascripts/discourse/admin-calendar-route-map.js index 2380b58c54d..24795b3f451 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/admin-calendar-route-map.js +++ b/plugins/discourse-events/assets/javascripts/discourse/admin-calendar-route-map.js @@ -2,6 +2,6 @@ export default { resource: "admin.adminPlugins.show", path: "/plugins", map() { - this.route("discourse-calendar-holidays", { path: "holidays" }); + this.route("discourse-events-holidays", { path: "holidays" }); }, }; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/api-initializers/discourse-group-timezones.gjs b/plugins/discourse-events/assets/javascripts/discourse/api-initializers/discourse-group-timezones.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/api-initializers/discourse-group-timezones.gjs rename to plugins/discourse-events/assets/javascripts/discourse/api-initializers/discourse-group-timezones.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list-item.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list-item.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/category-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/category-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/compact-event-editor.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/compact-event-editor.gjs similarity index 99% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/compact-event-editor.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/compact-event-editor.gjs index 355ec53b65a..e0150c0d8ba 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/compact-event-editor.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/compact-event-editor.gjs @@ -16,13 +16,13 @@ import DToggleSwitch from "discourse/ui-kit/d-toggle-switch"; import dConcatClass from "discourse/ui-kit/helpers/d-concat-class"; import dIcon from "discourse/ui-kit/helpers/d-icon"; import { i18n } from "discourse-i18n"; -import PostEventBuilder from "discourse/plugins/discourse-calendar/discourse/components/modal/post-event-builder"; +import PostEventBuilder from "discourse/plugins/discourse-events/discourse/components/modal/post-event-builder"; import { defaultEventState, isLivestreamUrl, reconcileDefaultReminder, -} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; -import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; +} from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper"; +import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event"; export default class CompactEventEditor extends Component { @service capabilities; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/composer-event-editor.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/composer-event-editor.gjs similarity index 97% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/composer-event-editor.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/composer-event-editor.gjs index a90ac7e8cf5..6f64a9d9c36 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/composer-event-editor.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/composer-event-editor.gjs @@ -10,7 +10,7 @@ import { parseEventAttrs, parseEventBlock, stateToEventInput, -} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; +} from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper"; import CompactEventEditor from "./compact-event-editor"; export default class ComposerEventEditor extends Component { diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/csv-uploader.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/csv-uploader.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/chat-channel.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/chat-channel.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/chat-channel.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/chat-channel.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/creator.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/creator.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/dates.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/dates.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/description.gjs similarity index 95% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/description.gjs index 194e6dce7c9..34852ee6e4a 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/description.gjs @@ -6,7 +6,7 @@ import { modifier } from "ember-modifier"; import { or } from "discourse/truth-helpers"; import dIcon from "discourse/ui-kit/helpers/d-icon"; import { i18n } from "discourse-i18n"; -import openLinksInNewTab from "discourse/plugins/discourse-calendar/discourse/modifiers/open-links-in-new-tab"; +import openLinksInNewTab from "discourse/plugins/discourse-events/discourse/modifiers/open-links-in-new-tab"; export default class DiscoursePostEventDescription extends Component { @tracked expanded = false; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/event-status.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/image.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/image.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/image.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/image.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/index.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/index.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/livestream.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/livestream.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/livestream.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/livestream.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/location.gjs similarity index 88% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/location.gjs index d8b28575941..29b544b34d6 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/location.gjs @@ -1,7 +1,7 @@ import Component from "@glimmer/component"; import { trustHTML } from "@ember/template"; import dIcon from "discourse/ui-kit/helpers/d-icon"; -import openLinksInNewTab from "discourse/plugins/discourse-calendar/discourse/modifiers/open-links-in-new-tab"; +import openLinksInNewTab from "discourse/plugins/discourse-events/discourse/modifiers/open-links-in-new-tab"; const BARE_URL_REGEX = /^https?:\/\/\S+$/; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/onebox-node-view.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/onebox-node-view.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/onebox-node-view.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/onebox-node-view.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/onebox-preview.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/onebox-preview.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/onebox-preview.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/onebox-preview.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/url.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/url.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/event-date.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/event-date.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/event-node-view.gjs similarity index 97% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/event-node-view.gjs index 412c686ab93..6dd75c342da 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/event-node-view.gjs @@ -9,7 +9,7 @@ import { getCustomFieldNames, parseEventAttrs, stateToEventInput, -} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; +} from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper"; import CompactEventEditor from "./compact-event-editor"; const CLEARABLE_ATTRS = [ diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/full-calendar.gjs similarity index 98% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/full-calendar.gjs index 7cfd02c871b..ffeb1a22700 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/full-calendar.gjs @@ -11,7 +11,7 @@ import loadFullCalendar from "discourse/lib/load-full-calendar"; import { sanitize } from "discourse/lib/text"; import DiscourseURL from "discourse/lib/url"; import { i18n } from "discourse-i18n"; -import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; +import DiscoursePostEvent from "discourse/plugins/discourse-events/discourse/components/discourse-post-event"; import { getCalendarButtonsText, getCurrentBcp47Locale, diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/index.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/index.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/index.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/new-day.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/new-day.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/timezone.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/group-timezones/timezone.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/embeddable-chat-channel.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/embeddable-chat-channel.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/embeddable-chat-channel.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/embeddable-chat-channel.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/mobile-livestream-chat-icon.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/mobile-livestream-chat-icon.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/mobile-livestream-chat-icon.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/mobile-livestream-chat-icon.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/modal/mobile-embeddable-chat-modal.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/modal/mobile-embeddable-chat-modal.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/modal/mobile-embeddable-chat-modal.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/modal/mobile-embeddable-chat-modal.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/responsive-livestream-chat-icon.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/responsive-livestream-chat-icon.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/responsive-livestream-chat-icon.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/responsive-livestream-chat-icon.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/zoom-entry.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/zoom-entry.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/zoom-entry.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/zoom-entry.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/zoom-page.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/zoom-page.gjs similarity index 97% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/zoom-page.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/livestream/zoom-page.gjs index 1392b821fcc..be7967ca225 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/components/livestream/zoom-page.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/components/livestream/zoom-page.gjs @@ -9,8 +9,8 @@ import getURL from "discourse/lib/get-url"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import DButton from "discourse/ui-kit/d-button"; import { i18n } from "discourse-i18n"; -import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; -import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; +import DiscoursePostEvent from "discourse/plugins/discourse-events/discourse/components/discourse-post-event"; +import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event"; import fetchZoomJoinPayload from "../../lib/fetch-zoom-join-payload"; import { loadZoomMeetingSdk } from "../../lib/load-zoom-meeting-sdk"; import { isWithinEventTimeframe } from "../../models/discourse-post-event-event"; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-builder.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-builder.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/post-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/post-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/post-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/post-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/region-input.js b/plugins/discourse-events/assets/javascripts/discourse/components/region-input.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/region-input.js rename to plugins/discourse-events/assets/javascripts/discourse/components/region-input.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/toggle-invitees.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/toggle-invitees.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/upcoming-events-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/upcoming-events-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs b/plugins/discourse-events/assets/javascripts/discourse/components/upcoming-events-list.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs rename to plugins/discourse-events/assets/javascripts/discourse/components/upcoming-events-list.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/before-main-outlet/embeddable-chat-channel-connector.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/before-main-outlet/embeddable-chat-channel-connector.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/before-main-outlet/embeddable-chat-channel-connector.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/before-main-outlet/embeddable-chat-channel-connector.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/before-topic-list-body/category-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/before-topic-list-body/category-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/before-topic-list-body/category-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/before-topic-list-body/category-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/calendar-subscriptions-feeds/event-feeds.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/calendar-subscriptions-feeds/event-feeds.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/calendar-subscriptions-feeds/event-feeds.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/calendar-subscriptions-feeds/event-feeds.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/category-custom-settings/show-event-category-sorting-settings.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/category-custom-settings/show-event-category-sorting-settings.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/category-custom-settings/show-event-category-sorting-settings.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/category-custom-settings/show-event-category-sorting-settings.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/chat-channel-card-cta/livestream-rsvp.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/chat-channel-card-cta/livestream-rsvp.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/chat-channel-card-cta/livestream-rsvp.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/chat-channel-card-cta/livestream-rsvp.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/chat-channel-preview-card-content/livestream-rsvp.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/chat-channel-preview-card-content/livestream-rsvp.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/chat-channel-preview-card-content/livestream-rsvp.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/chat-channel-preview-card-content/livestream-rsvp.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/discovery-list-container-top/category-events-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/discovery-list-container-top/category-events-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/discovery-list-container-top/category-events-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/discovery-list-container-top/category-events-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/header-topic-title-suffix/event-date-container.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/header-topic-title-suffix/event-date-container.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/header-topic-title-suffix/event-date-container.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/header-topic-title-suffix/event-date-container.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/topic-list-after-title/event-badge.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/topic-list-after-title/event-badge.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/topic-list-after-title/event-badge.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/topic-list-after-title/event-badge.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs rename to plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-calendar-holidays.js b/plugins/discourse-events/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-events-holidays.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-calendar-holidays.js rename to plugins/discourse-events/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-events-holidays.js diff --git a/plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events.js b/plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events.js new file mode 100644 index 00000000000..e6c2655f749 --- /dev/null +++ b/plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events.js @@ -0,0 +1,3 @@ +import Controller from "@ember/controller"; + +export default class extends Controller {} diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/index.js b/plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/index.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/index.js rename to plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/index.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/mine.js b/plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/mine.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/mine.js rename to plugins/discourse-events/assets/javascripts/discourse/controllers/discourse-post-event-upcoming-events/mine.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/discourse-calendar-topic-zoom-route-map.js b/plugins/discourse-events/assets/javascripts/discourse/discourse-calendar-topic-zoom-route-map.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/discourse-calendar-topic-zoom-route-map.js rename to plugins/discourse-events/assets/javascripts/discourse/discourse-calendar-topic-zoom-route-map.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/discourse-event-upcoming-events-route-map.js b/plugins/discourse-events/assets/javascripts/discourse/discourse-event-upcoming-events-route-map.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/discourse-event-upcoming-events-route-map.js rename to plugins/discourse-events/assets/javascripts/discourse/discourse-event-upcoming-events-route-map.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/helpers/format-event-name.js b/plugins/discourse-events/assets/javascripts/discourse/helpers/format-event-name.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/helpers/format-event-name.js rename to plugins/discourse-events/assets/javascripts/discourse/helpers/format-event-name.js diff --git a/plugins/discourse-events/assets/javascripts/discourse/helpers/format-future-date.js b/plugins/discourse-events/assets/javascripts/discourse/helpers/format-future-date.js new file mode 100644 index 00000000000..9e78486c90d --- /dev/null +++ b/plugins/discourse-events/assets/javascripts/discourse/helpers/format-future-date.js @@ -0,0 +1,8 @@ +import { trustHTML } from "@ember/template"; +import guessDateFormat from "../lib/guess-best-date-format"; + +export default function (date) { + date = moment.utc(date).tz(moment.tz.guess()); + const format = guessDateFormat(date); + return trustHTML(date.format(format)); +} diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-create-event-composer-action.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/add-create-event-composer-action.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-create-event-composer-action.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/add-create-event-composer-action.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-event-ui-builder.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/add-event-ui-builder.js similarity index 98% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-event-ui-builder.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/add-event-ui-builder.js index 6ffc7e132e7..b51114ee699 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-event-ui-builder.js +++ b/plugins/discourse-events/assets/javascripts/discourse/initializers/add-event-ui-builder.js @@ -1,5 +1,5 @@ import { withPluginApi } from "discourse/lib/plugin-api"; -import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; +import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event"; import PostEventBuilder from "../components/modal/post-event-builder"; import { defaultReminderFor, reminderToBBCode } from "../lib/raw-event-helper"; diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-events-create-topic-button.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/add-events-create-topic-button.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-events-create-topic-button.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/add-events-create-topic-button.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-upcoming-events-to-sidebar.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/add-upcoming-events-to-sidebar.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/add-upcoming-events-to-sidebar.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/add-upcoming-events-to-sidebar.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js similarity index 85% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js index 112f086d723..6b0d73124aa 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js +++ b/plugins/discourse-events/assets/javascripts/discourse/initializers/calendar-admin-plugin-configuration-nav.js @@ -1,6 +1,6 @@ import { withPluginApi } from "discourse/lib/plugin-api"; -const PLUGIN_ID = "discourse-calendar"; +const PLUGIN_ID = "discourse-events"; export default { name: "calendar-admin-plugin-configuration-nav", @@ -17,7 +17,7 @@ export default { api.addAdminPluginConfigurationNav(PLUGIN_ID, [ { label: "discourse_calendar.holidays.header_title", - route: "adminPlugins.show.discourse-calendar-holidays", + route: "adminPlugins.show.discourse-events-holidays", description: "discourse_calendar.holidays.disabled_holidays_description", }, diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/disable-sort.js b/plugins/discourse-events/assets/javascripts/discourse/initializers/disable-sort.js similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/disable-sort.js rename to plugins/discourse-events/assets/javascripts/discourse/initializers/disable-sort.js diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs similarity index 100% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-calendar.gjs rename to plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs b/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs similarity index 93% rename from plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs rename to plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs index 6ecd16b9ce4..92ac4b19492 100644 --- a/plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs +++ b/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-post-event-decorator.gjs @@ -1,9 +1,9 @@ import { withPluginApi } from "discourse/lib/plugin-api"; import { i18n } from "discourse-i18n"; -import ComposerEventEditor from "discourse/plugins/discourse-calendar/discourse/components/composer-event-editor"; -import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; -import DiscoursePostEventOneboxPreview from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event/onebox-preview"; -import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; +import ComposerEventEditor from "discourse/plugins/discourse-events/discourse/components/composer-event-editor"; +import DiscoursePostEvent from "discourse/plugins/discourse-events/discourse/components/discourse-post-event"; +import DiscoursePostEventOneboxPreview from "discourse/plugins/discourse-events/discourse/components/discourse-post-event/onebox-preview"; +import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event"; const ComposerEventEditorTemplate =