pages_core 3.5.1 → 3.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/README.md +7 -13
- data/app/assets/javascripts/pages/{admin.es6.jsx → admin.jsx} +2 -4
- data/app/assets/javascripts/pages/admin/components.jsx +2 -0
- data/app/assets/javascripts/pages/admin/components/attachment.jsx +130 -0
- data/app/assets/javascripts/pages/admin/components/attachment_editor.jsx +131 -0
- data/app/assets/javascripts/pages/admin/components/attachments.jsx +211 -0
- data/app/assets/javascripts/pages/admin/components/date_range_select.jsx +174 -0
- data/app/assets/javascripts/pages/admin/components/drag_uploader.jsx +174 -0
- data/app/assets/javascripts/pages/admin/components/editable_image.jsx +57 -0
- data/app/assets/javascripts/pages/admin/components/file_upload_button.jsx +44 -0
- data/app/assets/javascripts/pages/admin/components/focal_point.jsx +82 -0
- data/app/assets/javascripts/pages/admin/components/grid_image.jsx +124 -0
- data/app/assets/javascripts/pages/admin/components/image_editor.jsx +496 -0
- data/app/assets/javascripts/pages/admin/components/image_grid.jsx +301 -0
- data/app/assets/javascripts/pages/admin/components/image_uploader.jsx +171 -0
- data/app/assets/javascripts/pages/admin/components/modal.jsx +48 -0
- data/app/assets/javascripts/pages/admin/components/modal_store.jsx +20 -0
- data/app/assets/javascripts/pages/admin/components/page_dates.jsx +58 -0
- data/app/assets/javascripts/pages/admin/components/page_files.jsx +14 -0
- data/app/assets/javascripts/pages/admin/components/page_images.jsx +16 -0
- data/app/assets/javascripts/pages/admin/components/{page_tree.es6.jsx → page_tree.jsx} +7 -37
- data/app/assets/javascripts/pages/admin/components/{page_tree_node.es6.jsx → page_tree_node.jsx} +32 -10
- data/app/assets/javascripts/pages/admin/components/page_tree_store.jsx +203 -0
- data/app/assets/javascripts/pages/admin/components/rich_text_area.jsx +63 -0
- data/app/assets/javascripts/pages/admin/components/rich_text_toolbar.jsx +58 -0
- data/app/assets/javascripts/pages/admin/components/toast.jsx +37 -0
- data/app/assets/javascripts/pages/admin/components/toast_store.jsx +52 -0
- data/app/assets/javascripts/pages/admin/features/{content_tabs.es6.jsx → content_tabs.jsx} +11 -2
- data/app/assets/javascripts/pages/admin/features/{edit_page.es6.jsx → edit_page.jsx} +7 -51
- data/app/assets/javascripts/pages/admin/features/rich_text.jsx +14 -0
- data/app/assets/javascripts/pages/admin/features/{tag_editor.es6.jsx → tag_editor.jsx} +0 -0
- data/app/assets/javascripts/pages/admin/lib/{tree.es6.jsx → tree.jsx} +0 -0
- data/app/assets/javascripts/pages/{login_form.es6.jsx → login_form.jsx} +0 -0
- data/app/assets/stylesheets/pages/admin.scss +9 -13
- data/app/assets/stylesheets/pages/admin/components/archive.scss +6 -0
- data/app/assets/stylesheets/pages/admin/components/attachments.scss +130 -0
- data/app/assets/stylesheets/pages/admin/components/buttons.scss +18 -0
- data/app/assets/stylesheets/pages/admin/components/forms.scss +99 -21
- data/app/assets/stylesheets/pages/admin/components/header.scss +16 -28
- data/app/assets/stylesheets/pages/admin/components/image_editor.scss +195 -0
- data/app/assets/stylesheets/pages/admin/components/image_grid.scss +181 -0
- data/app/assets/stylesheets/pages/admin/components/image_uploader.scss +53 -0
- data/app/assets/stylesheets/pages/admin/components/links.scss +1 -1
- data/app/assets/stylesheets/pages/admin/components/list_table.scss +8 -5
- data/app/assets/stylesheets/pages/admin/components/login.scss +2 -8
- data/app/assets/stylesheets/pages/admin/components/modal.scss +91 -0
- data/app/assets/stylesheets/pages/admin/components/page_tree.scss +12 -6
- data/app/assets/stylesheets/pages/admin/components/pagination.scss +34 -16
- data/app/assets/stylesheets/pages/admin/components/sidebar.scss +9 -6
- data/app/assets/stylesheets/pages/admin/components/tag_editor.scss +20 -15
- data/app/assets/stylesheets/pages/admin/components/textarea.scss +1 -71
- data/app/assets/stylesheets/pages/admin/components/toast.scss +51 -0
- data/app/assets/stylesheets/pages/admin/components/toolbar.scss +108 -0
- data/app/assets/stylesheets/pages/admin/controllers/pages.scss +9 -21
- data/app/assets/stylesheets/pages/admin/controllers/users.scss +2 -2
- data/app/assets/stylesheets/pages/admin/vars.scss +26 -4
- data/app/controller_dummies/admin/admin_controller.rb +0 -2
- data/app/controller_dummies/application_controller.rb +2 -4
- data/app/controller_dummies/attachments_controller.rb +2 -0
- data/app/controller_dummies/frontend_controller.rb +0 -2
- data/app/controller_dummies/images_controller.rb +0 -2
- data/app/controller_dummies/page_files_controller.rb +0 -2
- data/app/controller_dummies/pages_controller.rb +0 -2
- data/app/controller_dummies/sitemaps_controller.rb +0 -2
- data/app/controllers/admin/attachments_controller.rb +48 -0
- data/app/controllers/admin/categories_controller.rb +2 -5
- data/app/controllers/admin/images_controller.rb +25 -19
- data/app/controllers/admin/invites_controller.rb +16 -26
- data/app/controllers/admin/pages_controller.rb +50 -32
- data/app/controllers/admin/password_resets_controller.rb +11 -18
- data/app/controllers/admin/users_controller.rb +16 -22
- data/app/controllers/concerns/pages_core/admin/news_page_controller.rb +21 -14
- data/app/controllers/concerns/pages_core/authentication.rb +0 -2
- data/app/controllers/concerns/pages_core/domain_based_cache.rb +0 -2
- data/app/controllers/concerns/pages_core/error_renderer.rb +33 -0
- data/app/controllers/concerns/pages_core/policies_helper.rb +9 -13
- data/app/controllers/concerns/pages_core/preview_pages_controller.rb +3 -5
- data/app/controllers/concerns/pages_core/process_titler.rb +1 -3
- data/app/controllers/concerns/pages_core/rss_controller.rb +0 -2
- data/app/controllers/errors_controller.rb +52 -26
- data/app/controllers/pages_core/admin_controller.rb +22 -13
- data/app/controllers/pages_core/attachments_controller.rb +36 -0
- data/app/controllers/pages_core/{application_controller.rb → base_controller.rb} +16 -5
- data/app/controllers/pages_core/frontend/page_files_controller.rb +5 -24
- data/app/controllers/pages_core/frontend/pages_controller.rb +4 -8
- data/app/controllers/pages_core/frontend_controller.rb +0 -2
- data/app/controllers/pages_core/images_controller.rb +0 -2
- data/app/controllers/pages_core/sitemaps_controller.rb +3 -5
- data/app/controllers/sessions_controller.rb +3 -15
- data/app/formatters/pages_core/html_formatter.rb +60 -16
- data/app/formatters/pages_core/link_renderer.rb +15 -0
- data/app/helpers/admin/admin_helper.rb +0 -2
- data/app/helpers/admin/menu_helper.rb +2 -4
- data/app/helpers/admin/pages_helper.rb +47 -9
- data/app/helpers/application_helper.rb +0 -2
- data/app/helpers/frontend_helper.rb +0 -2
- data/app/helpers/pages_core/admin/admin_helper.rb +75 -20
- data/app/helpers/pages_core/admin/form_builder.rb +36 -0
- data/app/helpers/pages_core/admin/labelled_field_helper.rb +6 -8
- data/app/helpers/pages_core/admin/tag_editor_helper.rb +0 -2
- data/app/helpers/pages_core/application_helper.rb +1 -2
- data/app/helpers/pages_core/attachments_helper.rb +36 -0
- data/app/helpers/pages_core/form_builder.rb +7 -11
- data/app/helpers/pages_core/frontend_helper.rb +0 -6
- data/app/helpers/pages_core/head_tags_helper.rb +8 -4
- data/app/helpers/pages_core/images_helper.rb +0 -2
- data/app/helpers/pages_core/meta_tags_helper.rb +3 -5
- data/app/helpers/pages_core/open_graph_tags_helper.rb +1 -3
- data/app/helpers/pages_core/page_path_helper.rb +14 -9
- data/app/jobs/pages_core/autopublish_job.rb +0 -2
- data/app/jobs/pages_core/sweep_cache_job.rb +0 -2
- data/app/mailers/admin_mailer.rb +3 -16
- data/app/models/attachment.rb +76 -0
- data/app/models/autopublisher.rb +3 -3
- data/app/models/category.rb +0 -3
- data/app/models/concerns/pages_core/has_roles.rb +1 -2
- data/app/models/concerns/pages_core/humanizable_param.rb +4 -4
- data/app/models/concerns/pages_core/page_model/attachments.rb +39 -0
- data/app/models/concerns/pages_core/page_model/autopublishable.rb +0 -2
- data/app/models/concerns/pages_core/page_model/dated_page.rb +59 -0
- data/app/models/concerns/pages_core/page_model/images.rb +12 -15
- data/app/models/concerns/pages_core/page_model/localizable.rb +10 -3
- data/app/models/concerns/pages_core/page_model/pathable.rb +8 -10
- data/app/models/concerns/pages_core/page_model/redirectable.rb +0 -2
- data/app/models/concerns/pages_core/page_model/sortable.rb +1 -3
- data/app/models/concerns/pages_core/page_model/status.rb +1 -3
- data/app/models/concerns/pages_core/page_model/templateable.rb +2 -4
- data/app/models/concerns/pages_core/page_model/tree.rb +24 -5
- data/app/models/concerns/pages_core/sweepable.rb +0 -2
- data/app/models/concerns/pages_core/taggable.rb +4 -3
- data/app/models/image.rb +1 -0
- data/app/models/invite.rb +0 -10
- data/app/models/page.rb +17 -21
- data/app/models/page_builder.rb +0 -2
- data/app/models/page_category.rb +0 -2
- data/app/models/page_exporter.rb +87 -0
- data/app/models/page_file.rb +24 -48
- data/app/models/page_image.rb +3 -37
- data/app/models/page_path.rb +0 -2
- data/app/models/password_reset_token.rb +0 -4
- data/app/models/role.rb +15 -2
- data/app/models/tag.rb +15 -6
- data/app/models/tagging.rb +1 -3
- data/app/models/user.rb +29 -25
- data/app/policies/page_file_policy.rb +13 -17
- data/app/policies/page_image_policy.rb +13 -17
- data/app/policies/page_policy.rb +26 -26
- data/app/policies/policy.rb +2 -8
- data/app/policies/user_policy.rb +32 -32
- data/app/serializers/admin/attachment_serializer.rb +29 -0
- data/app/serializers/admin/image_serializer.rb +53 -6
- data/app/serializers/admin/page_file_serializer.rb +6 -0
- data/app/serializers/admin/page_image_serializer.rb +1 -1
- data/app/serializers/page_export_serializer.rb +30 -0
- data/app/serializers/page_file_export_serializer.rb +4 -0
- data/app/serializers/page_image_export_serializer.rb +40 -0
- data/app/serializers/page_image_serializer.rb +2 -0
- data/app/services/pages_core/create_user_service.rb +36 -0
- data/app/services/pages_core/invite_service.rb +41 -0
- data/app/views/admin/images/show.json.jbuilder +6 -0
- data/app/views/admin/pages/_edit_content.html.erb +7 -0
- data/app/views/admin/pages/_edit_files.html.erb +8 -0
- data/app/views/admin/pages/_edit_images.html.erb +8 -95
- data/app/views/admin/pages/_edit_options.html.erb +7 -15
- data/app/views/admin/pages/_list_item.html.erb +50 -0
- data/app/views/admin/pages/deleted.html.erb +42 -0
- data/app/views/admin/pages/edit.html.erb +9 -94
- data/app/views/admin/pages/index.html.erb +9 -12
- data/app/views/admin/pages/new.html.erb +2 -1
- data/app/views/admin/pages/news.html.erb +59 -45
- data/app/views/admin/password_resets/show.html.erb +6 -9
- data/app/views/admin/users/_access_control.html.erb +4 -1
- data/app/views/admin/users/_list.html.erb +12 -7
- data/app/views/admin/users/edit.html.erb +5 -11
- data/app/views/admin/users/login.html.erb +58 -15
- data/app/views/admin/users/show.html.erb +1 -1
- data/app/views/admin_mailer/invite.text.erb +1 -1
- data/app/views/admin_mailer/password_reset.text.erb +1 -1
- data/app/views/errors/401.html.erb +6 -0
- data/app/views/errors/403.html.erb +1 -1
- data/app/views/errors/500.html.erb +11 -6
- data/app/views/errors/500_critical.html.erb +1 -1
- data/app/views/feeds/pages.rss.builder +1 -3
- data/app/views/layouts/admin.html.erb +83 -83
- data/app/views/layouts/admin/_analytics.html.erb +1 -3
- data/app/views/layouts/admin/_header.html.erb +2 -2
- data/app/views/layouts/errors.html.erb +3 -7
- data/config/locales/en.yml +12 -0
- data/config/routes.rb +38 -55
- data/db/migrate/20111219033112_create_pages_tables.rb +6 -8
- data/db/migrate/20120627033112_rename_textbits.rb +1 -3
- data/db/migrate/20121010055412_drop_removed_tables.rb +1 -3
- data/db/migrate/20130130053932_add_queue_to_delayed_jobs.rb +1 -3
- data/db/migrate/20130303053932_remove_filter_from_localizations.rb +1 -3
- data/db/migrate/20130303160632_remove_imagesets.rb +1 -3
- data/db/migrate/20130303161732_remove_sms_subscribers.rb +1 -3
- data/db/migrate/20130823133208_update_page_redirect_to.rb +1 -3
- data/db/migrate/20140203183900_create_roles.rb +1 -1
- data/db/migrate/20140414150500_change_locale_names.rb +1 -3
- data/db/migrate/20140604142100_remove_openid_url.rb +1 -1
- data/db/migrate/20140920231700_convert_images_to_dis.rb +1 -1
- data/db/migrate/20140922124600_convert_page_files_to_dis.rb +1 -1
- data/db/migrate/20141004003100_create_password_reset_tokens.rb +1 -1
- data/db/migrate/20141006181300_remove_user_cruft.rb +1 -1
- data/db/migrate/20141007173000_create_invites.rb +1 -1
- data/db/migrate/20150204130800_update_delayed_job_table.rb +1 -1
- data/db/migrate/20150401131300_localize_images.rb +1 -1
- data/db/migrate/20150520174300_add_meta_image_to_page.rb +1 -1
- data/db/migrate/20150904164200_add_pinned_to_tags.rb +1 -1
- data/db/migrate/20151002174800_create_page_paths.rb +2 -2
- data/db/migrate/20151021103400_drop_binaries_table.rb +1 -1
- data/db/migrate/20151204151000_remove_page_content_order.rb +1 -1
- data/db/migrate/20160330220900_rename_pages_categories.rb +1 -1
- data/db/migrate/20160405202700_change_localization_limit.rb +1 -1
- data/db/migrate/20170716040500_remove_page_comments.rb +23 -0
- data/db/migrate/20170716213400_remove_sessions.rb +15 -0
- data/db/migrate/20180207134000_add_dates_to_pages.rb +11 -0
- data/db/migrate/20190211154800_create_attachments.rb +73 -0
- data/lib/pages_core.rb +6 -9
- data/lib/pages_core/admin_menu_item.rb +0 -2
- data/lib/pages_core/archive_finder.rb +21 -15
- data/lib/pages_core/attachment_embedder.rb +38 -0
- data/lib/pages_core/cache_sweeper.rb +14 -23
- data/lib/pages_core/configuration.rb +0 -2
- data/lib/pages_core/configuration/base.rb +0 -2
- data/lib/pages_core/configuration/pages.rb +2 -8
- data/lib/pages_core/digest_verifier.rb +70 -0
- data/lib/pages_core/engine.rb +6 -13
- data/lib/pages_core/extensions.rb +0 -3
- data/lib/pages_core/extensions/string_extensions.rb +0 -2
- data/lib/pages_core/page_path_constraint.rb +0 -2
- data/lib/pages_core/pages_plugin.rb +0 -2
- data/lib/pages_core/plugin.rb +0 -2
- data/lib/pages_core/pub_sub.rb +36 -0
- data/lib/pages_core/templates.rb +0 -2
- data/lib/pages_core/templates/block_configuration.rb +1 -3
- data/lib/pages_core/templates/configuration.rb +88 -10
- data/lib/pages_core/templates/configuration_handler.rb +6 -4
- data/lib/pages_core/templates/configuration_proxy.rb +4 -2
- data/lib/pages_core/templates/controller_actions.rb +0 -2
- data/lib/pages_core/templates/template_configuration.rb +41 -37
- data/lib/pages_core/version.rb +1 -3
- data/lib/rails/generators/pages_core/frontend/frontend_generator.rb +10 -17
- data/lib/rails/generators/pages_core/frontend/templates/application.js.erb +1 -2
- data/lib/rails/generators/pages_core/frontend/templates/{application.css.scss.erb → application.scss.erb} +0 -0
- data/lib/rails/generators/pages_core/frontend/templates/{base.css.scss.erb → base.scss.erb} +0 -0
- data/lib/rails/generators/pages_core/frontend/templates/{breakpoints.css.scss.erb → breakpoints.scss.erb} +0 -0
- data/lib/rails/generators/pages_core/frontend/templates/clearfix.scss.erb +7 -0
- data/lib/rails/generators/pages_core/frontend/templates/layout.html.erb +0 -3
- data/lib/rails/generators/pages_core/install/install_generator.rb +4 -15
- data/lib/rails/generators/pages_core/install/templates/application_controller.rb +1 -3
- data/lib/rails/generators/pages_core/install/templates/application_helper.rb +0 -2
- data/lib/rails/generators/pages_core/install/templates/cache_sweeper_initializer.rb +0 -5
- data/lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb +0 -2
- data/lib/rails/generators/pages_core/install/templates/frontend_controller.rb +0 -2
- data/lib/rails/generators/pages_core/install/templates/frontend_helper.rb +0 -2
- data/lib/rails/generators/pages_core/install/templates/page_templates_initializer.rb +7 -15
- data/lib/rails/generators/pages_core/install/templates/pages_controller.rb +0 -2
- data/lib/rails/generators/pages_core/install/templates/pages_initializer.rb +2 -19
- data/lib/rails/generators/pages_core/rspec/rspec_generator.rb +2 -4
- data/lib/rails/generators/pages_core/rspec/templates/factories.rb +1 -1
- data/lib/rails/generators/pages_core/rspec/templates/spec_helper.rb +4 -13
- data/lib/tasks/pages.rake +0 -62
- data/lib/tasks/pages/cache.rake +6 -2
- data/lib/tasks/pages/export.rake +9 -0
- data/lib/tasks/pages/page_paths.rake +0 -2
- data/lib/tasks/pages/update.rake +0 -2
- data/template.rb +3 -3
- data/vendor/assets/javascripts/ReactCrop.min.js +1 -0
- data/vendor/assets/javascripts/reflux.min.js +1 -1
- data/vendor/assets/stylesheets/ReactCrop.css +167 -0
- metadata +200 -175
- data/app/assets/javascripts/pages/admin/components.es6.jsx +0 -1
- data/app/assets/javascripts/pages/admin/components/page_tree_actions.es6.jsx +0 -8
- data/app/assets/javascripts/pages/admin/components/page_tree_store.es6.jsx +0 -161
- data/app/assets/javascripts/pages/admin/features/editable_image.es6.jsx +0 -145
- data/app/assets/javascripts/pages/admin/features/modal.es6.jsx +0 -90
- data/app/assets/javascripts/pages/admin/features/page_images.es6.jsx +0 -338
- data/app/assets/javascripts/pages/admin/features/rich_text.es6.jsx +0 -124
- data/app/assets/javascripts/pages/admin/lib/ajax_extensions.es6.jsx +0 -21
- data/app/assets/javascripts/pages/admin/lib/center_on_screen.es6.jsx +0 -22
- data/app/assets/stylesheets/pages/admin/components/editable_image.scss +0 -18
- data/app/assets/stylesheets/pages/admin/components/images.scss +0 -155
- data/app/assets/stylesheets/pages/admin/print.scss +0 -17
- data/app/controllers/admin/page_comments_controller.rb +0 -61
- data/app/controllers/admin/page_files_controller.rb +0 -79
- data/app/controllers/admin/page_images_controller.rb +0 -111
- data/app/controllers/concerns/pages_core/add_comments_controller.rb +0 -67
- data/app/controllers/concerns/pages_core/exception_handler.rb +0 -137
- data/app/controllers/concerns/pages_core/search_pages_controller.rb +0 -40
- data/app/helpers/pages_core/login_helper.rb +0 -14
- data/app/indices/page_file_index.rb +0 -9
- data/app/indices/page_index.rb +0 -29
- data/app/indices/user_index.rb +0 -11
- data/app/models/concerns/pages_core/page_model/commentable.rb +0 -29
- data/app/models/concerns/pages_core/page_model/searchable.rb +0 -41
- data/app/models/page_comment.rb +0 -18
- data/app/serializers/page_tree_serializer.rb +0 -15
- data/app/views/admin/pages/_edit_comments.html.erb +0 -37
- data/app/views/admin/pages/_pagelisting.html.erb +0 -63
- data/app/views/admin/users/_login_form.html.erb +0 -47
- data/app/views/admin_mailer/comment_notification.text.erb +0 -7
- data/lib/pages_core/extensions/hash_extensions.rb +0 -23
- data/lib/pages_core/file_embedder.rb +0 -40
- data/lib/pages_core/paginates.rb +0 -102
- data/lib/rails/generators/pages_core/frontend/templates/hidpi.css.scss.erb +0 -8
- data/lib/rails/generators/pages_core/install/templates/thinking_sphinx.yml +0 -12
- data/lib/tasks/db.rake +0 -96
- data/lib/tasks/pages/assets.rake +0 -65
- data/vendor/assets/javascripts/jquery.dimscreen.js +0 -77
- data/vendor/assets/javascripts/jquery.fieldselection.js +0 -59
@@ -0,0 +1,301 @@
|
|
1
|
+
class ImageGrid extends DragUploader {
|
2
|
+
constructor(props) {
|
3
|
+
super(props);
|
4
|
+
|
5
|
+
this.validMimeTypes = ["image/gif",
|
6
|
+
"image/jpeg",
|
7
|
+
"image/pjpeg",
|
8
|
+
"image/png",
|
9
|
+
"image/tiff"];
|
10
|
+
|
11
|
+
let records = props.records.map(
|
12
|
+
r => ({ ...r, ref: React.createRef(), handle: this.getHandle() })
|
13
|
+
);
|
14
|
+
|
15
|
+
this.state = { ...this.state,
|
16
|
+
primary: null,
|
17
|
+
images: records,
|
18
|
+
deleted: [] };
|
19
|
+
|
20
|
+
if (props.enablePrimary) {
|
21
|
+
this.state = { ...this.state,
|
22
|
+
primary: records.filter(r => r.primary)[0] || null,
|
23
|
+
images: records.filter(r => !r.primary) };
|
24
|
+
}
|
25
|
+
|
26
|
+
this.container = React.createRef();
|
27
|
+
this.imagesContainer = React.createRef();
|
28
|
+
this.primaryContainer = React.createRef();
|
29
|
+
|
30
|
+
this.deleteImage = this.deleteImage.bind(this);
|
31
|
+
this.uploadAdditional = this.uploadAdditional.bind(this);
|
32
|
+
this.uploadPrimary = this.uploadPrimary.bind(this);
|
33
|
+
}
|
34
|
+
|
35
|
+
attributeName(record) {
|
36
|
+
return `${this.props.attribute}[${this.index(record) + 1}]`;
|
37
|
+
}
|
38
|
+
|
39
|
+
draggables() {
|
40
|
+
return this.state.images;
|
41
|
+
}
|
42
|
+
|
43
|
+
deleteImage(record) {
|
44
|
+
let { primary, images, deleted } = this.state;
|
45
|
+
if (record == this.state.primary) {
|
46
|
+
primary = null;
|
47
|
+
} else {
|
48
|
+
images = images.filter(i => i != record);
|
49
|
+
}
|
50
|
+
if (record.id) {
|
51
|
+
deleted = [...deleted, record];
|
52
|
+
}
|
53
|
+
this.setState({ primary: primary, images: images, deleted: deleted });
|
54
|
+
}
|
55
|
+
|
56
|
+
injectUploads(files, primary, images) {
|
57
|
+
let queue = files.slice();
|
58
|
+
if (primary === "Files") {
|
59
|
+
primary = queue.shift();
|
60
|
+
images = [...queue, ...images];
|
61
|
+
} else {
|
62
|
+
let source = images;
|
63
|
+
images = [];
|
64
|
+
source.forEach(function (img) {
|
65
|
+
if (img === "Files") {
|
66
|
+
images = [...images, ...queue];
|
67
|
+
} else {
|
68
|
+
images.push(img);
|
69
|
+
}
|
70
|
+
});
|
71
|
+
}
|
72
|
+
return { primary: primary, images: images };
|
73
|
+
}
|
74
|
+
|
75
|
+
receiveFiles(files, newState) {
|
76
|
+
var { primary, images } = this.getDraggedOrder();
|
77
|
+
|
78
|
+
if (files.length > 0) {
|
79
|
+
var { primary, images } = this.injectUploads(
|
80
|
+
files.map(f => this.uploadImage(f)), primary, images
|
81
|
+
);
|
82
|
+
}
|
83
|
+
|
84
|
+
this.setState({...newState, primary: primary, images: images});
|
85
|
+
}
|
86
|
+
|
87
|
+
index(record) {
|
88
|
+
let { primary, images, deleted } = this.state;
|
89
|
+
var ordered = [...images, ...deleted];
|
90
|
+
if (primary) {
|
91
|
+
ordered = [primary, ...ordered];
|
92
|
+
}
|
93
|
+
return ordered.indexOf(record);
|
94
|
+
}
|
95
|
+
|
96
|
+
renderDrag() {
|
97
|
+
let record = this.state.dragging;
|
98
|
+
if (record === "Files") {
|
99
|
+
return "";
|
100
|
+
} else {
|
101
|
+
let containerSize = this.container.current.getBoundingClientRect();
|
102
|
+
let x = this.state.x - (containerSize.x || containerSize.left);
|
103
|
+
let y = this.state.y - (containerSize.y || containerSize.top);
|
104
|
+
let translateStyle = {
|
105
|
+
transform: `translate3d(${x}px, ${y}px, 0)`
|
106
|
+
};
|
107
|
+
return (
|
108
|
+
<div className="drag-image" style={translateStyle}>
|
109
|
+
{record.image && (
|
110
|
+
<img src={record.src || record.image.thumbnail_url} />
|
111
|
+
)}
|
112
|
+
</div>
|
113
|
+
);
|
114
|
+
}
|
115
|
+
}
|
116
|
+
|
117
|
+
getDraggedOrder() {
|
118
|
+
let dragging = this.state.dragging;
|
119
|
+
var primary = this.state.primary;
|
120
|
+
var images = this.state.images;
|
121
|
+
if (dragging) {
|
122
|
+
if (this.hovering(this.primaryContainer)) {
|
123
|
+
images = [primary, ...images].filter(
|
124
|
+
r => r !== null && r !== dragging
|
125
|
+
);
|
126
|
+
primary = dragging;
|
127
|
+
} else if (this.hovering(this.imagesContainer)) {
|
128
|
+
images = [];
|
129
|
+
if (dragging === primary) {
|
130
|
+
primary = null;
|
131
|
+
}
|
132
|
+
this.state.images.filter(r => r !== dragging).forEach(r => {
|
133
|
+
if (this.hovering(r) && images.indexOf(dragging) === -1) {
|
134
|
+
images.push(dragging);
|
135
|
+
}
|
136
|
+
images.push(r);
|
137
|
+
});
|
138
|
+
if (images.indexOf(dragging) === -1) {
|
139
|
+
images.push(dragging);
|
140
|
+
}
|
141
|
+
} else {
|
142
|
+
if (dragging === primary) {
|
143
|
+
primary = null;
|
144
|
+
}
|
145
|
+
images = this.state.images.filter(r => r !== dragging);
|
146
|
+
if (this.state.y < this.imagesContainer.current.getBoundingClientRect().top) {
|
147
|
+
images = [dragging, ...images];
|
148
|
+
} else {
|
149
|
+
images.push(dragging);
|
150
|
+
}
|
151
|
+
}
|
152
|
+
}
|
153
|
+
return { primary: primary, images: images };
|
154
|
+
}
|
155
|
+
|
156
|
+
renderImage(record, primary) {
|
157
|
+
let dragging = this.state.dragging;
|
158
|
+
if (record === "Files") {
|
159
|
+
return (
|
160
|
+
<div className="grid-image" key="file-placeholder">
|
161
|
+
<div className="file-placeholder" />
|
162
|
+
</div>
|
163
|
+
);
|
164
|
+
}
|
165
|
+
|
166
|
+
let onUpdate = (image, src) => {
|
167
|
+
this.updateImage(record, { image: image, src: src });
|
168
|
+
};
|
169
|
+
|
170
|
+
return (
|
171
|
+
<GridImage key={record.handle}
|
172
|
+
record={record}
|
173
|
+
locale={this.props.locale}
|
174
|
+
locales={this.props.locales}
|
175
|
+
csrf_token={this.props.csrf_token}
|
176
|
+
showEmbed={this.props.showEmbed}
|
177
|
+
startDrag={this.startDrag}
|
178
|
+
position={this.index(record) + 1}
|
179
|
+
primary={primary}
|
180
|
+
onUpdate={onUpdate}
|
181
|
+
enablePrimary={this.props.enablePrimary}
|
182
|
+
deleteImage={this.deleteImage}
|
183
|
+
attributeName={this.attributeName(record)}
|
184
|
+
placeholder={dragging && dragging == record} />
|
185
|
+
);
|
186
|
+
}
|
187
|
+
|
188
|
+
render() {
|
189
|
+
let { dragging, deleted } = this.state;
|
190
|
+
let { primary, images } = this.getDraggedOrder();
|
191
|
+
return (
|
192
|
+
<div className="image-grid"
|
193
|
+
ref={this.container}
|
194
|
+
onDragOver={this.drag}
|
195
|
+
onDrop={this.dragEnd}>
|
196
|
+
{dragging && this.renderDrag()}
|
197
|
+
{this.props.enablePrimary && (
|
198
|
+
<div className="primary-image" ref={this.primaryContainer}>
|
199
|
+
<h3>
|
200
|
+
Main image
|
201
|
+
</h3>
|
202
|
+
{primary && this.renderImage(primary, true)}
|
203
|
+
{!primary && (
|
204
|
+
<div className="drop-target">
|
205
|
+
<FileUploadButton multiple={true}
|
206
|
+
type="image"
|
207
|
+
multiline={true}
|
208
|
+
callback={this.uploadPrimary} />
|
209
|
+
</div>
|
210
|
+
)}
|
211
|
+
{this.props.primaryAttribute && (
|
212
|
+
<input type="hidden" name={this.props.primaryAttribute}
|
213
|
+
value={(primary && primary.image && primary.image.id) || ""} />
|
214
|
+
)}
|
215
|
+
</div>
|
216
|
+
)}
|
217
|
+
<div className="grid" ref={this.imagesContainer}>
|
218
|
+
<h3>
|
219
|
+
{this.props.enablePrimary ? "More images" : "Images"}
|
220
|
+
</h3>
|
221
|
+
<div className="drop-target">
|
222
|
+
<FileUploadButton multiple={true}
|
223
|
+
type="image"
|
224
|
+
callback={this.uploadAdditional} />
|
225
|
+
</div>
|
226
|
+
<div className="images">
|
227
|
+
{images.map(r => this.renderImage(r, false))}
|
228
|
+
</div>
|
229
|
+
</div>
|
230
|
+
<div className="deleted">
|
231
|
+
{deleted.map(r => this.renderDeletedImage(r))}
|
232
|
+
</div>
|
233
|
+
</div>
|
234
|
+
);
|
235
|
+
}
|
236
|
+
|
237
|
+
renderDeletedImage(record) {
|
238
|
+
let image = record.image;
|
239
|
+
let attrName = this.attributeName(record);
|
240
|
+
return (
|
241
|
+
<span className="deleted-image" key={`deleted-${record.id}`}>
|
242
|
+
<input name={`${attrName}[id]`}
|
243
|
+
type="hidden" value={record.id} />
|
244
|
+
<input name={`${attrName}[image_id]`}
|
245
|
+
type="hidden" value={(image && image.id) || ""} />
|
246
|
+
<input name={`${attrName}[_destroy]`}
|
247
|
+
type="hidden" value={true} />
|
248
|
+
</span>
|
249
|
+
);
|
250
|
+
}
|
251
|
+
|
252
|
+
updateImage(record, attrs) {
|
253
|
+
if (this.state.primary === record) {
|
254
|
+
this.setState({ primary: { ...record, ...attrs } });
|
255
|
+
} else {
|
256
|
+
let images = this.state.images.slice();
|
257
|
+
images[images.indexOf(record)] = { ...record, ...attrs };
|
258
|
+
this.setState({ images: images });
|
259
|
+
}
|
260
|
+
}
|
261
|
+
|
262
|
+
uploadImage(file) {
|
263
|
+
let component = this;
|
264
|
+
var obj = { image: null, file: file, ref: React.createRef(),
|
265
|
+
handle: this.getHandle() };
|
266
|
+
|
267
|
+
let data = new FormData();
|
268
|
+
|
269
|
+
data.append("image[file]", file);
|
270
|
+
this.postFile("/admin/images.json", data, function (json) {
|
271
|
+
let preloader = new Image();
|
272
|
+
obj.file = null;
|
273
|
+
obj.image = json;
|
274
|
+
preloader.onload = () => component.setState({});
|
275
|
+
preloader.src = obj.image.thumbnail_url;
|
276
|
+
});
|
277
|
+
|
278
|
+
return obj;
|
279
|
+
}
|
280
|
+
|
281
|
+
uploadAdditional(files) {
|
282
|
+
this.setState({
|
283
|
+
images: [...this.state.images,
|
284
|
+
...files.map(f => this.uploadImage(f))]
|
285
|
+
});
|
286
|
+
}
|
287
|
+
|
288
|
+
uploadPrimary(files) {
|
289
|
+
let uploadedFiles = files.map(f => this.uploadImage(f));
|
290
|
+
var primary = this.state.primary;
|
291
|
+
var images = this.state.images;
|
292
|
+
if (primary) {
|
293
|
+
images = [primary, ...images];
|
294
|
+
}
|
295
|
+
primary = uploadedFiles[0];
|
296
|
+
if (uploadedFiles.length > 1) {
|
297
|
+
images = [...uploadedFiles.slice(1), ...images];
|
298
|
+
}
|
299
|
+
this.setState({ primary: primary, images: images });
|
300
|
+
}
|
301
|
+
}
|
@@ -0,0 +1,171 @@
|
|
1
|
+
class ImageUploader extends React.Component {
|
2
|
+
constructor(props) {
|
3
|
+
super(props);
|
4
|
+
this.state = { dragover: false,
|
5
|
+
uploading: false,
|
6
|
+
image: props.image,
|
7
|
+
src: props.src };
|
8
|
+
this.receiveFiles = this.receiveFiles.bind(this);
|
9
|
+
this.removeImage = this.removeImage.bind(this);
|
10
|
+
this.dragOver = this.dragOver.bind(this);
|
11
|
+
this.dragLeave = this.dragLeave.bind(this);
|
12
|
+
this.dragEnd = this.dragEnd.bind(this);
|
13
|
+
this.drop = this.drop.bind(this);
|
14
|
+
}
|
15
|
+
|
16
|
+
receiveFiles(files) {
|
17
|
+
if (files.length > 0) {
|
18
|
+
this.uploadImage(files[0]);
|
19
|
+
}
|
20
|
+
}
|
21
|
+
|
22
|
+
clearItems(dt) {
|
23
|
+
if (dt.items) {
|
24
|
+
for (var i = 0; i < dt.items.length; i++) {
|
25
|
+
dt.items.remove(i);
|
26
|
+
}
|
27
|
+
} else {
|
28
|
+
dt.clearData();
|
29
|
+
}
|
30
|
+
}
|
31
|
+
|
32
|
+
dragOver(evt) {
|
33
|
+
evt.preventDefault();
|
34
|
+
this.setState({ dragover: true });
|
35
|
+
}
|
36
|
+
|
37
|
+
dragLeave() {
|
38
|
+
this.setState({ dragover: false });
|
39
|
+
}
|
40
|
+
|
41
|
+
dragEnd(evt) {
|
42
|
+
clearItems(evt.dataTransfer);
|
43
|
+
this.setState({ dragover: false });
|
44
|
+
}
|
45
|
+
|
46
|
+
drop(evt) {
|
47
|
+
let files = this.getFiles(evt.dataTransfer);
|
48
|
+
evt.preventDefault();
|
49
|
+
if (files.length > 0) {
|
50
|
+
this.uploadImage(files[0]);
|
51
|
+
}
|
52
|
+
}
|
53
|
+
|
54
|
+
editableImage() {
|
55
|
+
let image = this.state.image;
|
56
|
+
if (!image) { return; }
|
57
|
+
return (
|
58
|
+
<div className="image">
|
59
|
+
<EditableImage image={image}
|
60
|
+
src={this.state.src}
|
61
|
+
width={this.props.width}
|
62
|
+
caption={this.props.caption}
|
63
|
+
locale={this.props.locale}
|
64
|
+
locales={this.props.locales}
|
65
|
+
csrf_token={this.props.csrf_token} />
|
66
|
+
</div>
|
67
|
+
);
|
68
|
+
}
|
69
|
+
|
70
|
+
getFiles(dt) {
|
71
|
+
var files = [];
|
72
|
+
if (dt.items) {
|
73
|
+
for (var i = 0; i < dt.items.length; i++) {
|
74
|
+
if (dt.items[i].kind == "file") {
|
75
|
+
files.push(dt.items[i].getAsFile());
|
76
|
+
}
|
77
|
+
}
|
78
|
+
} else {
|
79
|
+
for (var i = 0; i < dt.files.length; i++) {
|
80
|
+
files.push(dt.files[i]);
|
81
|
+
}
|
82
|
+
}
|
83
|
+
return files;
|
84
|
+
}
|
85
|
+
|
86
|
+
render() {
|
87
|
+
let image = this.state.image;
|
88
|
+
let id = image ? image.id : "";
|
89
|
+
let classes = ["image-uploader"];
|
90
|
+
if (this.state.uploading) {
|
91
|
+
classes.push("uploading");
|
92
|
+
} else if (this.state.dragover) {
|
93
|
+
classes.push("dragover");
|
94
|
+
}
|
95
|
+
return (
|
96
|
+
<div className={classes.join(" ")}
|
97
|
+
onDragOver={this.dragOver}
|
98
|
+
onDragLeave={this.dragLeave}
|
99
|
+
onDragEnd={this.dragEnd}
|
100
|
+
onDrop={this.drop}>
|
101
|
+
<input type="hidden"
|
102
|
+
name={this.props.attr}
|
103
|
+
value={id} />
|
104
|
+
{this.editableImage()}
|
105
|
+
<div className="ui-wrapper">
|
106
|
+
{this.state.uploading && (
|
107
|
+
<div className="ui">
|
108
|
+
Uploading image...
|
109
|
+
</div>
|
110
|
+
)}
|
111
|
+
{!this.state.uploading && (
|
112
|
+
<div className="ui">
|
113
|
+
<FileUploadButton type="image"
|
114
|
+
multiline={true}
|
115
|
+
callback={this.receiveFiles} />
|
116
|
+
{image && (
|
117
|
+
<a className="delete remove-image"
|
118
|
+
href="#"
|
119
|
+
onClick={this.removeImage}>
|
120
|
+
Remove image
|
121
|
+
</a>
|
122
|
+
)}
|
123
|
+
</div>
|
124
|
+
)}
|
125
|
+
</div>
|
126
|
+
</div>
|
127
|
+
);
|
128
|
+
}
|
129
|
+
|
130
|
+
removeImage(evt) {
|
131
|
+
evt.preventDefault();
|
132
|
+
this.setState({image: null, src: null});
|
133
|
+
}
|
134
|
+
|
135
|
+
uploadImage(file) {
|
136
|
+
let validTypes = ["image/gif",
|
137
|
+
"image/jpeg",
|
138
|
+
"image/pjpeg",
|
139
|
+
"image/png",
|
140
|
+
"image/tiff"];
|
141
|
+
|
142
|
+
if (validTypes.indexOf(file.type) == -1) {
|
143
|
+
alert("Invalid file type, only images in JPEG, PNG or GIF " +
|
144
|
+
"formats are supported");
|
145
|
+
return;
|
146
|
+
}
|
147
|
+
|
148
|
+
let locale = this.props.locale;
|
149
|
+
let locales = this.props.locales ? Object.keys(this.props.locales) : [locale];
|
150
|
+
|
151
|
+
let component = this;
|
152
|
+
let xhr = new XMLHttpRequest();
|
153
|
+
let data = new FormData();
|
154
|
+
this.setState({ image: null, src: null, dragover: false, uploading: true });
|
155
|
+
data.append("image[file]", file);
|
156
|
+
locales.forEach((l) => {
|
157
|
+
data.append(`image[alternative][${l}]`, this.props.alternative);
|
158
|
+
});
|
159
|
+
xhr.open("POST", "/admin/images.json");
|
160
|
+
xhr.setRequestHeader("X-CSRF-Token", this.props.csrf_token);
|
161
|
+
xhr.addEventListener("load", function (evt) {
|
162
|
+
if (xhr.readyState == 4 && xhr.status == "200") {
|
163
|
+
let image = JSON.parse(xhr.responseText);
|
164
|
+
component.setState({ uploading: false,
|
165
|
+
image: image,
|
166
|
+
src: image.thumbnail_url });
|
167
|
+
}
|
168
|
+
});
|
169
|
+
xhr.send(data);
|
170
|
+
}
|
171
|
+
}
|