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.
Files changed (330) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -3
  3. data/Rakefile +3 -1
  4. data/app/assets/builds/pages_core/admin-dist.js +55 -0
  5. data/app/assets/stylesheets/pages/admin/components/forms.scss +20 -0
  6. data/app/assets/stylesheets/pages/admin/components/image_editor.scss +1 -0
  7. data/app/assets/stylesheets/pages/admin/components/image_grid.scss +33 -5
  8. data/app/assets/stylesheets/pages/admin/components/layout.scss +2 -1
  9. data/app/assets/stylesheets/pages/admin/components/login.scss +6 -0
  10. data/app/assets/stylesheets/pages/admin/components/tabs.scss +5 -0
  11. data/app/assets/stylesheets/pages/admin/components/tag_editor.scss +13 -7
  12. data/app/assets/stylesheets/pages/admin/controllers/pages.scss +13 -5
  13. data/app/assets/stylesheets/pages/admin.scss +0 -1
  14. data/app/assets/stylesheets/pages/errors.css +2 -0
  15. data/app/controller_dummies/admin/admin_controller.rb +3 -1
  16. data/app/controller_dummies/application_controller.rb +3 -1
  17. data/app/controller_dummies/attachments_controller.rb +3 -1
  18. data/app/controller_dummies/frontend_controller.rb +3 -1
  19. data/app/controller_dummies/images_controller.rb +3 -1
  20. data/app/controller_dummies/page_files_controller.rb +3 -1
  21. data/app/controller_dummies/pages_controller.rb +3 -1
  22. data/app/controller_dummies/sitemaps_controller.rb +3 -1
  23. data/app/controllers/admin/attachments_controller.rb +5 -3
  24. data/app/controllers/admin/categories_controller.rb +2 -0
  25. data/app/controllers/admin/images_controller.rb +16 -8
  26. data/app/controllers/admin/invites_controller.rb +4 -1
  27. data/app/controllers/admin/pages_controller.rb +9 -26
  28. data/app/controllers/admin/password_resets_controller.rb +9 -5
  29. data/app/controllers/admin/users_controller.rb +10 -4
  30. data/app/controllers/concerns/pages_core/admin/news_page_controller.rb +13 -11
  31. data/app/controllers/concerns/pages_core/admin/persistent_params.rb +75 -0
  32. data/app/controllers/concerns/pages_core/authentication.rb +13 -5
  33. data/app/controllers/concerns/pages_core/error_renderer.rb +3 -0
  34. data/app/controllers/concerns/pages_core/error_reporting.rb +36 -0
  35. data/app/controllers/concerns/pages_core/policies_helper.rb +4 -1
  36. data/app/controllers/concerns/pages_core/preview_pages_controller.rb +8 -0
  37. data/app/controllers/concerns/pages_core/process_titler.rb +2 -0
  38. data/app/controllers/concerns/pages_core/rss_controller.rb +2 -0
  39. data/app/controllers/concerns/pages_core/static_cache_controller.rb +48 -0
  40. data/app/controllers/errors_controller.rb +5 -53
  41. data/app/controllers/pages_core/admin_controller.rb +7 -67
  42. data/app/controllers/pages_core/attachments_controller.rb +10 -6
  43. data/app/controllers/pages_core/base_controller.rb +11 -17
  44. data/app/controllers/pages_core/frontend/page_files_controller.rb +6 -2
  45. data/app/controllers/pages_core/frontend/pages_controller.rb +14 -18
  46. data/app/controllers/pages_core/frontend_controller.rb +3 -0
  47. data/app/controllers/pages_core/images_controller.rb +3 -1
  48. data/app/controllers/pages_core/sitemaps_controller.rb +11 -5
  49. data/app/controllers/sessions_controller.rb +3 -1
  50. data/app/formatters/pages_core/html_formatter.rb +13 -63
  51. data/app/formatters/pages_core/image_embedder.rb +79 -0
  52. data/app/formatters/pages_core/link_renderer.rb +4 -2
  53. data/app/helpers/admin/admin_helper.rb +2 -0
  54. data/app/helpers/admin/menu_helper.rb +6 -4
  55. data/app/helpers/admin/pages_helper.rb +4 -57
  56. data/app/helpers/application_helper.rb +3 -1
  57. data/app/helpers/frontend_helper.rb +3 -1
  58. data/app/helpers/pages_core/admin/admin_helper.rb +22 -106
  59. data/app/helpers/pages_core/admin/content_tabs_helper.rb +31 -0
  60. data/app/helpers/pages_core/admin/date_range_helper.rb +55 -0
  61. data/app/helpers/pages_core/admin/form_builder.rb +8 -0
  62. data/app/helpers/pages_core/admin/image_uploads_helper.rb +47 -0
  63. data/app/helpers/pages_core/admin/labelled_field_helper.rb +12 -9
  64. data/app/helpers/pages_core/admin/page_blocks_helper.rb +66 -0
  65. data/app/helpers/pages_core/admin/page_json_helper.rb +23 -0
  66. data/app/helpers/pages_core/admin/tag_editor_helper.rb +11 -39
  67. data/app/helpers/pages_core/application_helper.rb +3 -0
  68. data/app/helpers/pages_core/attachments_helper.rb +31 -27
  69. data/app/helpers/pages_core/form_builder.rb +17 -13
  70. data/app/helpers/pages_core/frontend_helper.rb +3 -3
  71. data/app/helpers/pages_core/head_tags_helper.rb +18 -22
  72. data/app/helpers/pages_core/images_helper.rb +3 -0
  73. data/app/helpers/pages_core/meta_tags_helper.rb +3 -1
  74. data/app/helpers/pages_core/open_graph_tags_helper.rb +8 -6
  75. data/app/helpers/pages_core/page_path_helper.rb +24 -3
  76. data/app/javascript/admin-dist.js +2 -0
  77. data/app/javascript/components/Attachments/Attachment.jsx +121 -0
  78. data/app/javascript/components/Attachments/AttachmentEditor.jsx +116 -0
  79. data/app/javascript/components/Attachments/Placeholder.jsx +10 -0
  80. data/app/javascript/components/Attachments.jsx +165 -0
  81. data/app/{assets/javascripts/pages/admin/components/date_range_select.jsx → javascript/components/DateRangeSelect.jsx} +16 -5
  82. data/app/javascript/components/EditableImage.jsx +61 -0
  83. data/app/{assets/javascripts/pages/admin/components/file_upload_button.jsx → javascript/components/FileUploadButton.jsx} +11 -1
  84. data/app/{assets/javascripts/pages/admin/components/focal_point.jsx → javascript/components/ImageCropper/FocalPoint.jsx} +12 -1
  85. data/app/javascript/components/ImageCropper/Image.jsx +65 -0
  86. data/app/javascript/components/ImageCropper/Toolbar.jsx +73 -0
  87. data/app/javascript/components/ImageCropper/useCrop.js +199 -0
  88. data/app/javascript/components/ImageCropper.jsx +90 -0
  89. data/app/javascript/components/ImageEditor/Form.jsx +98 -0
  90. data/app/javascript/components/ImageEditor.jsx +62 -0
  91. data/app/javascript/components/ImageGrid/DragElement.jsx +30 -0
  92. data/app/javascript/components/ImageGrid/FilePlaceholder.jsx +9 -0
  93. data/app/javascript/components/ImageGrid/GridImage.jsx +103 -0
  94. data/app/javascript/components/ImageGrid/Placeholder.jsx +23 -0
  95. data/app/javascript/components/ImageGrid.jsx +257 -0
  96. data/app/javascript/components/ImageUploader.jsx +171 -0
  97. data/app/{assets/javascripts/pages/admin/components/modal.jsx → javascript/components/Modal.jsx} +13 -2
  98. data/app/javascript/components/ModalStore.jsx +12 -0
  99. data/app/{assets/javascripts/pages/admin/components/page_dates.jsx → javascript/components/PageDates.jsx} +11 -1
  100. data/app/{assets/javascripts/pages/admin/components/page_files.jsx → javascript/components/PageFiles.jsx} +11 -2
  101. data/app/{assets/javascripts/pages/admin/components/page_images.jsx → javascript/components/PageImages.jsx} +11 -2
  102. data/app/{assets/javascripts/pages/admin/components/page_tree_store.jsx → javascript/components/PageTree.jsx} +127 -137
  103. data/app/{assets/javascripts/pages/admin/components/page_tree.jsx → javascript/components/PageTreeDraggable.jsx} +44 -38
  104. data/app/{assets/javascripts/pages/admin/components/page_tree_node.jsx → javascript/components/PageTreeNode.jsx} +46 -31
  105. data/app/javascript/components/RichTextArea.jsx +213 -0
  106. data/app/javascript/components/RichTextToolbarButton.jsx +20 -0
  107. data/app/javascript/components/TagEditor/AddTagForm.jsx +42 -0
  108. data/app/javascript/components/TagEditor/Tag.jsx +32 -0
  109. data/app/javascript/components/TagEditor.jsx +61 -0
  110. data/app/javascript/components/Toast.jsx +72 -0
  111. data/app/javascript/components/ToastStore.jsx +14 -0
  112. data/app/javascript/components/drag/draggedOrder.js +51 -0
  113. data/app/javascript/components/drag/useDragCollection.js +84 -0
  114. data/app/javascript/components/drag/useDragUploader.js +112 -0
  115. data/app/javascript/components/drag/useDraggable.js +17 -0
  116. data/app/javascript/components/drag.js +6 -0
  117. data/app/javascript/components.js +14 -0
  118. data/app/javascript/controllers/EditPageController.js +20 -0
  119. data/app/javascript/controllers/LoginController.js +29 -0
  120. data/app/javascript/controllers/MainController.js +65 -0
  121. data/app/javascript/controllers/PageOptionsController.js +62 -0
  122. data/app/javascript/features/RichText.jsx +34 -0
  123. data/app/javascript/hooks.js +2 -0
  124. data/app/javascript/index.js +33 -0
  125. data/app/{assets/javascripts/pages/admin/lib/tree.jsx → javascript/lib/Tree.js} +64 -63
  126. data/app/javascript/lib/copyToClipboard.js +13 -0
  127. data/app/javascript/lib/readyHandler.js +22 -0
  128. data/app/javascript/lib/request.js +36 -0
  129. data/app/jobs/pages_core/autopublish_job.rb +3 -1
  130. data/app/jobs/pages_core/sweep_cache_job.rb +4 -2
  131. data/app/mailers/admin_mailer.rb +4 -14
  132. data/app/models/attachment.rb +10 -8
  133. data/app/models/autopublisher.rb +3 -0
  134. data/app/models/category.rb +3 -1
  135. data/app/models/concerns/pages_core/has_roles.rb +2 -0
  136. data/app/models/concerns/pages_core/humanizable_param.rb +9 -6
  137. data/app/models/concerns/pages_core/page_model/attachments.rb +2 -0
  138. data/app/models/concerns/pages_core/page_model/autopublishable.rb +2 -0
  139. data/app/models/concerns/pages_core/page_model/dated_page.rb +11 -11
  140. data/app/models/concerns/pages_core/page_model/images.rb +8 -2
  141. data/app/models/concerns/pages_core/page_model/localizable.rb +2 -0
  142. data/app/models/concerns/pages_core/page_model/pathable.rb +26 -25
  143. data/app/models/concerns/pages_core/page_model/redirectable.rb +3 -1
  144. data/app/models/concerns/pages_core/page_model/searchable.rb +19 -0
  145. data/app/models/concerns/pages_core/page_model/sortable.rb +6 -5
  146. data/app/models/concerns/pages_core/page_model/status.rb +2 -0
  147. data/app/models/concerns/pages_core/page_model/templateable.rb +7 -2
  148. data/app/models/concerns/pages_core/page_model/tree.rb +27 -20
  149. data/app/models/concerns/pages_core/searchable_document.rb +71 -0
  150. data/app/models/concerns/pages_core/sweepable.rb +4 -2
  151. data/app/models/concerns/pages_core/taggable.rb +33 -12
  152. data/app/models/image.rb +14 -1
  153. data/app/models/invite.rb +3 -1
  154. data/app/models/invite_role.rb +5 -3
  155. data/app/models/page.rb +6 -3
  156. data/app/models/page_builder.rb +2 -0
  157. data/app/models/page_category.rb +3 -1
  158. data/app/models/page_exporter.rb +23 -10
  159. data/app/models/page_file.rb +3 -1
  160. data/app/models/page_image.rb +3 -3
  161. data/app/models/page_path.rb +13 -5
  162. data/app/models/password_reset_token.rb +3 -1
  163. data/app/models/role.rb +9 -6
  164. data/app/models/search_document.rb +72 -0
  165. data/app/models/tag.rb +9 -6
  166. data/app/models/tagging.rb +4 -2
  167. data/app/models/user.rb +8 -5
  168. data/app/policies/invite_policy.rb +2 -0
  169. data/app/policies/page_file_policy.rb +2 -0
  170. data/app/policies/page_image_policy.rb +2 -0
  171. data/app/policies/page_policy.rb +2 -0
  172. data/app/policies/policy.rb +2 -0
  173. data/app/policies/user_policy.rb +2 -0
  174. data/app/{serializers/admin/attachment_serializer.rb → resources/admin/attachment_resource.rb} +10 -7
  175. data/app/{serializers/admin/image_serializer.rb → resources/admin/image_resource.rb} +13 -11
  176. data/app/resources/admin/page_file_resource.rb +10 -0
  177. data/app/resources/admin/page_image_resource.rb +10 -0
  178. data/app/resources/export/attachment_resource.rb +10 -0
  179. data/app/resources/export/page_image_resource.rb +45 -0
  180. data/app/resources/export/page_resource.rb +42 -0
  181. data/app/{serializers/page_image_serializer.rb → resources/page_image_resource.rb} +10 -16
  182. data/app/resources/page_resource.rb +33 -0
  183. data/app/services/pages_core/create_user_service.rb +5 -2
  184. data/app/services/pages_core/destroy_invite_service.rb +25 -0
  185. data/app/services/pages_core/invite_service.rb +4 -2
  186. data/app/views/admin/images/show.json.jbuilder +2 -0
  187. data/app/views/admin/pages/_edit_content.html.erb +1 -1
  188. data/app/views/admin/pages/_edit_files.html.erb +1 -5
  189. data/app/views/admin/pages/_edit_images.html.erb +1 -5
  190. data/app/views/admin/pages/_edit_metadata.html.erb +1 -12
  191. data/app/views/admin/pages/_edit_options.html.erb +74 -55
  192. data/app/views/admin/pages/_form.html.erb +19 -0
  193. data/app/views/admin/pages/edit.html.erb +35 -61
  194. data/app/views/admin/pages/index.html.erb +0 -1
  195. data/app/views/admin/pages/new.html.erb +32 -32
  196. data/app/views/admin/pages/news.html.erb +1 -1
  197. data/app/views/admin/users/_access_control.html.erb +5 -1
  198. data/app/views/admin/users/login.html.erb +12 -4
  199. data/app/views/errors/500.html.erb +2 -20
  200. data/app/views/errors/_generic_help.html.erb +1 -1
  201. data/app/views/feeds/pages.rss.builder +3 -2
  202. data/app/views/layouts/admin/_header.html.erb +1 -1
  203. data/app/views/layouts/admin/_page_header.html.erb +33 -0
  204. data/app/views/layouts/admin.html.erb +23 -42
  205. data/app/views/pages_core/_google_analytics.html.erb +8 -0
  206. data/app/views/sitemaps/show.xml.builder +2 -0
  207. data/config/routes.rb +5 -6
  208. data/db/migrate/20111219033112_create_pages_tables.rb +192 -271
  209. data/db/migrate/20180625154059_enable_search_extensions.rb +10 -0
  210. data/db/migrate/20210209151400_create_search_configurations.rb +35 -0
  211. data/db/migrate/20210210235200_create_search_documents.rb +74 -0
  212. data/lib/pages_core/admin_menu_item.rb +3 -0
  213. data/lib/pages_core/archive_finder.rb +12 -16
  214. data/lib/pages_core/attachment_embedder.rb +4 -6
  215. data/lib/pages_core/cache_sweeper.rb +10 -108
  216. data/lib/pages_core/configuration/base.rb +5 -0
  217. data/lib/pages_core/configuration/pages.rb +4 -2
  218. data/lib/pages_core/configuration.rb +2 -0
  219. data/lib/pages_core/digest_verifier.rb +5 -5
  220. data/lib/pages_core/engine.rb +53 -5
  221. data/lib/pages_core/extensions/string_extensions.rb +3 -1
  222. data/lib/pages_core/extensions.rb +2 -0
  223. data/lib/pages_core/page_path_constraint.rb +2 -0
  224. data/lib/pages_core/pages_plugin.rb +3 -1
  225. data/lib/pages_core/plugin.rb +4 -52
  226. data/lib/pages_core/pub_sub.rb +2 -0
  227. data/lib/pages_core/static_cache/null_handler.rb +17 -0
  228. data/lib/pages_core/static_cache/page_cache_handler.rb +56 -0
  229. data/lib/pages_core/static_cache/varnish_handler.rb +55 -0
  230. data/lib/pages_core/static_cache.rb +26 -0
  231. data/lib/pages_core/templates/block_configuration.rb +4 -1
  232. data/lib/pages_core/templates/configuration.rb +5 -1
  233. data/lib/pages_core/templates/configuration_handler.rb +5 -3
  234. data/lib/pages_core/templates/configuration_proxy.rb +2 -0
  235. data/lib/pages_core/templates/controller_actions.rb +2 -0
  236. data/lib/pages_core/templates/template_configuration.rb +20 -14
  237. data/lib/pages_core/templates.rb +5 -3
  238. data/lib/pages_core/version.rb +3 -1
  239. data/lib/pages_core.rb +13 -5
  240. data/lib/rails/generators/pages_core/frontend/frontend_generator.rb +2 -7
  241. data/lib/rails/generators/pages_core/install/install_generator.rb +3 -7
  242. data/lib/rails/generators/pages_core/install/templates/active_job_initializer.rb +2 -0
  243. data/lib/rails/generators/pages_core/install/templates/application_controller.rb +2 -0
  244. data/lib/rails/generators/pages_core/install/templates/application_helper.rb +2 -0
  245. data/lib/rails/generators/pages_core/install/templates/delayed_job +1 -0
  246. data/lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb +17 -0
  247. data/lib/rails/generators/pages_core/install/templates/frontend_controller.rb +2 -0
  248. data/lib/rails/generators/pages_core/install/templates/frontend_helper.rb +2 -0
  249. data/lib/rails/generators/pages_core/install/templates/gitignore.erb +12 -1
  250. data/lib/rails/generators/pages_core/install/templates/page_templates_initializer.rb +4 -2
  251. data/lib/rails/generators/pages_core/install/templates/pages_controller.rb +2 -0
  252. data/lib/rails/generators/pages_core/install/templates/pages_initializer.rb +2 -6
  253. data/lib/rails/generators/pages_core/rspec/rspec_generator.rb +18 -14
  254. data/lib/rails/generators/pages_core/rspec/templates/factories.rb +3 -8
  255. data/lib/rails/generators/pages_core/rspec/templates/mailer_macros.rb +2 -0
  256. data/lib/rails/generators/pages_core/rspec/templates/page_templates_spec.rb +26 -0
  257. data/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb +91 -0
  258. data/lib/rails/generators/pages_core/rspec/templates/spec_helper.rb +89 -36
  259. data/lib/tasks/pages/cache.rake +8 -5
  260. data/lib/tasks/pages/export.rake +3 -1
  261. data/lib/tasks/pages/page_paths.rake +2 -0
  262. data/lib/tasks/pages.rake +3 -2
  263. data/template.rb +2 -0
  264. metadata +193 -156
  265. data/app/assets/javascripts/pages/admin/components/attachment.jsx +0 -130
  266. data/app/assets/javascripts/pages/admin/components/attachment_editor.jsx +0 -131
  267. data/app/assets/javascripts/pages/admin/components/attachments.jsx +0 -211
  268. data/app/assets/javascripts/pages/admin/components/drag_uploader.jsx +0 -174
  269. data/app/assets/javascripts/pages/admin/components/editable_image.jsx +0 -57
  270. data/app/assets/javascripts/pages/admin/components/grid_image.jsx +0 -124
  271. data/app/assets/javascripts/pages/admin/components/image_editor.jsx +0 -496
  272. data/app/assets/javascripts/pages/admin/components/image_grid.jsx +0 -301
  273. data/app/assets/javascripts/pages/admin/components/image_uploader.jsx +0 -171
  274. data/app/assets/javascripts/pages/admin/components/modal_store.jsx +0 -20
  275. data/app/assets/javascripts/pages/admin/components/rich_text_area.jsx +0 -63
  276. data/app/assets/javascripts/pages/admin/components/rich_text_toolbar.jsx +0 -58
  277. data/app/assets/javascripts/pages/admin/components/toast.jsx +0 -37
  278. data/app/assets/javascripts/pages/admin/components/toast_store.jsx +0 -52
  279. data/app/assets/javascripts/pages/admin/components.jsx +0 -2
  280. data/app/assets/javascripts/pages/admin/features/content_tabs.jsx +0 -72
  281. data/app/assets/javascripts/pages/admin/features/edit_page.jsx +0 -97
  282. data/app/assets/javascripts/pages/admin/features/rich_text.jsx +0 -14
  283. data/app/assets/javascripts/pages/admin/features/tag_editor.jsx +0 -160
  284. data/app/assets/javascripts/pages/admin.jsx +0 -17
  285. data/app/assets/javascripts/pages/login_form.jsx +0 -21
  286. data/app/controllers/concerns/pages_core/domain_based_cache.rb +0 -26
  287. data/app/serializers/admin/page_file_serializer.rb +0 -6
  288. data/app/serializers/admin/page_image_serializer.rb +0 -6
  289. data/app/serializers/page_export_serializer.rb +0 -30
  290. data/app/serializers/page_file_export_serializer.rb +0 -4
  291. data/app/serializers/page_image_export_serializer.rb +0 -40
  292. data/app/serializers/page_serializer.rb +0 -21
  293. data/app/views/admin_mailer/error_report.html.erb +0 -70
  294. data/app/views/errors/500_critical.html.erb +0 -7
  295. data/app/views/errors/report.html.erb +0 -4
  296. data/app/views/layouts/admin/_analytics.html.erb +0 -16
  297. data/config/removed_migrations.yml +0 -60
  298. data/db/migrate/20120627033112_rename_textbits.rb +0 -17
  299. data/db/migrate/20121010055412_drop_removed_tables.rb +0 -81
  300. data/db/migrate/20130130053932_add_queue_to_delayed_jobs.rb +0 -9
  301. data/db/migrate/20130303053932_remove_filter_from_localizations.rb +0 -9
  302. data/db/migrate/20130303160632_remove_imagesets.rb +0 -22
  303. data/db/migrate/20130303161732_remove_sms_subscribers.rb +0 -14
  304. data/db/migrate/20130823133208_update_page_redirect_to.rb +0 -10
  305. data/db/migrate/20140203183900_create_roles.rb +0 -66
  306. data/db/migrate/20140414150500_change_locale_names.rb +0 -11
  307. data/db/migrate/20140604142100_remove_openid_url.rb +0 -9
  308. data/db/migrate/20140920231700_convert_images_to_dis.rb +0 -81
  309. data/db/migrate/20140922124600_convert_page_files_to_dis.rb +0 -50
  310. data/db/migrate/20141004003100_create_password_reset_tokens.rb +0 -10
  311. data/db/migrate/20141006181300_remove_user_cruft.rb +0 -11
  312. data/db/migrate/20141007173000_create_invites.rb +0 -16
  313. data/db/migrate/20150204130800_update_delayed_job_table.rb +0 -9
  314. data/db/migrate/20150401131300_localize_images.rb +0 -38
  315. data/db/migrate/20150520174300_add_meta_image_to_page.rb +0 -5
  316. data/db/migrate/20150904164200_add_pinned_to_tags.rb +0 -5
  317. data/db/migrate/20151002174800_create_page_paths.rb +0 -10
  318. data/db/migrate/20151021103400_drop_binaries_table.rb +0 -7
  319. data/db/migrate/20151204151000_remove_page_content_order.rb +0 -5
  320. data/db/migrate/20160330220900_rename_pages_categories.rb +0 -6
  321. data/db/migrate/20160405202700_change_localization_limit.rb +0 -9
  322. data/db/migrate/20170716040500_remove_page_comments.rb +0 -23
  323. data/db/migrate/20170716213400_remove_sessions.rb +0 -15
  324. data/db/migrate/20180207134000_add_dates_to_pages.rb +0 -11
  325. data/db/migrate/20190211154800_create_attachments.rb +0 -73
  326. data/lib/rails/generators/pages_core/frontend/templates/application.js.erb +0 -15
  327. data/lib/rails/generators/pages_core/install/templates/cache_sweeper_initializer.rb +0 -6
  328. data/lib/tasks/pages/update.rake +0 -17
  329. data/vendor/assets/javascripts/ReactCrop.min.js +0 -1
  330. data/vendor/assets/javascripts/reflux.min.js +0 -1
@@ -0,0 +1,121 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+ import copyToClipboard from "../../lib/copyToClipboard";
4
+ import AttachmentEditor from "./AttachmentEditor";
5
+ import ModalStore from "../ModalStore";
6
+ import ToastStore from "../ToastStore";
7
+
8
+ import { useDraggable } from "../drag";
9
+
10
+ export default function Attachment(props) {
11
+ const { attributeName, draggable } = props;
12
+ const { record } = draggable;
13
+ const { attachment, uploading } = record;
14
+
15
+ const listeners = useDraggable(draggable, props.startDrag);
16
+
17
+ const copyEmbed = (evt) => {
18
+ evt.preventDefault();
19
+ copyToClipboard(`[attachment:${attachment.id}]`);
20
+ ToastStore.dispatch({
21
+ type: "NOTICE", message: "Embed code copied to clipboard"
22
+ });
23
+ };
24
+
25
+ const deleteRecord = (evt) => {
26
+ evt.preventDefault();
27
+ if (props.deleteRecord) {
28
+ props.deleteRecord();
29
+ }
30
+ };
31
+
32
+ const description = () => {
33
+ if (attachment.description && attachment.description[props.locale]) {
34
+ return attachment.description[props.locale];
35
+ }
36
+ return null;
37
+ };
38
+
39
+ const name = () => {
40
+ if (attachment.name && attachment.name[props.locale]) {
41
+ return attachment.name[props.locale];
42
+ }
43
+ return null;
44
+ };
45
+
46
+ const editAttachment = (evt) => {
47
+ evt.preventDefault();
48
+ ModalStore.dispatch({
49
+ type: "OPEN",
50
+ payload: <AttachmentEditor attachment={attachment}
51
+ locale={props.locale}
52
+ locales={props.locales}
53
+ onUpdate={props.onUpdate} />
54
+ });
55
+ };
56
+
57
+ const classes = ["attachment"];
58
+ if (props.placeholder) {
59
+ classes.push("placeholder");
60
+ }
61
+ if (record.uploading) {
62
+ classes.push("uploading");
63
+ }
64
+
65
+ const icon = uploading ? "cloud-upload" : "paperclip";
66
+
67
+ return (
68
+ <div className={classes.join(" ")}
69
+ {...listeners}>
70
+ <input name={`${attributeName}[id]`}
71
+ type="hidden" value={record.id || ""} />
72
+ <input name={`${attributeName}[attachment_id]`}
73
+ type="hidden" value={(attachment && attachment.id) || ""} />
74
+ <input name={`${attributeName}[position]`}
75
+ type="hidden" value={props.position} />
76
+ {!uploading &&
77
+ <div className="actions">
78
+ <button onClick={editAttachment}>
79
+ Edit
80
+ </button>
81
+ {props.showEmbed && (
82
+ <button onClick={copyEmbed}>
83
+ Embed
84
+ </button>
85
+ )}
86
+ {props.deleteRecord && (
87
+ <button onClick={deleteRecord}>
88
+ Remove
89
+ </button>
90
+ )}
91
+ </div>
92
+ }
93
+ {attachment &&
94
+ <div className="attachment-info">
95
+ <h3>
96
+ <i className={`fa fa-${icon} icon`} />
97
+ {name() || <em>Untitled</em>}<br />
98
+ </h3>
99
+ {!uploading &&
100
+ <a href={attachment.url}
101
+ rel="noreferrer"
102
+ target="_blank">{attachment.filename}</a>}
103
+ {!uploading && description() && <p>{description()}</p>}
104
+ </div>}
105
+ </div>
106
+ );
107
+ }
108
+
109
+ Attachment.propTypes = {
110
+ locale: PropTypes.string,
111
+ locales: PropTypes.object,
112
+ draggable: PropTypes.object,
113
+ deleteRecord: PropTypes.func,
114
+ startDrag: PropTypes.func,
115
+ showEmbed: PropTypes.bool,
116
+ onUpdate: PropTypes.func,
117
+ attributeName: PropTypes.string,
118
+ placeholder: PropTypes.bool,
119
+ position: PropTypes.number,
120
+ ref: PropTypes.object
121
+ };
@@ -0,0 +1,116 @@
1
+ import React, { useState } from "react";
2
+ import PropTypes from "prop-types";
3
+ import copyToClipboard, { copySupported } from "../../lib/copyToClipboard";
4
+ import ModalStore from "../ModalStore";
5
+ import ToastStore from "../ToastStore";
6
+ import { putJson } from "../../lib/request";
7
+
8
+ export default function AttachmentEditor(props) {
9
+ const { attachment } = props;
10
+
11
+ const [locale, setLocale] = useState(props.locale);
12
+ const [localizations, setLocalizations] = useState({
13
+ name: attachment.name || {},
14
+ description: attachment.description || {},
15
+ });
16
+
17
+ const updateLocalization = (name) => (evt) => {
18
+ setLocalizations({
19
+ ...localizations,
20
+ [name]: { ...localizations[name],
21
+ [locale]: evt.target.value }
22
+ });
23
+ };
24
+
25
+ const copyEmbedCode = (evt) => {
26
+ evt.preventDefault();
27
+ copyToClipboard(`[attachment:${attachment.id}]`);
28
+ ToastStore.dispatch({
29
+ type: "NOTICE", message: "Embed code copied to clipboard"
30
+ });
31
+ };
32
+
33
+ const save = (evt) => {
34
+ evt.preventDefault();
35
+ evt.stopPropagation();
36
+
37
+ let data = { ...localizations };
38
+
39
+ putJson(`/admin/attachments/${attachment.id}`,
40
+ { attachment: data });
41
+
42
+ if (props.onUpdate) {
43
+ props.onUpdate(data);
44
+ }
45
+ ModalStore.dispatch({ type: "CLOSE" });
46
+ };
47
+
48
+ return (
49
+ <div className="attachment-editor">
50
+ <form>
51
+ {props.locales && Object.keys(props.locales).length > 1 && (
52
+ <div className="field">
53
+ <label>
54
+ Locale
55
+ </label>
56
+ <select name="locale"
57
+ onChange={e => setLocale(e.target.value)}>
58
+ {Object.keys(props.locales).map(key => (
59
+ <option key={`locale-${key}`} value={key}>
60
+ {props.locales[key]}
61
+ </option>
62
+ ))}
63
+ </select>
64
+ </div>
65
+ )}
66
+ <div className="field">
67
+ <label>Name</label>
68
+ <input type="text"
69
+ className="name"
70
+ value={localizations.name[locale] || ""}
71
+ onChange={updateLocalization("name")} />
72
+ </div>
73
+ <div className="field">
74
+ <label>Description</label>
75
+ <textarea className="description"
76
+ value={localizations.description[locale] || ""}
77
+ onChange={updateLocalization("description")} />
78
+ </div>
79
+ <div className="field embed-code">
80
+ <label>
81
+ Embed code
82
+ </label>
83
+ <input type="text"
84
+ value={`[attachment:${attachment.id}]`}
85
+ disabled={true} />
86
+ {copySupported() && (
87
+ <button onClick={copyEmbedCode}>
88
+ Copy
89
+ </button>
90
+ )}
91
+ </div>
92
+ <div className="field">
93
+ <label>File</label>
94
+ <a href={attachment.url}
95
+ rel="noreferrer"
96
+ target="_blank">{attachment.filename}</a>
97
+ </div>
98
+ <div className="buttons">
99
+ <button onClick={save}>
100
+ Save
101
+ </button>
102
+ <button onClick={() => ModalStore.dispatch({ type: "CLOSE" })}>
103
+ Cancel
104
+ </button>
105
+ </div>
106
+ </form>
107
+ </div>
108
+ );
109
+ }
110
+
111
+ AttachmentEditor.propTypes = {
112
+ attachment: PropTypes.object,
113
+ locale: PropTypes.string,
114
+ locales: PropTypes.object,
115
+ onUpdate: PropTypes.func
116
+ };
@@ -0,0 +1,10 @@
1
+ import React from "react";
2
+
3
+ export default function Placeholder() {
4
+ return (
5
+ <div className="attachment drop-placeholder"
6
+ key="file-placeholder">
7
+ Upload files here
8
+ </div>
9
+ );
10
+ }
@@ -0,0 +1,165 @@
1
+ import React, { useState } from "react";
2
+ import PropTypes from "prop-types";
3
+ import Attachment from "./Attachments/Attachment";
4
+ import Placeholder from "./Attachments/Placeholder";
5
+ import FileUploadButton from "./FileUploadButton";
6
+ import { post } from "../lib/request";
7
+
8
+ import { createDraggable,
9
+ draggedOrder,
10
+ useDragCollection,
11
+ useDragUploader } from "./drag";
12
+
13
+ function filenameToName(str) {
14
+ return str.replace(/\.[\w\d]+$/, "").replace(/_/g, " ");
15
+ }
16
+
17
+ export default function Attachments(props) {
18
+ const collection = useDragCollection(props.records);
19
+ const locales = props.locales ? Object.keys(props.locales) : [props.locale];
20
+ const [deleted, setDeleted] = useState([]);
21
+
22
+ const uploadAttachment = (file) => {
23
+ let name = {};
24
+ locales.forEach((l) => name[l] = file.name);
25
+
26
+ const draggable = createDraggable(
27
+ { attachment: { filename: file.name, name: name },
28
+ uploading: true }
29
+ );
30
+
31
+ let data = new FormData();
32
+
33
+ data.append("attachment[file]", file);
34
+ locales.forEach((l) => {
35
+ data.append(`attachment[name][${l}]`, filenameToName(file.name));
36
+ });
37
+
38
+ post("/admin/attachments.json", data)
39
+ .then(json => {
40
+ collection.dispatch({
41
+ type: "update",
42
+ payload: { ...draggable,
43
+ record: { attachment: json, uploading: false } }
44
+ });
45
+ });
46
+
47
+ return draggable;
48
+ };
49
+
50
+ const receiveFiles = (files) => {
51
+ collection.dispatch({
52
+ type: "append",
53
+ payload: files.map(f => uploadAttachment(f))
54
+ });
55
+ };
56
+
57
+ const dragEnd = (dragState, files) => {
58
+ collection.dispatch({
59
+ type: "reorder",
60
+ payload: draggedOrder(collection, dragState)
61
+ });
62
+ collection.dispatch({
63
+ type: "insertFiles",
64
+ payload: files.map(f => uploadAttachment(f))
65
+ });
66
+ };
67
+
68
+ const [dragState,
69
+ dragStart,
70
+ listeners] = useDragUploader([collection], dragEnd);
71
+
72
+ const position = (record) => {
73
+ return [...collection.draggables.map(d => d.record),
74
+ ...deleted].indexOf(record) + 1;
75
+ };
76
+
77
+ const attrName = (record) => {
78
+ return `${props.attribute}[${position(record)}]`;
79
+ };
80
+
81
+ const update = (draggable) => (attachment) => {
82
+ const { record } = draggable;
83
+ const updated = {
84
+ ...draggable,
85
+ record: {
86
+ ...record,
87
+ attachment: { ...record.attachment, ...attachment }
88
+ }
89
+ };
90
+ collection.dispatch({ type: "update", payload: updated });
91
+ };
92
+
93
+ const remove = (draggable) => () => {
94
+ collection.dispatch({ type: "remove", payload: draggable });
95
+ if (draggable.record.id) {
96
+ setDeleted([...deleted, draggable.record]);
97
+ }
98
+ };
99
+
100
+ const attachment = (draggable) => {
101
+ const { dragging } = dragState;
102
+
103
+ if (draggable === "Files") {
104
+ return (<Placeholder key="placeholder" />);
105
+ }
106
+
107
+ return (
108
+ <Attachment key={draggable.handle}
109
+ draggable={draggable}
110
+ locale={props.locale}
111
+ locales={props.locales}
112
+ showEmbed={props.showEmbed}
113
+ startDrag={dragStart}
114
+ position={position(draggable.record)}
115
+ onUpdate={update(draggable)}
116
+ deleteRecord={remove(draggable)}
117
+ attributeName={attrName(draggable.record)}
118
+ placeholder={dragging && dragging == draggable} />
119
+ );
120
+ };
121
+
122
+ const dragOrder = draggedOrder(collection, dragState);
123
+
124
+ const classes = ["attachments"];
125
+ if (dragState.dragging) {
126
+ classes.push("dragover");
127
+ }
128
+
129
+ return (
130
+ <div className={classes.join(" ")}
131
+ ref={collection.ref}
132
+ {...listeners}>
133
+ <div className="files">
134
+ {dragOrder.map(d => attachment(d))}
135
+ </div>
136
+ <div className="deleted">
137
+ {deleted.map(r =>
138
+ <span className="deleted-attachment" key={r.id}>
139
+ <input name={`${attrName(r)}[id]`}
140
+ type="hidden"
141
+ value={r.id} />
142
+ <input name={`${attrName(r)}[attachment_id]`}
143
+ type="hidden"
144
+ value={(r.attachment && r.attachment.id) || ""} />
145
+ <input name={`${attrName(r)}[_destroy]`}
146
+ type="hidden"
147
+ value={true} />
148
+ </span>)}
149
+ </div>
150
+ <div className="drop-target">
151
+ <FileUploadButton multiple={true}
152
+ multiline={true}
153
+ callback={receiveFiles} />
154
+ </div>
155
+ </div>
156
+ );
157
+ }
158
+
159
+ Attachments.propTypes = {
160
+ attribute: PropTypes.string,
161
+ locale: PropTypes.string,
162
+ locales: PropTypes.object,
163
+ records: PropTypes.array,
164
+ showEmbed: PropTypes.bool
165
+ };
@@ -1,4 +1,7 @@
1
- class DateRangeSelect extends React.Component {
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default class DateRangeSelect extends React.Component {
2
5
  constructor(props) {
3
6
  super(props);
4
7
  this.state = {
@@ -37,16 +40,16 @@ class DateRangeSelect extends React.Component {
37
40
 
38
41
  modifyDate(original, options = {}) {
39
42
  var newDate = new Date(original);
40
- if (options.hasOwnProperty("year")) {
43
+ if (Object.prototype.hasOwnProperty.call(options, "year")) {
41
44
  newDate.setFullYear(options.year);
42
45
  }
43
- if (options.hasOwnProperty("month")) {
46
+ if (Object.prototype.hasOwnProperty.call(options, "month")) {
44
47
  newDate.setMonth(options.month);
45
48
  }
46
- if (options.hasOwnProperty("date")) {
49
+ if (Object.prototype.hasOwnProperty.call(options, "date")) {
47
50
  newDate.setDate(options.date);
48
51
  }
49
- if (options.hasOwnProperty("time") &&
52
+ if (Object.prototype.hasOwnProperty.call(options, "time") &&
50
53
  options.time.match(/^[\d]{1,2}(:[\d]{1,2})?$/)) {
51
54
  newDate.setHours(options.time.split(":")[0]);
52
55
  newDate.setMinutes(options.time.split(":")[1] || 0);
@@ -172,3 +175,11 @@ class DateRangeSelect extends React.Component {
172
175
  return Array.apply(null, Array(31)).map((_, i) => i + 1);
173
176
  }
174
177
  }
178
+
179
+ DateRangeSelect.propTypes = {
180
+ startsAt: PropTypes.string,
181
+ endsAt: PropTypes.string,
182
+ disabled: PropTypes.bool,
183
+ disableTime: PropTypes.bool,
184
+ objectName: PropTypes.string
185
+ };
@@ -0,0 +1,61 @@
1
+ import React, { useState } from "react";
2
+ import PropTypes from "prop-types";
3
+ import ImageEditor from "./ImageEditor";
4
+ import ModalStore from "./ModalStore";
5
+
6
+ export default function EditableImage(props) {
7
+ const [image, setImage] = useState(props.image);
8
+ const [src, setSrc] = useState(props.src);
9
+
10
+ const height = () => {
11
+ const width = image.crop_width || image.real_width;
12
+ const height = image.crop_height || image.real_height;
13
+ return Math.round((height / width) * props.width);
14
+ };
15
+
16
+ const updateImage = (updatedImage, src) => {
17
+ let newImage = { ...image, ...updatedImage };
18
+ setSrc(src);
19
+ setImage(newImage);
20
+ if (props.onUpdate) {
21
+ props.onUpdate(newImage, src);
22
+ }
23
+ };
24
+
25
+ const handleClick = (evt) => {
26
+ evt.preventDefault();
27
+ ModalStore.dispatch({
28
+ type: "OPEN",
29
+ payload: <ImageEditor image={image}
30
+ caption={props.caption}
31
+ locale={props.locale}
32
+ locales={props.locales}
33
+ onUpdate={updateImage} />
34
+ });
35
+ };
36
+
37
+ const altWarning = !image.alternative[props.locale];
38
+
39
+ return (
40
+ <div className="editable-image">
41
+ {altWarning &&
42
+ <span className="alt-warning" title="Alternative text is missing">
43
+ <i className="fa fa-exclamation-triangle icon" />
44
+ </span>}
45
+ <img src={src}
46
+ width={props.width}
47
+ height={height()}
48
+ onClick={handleClick} />
49
+ </div>
50
+ );
51
+ }
52
+
53
+ EditableImage.propTypes = {
54
+ image: PropTypes.object,
55
+ src: PropTypes.string,
56
+ caption: PropTypes.bool,
57
+ locale: PropTypes.string,
58
+ locales: PropTypes.object,
59
+ width: PropTypes.number,
60
+ onUpdate: PropTypes.func
61
+ };
@@ -1,4 +1,7 @@
1
- class FileUploadButton extends React.Component {
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default class FileUploadButton extends React.Component {
2
5
  constructor(props) {
3
6
  super(props);
4
7
  this.inputRef = React.createRef();
@@ -42,3 +45,10 @@ class FileUploadButton extends React.Component {
42
45
  this.inputRef.current.click();
43
46
  }
44
47
  }
48
+
49
+ FileUploadButton.propTypes = {
50
+ callback: PropTypes.func,
51
+ type: PropTypes.string,
52
+ multiple: PropTypes.bool,
53
+ multiline: PropTypes.bool
54
+ };
@@ -1,4 +1,7 @@
1
- class FocalPoint extends React.Component {
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default class FocalPoint extends React.Component {
2
5
  constructor(props) {
3
6
  super(props);
4
7
  this.state = {
@@ -80,3 +83,11 @@ class FocalPoint extends React.Component {
80
83
  );
81
84
  }
82
85
  }
86
+
87
+ FocalPoint.propTypes = {
88
+ x: PropTypes.number,
89
+ y: PropTypes.number,
90
+ onChange: PropTypes.func,
91
+ width: PropTypes.number,
92
+ height: PropTypes.number
93
+ };
@@ -0,0 +1,65 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+ import ReactCrop from "react-image-crop";
4
+
5
+ import { cropSize } from "./useCrop";
6
+ import FocalPoint from "./FocalPoint";
7
+
8
+ export default function Image(props) {
9
+ const imageSize = () => {
10
+ const { image, cropping, crop_width, crop_height } = props.cropState;
11
+ if (cropping) {
12
+ return { width: image.real_width, height: image.real_height };
13
+ } else {
14
+ return { width: crop_width, height: crop_height };
15
+ }
16
+ };
17
+
18
+ const maxWidth = props.containerSize.width;
19
+ const maxHeight = props.containerSize.height;
20
+ const aspect = imageSize().width / imageSize().height;
21
+
22
+ var width = maxWidth;
23
+ var height = maxWidth / aspect;
24
+
25
+ if (height > maxHeight) {
26
+ height = maxHeight;
27
+ width = maxHeight * aspect;
28
+ }
29
+
30
+ const style = { width: `${width}px`, height: `${height}px` };
31
+
32
+ if (props.cropState.cropping) {
33
+ return (
34
+ <div className="image-wrapper" style={style}>
35
+ <ReactCrop src={props.cropState.image.uncropped_url}
36
+ crop={cropSize(props.cropState)}
37
+ minWidth={10}
38
+ minHeight={10}
39
+ onChange={props.setCrop} />
40
+ </div>
41
+ );
42
+ } else {
43
+ return (
44
+ <div className="image-wrapper" style={style}>
45
+ {props.focalPoint && (
46
+ <FocalPoint width={width} height={height}
47
+ x={props.focalPoint.x}
48
+ y={props.focalPoint.y}
49
+ onChange={props.setFocal} />
50
+ )}
51
+ <img src={props.croppedImage} />
52
+ </div>
53
+ );
54
+ }
55
+
56
+ }
57
+
58
+ Image.propTypes = {
59
+ containerSize: PropTypes.object,
60
+ croppedImage: PropTypes.string,
61
+ cropState: PropTypes.object,
62
+ focalPoint: PropTypes.object,
63
+ setCrop: PropTypes.func,
64
+ setFocal: PropTypes.func
65
+ };
@@ -0,0 +1,73 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default function Toolbar(props) {
5
+ const { cropping } = props.cropState;
6
+
7
+ const aspectRatios = [
8
+ ["Free", null], ["1:1", 1], ["3:2", 3/2], ["2:3", 2/3],
9
+ ["4:3", 4/3], ["3:4", 3/4], ["5:4", 5/4], ["4:5", 4/5],
10
+ ["16:9", 16/9]
11
+ ];
12
+
13
+ const updateAspect = (ratio) => (evt) => {
14
+ evt.preventDefault();
15
+ props.setAspect(ratio);
16
+ };
17
+
18
+ const width = Math.ceil(props.cropState.crop_width);
19
+ const height = Math.ceil(props.cropState.crop_height);
20
+ const format = props.image.content_type.split("/")[1].toUpperCase();
21
+
22
+ return (
23
+ <div className="toolbars">
24
+ <div className="toolbar">
25
+ <div className="info">
26
+ <span className="format">
27
+ {width}x{height} {format}
28
+ </span>
29
+ </div>
30
+ <button title="Crop image"
31
+ onClick={props.toggleCrop}
32
+ className={cropping ? "active" : ""}>
33
+ <i className="fa fa-crop" />
34
+ </button>
35
+ <button disabled={cropping}
36
+ title="Toggle focal point"
37
+ onClick={props.toggleFocal}>
38
+ <i className="fa fa-bullseye" />
39
+ </button>
40
+ <a href={props.image.original_url}
41
+ className="button"
42
+ title="Download original image"
43
+ disabled={cropping}
44
+ download={props.image.filename}
45
+ onClick={evt => cropping && evt.preventDefault()}>
46
+ <i className="fa fa-download" />
47
+ </a>
48
+ </div>
49
+ {cropping && (
50
+ <div className="aspect-ratios toolbar">
51
+ <div className="label">
52
+ Lock aspect ratio:
53
+ </div>
54
+ {aspectRatios.map(ratio => (
55
+ <button key={"ratio-" + ratio[1]}
56
+ className={(ratio[1] == props.cropState.aspect) ? "active" : ""}
57
+ onClick={updateAspect(ratio[1])}>
58
+ {ratio[0]}
59
+ </button>
60
+ ))}
61
+ </div>
62
+ )}
63
+ </div>
64
+ );
65
+ }
66
+
67
+ Toolbar.propTypes = {
68
+ cropState: PropTypes.object,
69
+ image: PropTypes.object,
70
+ setAspect: PropTypes.func,
71
+ toggleCrop: PropTypes.func,
72
+ toggleFocal: PropTypes.func
73
+ };