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
@@ -25,10 +25,14 @@
25
25
  SOFTWARE.
26
26
  */
27
27
 
28
- class PageTreeNode extends React.Component {
28
+ import React from "react";
29
+ import PropTypes from "prop-types";
30
+
31
+ export default class PageTreeNode extends React.Component {
29
32
  constructor(props) {
30
33
  super(props);
31
34
  this.state = { newName: props.index.node.name };
35
+ this.innerRef = React.createRef();
32
36
  }
33
37
 
34
38
  permitted(action) {
@@ -49,7 +53,7 @@ class PageTreeNode extends React.Component {
49
53
  <span className="actions">
50
54
  <button type="button"
51
55
  className="add"
52
- onClick={e => this.props.addChild(this.props.index)}>
56
+ onClick={() => this.props.addChild(this.props.index)}>
53
57
  <i className="fa fa-plus icon" />
54
58
  Add child
55
59
  </button>
@@ -59,27 +63,27 @@ class PageTreeNode extends React.Component {
59
63
  return (
60
64
  <span className="actions">
61
65
  {this.permitted("edit") && this.button(statusLabel, {
62
- className: "toggle-status",
63
- icon: statusIcon,
64
- onClick: e => this.toggleStatus()
66
+ className: "toggle-status",
67
+ icon: statusIcon,
68
+ onClick: () => this.toggleStatus()
65
69
  })}
66
70
 
67
71
  {this.permitted("edit") && this.button("Rename", {
68
- className: "edit",
69
- icon: "pencil",
70
- onClick: e => this.edit()
72
+ className: "edit",
73
+ icon: "pencil",
74
+ onClick: () => this.edit()
71
75
  })}
72
76
 
73
77
  {this.permitted("edit") && this.button("Delete", {
74
- className: "delete",
75
- icon: "trash",
76
- onClick: e => this.deletePage()
78
+ className: "delete",
79
+ icon: "trash",
80
+ onClick: () => this.deletePage()
77
81
  })}
78
82
 
79
83
  {this.permitted("create") && this.button("Add child", {
80
- className: "add",
81
- icon: "plus",
82
- onClick: e => this.props.addChild(this.props.index)
84
+ className: "add",
85
+ icon: "plus",
86
+ onClick: () => this.props.addChild(this.props.index)
83
87
  })}
84
88
  </span>
85
89
  );
@@ -89,11 +93,11 @@ class PageTreeNode extends React.Component {
89
93
  addButton() {
90
94
  let self = this;
91
95
  let node = this.node();
92
- let handleClick = function (e) {
96
+ let handleClick = function () {
93
97
  if (self.props.addChild) {
94
98
  self.props.addChild(self.props.index);
95
99
  }
96
- }
100
+ };
97
101
 
98
102
  if (!node.collapsed &&
99
103
  this.permitted("create") &&
@@ -128,9 +132,9 @@ class PageTreeNode extends React.Component {
128
132
  if (index.children && index.children.length && !index.node.collapsed) {
129
133
  var childrenStyles = {};
130
134
  if (index.node.collapsed) {
131
- childrenStyles.display = 'none';
135
+ childrenStyles.display = "none";
132
136
  }
133
- childrenStyles['paddingLeft'] = this.props.paddingLeft + 'px';
137
+ childrenStyles["paddingLeft"] = this.props.paddingLeft + "px";
134
138
 
135
139
  return (
136
140
  <div className="children" style={childrenStyles}>
@@ -172,7 +176,7 @@ class PageTreeNode extends React.Component {
172
176
  if (self.props.onCollapse) {
173
177
  self.props.onCollapse(nodeId);
174
178
  }
175
- }
179
+ };
176
180
 
177
181
  if (this.visibleChildren().length > 0) {
178
182
  let collapsed = index.node.collapsed;
@@ -186,7 +190,7 @@ class PageTreeNode extends React.Component {
186
190
 
187
191
  return (
188
192
  <i className={classnames}
189
- onMouseDown={function(e) {e.stopPropagation()}}
193
+ onMouseDown={function(e) {e.stopPropagation();}}
190
194
  onClick={handleCollapse} />
191
195
  );
192
196
  }
@@ -220,7 +224,7 @@ class PageTreeNode extends React.Component {
220
224
  }
221
225
 
222
226
  editUrl(page) {
223
- return(`/admin/${page.locale}/pages/${page.param}/edit`)
227
+ return(`/admin/${page.locale}/pages/${page.param}/edit`);
224
228
  }
225
229
 
226
230
  node() {
@@ -251,14 +255,16 @@ class PageTreeNode extends React.Component {
251
255
 
252
256
  let handleMouseDown = function (e) {
253
257
  if (self.permitted("edit") && !editing && props.onDragStart) {
254
- props.onDragStart(props.index.id, self.refs.inner, e);
258
+ props.onDragStart(props.index.id, self.innerRef.current, e);
255
259
  }
256
- }
260
+ };
257
261
 
258
262
  if (this.node().status != 4) {
259
263
  return (
260
264
  <div className={classnames}>
261
- <div className="inner" ref="inner" onMouseDown={handleMouseDown}>
265
+ <div className="inner"
266
+ ref={this.innerRef}
267
+ onMouseDown={handleMouseDown}>
262
268
  {this.collapseArrow()}
263
269
  {node}
264
270
  </div>
@@ -276,7 +282,7 @@ class PageTreeNode extends React.Component {
276
282
 
277
283
  let handleNameChange = function(event) {
278
284
  self.setState({newName: event.target.value});
279
- }
285
+ };
280
286
 
281
287
  let performEdit = function(event) {
282
288
  event.preventDefault();
@@ -284,12 +290,12 @@ class PageTreeNode extends React.Component {
284
290
  name: self.state.newName,
285
291
  editing: false
286
292
  });
287
- }
293
+ };
288
294
 
289
- let cancelEdit = function(e) {
295
+ let cancelEdit = function() {
290
296
  self.setState({newName: self.node().name});
291
297
  self.updatePage({editing: false});
292
- }
298
+ };
293
299
 
294
300
  return (
295
301
  <div className="page edit">
@@ -298,7 +304,6 @@ class PageTreeNode extends React.Component {
298
304
  <input type="text"
299
305
  value={this.state.newName}
300
306
  autoFocus
301
- ref="nameInput"
302
307
  onChange={handleNameChange} />
303
308
  <button className="save" type="submit">
304
309
  <i className="fa fa-cloud icon"></i>
@@ -315,7 +320,6 @@ class PageTreeNode extends React.Component {
315
320
  }
316
321
 
317
322
  renderNode() {
318
- let self = this;
319
323
  let index = this.props.index;
320
324
  let node = index.node;
321
325
 
@@ -338,7 +342,7 @@ class PageTreeNode extends React.Component {
338
342
  if (node.id && node.starts_at) {
339
343
  dateLabel = <span className="date">
340
344
  {node.starts_at}
341
- </span>
345
+ </span>;
342
346
  }
343
347
 
344
348
  if (node.news_page) {
@@ -394,3 +398,14 @@ class PageTreeNode extends React.Component {
394
398
  }
395
399
  }
396
400
  }
401
+
402
+ PageTreeNode.propTypes = {
403
+ addChild: PropTypes.func,
404
+ dragging: PropTypes.number,
405
+ index: PropTypes.object,
406
+ onCollapse: PropTypes.func,
407
+ onDragStart: PropTypes.func,
408
+ paddingLeft: PropTypes.number,
409
+ tree: PropTypes.object,
410
+ updatePage: PropTypes.func
411
+ };
@@ -0,0 +1,213 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+ import RichTextToolbarButton from "./RichTextToolbarButton";
4
+
5
+ export default class RichTextArea extends React.Component {
6
+ constructor(props) {
7
+ super(props);
8
+ this.state = {
9
+ value: props.value || "",
10
+ rows: props.rows || 5
11
+ };
12
+ this.inputRef = React.createRef();
13
+ this.handleChange = this.handleChange.bind(this);
14
+ this.handleKeyPress = this.handleKeyPress.bind(this);
15
+ this.getSelection = this.getSelection.bind(this);
16
+ this.link = this.link.bind(this);
17
+ this.replaceSelection = this.replaceSelection.bind(this);
18
+ }
19
+
20
+ actions() {
21
+ const simple = [
22
+ {
23
+ name: "bold",
24
+ className: "bold",
25
+ hotkey: "b",
26
+ fn: (str) => ["<b>", str, "</b>"]
27
+ },
28
+ { name: "italic",
29
+ className: "italic",
30
+ hotkey: "i",
31
+ fn: (str) => ["<i>", str, "</i>"]
32
+ },
33
+ ];
34
+
35
+ const advanced = [
36
+ {
37
+ name: "Heading 2",
38
+ className: "header h2",
39
+ fn: (str) => ["h2. ", str, ""]
40
+ },
41
+ {
42
+ name: "Heading 3",
43
+ className: "header h3",
44
+ fn: (str) => ["h3. ", str, ""]
45
+ },
46
+ {
47
+ name: "Heading 4",
48
+ className: "header h4",
49
+ fn: (str) => ["h4. ", str, ""]
50
+ },
51
+ {
52
+ name: "Blockquote",
53
+ className: "quote-left",
54
+ fn: (str) => ["bq. ", str, ""]
55
+ },
56
+ {
57
+ name: "List",
58
+ className: "list-ul",
59
+ fn: (str) => ["", this.strToList(str, "*"), ""]
60
+ },
61
+ {
62
+ name: "Ordered list",
63
+ className: "list-ol",
64
+ fn: (str) => ["", this.strToList(str, "#"), ""]
65
+ },
66
+ {
67
+ name: "Link",
68
+ className: "link",
69
+ fn: this.link
70
+ },
71
+ {
72
+ name: "Email link",
73
+ className: "envelope",
74
+ fn: this.emailLink
75
+ },
76
+ ];
77
+
78
+ return this.props.simple ? simple : [...simple, ...advanced];
79
+ }
80
+
81
+ applyAction(fn) {
82
+ let [prefix, replacement, postfix] = fn(this.getSelection());
83
+ this.replaceSelection(prefix, replacement, postfix);
84
+ }
85
+
86
+ emailLink(selection) {
87
+ var address = prompt("Enter email address", "");
88
+ let name = selection.length > 0 ? selection : address;
89
+ return ["\"", name, `":mailto:${address}`];
90
+ }
91
+
92
+ getSelection() {
93
+ let { selectionStart, selectionEnd, value } = this.inputRef.current;
94
+ return value.substr(selectionStart, (selectionEnd - selectionStart));
95
+ }
96
+
97
+ handleChange(evt) {
98
+ this.setState({ value: evt.target.value });
99
+ }
100
+
101
+ handleKeyPress(evt) {
102
+ let key;
103
+ if (evt.which >= 65 && evt.which <= 90) {
104
+ key = String.fromCharCode(evt.keyCode).toLowerCase();
105
+ } else if (evt.keyCode === 13) {
106
+ key = "enter";
107
+ }
108
+
109
+ let hotkeys = {};
110
+ this.actions().forEach(a => {
111
+ if (a.hotkey) {
112
+ hotkeys[a.hotkey] = a.fn;
113
+ }
114
+ });
115
+
116
+ if ((evt.metaKey || evt.ctrlKey) && Object.prototype.hasOwnProperty.call(hotkeys, key)) {
117
+ evt.preventDefault();
118
+ this.applyAction(hotkeys[key]);
119
+ }
120
+ }
121
+
122
+ link(selection) {
123
+ let name = selection.length > 0 ? selection : "Link text";
124
+ var url = prompt("Enter link URL", "");
125
+ if (url) {
126
+ return ["\"", name, `":${this.relativeUrl(url)}`];
127
+ } else {
128
+ return ["", name, ""];
129
+ }
130
+ }
131
+
132
+ relativeUrl(str) {
133
+ let url = null;
134
+
135
+ if (!str.match(/^https:\/\//) || !document || !document.location) {
136
+ return str;
137
+ }
138
+
139
+ try {
140
+ url = new URL(str);
141
+ } catch (error) {
142
+ console.log("Error parsing URL: ", error);
143
+ }
144
+
145
+ if (url &&
146
+ url.hostname == document.location.hostname &&
147
+ (document.location.port || "80") == (url.port || "80")) {
148
+ return url.pathname;
149
+ }
150
+ return str;
151
+ }
152
+
153
+ render() {
154
+ let { value, rows } = this.state;
155
+ let { id, name } = this.props;
156
+
157
+ const clickHandler = (fn) => (evt) => {
158
+ evt.preventDefault();
159
+ this.applyAction(fn);
160
+ };
161
+
162
+ return (
163
+ <div className="rich-text-area">
164
+ <div className="rich-text toolbar">
165
+ {this.actions().map(a =>
166
+ <RichTextToolbarButton
167
+ key={a.name}
168
+ name={a.name}
169
+ className={a.className}
170
+ onClick={clickHandler(a.fn)} />)}
171
+ </div>
172
+ <textarea
173
+ className="rich"
174
+ ref={this.inputRef}
175
+ id={id}
176
+ name={name}
177
+ value={value}
178
+ rows={rows}
179
+ onChange={this.handleChange}
180
+ onKeyDown={this.handleKeyPress} />
181
+ </div>
182
+ );
183
+ }
184
+
185
+ replaceSelection(prefix, replacement, postfix) {
186
+ let textarea = this.inputRef.current;
187
+ let { selectionStart, selectionEnd, value } = textarea;
188
+
189
+ textarea.value =
190
+ value.substr(0, selectionStart) +
191
+ prefix + replacement + postfix +
192
+ value.substr(selectionEnd, value.length);
193
+
194
+ textarea.focus({ preventScroll: true });
195
+ textarea.setSelectionRange(
196
+ selectionStart + prefix.length,
197
+ selectionStart + prefix.length + replacement.length
198
+ );
199
+ this.setState({ value: textarea.value });
200
+ }
201
+
202
+ strToList(str, prefix) {
203
+ return str.split("\n").map(l => prefix + " " + l).join("\n");
204
+ }
205
+ }
206
+
207
+ RichTextArea.propTypes = {
208
+ id: PropTypes.string,
209
+ name: PropTypes.string,
210
+ value: PropTypes.string,
211
+ rows: PropTypes.number,
212
+ simple: PropTypes.bool
213
+ };
@@ -0,0 +1,20 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default class RichTextToolbarButton extends React.Component {
5
+ render() {
6
+ return (
7
+ <a title={this.props.name}
8
+ className={"button " + this.props.className}
9
+ onClick={this.props.onClick}>
10
+ <i className={"fa fa-" + this.props.className} />
11
+ </a>
12
+ );
13
+ }
14
+ }
15
+
16
+ RichTextToolbarButton.propTypes = {
17
+ className: PropTypes.string,
18
+ name: PropTypes.string,
19
+ onClick: PropTypes.func
20
+ };
@@ -0,0 +1,42 @@
1
+ import React, { useState } from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default function AddTagForm(props) {
5
+ const [tag, setTag] = useState("");
6
+
7
+ const submit = (evt) => {
8
+ evt.preventDefault();
9
+ props.addTag(tag);
10
+ setTag("");
11
+ };
12
+
13
+ const handleKeyDown = (evt) => {
14
+ if (evt.which === 13) {
15
+ submit(evt);
16
+ }
17
+ };
18
+
19
+ const handleChange = (evt) => {
20
+ setTag(evt.target.value);
21
+ };
22
+
23
+ return (
24
+ <div className="add-tag-form">
25
+ <input name="add-tag"
26
+ type="text"
27
+ className="add-tag"
28
+ value={tag}
29
+ onKeyDown={handleKeyDown}
30
+ onChange={handleChange}
31
+ placeholder="Add tag..." />
32
+ <button onClick={submit}
33
+ disabled={!tag}>
34
+ Add
35
+ </button>
36
+ </div>
37
+ );
38
+ }
39
+
40
+ AddTagForm.propTypes = {
41
+ addTag: PropTypes.func
42
+ };
@@ -0,0 +1,32 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ export default function Tag(props) {
5
+ const handleChange = () => {
6
+ props.toggleEnabled(props.tag);
7
+ };
8
+
9
+ let classes = ["tag"];
10
+ if (props.enabled) {
11
+ classes.push("enabled");
12
+ }
13
+
14
+ return (
15
+ <span className={classes.join(" ")}>
16
+ <label className="check-box">
17
+ <input type="checkbox"
18
+ name={"tag-" + props.tag}
19
+ value="1"
20
+ checked={props.enabled}
21
+ onChange={handleChange} />
22
+ <span className="name">{props.tag}</span>
23
+ </label>
24
+ </span>
25
+ );
26
+ }
27
+
28
+ Tag.propTypes = {
29
+ enabled: PropTypes.bool,
30
+ tag: PropTypes.string,
31
+ toggleEnabled: PropTypes.func
32
+ };
@@ -0,0 +1,61 @@
1
+ import React, { useState } from "react";
2
+ import PropTypes from "prop-types";
3
+
4
+ import AddTagForm from "./TagEditor/AddTagForm";
5
+ import Tag from "./TagEditor/Tag";
6
+
7
+ function onlyUnique(value, index, self) {
8
+ return self.indexOf(value) === index;
9
+ }
10
+
11
+ export default function TagEditor(props) {
12
+ const [tags, setTags] = useState(props.tags);
13
+ const [enabled, setEnabled] = useState(props.enabled);
14
+
15
+ const tagList = [...tags, ...enabled].filter(onlyUnique);
16
+
17
+ const normalize = (tag) => {
18
+ return (
19
+ tagList.filter(t => t.toLowerCase() == tag.toLowerCase())[0] || tag
20
+ );
21
+ };
22
+
23
+ const tagEnabled = (tag) => {
24
+ return enabled.map(t => t.toLowerCase()).indexOf(tag.toLowerCase()) !== -1;
25
+ };
26
+
27
+ const toggleEnabled = (tag) => {
28
+ const normalized = normalize(tag);
29
+
30
+ if (tagEnabled(normalized)) {
31
+ setEnabled(enabled.filter((t) => t !== normalized));
32
+ } else {
33
+ setEnabled([...enabled, normalized]);
34
+ }
35
+ };
36
+
37
+ const addTag = (tag) => {
38
+ const normalized = normalize(tag);
39
+
40
+ setTags([...tags, normalized].filter(onlyUnique));
41
+ setEnabled([...enabled, normalized].filter(onlyUnique));
42
+ };
43
+
44
+ return (
45
+ <div className="tag-editor clearfix">
46
+ <input type="hidden" name={props.name} value={JSON.stringify(enabled)} />
47
+ {tagList.map((t) =>
48
+ <Tag key={t}
49
+ tag={t}
50
+ enabled={tagEnabled(t)}
51
+ toggleEnabled={toggleEnabled} />)}
52
+ <AddTagForm addTag={addTag} />
53
+ </div>
54
+ );
55
+ }
56
+
57
+ TagEditor.propTypes = {
58
+ name: PropTypes.string,
59
+ enabled: PropTypes.array,
60
+ tags: PropTypes.array
61
+ };
@@ -0,0 +1,72 @@
1
+ import React from "react";
2
+ import PropTypes from "prop-types";
3
+ import ToastStore from "./ToastStore";
4
+
5
+ export default class Toast extends React.Component {
6
+ constructor(props) {
7
+ super(props);
8
+ this.state = { toast: undefined,
9
+ fadeout: false };
10
+ this.store = ToastStore;
11
+ this.timer = undefined;
12
+ this.handleChange = this.handleChange.bind(this);
13
+ }
14
+
15
+ componentDidMount() {
16
+ this.unsubscribe = this.store.subscribe(this.handleChange);
17
+ if (this.props.error) {
18
+ this.store.dispatch({ type: "ERROR", message: this.props.error });
19
+ }
20
+ if (this.props.notice) {
21
+ this.store.dispatch({ type: "NOTICE", message: this.props.notice });
22
+ }
23
+ }
24
+
25
+ componentWillUnmount() {
26
+ this.unsubscribe();
27
+ if (this.timer) {
28
+ clearTimeout(this.timer);
29
+ }
30
+ }
31
+
32
+ handleChange() {
33
+ this.setState({ toast: this.store.getState()[0], fadeout: false });
34
+ if (!this.timer) {
35
+ this.timer = setTimeout(() => {
36
+ this.setState({ fadeout: true });
37
+ this.timer = setTimeout(() => {
38
+ this.timer = undefined;
39
+ this.setState({ fadeout: false });
40
+ this.store.dispatch({ type: "NEXT" });
41
+ }, 500);
42
+ }, 4000);
43
+ }
44
+ }
45
+
46
+ render() {
47
+ let toast = this.state.toast;
48
+ let classNames = ["toast"];
49
+
50
+ if (toast) {
51
+ classNames.push(toast.type);
52
+ if (this.state.fadeout) {
53
+ classNames.push("fadeout");
54
+ }
55
+ }
56
+
57
+ return (
58
+ <div className="toast-wrapper">
59
+ {toast && (
60
+ <div className={classNames.join(" ")}>
61
+ {toast.message}
62
+ </div>
63
+ )}
64
+ </div>
65
+ );
66
+ }
67
+ }
68
+
69
+ Toast.propTypes = {
70
+ notice: PropTypes.string,
71
+ error: PropTypes.string
72
+ };
@@ -0,0 +1,14 @@
1
+ import { createStore } from "redux";
2
+
3
+ export default createStore((state = [], action) => {
4
+ switch(action.type) {
5
+ case "ERROR":
6
+ return [...state, { message: action.message, type: "error" }];
7
+ case "NOTICE":
8
+ return [...state, { message: action.message, type: "notice" }];
9
+ case "NEXT":
10
+ return state.slice(1);
11
+ default:
12
+ return state;
13
+ }
14
+ });