pages_core 3.6.0 → 3.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -3
- data/Rakefile +3 -1
- data/app/assets/builds/pages_core/admin-dist.js +55 -0
- data/app/assets/stylesheets/pages/admin/components/forms.scss +20 -0
- data/app/assets/stylesheets/pages/admin/components/image_editor.scss +1 -0
- data/app/assets/stylesheets/pages/admin/components/image_grid.scss +33 -5
- data/app/assets/stylesheets/pages/admin/components/layout.scss +2 -1
- data/app/assets/stylesheets/pages/admin/components/login.scss +6 -0
- data/app/assets/stylesheets/pages/admin/components/tabs.scss +5 -0
- data/app/assets/stylesheets/pages/admin/components/tag_editor.scss +13 -7
- data/app/assets/stylesheets/pages/admin/controllers/pages.scss +13 -5
- data/app/assets/stylesheets/pages/admin.scss +0 -1
- data/app/assets/stylesheets/pages/errors.css +2 -0
- data/app/controller_dummies/admin/admin_controller.rb +3 -1
- data/app/controller_dummies/application_controller.rb +3 -1
- data/app/controller_dummies/attachments_controller.rb +3 -1
- data/app/controller_dummies/frontend_controller.rb +3 -1
- data/app/controller_dummies/images_controller.rb +3 -1
- data/app/controller_dummies/page_files_controller.rb +3 -1
- data/app/controller_dummies/pages_controller.rb +3 -1
- data/app/controller_dummies/sitemaps_controller.rb +3 -1
- data/app/controllers/admin/attachments_controller.rb +5 -3
- data/app/controllers/admin/categories_controller.rb +2 -0
- data/app/controllers/admin/images_controller.rb +16 -8
- data/app/controllers/admin/invites_controller.rb +4 -1
- data/app/controllers/admin/pages_controller.rb +9 -26
- data/app/controllers/admin/password_resets_controller.rb +9 -5
- data/app/controllers/admin/users_controller.rb +10 -4
- data/app/controllers/concerns/pages_core/admin/news_page_controller.rb +13 -11
- data/app/controllers/concerns/pages_core/admin/persistent_params.rb +75 -0
- data/app/controllers/concerns/pages_core/authentication.rb +13 -5
- data/app/controllers/concerns/pages_core/error_renderer.rb +3 -0
- data/app/controllers/concerns/pages_core/error_reporting.rb +36 -0
- data/app/controllers/concerns/pages_core/policies_helper.rb +4 -1
- data/app/controllers/concerns/pages_core/preview_pages_controller.rb +8 -0
- data/app/controllers/concerns/pages_core/process_titler.rb +2 -0
- data/app/controllers/concerns/pages_core/rss_controller.rb +2 -0
- data/app/controllers/concerns/pages_core/static_cache_controller.rb +48 -0
- data/app/controllers/errors_controller.rb +5 -53
- data/app/controllers/pages_core/admin_controller.rb +7 -67
- data/app/controllers/pages_core/attachments_controller.rb +10 -6
- data/app/controllers/pages_core/base_controller.rb +11 -17
- data/app/controllers/pages_core/frontend/page_files_controller.rb +6 -2
- data/app/controllers/pages_core/frontend/pages_controller.rb +14 -18
- data/app/controllers/pages_core/frontend_controller.rb +3 -0
- data/app/controllers/pages_core/images_controller.rb +3 -1
- data/app/controllers/pages_core/sitemaps_controller.rb +11 -5
- data/app/controllers/sessions_controller.rb +3 -1
- data/app/formatters/pages_core/html_formatter.rb +13 -63
- data/app/formatters/pages_core/image_embedder.rb +79 -0
- data/app/formatters/pages_core/link_renderer.rb +4 -2
- data/app/helpers/admin/admin_helper.rb +2 -0
- data/app/helpers/admin/menu_helper.rb +6 -4
- data/app/helpers/admin/pages_helper.rb +4 -57
- data/app/helpers/application_helper.rb +3 -1
- data/app/helpers/frontend_helper.rb +3 -1
- data/app/helpers/pages_core/admin/admin_helper.rb +22 -106
- data/app/helpers/pages_core/admin/content_tabs_helper.rb +31 -0
- data/app/helpers/pages_core/admin/date_range_helper.rb +55 -0
- data/app/helpers/pages_core/admin/form_builder.rb +8 -0
- data/app/helpers/pages_core/admin/image_uploads_helper.rb +47 -0
- data/app/helpers/pages_core/admin/labelled_field_helper.rb +12 -9
- data/app/helpers/pages_core/admin/page_blocks_helper.rb +66 -0
- data/app/helpers/pages_core/admin/page_json_helper.rb +23 -0
- data/app/helpers/pages_core/admin/tag_editor_helper.rb +11 -39
- data/app/helpers/pages_core/application_helper.rb +3 -0
- data/app/helpers/pages_core/attachments_helper.rb +31 -27
- data/app/helpers/pages_core/form_builder.rb +17 -13
- data/app/helpers/pages_core/frontend_helper.rb +3 -3
- data/app/helpers/pages_core/head_tags_helper.rb +18 -22
- data/app/helpers/pages_core/images_helper.rb +3 -0
- data/app/helpers/pages_core/meta_tags_helper.rb +3 -1
- data/app/helpers/pages_core/open_graph_tags_helper.rb +8 -6
- data/app/helpers/pages_core/page_path_helper.rb +24 -3
- data/app/javascript/admin-dist.js +2 -0
- data/app/javascript/components/Attachments/Attachment.jsx +121 -0
- data/app/javascript/components/Attachments/AttachmentEditor.jsx +116 -0
- data/app/javascript/components/Attachments/Placeholder.jsx +10 -0
- data/app/javascript/components/Attachments.jsx +165 -0
- data/app/{assets/javascripts/pages/admin/components/date_range_select.jsx → javascript/components/DateRangeSelect.jsx} +16 -5
- data/app/javascript/components/EditableImage.jsx +61 -0
- data/app/{assets/javascripts/pages/admin/components/file_upload_button.jsx → javascript/components/FileUploadButton.jsx} +11 -1
- data/app/{assets/javascripts/pages/admin/components/focal_point.jsx → javascript/components/ImageCropper/FocalPoint.jsx} +12 -1
- data/app/javascript/components/ImageCropper/Image.jsx +65 -0
- data/app/javascript/components/ImageCropper/Toolbar.jsx +73 -0
- data/app/javascript/components/ImageCropper/useCrop.js +199 -0
- data/app/javascript/components/ImageCropper.jsx +90 -0
- data/app/javascript/components/ImageEditor/Form.jsx +98 -0
- data/app/javascript/components/ImageEditor.jsx +62 -0
- data/app/javascript/components/ImageGrid/DragElement.jsx +30 -0
- data/app/javascript/components/ImageGrid/FilePlaceholder.jsx +9 -0
- data/app/javascript/components/ImageGrid/GridImage.jsx +103 -0
- data/app/javascript/components/ImageGrid/Placeholder.jsx +23 -0
- data/app/javascript/components/ImageGrid.jsx +257 -0
- data/app/javascript/components/ImageUploader.jsx +171 -0
- data/app/{assets/javascripts/pages/admin/components/modal.jsx → javascript/components/Modal.jsx} +13 -2
- data/app/javascript/components/ModalStore.jsx +12 -0
- data/app/{assets/javascripts/pages/admin/components/page_dates.jsx → javascript/components/PageDates.jsx} +11 -1
- data/app/{assets/javascripts/pages/admin/components/page_files.jsx → javascript/components/PageFiles.jsx} +11 -2
- data/app/{assets/javascripts/pages/admin/components/page_images.jsx → javascript/components/PageImages.jsx} +11 -2
- data/app/{assets/javascripts/pages/admin/components/page_tree_store.jsx → javascript/components/PageTree.jsx} +127 -137
- data/app/{assets/javascripts/pages/admin/components/page_tree.jsx → javascript/components/PageTreeDraggable.jsx} +44 -38
- data/app/{assets/javascripts/pages/admin/components/page_tree_node.jsx → javascript/components/PageTreeNode.jsx} +46 -31
- data/app/javascript/components/RichTextArea.jsx +213 -0
- data/app/javascript/components/RichTextToolbarButton.jsx +20 -0
- data/app/javascript/components/TagEditor/AddTagForm.jsx +42 -0
- data/app/javascript/components/TagEditor/Tag.jsx +32 -0
- data/app/javascript/components/TagEditor.jsx +61 -0
- data/app/javascript/components/Toast.jsx +72 -0
- data/app/javascript/components/ToastStore.jsx +14 -0
- data/app/javascript/components/drag/draggedOrder.js +51 -0
- data/app/javascript/components/drag/useDragCollection.js +84 -0
- data/app/javascript/components/drag/useDragUploader.js +112 -0
- data/app/javascript/components/drag/useDraggable.js +17 -0
- data/app/javascript/components/drag.js +6 -0
- data/app/javascript/components.js +14 -0
- data/app/javascript/controllers/EditPageController.js +20 -0
- data/app/javascript/controllers/LoginController.js +29 -0
- data/app/javascript/controllers/MainController.js +65 -0
- data/app/javascript/controllers/PageOptionsController.js +62 -0
- data/app/javascript/features/RichText.jsx +34 -0
- data/app/javascript/hooks.js +2 -0
- data/app/javascript/index.js +33 -0
- data/app/{assets/javascripts/pages/admin/lib/tree.jsx → javascript/lib/Tree.js} +64 -63
- data/app/javascript/lib/copyToClipboard.js +13 -0
- data/app/javascript/lib/readyHandler.js +22 -0
- data/app/javascript/lib/request.js +36 -0
- data/app/jobs/pages_core/autopublish_job.rb +3 -1
- data/app/jobs/pages_core/sweep_cache_job.rb +4 -2
- data/app/mailers/admin_mailer.rb +4 -14
- data/app/models/attachment.rb +10 -8
- data/app/models/autopublisher.rb +3 -0
- data/app/models/category.rb +3 -1
- data/app/models/concerns/pages_core/has_roles.rb +2 -0
- data/app/models/concerns/pages_core/humanizable_param.rb +9 -6
- data/app/models/concerns/pages_core/page_model/attachments.rb +2 -0
- data/app/models/concerns/pages_core/page_model/autopublishable.rb +2 -0
- data/app/models/concerns/pages_core/page_model/dated_page.rb +11 -11
- data/app/models/concerns/pages_core/page_model/images.rb +8 -2
- data/app/models/concerns/pages_core/page_model/localizable.rb +2 -0
- data/app/models/concerns/pages_core/page_model/pathable.rb +26 -25
- data/app/models/concerns/pages_core/page_model/redirectable.rb +3 -1
- data/app/models/concerns/pages_core/page_model/searchable.rb +19 -0
- data/app/models/concerns/pages_core/page_model/sortable.rb +6 -5
- data/app/models/concerns/pages_core/page_model/status.rb +2 -0
- data/app/models/concerns/pages_core/page_model/templateable.rb +7 -2
- data/app/models/concerns/pages_core/page_model/tree.rb +27 -20
- data/app/models/concerns/pages_core/searchable_document.rb +71 -0
- data/app/models/concerns/pages_core/sweepable.rb +4 -2
- data/app/models/concerns/pages_core/taggable.rb +33 -12
- data/app/models/image.rb +14 -1
- data/app/models/invite.rb +3 -1
- data/app/models/invite_role.rb +5 -3
- data/app/models/page.rb +6 -3
- data/app/models/page_builder.rb +2 -0
- data/app/models/page_category.rb +3 -1
- data/app/models/page_exporter.rb +23 -10
- data/app/models/page_file.rb +3 -1
- data/app/models/page_image.rb +3 -3
- data/app/models/page_path.rb +13 -5
- data/app/models/password_reset_token.rb +3 -1
- data/app/models/role.rb +9 -6
- data/app/models/search_document.rb +72 -0
- data/app/models/tag.rb +9 -6
- data/app/models/tagging.rb +4 -2
- data/app/models/user.rb +8 -5
- data/app/policies/invite_policy.rb +2 -0
- data/app/policies/page_file_policy.rb +2 -0
- data/app/policies/page_image_policy.rb +2 -0
- data/app/policies/page_policy.rb +2 -0
- data/app/policies/policy.rb +2 -0
- data/app/policies/user_policy.rb +2 -0
- data/app/{serializers/admin/attachment_serializer.rb → resources/admin/attachment_resource.rb} +10 -7
- data/app/{serializers/admin/image_serializer.rb → resources/admin/image_resource.rb} +13 -11
- data/app/resources/admin/page_file_resource.rb +10 -0
- data/app/resources/admin/page_image_resource.rb +10 -0
- data/app/resources/export/attachment_resource.rb +10 -0
- data/app/resources/export/page_image_resource.rb +45 -0
- data/app/resources/export/page_resource.rb +42 -0
- data/app/{serializers/page_image_serializer.rb → resources/page_image_resource.rb} +10 -16
- data/app/resources/page_resource.rb +33 -0
- data/app/services/pages_core/create_user_service.rb +5 -2
- data/app/services/pages_core/destroy_invite_service.rb +25 -0
- data/app/services/pages_core/invite_service.rb +4 -2
- data/app/views/admin/images/show.json.jbuilder +2 -0
- data/app/views/admin/pages/_edit_content.html.erb +1 -1
- data/app/views/admin/pages/_edit_files.html.erb +1 -5
- data/app/views/admin/pages/_edit_images.html.erb +1 -5
- data/app/views/admin/pages/_edit_metadata.html.erb +1 -12
- data/app/views/admin/pages/_edit_options.html.erb +74 -55
- data/app/views/admin/pages/_form.html.erb +19 -0
- data/app/views/admin/pages/edit.html.erb +35 -61
- data/app/views/admin/pages/index.html.erb +0 -1
- data/app/views/admin/pages/new.html.erb +32 -32
- data/app/views/admin/pages/news.html.erb +1 -1
- data/app/views/admin/users/_access_control.html.erb +5 -1
- data/app/views/admin/users/login.html.erb +12 -4
- data/app/views/errors/500.html.erb +2 -20
- data/app/views/errors/_generic_help.html.erb +1 -1
- data/app/views/feeds/pages.rss.builder +3 -2
- data/app/views/layouts/admin/_header.html.erb +1 -1
- data/app/views/layouts/admin/_page_header.html.erb +33 -0
- data/app/views/layouts/admin.html.erb +23 -42
- data/app/views/pages_core/_google_analytics.html.erb +8 -0
- data/app/views/sitemaps/show.xml.builder +2 -0
- data/config/routes.rb +5 -6
- data/db/migrate/20111219033112_create_pages_tables.rb +192 -271
- data/db/migrate/20180625154059_enable_search_extensions.rb +10 -0
- data/db/migrate/20210209151400_create_search_configurations.rb +35 -0
- data/db/migrate/20210210235200_create_search_documents.rb +74 -0
- data/lib/pages_core/admin_menu_item.rb +3 -0
- data/lib/pages_core/archive_finder.rb +12 -16
- data/lib/pages_core/attachment_embedder.rb +4 -6
- data/lib/pages_core/cache_sweeper.rb +10 -108
- data/lib/pages_core/configuration/base.rb +5 -0
- data/lib/pages_core/configuration/pages.rb +4 -2
- data/lib/pages_core/configuration.rb +2 -0
- data/lib/pages_core/digest_verifier.rb +5 -5
- data/lib/pages_core/engine.rb +53 -5
- data/lib/pages_core/extensions/string_extensions.rb +3 -1
- data/lib/pages_core/extensions.rb +2 -0
- data/lib/pages_core/page_path_constraint.rb +2 -0
- data/lib/pages_core/pages_plugin.rb +3 -1
- data/lib/pages_core/plugin.rb +4 -52
- data/lib/pages_core/pub_sub.rb +2 -0
- data/lib/pages_core/static_cache/null_handler.rb +17 -0
- data/lib/pages_core/static_cache/page_cache_handler.rb +56 -0
- data/lib/pages_core/static_cache/varnish_handler.rb +55 -0
- data/lib/pages_core/static_cache.rb +26 -0
- data/lib/pages_core/templates/block_configuration.rb +4 -1
- data/lib/pages_core/templates/configuration.rb +5 -1
- data/lib/pages_core/templates/configuration_handler.rb +5 -3
- data/lib/pages_core/templates/configuration_proxy.rb +2 -0
- data/lib/pages_core/templates/controller_actions.rb +2 -0
- data/lib/pages_core/templates/template_configuration.rb +20 -14
- data/lib/pages_core/templates.rb +5 -3
- data/lib/pages_core/version.rb +3 -1
- data/lib/pages_core.rb +13 -5
- data/lib/rails/generators/pages_core/frontend/frontend_generator.rb +2 -7
- data/lib/rails/generators/pages_core/install/install_generator.rb +3 -7
- data/lib/rails/generators/pages_core/install/templates/active_job_initializer.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/application_controller.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/application_helper.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/delayed_job +1 -0
- data/lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb +17 -0
- data/lib/rails/generators/pages_core/install/templates/frontend_controller.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/frontend_helper.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/gitignore.erb +12 -1
- data/lib/rails/generators/pages_core/install/templates/page_templates_initializer.rb +4 -2
- data/lib/rails/generators/pages_core/install/templates/pages_controller.rb +2 -0
- data/lib/rails/generators/pages_core/install/templates/pages_initializer.rb +2 -6
- data/lib/rails/generators/pages_core/rspec/rspec_generator.rb +18 -14
- data/lib/rails/generators/pages_core/rspec/templates/factories.rb +3 -8
- data/lib/rails/generators/pages_core/rspec/templates/mailer_macros.rb +2 -0
- data/lib/rails/generators/pages_core/rspec/templates/page_templates_spec.rb +26 -0
- data/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb +91 -0
- data/lib/rails/generators/pages_core/rspec/templates/spec_helper.rb +89 -36
- data/lib/tasks/pages/cache.rake +8 -5
- data/lib/tasks/pages/export.rake +3 -1
- data/lib/tasks/pages/page_paths.rake +2 -0
- data/lib/tasks/pages.rake +3 -2
- data/template.rb +2 -0
- metadata +193 -156
- data/app/assets/javascripts/pages/admin/components/attachment.jsx +0 -130
- data/app/assets/javascripts/pages/admin/components/attachment_editor.jsx +0 -131
- data/app/assets/javascripts/pages/admin/components/attachments.jsx +0 -211
- data/app/assets/javascripts/pages/admin/components/drag_uploader.jsx +0 -174
- data/app/assets/javascripts/pages/admin/components/editable_image.jsx +0 -57
- data/app/assets/javascripts/pages/admin/components/grid_image.jsx +0 -124
- data/app/assets/javascripts/pages/admin/components/image_editor.jsx +0 -496
- data/app/assets/javascripts/pages/admin/components/image_grid.jsx +0 -301
- data/app/assets/javascripts/pages/admin/components/image_uploader.jsx +0 -171
- data/app/assets/javascripts/pages/admin/components/modal_store.jsx +0 -20
- data/app/assets/javascripts/pages/admin/components/rich_text_area.jsx +0 -63
- data/app/assets/javascripts/pages/admin/components/rich_text_toolbar.jsx +0 -58
- data/app/assets/javascripts/pages/admin/components/toast.jsx +0 -37
- data/app/assets/javascripts/pages/admin/components/toast_store.jsx +0 -52
- data/app/assets/javascripts/pages/admin/components.jsx +0 -2
- data/app/assets/javascripts/pages/admin/features/content_tabs.jsx +0 -72
- data/app/assets/javascripts/pages/admin/features/edit_page.jsx +0 -97
- data/app/assets/javascripts/pages/admin/features/rich_text.jsx +0 -14
- data/app/assets/javascripts/pages/admin/features/tag_editor.jsx +0 -160
- data/app/assets/javascripts/pages/admin.jsx +0 -17
- data/app/assets/javascripts/pages/login_form.jsx +0 -21
- data/app/controllers/concerns/pages_core/domain_based_cache.rb +0 -26
- data/app/serializers/admin/page_file_serializer.rb +0 -6
- data/app/serializers/admin/page_image_serializer.rb +0 -6
- data/app/serializers/page_export_serializer.rb +0 -30
- data/app/serializers/page_file_export_serializer.rb +0 -4
- data/app/serializers/page_image_export_serializer.rb +0 -40
- data/app/serializers/page_serializer.rb +0 -21
- data/app/views/admin_mailer/error_report.html.erb +0 -70
- data/app/views/errors/500_critical.html.erb +0 -7
- data/app/views/errors/report.html.erb +0 -4
- data/app/views/layouts/admin/_analytics.html.erb +0 -16
- data/config/removed_migrations.yml +0 -60
- data/db/migrate/20120627033112_rename_textbits.rb +0 -17
- data/db/migrate/20121010055412_drop_removed_tables.rb +0 -81
- data/db/migrate/20130130053932_add_queue_to_delayed_jobs.rb +0 -9
- data/db/migrate/20130303053932_remove_filter_from_localizations.rb +0 -9
- data/db/migrate/20130303160632_remove_imagesets.rb +0 -22
- data/db/migrate/20130303161732_remove_sms_subscribers.rb +0 -14
- data/db/migrate/20130823133208_update_page_redirect_to.rb +0 -10
- data/db/migrate/20140203183900_create_roles.rb +0 -66
- data/db/migrate/20140414150500_change_locale_names.rb +0 -11
- data/db/migrate/20140604142100_remove_openid_url.rb +0 -9
- data/db/migrate/20140920231700_convert_images_to_dis.rb +0 -81
- data/db/migrate/20140922124600_convert_page_files_to_dis.rb +0 -50
- data/db/migrate/20141004003100_create_password_reset_tokens.rb +0 -10
- data/db/migrate/20141006181300_remove_user_cruft.rb +0 -11
- data/db/migrate/20141007173000_create_invites.rb +0 -16
- data/db/migrate/20150204130800_update_delayed_job_table.rb +0 -9
- data/db/migrate/20150401131300_localize_images.rb +0 -38
- data/db/migrate/20150520174300_add_meta_image_to_page.rb +0 -5
- data/db/migrate/20150904164200_add_pinned_to_tags.rb +0 -5
- data/db/migrate/20151002174800_create_page_paths.rb +0 -10
- data/db/migrate/20151021103400_drop_binaries_table.rb +0 -7
- data/db/migrate/20151204151000_remove_page_content_order.rb +0 -5
- data/db/migrate/20160330220900_rename_pages_categories.rb +0 -6
- data/db/migrate/20160405202700_change_localization_limit.rb +0 -9
- data/db/migrate/20170716040500_remove_page_comments.rb +0 -23
- data/db/migrate/20170716213400_remove_sessions.rb +0 -15
- data/db/migrate/20180207134000_add_dates_to_pages.rb +0 -11
- data/db/migrate/20190211154800_create_attachments.rb +0 -73
- data/lib/rails/generators/pages_core/frontend/templates/application.js.erb +0 -15
- data/lib/rails/generators/pages_core/install/templates/cache_sweeper_initializer.rb +0 -6
- data/lib/tasks/pages/update.rake +0 -17
- data/vendor/assets/javascripts/ReactCrop.min.js +0 -1
- data/vendor/assets/javascripts/reflux.min.js +0 -1
@@ -0,0 +1,257 @@
|
|
1
|
+
import React, { useRef, useState } from "react";
|
2
|
+
import PropTypes from "prop-types";
|
3
|
+
import FileUploadButton from "./FileUploadButton";
|
4
|
+
import DragElement from "./ImageGrid/DragElement";
|
5
|
+
import FilePlaceholder from "./ImageGrid/FilePlaceholder";
|
6
|
+
import GridImage from "./ImageGrid/GridImage";
|
7
|
+
import ToastStore from "./ToastStore";
|
8
|
+
import { post } from "../lib/request";
|
9
|
+
|
10
|
+
import { createDraggable,
|
11
|
+
collectionOrder,
|
12
|
+
useDragCollection,
|
13
|
+
useDragUploader } from "./drag";
|
14
|
+
|
15
|
+
function filterFiles(files) {
|
16
|
+
const validMimeTypes = ["image/gif",
|
17
|
+
"image/jpeg",
|
18
|
+
"image/pjpeg",
|
19
|
+
"image/png",
|
20
|
+
"image/tiff"];
|
21
|
+
return files.filter(f => (validMimeTypes.indexOf(f.type) !== -1));
|
22
|
+
}
|
23
|
+
|
24
|
+
function draggedImageOrder(primaryCollection, imagesCollection, dragState) {
|
25
|
+
const [primary, ...rest] = collectionOrder(primaryCollection, dragState);
|
26
|
+
let images = [...rest, ...collectionOrder(imagesCollection, dragState)];
|
27
|
+
|
28
|
+
if (dragState.dragging && [primary, ...images].indexOf(dragState.dragging) === -1) {
|
29
|
+
if (dragState.y < imagesCollection.ref.current.getBoundingClientRect().top) {
|
30
|
+
images = [dragState.dragging, ...images];
|
31
|
+
} else {
|
32
|
+
images.push(dragState.dragging);
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
return [primary, images];
|
37
|
+
}
|
38
|
+
|
39
|
+
function initRecords(props) {
|
40
|
+
const primary = props.enablePrimary ?
|
41
|
+
props.records.filter(r => r.primary).slice(0, 1) :
|
42
|
+
[];
|
43
|
+
|
44
|
+
return [primary, props.records.filter(r => primary.indexOf(r) === -1)];
|
45
|
+
}
|
46
|
+
|
47
|
+
export default function ImageGrid(props) {
|
48
|
+
const [initPrimary, initImages] = initRecords(props);
|
49
|
+
const primary = useDragCollection(initPrimary);
|
50
|
+
const images = useDragCollection(initImages);
|
51
|
+
const [deleted, setDeleted] = useState([]);
|
52
|
+
|
53
|
+
const containerRef = useRef();
|
54
|
+
|
55
|
+
const dispatchAll = (action) => {
|
56
|
+
primary.dispatch(action);
|
57
|
+
images.dispatch(action);
|
58
|
+
};
|
59
|
+
|
60
|
+
const dragEnd = (dragState, files) => {
|
61
|
+
const [draggedPrimary,
|
62
|
+
draggedImages] = draggedImageOrder(primary, images, dragState);
|
63
|
+
|
64
|
+
primary.dispatch({
|
65
|
+
type: "reorder",
|
66
|
+
payload: draggedPrimary ? [draggedPrimary] : []
|
67
|
+
});
|
68
|
+
images.dispatch({ type: "reorder", payload: draggedImages });
|
69
|
+
|
70
|
+
if (files) {
|
71
|
+
const uploads = filterFiles(files).map(f => uploadImage(f));
|
72
|
+
dispatchAll({ type: "insertFiles", payload: uploads });
|
73
|
+
}
|
74
|
+
};
|
75
|
+
|
76
|
+
const [dragState,
|
77
|
+
dragStart,
|
78
|
+
listeners] = useDragUploader([primary, images], dragEnd);
|
79
|
+
|
80
|
+
const position = (record) => {
|
81
|
+
return [...primary.draggables.map(d => d.record),
|
82
|
+
...images.draggables.map(d => d.record),
|
83
|
+
...deleted].indexOf(record) + 1;
|
84
|
+
};
|
85
|
+
|
86
|
+
const attrName = (record) => {
|
87
|
+
return `${props.attribute}[${position(record)}]`;
|
88
|
+
};
|
89
|
+
|
90
|
+
const uploadImage = (file) => {
|
91
|
+
const draggable = createDraggable(
|
92
|
+
{ image: null, file: file }
|
93
|
+
);
|
94
|
+
|
95
|
+
let data = new FormData();
|
96
|
+
|
97
|
+
data.append("image[file]", file);
|
98
|
+
|
99
|
+
post("/admin/images.json", data)
|
100
|
+
.then(json => {
|
101
|
+
if (json.status === "error") {
|
102
|
+
ToastStore.dispatch({
|
103
|
+
type: "ERROR", message: "Error uploading image: " + json.error
|
104
|
+
});
|
105
|
+
dispatchAll({ type: "remove", payload: draggable });
|
106
|
+
} else {
|
107
|
+
dispatchAll({
|
108
|
+
type: "update",
|
109
|
+
payload: { ...draggable, record: { image: json } }
|
110
|
+
});
|
111
|
+
}
|
112
|
+
});
|
113
|
+
|
114
|
+
return draggable;
|
115
|
+
};
|
116
|
+
|
117
|
+
const update = (draggable) => (image) => {
|
118
|
+
const { record } = draggable;
|
119
|
+
const updated = {
|
120
|
+
...draggable,
|
121
|
+
record: {
|
122
|
+
...record,
|
123
|
+
image: { ...record.image, ...image }
|
124
|
+
}
|
125
|
+
};
|
126
|
+
dispatchAll({ type: "update", payload: updated });
|
127
|
+
};
|
128
|
+
|
129
|
+
const remove = (draggable) => () => {
|
130
|
+
dispatchAll({ type: "remove", payload: draggable });
|
131
|
+
if (draggable.record.id) {
|
132
|
+
setDeleted([...deleted, draggable.record]);
|
133
|
+
}
|
134
|
+
};
|
135
|
+
|
136
|
+
const renderImage = (draggable, isPrimary) => {
|
137
|
+
const { dragging } = dragState;
|
138
|
+
|
139
|
+
if (draggable === "Files") {
|
140
|
+
return (<FilePlaceholder key="placeholder" />);
|
141
|
+
}
|
142
|
+
|
143
|
+
return (
|
144
|
+
<GridImage key={draggable.handle}
|
145
|
+
draggable={draggable}
|
146
|
+
locale={props.locale}
|
147
|
+
locales={props.locales}
|
148
|
+
showEmbed={props.showEmbed}
|
149
|
+
startDrag={dragStart}
|
150
|
+
position={position(draggable.record)}
|
151
|
+
primary={isPrimary}
|
152
|
+
onUpdate={update(draggable)}
|
153
|
+
enablePrimary={props.enablePrimary}
|
154
|
+
deleteImage={remove(draggable)}
|
155
|
+
attributeName={attrName(draggable.record)}
|
156
|
+
placeholder={dragging && dragging == draggable} />
|
157
|
+
);
|
158
|
+
};
|
159
|
+
|
160
|
+
const uploadPrimary = (files) => {
|
161
|
+
const [first, ...rest] = filterFiles(files).map(f => uploadImage(f));
|
162
|
+
if (first) {
|
163
|
+
images.dispatch({
|
164
|
+
type: "prepend",
|
165
|
+
payload: [...primary.draggables, ...rest]
|
166
|
+
});
|
167
|
+
primary.dispatch({ type: "replace", payload: [first] });
|
168
|
+
}
|
169
|
+
};
|
170
|
+
|
171
|
+
const uploadAdditional = (files) => {
|
172
|
+
images.dispatch({
|
173
|
+
type: "append",
|
174
|
+
payload: filterFiles(files).map(f => uploadImage(f))
|
175
|
+
});
|
176
|
+
};
|
177
|
+
|
178
|
+
let classNames = ["image-grid"];
|
179
|
+
if (props.enablePrimary) {
|
180
|
+
classNames.push("with-primary-image");
|
181
|
+
}
|
182
|
+
|
183
|
+
const [draggedPrimary,
|
184
|
+
draggedImages] = draggedImageOrder(primary, images, dragState);
|
185
|
+
|
186
|
+
return (
|
187
|
+
<div className={classNames.join(" ")}
|
188
|
+
ref={containerRef}
|
189
|
+
{...listeners}>
|
190
|
+
{dragState.dragging &&
|
191
|
+
<DragElement draggable={dragState.dragging}
|
192
|
+
dragState={dragState}
|
193
|
+
container={containerRef} />}
|
194
|
+
{props.enablePrimary && (
|
195
|
+
<div className="primary-image" ref={primary.ref}>
|
196
|
+
<h3>
|
197
|
+
Main image
|
198
|
+
</h3>
|
199
|
+
{draggedPrimary &&
|
200
|
+
<>
|
201
|
+
{renderImage(draggedPrimary, true)}
|
202
|
+
{props.primaryAttribute && (
|
203
|
+
<input type="hidden" name={props.primaryAttribute}
|
204
|
+
value={(draggedPrimary.record &&
|
205
|
+
draggedPrimary.record.image &&
|
206
|
+
draggedPrimary.record.image.id) || ""} />
|
207
|
+
)}
|
208
|
+
</>}
|
209
|
+
{!draggedPrimary && (
|
210
|
+
<div className="drop-target">
|
211
|
+
<FileUploadButton multiple={true}
|
212
|
+
type="image"
|
213
|
+
multiline={true}
|
214
|
+
callback={uploadPrimary} />
|
215
|
+
</div>)}
|
216
|
+
</div>
|
217
|
+
)}
|
218
|
+
<div className="grid" ref={images.ref}>
|
219
|
+
<h3>
|
220
|
+
{props.enablePrimary ? "More images" : "Images"}
|
221
|
+
</h3>
|
222
|
+
<div className="drop-target">
|
223
|
+
<FileUploadButton multiple={true}
|
224
|
+
type="image"
|
225
|
+
callback={uploadAdditional} />
|
226
|
+
</div>
|
227
|
+
<div className="images">
|
228
|
+
{draggedImages.map(r => renderImage(r, false))}
|
229
|
+
</div>
|
230
|
+
</div>
|
231
|
+
<div className="deleted">
|
232
|
+
{deleted.map(r =>
|
233
|
+
<span className="deleted-image" key={r.id}>
|
234
|
+
<input name={`${attrName(r)}[id]`}
|
235
|
+
type="hidden"
|
236
|
+
value={r.id} />
|
237
|
+
<input name={`${attrName(r)}[attachment_id]`}
|
238
|
+
type="hidden"
|
239
|
+
value={(r.image && r.image.id) || ""} />
|
240
|
+
<input name={`${attrName(r)}[_destroy]`}
|
241
|
+
type="hidden"
|
242
|
+
value={true} />
|
243
|
+
</span>)}
|
244
|
+
</div>
|
245
|
+
</div>
|
246
|
+
);
|
247
|
+
}
|
248
|
+
|
249
|
+
ImageGrid.propTypes = {
|
250
|
+
attribute: PropTypes.string,
|
251
|
+
locale: PropTypes.string,
|
252
|
+
locales: PropTypes.array,
|
253
|
+
records: PropTypes.array,
|
254
|
+
enablePrimary: PropTypes.bool,
|
255
|
+
primaryAttribute: PropTypes.string,
|
256
|
+
showEmbed: PropTypes.bool
|
257
|
+
};
|
@@ -0,0 +1,171 @@
|
|
1
|
+
import React, { useState } from "react";
|
2
|
+
import PropTypes from "prop-types";
|
3
|
+
import EditableImage from "./EditableImage";
|
4
|
+
import FileUploadButton from "./FileUploadButton";
|
5
|
+
import ToastStore from "./ToastStore";
|
6
|
+
import { post } from "../lib/request";
|
7
|
+
|
8
|
+
function getFiles(dt) {
|
9
|
+
var files = [];
|
10
|
+
if (dt.items) {
|
11
|
+
for (let i = 0; i < dt.items.length; i++) {
|
12
|
+
if (dt.items[i].kind == "file") {
|
13
|
+
files.push(dt.items[i].getAsFile());
|
14
|
+
}
|
15
|
+
}
|
16
|
+
} else {
|
17
|
+
for (let i = 0; i < dt.files.length; i++) {
|
18
|
+
files.push(dt.files[i]);
|
19
|
+
}
|
20
|
+
}
|
21
|
+
return files;
|
22
|
+
}
|
23
|
+
|
24
|
+
export default function ImageUploader(props) {
|
25
|
+
const [uploading, setUploading] = useState(false);
|
26
|
+
const [dragover, setDragover] = useState(false);
|
27
|
+
const [image, setImage] = useState(props.image);
|
28
|
+
const [src, setSrc] = useState(props.src);
|
29
|
+
|
30
|
+
const handleDragOver = (evt) => {
|
31
|
+
evt.preventDefault();
|
32
|
+
setDragover(true);
|
33
|
+
};
|
34
|
+
|
35
|
+
const handleDragLeave = () => {
|
36
|
+
setDragover(false);
|
37
|
+
};
|
38
|
+
|
39
|
+
const handleDragEnd = (evt) => {
|
40
|
+
if (evt.dataTransfer.items) {
|
41
|
+
for (var i = 0; i < evt.dataTransfer.items.length; i++) {
|
42
|
+
evt.dataTransfer.items.remove(i);
|
43
|
+
}
|
44
|
+
} else {
|
45
|
+
evt.dataTransfer.clearData();
|
46
|
+
}
|
47
|
+
setDragover(false);
|
48
|
+
};
|
49
|
+
|
50
|
+
const handleDrop = (evt) => {
|
51
|
+
let files = getFiles(evt.dataTransfer);
|
52
|
+
evt.preventDefault();
|
53
|
+
if (files.length > 0) {
|
54
|
+
uploadImage(files[0]);
|
55
|
+
}
|
56
|
+
};
|
57
|
+
|
58
|
+
const handleRemove = (evt) => {
|
59
|
+
evt.preventDefault();
|
60
|
+
setImage(null);
|
61
|
+
setSrc(null);
|
62
|
+
};
|
63
|
+
|
64
|
+
const receiveFiles = (files) => {
|
65
|
+
if (files.length > 0) {
|
66
|
+
uploadImage(files[0]);
|
67
|
+
}
|
68
|
+
};
|
69
|
+
|
70
|
+
const uploadImage = (file) => {
|
71
|
+
let validTypes = ["image/gif",
|
72
|
+
"image/jpeg",
|
73
|
+
"image/pjpeg",
|
74
|
+
"image/png",
|
75
|
+
"image/tiff"];
|
76
|
+
|
77
|
+
if (validTypes.indexOf(file.type) == -1) {
|
78
|
+
alert("Invalid file type, only images in JPEG, PNG or GIF " +
|
79
|
+
"formats are supported");
|
80
|
+
return;
|
81
|
+
}
|
82
|
+
|
83
|
+
let locale = props.locale;
|
84
|
+
let locales = props.locales ? Object.keys(props.locales) : [locale];
|
85
|
+
|
86
|
+
let data = new FormData();
|
87
|
+
|
88
|
+
setImage(null);
|
89
|
+
setSrc(null);
|
90
|
+
setDragover(false);
|
91
|
+
setUploading(true);
|
92
|
+
|
93
|
+
data.append("image[file]", file);
|
94
|
+
locales.forEach((l) => {
|
95
|
+
data.append(`image[alternative][${l}]`, (props.alternative || ""));
|
96
|
+
});
|
97
|
+
|
98
|
+
post("/admin/images.json", data)
|
99
|
+
.then(response => {
|
100
|
+
setUploading(false);
|
101
|
+
if (response.status === "error") {
|
102
|
+
ToastStore.dispatch({
|
103
|
+
type: "ERROR",
|
104
|
+
message: "Error uploading image: " + response.error
|
105
|
+
});
|
106
|
+
} else {
|
107
|
+
setSrc(response.thumbnail_url);
|
108
|
+
setImage(response);
|
109
|
+
}
|
110
|
+
});
|
111
|
+
};
|
112
|
+
|
113
|
+
let classes = ["image-uploader"];
|
114
|
+
if (uploading) {
|
115
|
+
classes.push("uploading");
|
116
|
+
} else if (dragover) {
|
117
|
+
classes.push("dragover");
|
118
|
+
}
|
119
|
+
return (
|
120
|
+
<div className={classes.join(" ")}
|
121
|
+
onDragOver={handleDragOver}
|
122
|
+
onDragLeave={handleDragLeave}
|
123
|
+
onDragEnd={handleDragEnd}
|
124
|
+
onDrop={handleDrop}>
|
125
|
+
<input type="hidden"
|
126
|
+
name={props.attr}
|
127
|
+
value={image ? image.id : ""} />
|
128
|
+
{image &&
|
129
|
+
<div className="image">
|
130
|
+
<EditableImage image={image}
|
131
|
+
src={src}
|
132
|
+
width={props.width}
|
133
|
+
caption={props.caption}
|
134
|
+
locale={props.locale}
|
135
|
+
locales={props.locales} />
|
136
|
+
</div>}
|
137
|
+
<div className="ui-wrapper">
|
138
|
+
{uploading && (
|
139
|
+
<div className="ui">
|
140
|
+
Uploading image...
|
141
|
+
</div>
|
142
|
+
)}
|
143
|
+
{!uploading && (
|
144
|
+
<div className="ui">
|
145
|
+
<FileUploadButton type="image"
|
146
|
+
multiline={true}
|
147
|
+
callback={receiveFiles} />
|
148
|
+
{image && (
|
149
|
+
<a className="delete remove-image"
|
150
|
+
href="#"
|
151
|
+
onClick={handleRemove}>
|
152
|
+
Remove image
|
153
|
+
</a>
|
154
|
+
)}
|
155
|
+
</div>
|
156
|
+
)}
|
157
|
+
</div>
|
158
|
+
</div>
|
159
|
+
);
|
160
|
+
}
|
161
|
+
|
162
|
+
ImageUploader.propTypes = {
|
163
|
+
locale: PropTypes.string,
|
164
|
+
locales: PropTypes.object,
|
165
|
+
image: PropTypes.object,
|
166
|
+
src: PropTypes.string,
|
167
|
+
width: PropTypes.number,
|
168
|
+
caption: PropTypes.bool,
|
169
|
+
attr: PropTypes.string,
|
170
|
+
alternative: PropTypes.string
|
171
|
+
};
|
data/app/{assets/javascripts/pages/admin/components/modal.jsx → javascript/components/Modal.jsx}
RENAMED
@@ -1,23 +1,34 @@
|
|
1
|
-
|
1
|
+
import React from "react";
|
2
|
+
import ModalStore from "./ModalStore";
|
3
|
+
|
4
|
+
export default class Modal extends React.Component {
|
2
5
|
constructor(props) {
|
3
6
|
super(props);
|
7
|
+
this.state = { component: null };
|
4
8
|
this.store = ModalStore;
|
5
9
|
this.closeModal = this.closeModal.bind(this);
|
10
|
+
this.handleChange = this.handleChange.bind(this);
|
6
11
|
this.handleKeypress = this.handleKeypress.bind(this);
|
7
12
|
}
|
8
13
|
|
9
14
|
componentDidMount() {
|
15
|
+
this.unsubscribe = this.store.subscribe(this.handleChange);
|
10
16
|
window.addEventListener("keypress", this.handleKeypress);
|
11
17
|
}
|
12
18
|
|
13
19
|
componentWillUnmount() {
|
20
|
+
this.unsubscribe();
|
14
21
|
window.removeEventListener("keypress", this.handleKeypress);
|
15
22
|
}
|
16
23
|
|
17
24
|
closeModal(evt) {
|
18
25
|
evt.stopPropagation();
|
19
26
|
evt.preventDefault();
|
20
|
-
|
27
|
+
ModalStore.dispatch({ type: "CLOSE" });
|
28
|
+
}
|
29
|
+
|
30
|
+
handleChange() {
|
31
|
+
this.setState({ ...this.store.getState() });
|
21
32
|
}
|
22
33
|
|
23
34
|
handleKeypress(evt) {
|
@@ -0,0 +1,12 @@
|
|
1
|
+
import { createStore } from "redux";
|
2
|
+
|
3
|
+
export default createStore((state = {}, action) => {
|
4
|
+
switch(action.type) {
|
5
|
+
case "OPEN":
|
6
|
+
return {...state, component: action.payload };
|
7
|
+
case "CLOSE":
|
8
|
+
return {...state, component: null };
|
9
|
+
default:
|
10
|
+
return state;
|
11
|
+
}
|
12
|
+
});
|
@@ -1,4 +1,8 @@
|
|
1
|
-
|
1
|
+
import React from "react";
|
2
|
+
import PropTypes from "prop-types";
|
3
|
+
import DateRangeSelect from "./DateRangeSelect";
|
4
|
+
|
5
|
+
export default class PageDates extends React.Component {
|
2
6
|
constructor(props) {
|
3
7
|
super(props);
|
4
8
|
this.state = {
|
@@ -56,3 +60,9 @@ class PageDates extends React.Component {
|
|
56
60
|
);
|
57
61
|
}
|
58
62
|
}
|
63
|
+
|
64
|
+
PageDates.propTypes = {
|
65
|
+
starts_at: PropTypes.string,
|
66
|
+
ends_at: PropTypes.string,
|
67
|
+
all_day: PropTypes.bool
|
68
|
+
};
|
@@ -1,4 +1,8 @@
|
|
1
|
-
|
1
|
+
import React from "react";
|
2
|
+
import PropTypes from "prop-types";
|
3
|
+
import Attachments from "./Attachments";
|
4
|
+
|
5
|
+
export default class PageFiles extends React.Component {
|
2
6
|
render() {
|
3
7
|
return (
|
4
8
|
<div className="page-files">
|
@@ -6,9 +10,14 @@ class PageFiles extends React.Component {
|
|
6
10
|
showEmbed={true}
|
7
11
|
locale={this.props.locale}
|
8
12
|
locales={this.props.locales}
|
9
|
-
csrf_token={this.props.csrf_token}
|
10
13
|
records={this.props.records} />
|
11
14
|
</div>
|
12
15
|
);
|
13
16
|
}
|
14
17
|
}
|
18
|
+
|
19
|
+
PageFiles.propTypes = {
|
20
|
+
locale: PropTypes.string,
|
21
|
+
locales: PropTypes.object,
|
22
|
+
records: PropTypes.array
|
23
|
+
};
|
@@ -1,4 +1,8 @@
|
|
1
|
-
|
1
|
+
import React from "react";
|
2
|
+
import PropTypes from "prop-types";
|
3
|
+
import ImageGrid from "./ImageGrid";
|
4
|
+
|
5
|
+
export default class PageImages extends React.Component {
|
2
6
|
render() {
|
3
7
|
return (
|
4
8
|
<div className="page-images">
|
@@ -8,9 +12,14 @@ class PageImages extends React.Component {
|
|
8
12
|
showEmbed={true}
|
9
13
|
locale={this.props.locale}
|
10
14
|
locales={this.props.locales}
|
11
|
-
csrf_token={this.props.csrf_token}
|
12
15
|
records={this.props.records} />
|
13
16
|
</div>
|
14
17
|
);
|
15
18
|
}
|
16
19
|
}
|
20
|
+
|
21
|
+
PageImages.propTypes = {
|
22
|
+
locale: PropTypes.string,
|
23
|
+
locales: PropTypes.object,
|
24
|
+
records: PropTypes.array
|
25
|
+
};
|