alchemy_cms 4.6.1 → 5.0.0.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (378) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +33 -1
  3. data/.github/workflows/stale.yml +1 -1
  4. data/.gitignore +20 -2
  5. data/.hound.yml +2 -1
  6. data/.prettierrc +6 -0
  7. data/.rubocop.yml +31 -10
  8. data/CHANGELOG.md +88 -0
  9. data/Gemfile +24 -22
  10. data/README.md +31 -19
  11. data/Rakefile +10 -8
  12. data/alchemy_cms.gemspec +5 -4
  13. data/app/assets/javascripts/alchemy/admin.js +1 -5
  14. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +2 -1
  15. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +0 -2
  16. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +17 -17
  17. data/app/assets/javascripts/alchemy/node_select.js +39 -0
  18. data/app/assets/javascripts/alchemy/templates/index.js +1 -0
  19. data/app/assets/javascripts/alchemy/templates/node.hbs +16 -0
  20. data/app/assets/stylesheets/alchemy/admin.scss +3 -2
  21. data/app/assets/stylesheets/alchemy/base.scss +0 -1
  22. data/app/assets/stylesheets/alchemy/elements.scss +1 -1
  23. data/app/assets/stylesheets/alchemy/forms.scss +5 -0
  24. data/app/assets/stylesheets/alchemy/node-select.scss +43 -0
  25. data/app/assets/stylesheets/alchemy/nodes.scss +1 -1
  26. data/app/assets/stylesheets/alchemy/sitemap.scss +5 -1
  27. data/app/assets/stylesheets/alchemy/tables.scss +1 -24
  28. data/app/controllers/alchemy/admin/attachments_controller.rb +8 -7
  29. data/app/controllers/alchemy/admin/base_controller.rb +13 -33
  30. data/app/controllers/alchemy/admin/clipboard_controller.rb +5 -4
  31. data/app/controllers/alchemy/admin/contents_controller.rb +1 -2
  32. data/app/controllers/alchemy/admin/dashboard_controller.rb +10 -9
  33. data/app/controllers/alchemy/admin/elements_controller.rb +20 -20
  34. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +12 -14
  35. data/app/controllers/alchemy/admin/languages_controller.rb +35 -2
  36. data/app/controllers/alchemy/admin/layoutpages_controller.rb +5 -2
  37. data/app/controllers/alchemy/admin/nodes_controller.rb +5 -4
  38. data/app/controllers/alchemy/admin/pages_controller.rb +50 -62
  39. data/app/controllers/alchemy/admin/pictures_controller.rb +16 -16
  40. data/app/controllers/alchemy/admin/resources_controller.rb +21 -13
  41. data/app/controllers/alchemy/admin/sites_controller.rb +18 -0
  42. data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
  43. data/app/controllers/alchemy/admin/tags_controller.rb +5 -3
  44. data/app/controllers/alchemy/admin/trash_controller.rb +6 -6
  45. data/app/controllers/alchemy/api/base_controller.rb +2 -2
  46. data/app/controllers/alchemy/api/contents_controller.rb +4 -4
  47. data/app/controllers/alchemy/api/elements_controller.rb +8 -8
  48. data/app/controllers/alchemy/api/nodes_controller.rb +37 -1
  49. data/app/controllers/alchemy/api/pages_controller.rb +14 -23
  50. data/app/controllers/alchemy/attachments_controller.rb +5 -5
  51. data/app/controllers/alchemy/base_controller.rb +10 -9
  52. data/app/controllers/alchemy/messages_controller.rb +16 -23
  53. data/app/controllers/alchemy/pages_controller.rb +13 -11
  54. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +3 -2
  55. data/app/controllers/concerns/alchemy/admin/current_language.rb +23 -0
  56. data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -5
  57. data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +4 -4
  58. data/app/controllers/concerns/alchemy/page_redirects.rb +2 -9
  59. data/app/controllers/concerns/alchemy/site_redirects.rb +2 -2
  60. data/app/decorators/alchemy/element_editor.rb +39 -0
  61. data/app/helpers/alchemy/admin/attachments_helper.rb +6 -6
  62. data/app/helpers/alchemy/admin/base_helper.rb +36 -35
  63. data/app/helpers/alchemy/admin/contents_helper.rb +3 -3
  64. data/app/helpers/alchemy/admin/elements_helper.rb +3 -88
  65. data/app/helpers/alchemy/admin/essences_helper.rb +8 -117
  66. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  67. data/app/helpers/alchemy/admin/navigation_helper.rb +24 -23
  68. data/app/helpers/alchemy/admin/pages_helper.rb +4 -4
  69. data/app/helpers/alchemy/admin/pictures_helper.rb +3 -3
  70. data/app/helpers/alchemy/admin/tags_helper.rb +8 -7
  71. data/app/helpers/alchemy/base_helper.rb +13 -8
  72. data/app/helpers/alchemy/elements_block_helper.rb +2 -31
  73. data/app/helpers/alchemy/elements_helper.rb +12 -58
  74. data/app/helpers/alchemy/pages_helper.rb +24 -174
  75. data/app/helpers/alchemy/url_helper.rb +2 -1
  76. data/app/mailers/alchemy/base_mailer.rb +1 -1
  77. data/app/mailers/alchemy/messages_mailer.rb +1 -1
  78. data/app/models/alchemy/attachment.rb +20 -18
  79. data/app/models/alchemy/base_record.rb +2 -5
  80. data/app/models/alchemy/content.rb +33 -38
  81. data/app/models/alchemy/content/factory.rb +24 -31
  82. data/app/models/alchemy/element.rb +45 -53
  83. data/app/models/alchemy/element/definitions.rb +4 -4
  84. data/app/models/alchemy/element/element_contents.rb +9 -6
  85. data/app/models/alchemy/element/element_essences.rb +4 -3
  86. data/app/models/alchemy/element/presenters.rb +3 -2
  87. data/app/models/alchemy/element_to_page.rb +1 -1
  88. data/app/models/alchemy/essence_boolean.rb +1 -3
  89. data/app/models/alchemy/essence_date.rb +2 -3
  90. data/app/models/alchemy/essence_file.rb +4 -4
  91. data/app/models/alchemy/essence_html.rb +1 -3
  92. data/app/models/alchemy/essence_link.rb +1 -3
  93. data/app/models/alchemy/essence_node.rb +18 -0
  94. data/app/models/alchemy/essence_page.rb +3 -16
  95. data/app/models/alchemy/essence_picture.rb +17 -16
  96. data/app/models/alchemy/essence_picture_view.rb +7 -6
  97. data/app/models/alchemy/essence_richtext.rb +1 -3
  98. data/app/models/alchemy/essence_select.rb +1 -3
  99. data/app/models/alchemy/essence_text.rb +0 -2
  100. data/app/models/alchemy/folded_page.rb +1 -0
  101. data/app/models/alchemy/language.rb +21 -35
  102. data/app/models/alchemy/language/code.rb +4 -4
  103. data/app/models/alchemy/legacy_page_url.rb +1 -1
  104. data/app/models/alchemy/message.rb +3 -3
  105. data/app/models/alchemy/node.rb +27 -4
  106. data/app/models/alchemy/page.rb +46 -127
  107. data/app/models/alchemy/page/fixed_attributes.rb +3 -2
  108. data/app/models/alchemy/page/page_elements.rb +35 -44
  109. data/app/models/alchemy/page/page_naming.rb +20 -70
  110. data/app/models/alchemy/page/page_natures.rb +7 -34
  111. data/app/models/alchemy/page/page_scopes.rb +23 -29
  112. data/app/models/alchemy/page/url_path.rb +0 -2
  113. data/app/models/alchemy/picture.rb +18 -27
  114. data/app/models/alchemy/picture/transformations.rb +9 -7
  115. data/app/models/alchemy/picture/url.rb +5 -5
  116. data/app/models/alchemy/site.rb +6 -36
  117. data/app/models/alchemy/site/layout.rb +2 -2
  118. data/app/models/concerns/alchemy/touch_elements.rb +24 -0
  119. data/app/serializers/alchemy/content_serializer.rb +0 -3
  120. data/app/serializers/alchemy/essence_boolean_serializer.rb +3 -3
  121. data/app/serializers/alchemy/essence_date_serializer.rb +3 -3
  122. data/app/serializers/alchemy/essence_file_serializer.rb +4 -2
  123. data/app/serializers/alchemy/essence_html_serializer.rb +3 -3
  124. data/app/serializers/alchemy/essence_link_serializer.rb +3 -3
  125. data/app/serializers/alchemy/essence_picture_serializer.rb +5 -4
  126. data/app/serializers/alchemy/essence_richtext_serializer.rb +3 -3
  127. data/app/serializers/alchemy/essence_select_serializer.rb +3 -3
  128. data/app/serializers/alchemy/essence_text_serializer.rb +5 -4
  129. data/app/serializers/alchemy/node_serializer.rb +2 -0
  130. data/app/serializers/alchemy/page_tree_serializer.rb +9 -13
  131. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  132. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +1 -2
  133. data/app/views/alchemy/admin/attachments/_files_list.html.erb +4 -4
  134. data/app/views/alchemy/admin/contents/create.js.erb +1 -3
  135. data/app/views/alchemy/admin/elements/_element.html.erb +9 -18
  136. data/app/views/alchemy/admin/elements/create.js.erb +1 -1
  137. data/app/views/alchemy/admin/elements/fold.js.erb +1 -1
  138. data/app/views/alchemy/admin/elements/index.html.erb +3 -3
  139. data/app/views/alchemy/admin/essence_files/assign.js.erb +1 -6
  140. data/app/views/alchemy/admin/essence_files/edit.html.erb +1 -1
  141. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +1 -7
  142. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +1 -1
  143. data/app/views/alchemy/admin/essence_pictures/edit.html.erb +7 -7
  144. data/app/views/alchemy/admin/essence_pictures/update.js.erb +1 -1
  145. data/app/views/alchemy/admin/languages/_form.html.erb +5 -5
  146. data/app/views/alchemy/admin/languages/_table.html.erb +3 -3
  147. data/app/views/alchemy/admin/languages/edit.html.erb +1 -0
  148. data/app/views/alchemy/admin/languages/index.html.erb +23 -4
  149. data/app/views/alchemy/admin/languages/new.html.erb +1 -0
  150. data/app/views/alchemy/admin/layoutpages/index.html.erb +3 -3
  151. data/app/views/alchemy/admin/nodes/_form.html.erb +18 -15
  152. data/app/views/alchemy/admin/nodes/_node.html.erb +1 -5
  153. data/app/views/alchemy/admin/nodes/index.html.erb +3 -4
  154. data/app/views/alchemy/admin/pages/_create_language_form.html.erb +0 -8
  155. data/app/views/alchemy/admin/pages/_form.html.erb +0 -1
  156. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -0
  157. data/app/views/alchemy/admin/pages/_page.html.erb +11 -19
  158. data/app/views/alchemy/admin/pages/_page_infos.html.erb +0 -4
  159. data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
  160. data/app/views/alchemy/admin/pages/info.html.erb +0 -9
  161. data/app/views/alchemy/admin/pages/unlock.js.erb +13 -6
  162. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +0 -2
  163. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +1 -5
  164. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +1 -1
  165. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +1 -2
  166. data/app/views/alchemy/admin/resources/_resource.html.erb +1 -1
  167. data/app/views/alchemy/admin/resources/_table.html.erb +2 -2
  168. data/app/views/alchemy/admin/sites/_form.html.erb +8 -0
  169. data/app/views/alchemy/admin/sites/edit.html.erb +1 -0
  170. data/app/views/alchemy/admin/sites/index.html.erb +21 -9
  171. data/app/views/alchemy/admin/sites/new.html.erb +1 -0
  172. data/app/views/alchemy/admin/tags/index.html.erb +2 -2
  173. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +10 -12
  174. data/app/views/alchemy/essences/_essence_date_editor.html.erb +11 -8
  175. data/app/views/alchemy/essences/_essence_file_editor.html.erb +16 -17
  176. data/app/views/alchemy/essences/_essence_html_editor.html.erb +8 -5
  177. data/app/views/alchemy/essences/_essence_link_editor.html.erb +18 -15
  178. data/app/views/alchemy/essences/_essence_node_editor.html.erb +27 -0
  179. data/app/views/alchemy/essences/_essence_node_view.html.erb +1 -0
  180. data/app/views/alchemy/essences/_essence_page_editor.html.erb +14 -11
  181. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +22 -20
  182. data/app/views/alchemy/essences/_essence_richtext_editor.html.erb +10 -7
  183. data/app/views/alchemy/essences/_essence_select_editor.html.erb +12 -16
  184. data/app/views/alchemy/essences/_essence_text_editor.html.erb +18 -17
  185. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +6 -11
  186. data/app/views/alchemy/pages/show.rss.builder +3 -2
  187. data/app/views/layouts/alchemy/admin.html.erb +1 -0
  188. data/babel.config.js +12 -0
  189. data/bin/rails +5 -4
  190. data/config/alchemy/config.yml +15 -18
  191. data/config/brakeman.ignore +1 -1
  192. data/config/initializers/assets.rb +2 -1
  193. data/config/initializers/dragonfly.rb +2 -1
  194. data/config/initializers/mime_types.rb +1 -0
  195. data/config/initializers/mini_profiler.rb +3 -2
  196. data/config/initializers/simple_form.rb +6 -6
  197. data/config/locales/alchemy.en.yml +23 -8
  198. data/config/routes.rb +25 -24
  199. data/config/spring.rb +3 -2
  200. data/db/migrate/20200226213334_alchemy_four_point_four.rb +313 -0
  201. data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb +11 -0
  202. data/db/migrate/20200504210159_remove_site_id_from_nodes.rb +28 -0
  203. data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb +8 -0
  204. data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb +27 -0
  205. data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb +6 -0
  206. data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb +24 -0
  207. data/lib/alchemy/admin/locale.rb +3 -1
  208. data/lib/alchemy/admin/preview_url.rb +64 -0
  209. data/lib/alchemy/auth_accessors.rb +8 -7
  210. data/lib/alchemy/cache_digests/template_tracker.rb +5 -4
  211. data/lib/alchemy/config.rb +1 -5
  212. data/lib/alchemy/configuration_methods.rb +3 -1
  213. data/lib/alchemy/controller_actions.rb +6 -5
  214. data/lib/alchemy/deprecation.rb +2 -1
  215. data/lib/alchemy/elements_finder.rb +5 -5
  216. data/lib/alchemy/engine.rb +23 -8
  217. data/lib/alchemy/errors.rb +0 -7
  218. data/lib/alchemy/essence.rb +17 -16
  219. data/lib/alchemy/filetypes.rb +5 -5
  220. data/lib/alchemy/forms/builder.rb +4 -4
  221. data/lib/alchemy/hints.rb +1 -1
  222. data/lib/alchemy/i18n.rb +2 -1
  223. data/lib/alchemy/modules.rb +12 -12
  224. data/lib/alchemy/name_conversions.rb +5 -5
  225. data/lib/alchemy/on_page_layout/callbacks_runner.rb +1 -0
  226. data/lib/alchemy/page_layout.rb +15 -12
  227. data/lib/alchemy/paths.rb +1 -1
  228. data/lib/alchemy/permissions.rb +7 -6
  229. data/lib/alchemy/resource.rb +23 -13
  230. data/lib/alchemy/resources_helper.rb +12 -18
  231. data/lib/alchemy/routing_constraints.rb +1 -1
  232. data/lib/alchemy/seeder.rb +42 -14
  233. data/lib/alchemy/shell.rb +13 -10
  234. data/lib/alchemy/taggable.rb +1 -0
  235. data/lib/alchemy/tasks/tidy.rb +4 -3
  236. data/lib/alchemy/test_support/config_stubbing.rb +1 -0
  237. data/lib/alchemy/test_support/essence_shared_examples.rb +72 -72
  238. data/lib/alchemy/test_support/factories.rb +1 -1
  239. data/lib/alchemy/test_support/factories/attachment_factory.rb +5 -5
  240. data/lib/alchemy/test_support/factories/content_factory.rb +6 -6
  241. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +7 -7
  242. data/lib/alchemy/test_support/factories/element_factory.rb +9 -9
  243. data/lib/alchemy/test_support/factories/essence_file_factory.rb +3 -3
  244. data/lib/alchemy/test_support/factories/essence_page_factory.rb +3 -3
  245. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +4 -4
  246. data/lib/alchemy/test_support/factories/essence_text_factory.rb +3 -3
  247. data/lib/alchemy/test_support/factories/language_factory.rb +16 -14
  248. data/lib/alchemy/test_support/factories/node_factory.rb +8 -8
  249. data/lib/alchemy/test_support/factories/page_factory.rb +15 -27
  250. data/lib/alchemy/test_support/factories/picture_factory.rb +5 -5
  251. data/lib/alchemy/test_support/factories/site_factory.rb +7 -6
  252. data/lib/alchemy/test_support/integration_helpers.rb +1 -0
  253. data/lib/alchemy/test_support/shared_contexts.rb +5 -4
  254. data/lib/alchemy/test_support/shared_uploader_examples.rb +4 -3
  255. data/lib/alchemy/tinymce.rb +15 -13
  256. data/lib/alchemy/upgrader.rb +8 -7
  257. data/lib/alchemy/upgrader/five_point_zero.rb +41 -0
  258. data/lib/alchemy/upgrader/tasks/element_views_updater.rb +4 -4
  259. data/lib/alchemy/upgrader/tasks/harden_gutentag_migrations.rb +29 -0
  260. data/lib/alchemy/version.rb +1 -1
  261. data/lib/alchemy_cms.rb +52 -50
  262. data/lib/{rails/generators → generators}/alchemy/base.rb +5 -4
  263. data/lib/{rails/generators → generators}/alchemy/elements/elements_generator.rb +13 -9
  264. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.erb +0 -0
  265. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.haml +0 -0
  266. data/lib/{rails/generators → generators}/alchemy/elements/templates/view.html.slim +0 -0
  267. data/lib/{rails/generators → generators}/alchemy/essence/essence_generator.rb +15 -13
  268. data/lib/generators/alchemy/essence/templates/editor.html.erb +17 -0
  269. data/lib/{rails/generators → generators}/alchemy/essence/templates/view.html.erb +0 -0
  270. data/lib/{rails/generators → generators}/alchemy/install/files/_article.html.erb +0 -0
  271. data/lib/{rails/generators → generators}/alchemy/install/files/_standard.html.erb +0 -0
  272. data/lib/{rails/generators → generators}/alchemy/install/files/alchemy.en.yml +0 -0
  273. data/lib/generators/alchemy/install/files/alchemy_admin.js +1 -0
  274. data/lib/{rails/generators → generators}/alchemy/install/files/all.css +0 -0
  275. data/lib/{rails/generators → generators}/alchemy/install/files/all.js +0 -0
  276. data/lib/{rails/generators → generators}/alchemy/install/files/application.html.erb +0 -0
  277. data/lib/{rails/generators → generators}/alchemy/install/files/article.scss +0 -0
  278. data/lib/generators/alchemy/install/install_generator.rb +110 -0
  279. data/lib/{rails/generators → generators}/alchemy/install/templates/dragonfly.rb.tt +0 -0
  280. data/lib/{rails/generators → generators}/alchemy/install/templates/elements.yml.tt +0 -0
  281. data/lib/{rails/generators → generators}/alchemy/install/templates/menus.yml.tt +0 -0
  282. data/lib/{rails/generators → generators}/alchemy/install/templates/page_layouts.yml.tt +0 -0
  283. data/lib/{rails/generators → generators}/alchemy/menus/menus_generator.rb +2 -2
  284. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.erb +1 -4
  285. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.haml +1 -4
  286. data/lib/{rails/generators → generators}/alchemy/menus/templates/node.html.slim +1 -4
  287. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.erb +1 -1
  288. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.haml +1 -1
  289. data/lib/{rails/generators → generators}/alchemy/menus/templates/wrapper.html.slim +1 -1
  290. data/lib/{rails/generators → generators}/alchemy/module/module_generator.rb +3 -2
  291. data/lib/{rails/generators → generators}/alchemy/module/templates/ability.rb.tt +0 -0
  292. data/lib/{rails/generators → generators}/alchemy/module/templates/controller.rb.tt +0 -0
  293. data/lib/{rails/generators → generators}/alchemy/module/templates/module_config.rb.tt +0 -0
  294. data/lib/{rails/generators → generators}/alchemy/page_layouts/page_layouts_generator.rb +5 -4
  295. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.erb +0 -0
  296. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.haml +0 -0
  297. data/lib/{rails/generators → generators}/alchemy/page_layouts/templates/layout.html.slim +0 -0
  298. data/lib/{rails/generators → generators}/alchemy/site_layouts/site_layouts_generator.rb +4 -2
  299. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.erb +0 -0
  300. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.haml +0 -0
  301. data/lib/{rails/generators → generators}/alchemy/site_layouts/templates/layout.html.slim +0 -0
  302. data/lib/{rails/generators → generators}/alchemy/views/views_generator.rb +7 -6
  303. data/lib/kaminari/scoped_pagination_url_helper.rb +1 -0
  304. data/lib/tasks/alchemy/db.rake +3 -19
  305. data/lib/tasks/alchemy/install.rake +3 -2
  306. data/lib/tasks/alchemy/tidy.rake +9 -8
  307. data/lib/tasks/alchemy/upgrade.rake +18 -116
  308. data/package.json +45 -0
  309. data/package/admin.js +14 -0
  310. data/package/src/__tests__/i18n.spec.js +70 -0
  311. data/package/src/i18n.js +48 -0
  312. data/package/src/node_tree.js +72 -0
  313. data/package/src/translations.js +32 -0
  314. data/package/src/utils/__tests__/ajax.spec.js +124 -0
  315. data/package/src/utils/__tests__/events.spec.js +38 -0
  316. data/package/src/utils/ajax.js +48 -0
  317. data/package/src/utils/events.js +16 -0
  318. data/vendor/assets/fonts/fa-regular-400.eot +0 -0
  319. data/vendor/assets/fonts/fa-regular-400.svg +798 -358
  320. data/vendor/assets/fonts/fa-regular-400.ttf +0 -0
  321. data/vendor/assets/fonts/fa-regular-400.woff +0 -0
  322. data/vendor/assets/fonts/fa-regular-400.woff2 +0 -0
  323. data/vendor/assets/fonts/fa-solid-900.eot +0 -0
  324. data/vendor/assets/fonts/fa-solid-900.svg +4933 -1408
  325. data/vendor/assets/fonts/fa-solid-900.ttf +0 -0
  326. data/vendor/assets/fonts/fa-solid-900.woff +0 -0
  327. data/vendor/assets/fonts/fa-solid-900.woff2 +0 -0
  328. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +1 -2
  329. data/vendor/assets/stylesheets/fontawesome/_core.scss +5 -0
  330. data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +1 -1
  331. data/vendor/assets/stylesheets/fontawesome/_icons.scss +651 -2
  332. data/vendor/assets/stylesheets/fontawesome/_mixins.scss +0 -1
  333. data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +3 -2
  334. data/vendor/assets/stylesheets/fontawesome/_stacked.scss +1 -1
  335. data/vendor/assets/stylesheets/fontawesome/_variables.scss +662 -9
  336. data/vendor/assets/stylesheets/fontawesome/fontawesome.scss +2 -2
  337. data/vendor/assets/stylesheets/fontawesome/regular.scss +23 -0
  338. data/vendor/assets/stylesheets/fontawesome/solid.scss +24 -0
  339. metadata +108 -86
  340. data/app/assets/javascripts/alchemy/alchemy.i18n.js.coffee +0 -32
  341. data/app/assets/javascripts/alchemy/alchemy.node_tree.js +0 -66
  342. data/app/assets/javascripts/alchemy/alchemy.translations.js.coffee +0 -29
  343. data/app/assets/javascripts/alchemy/alchemy.utils.js +0 -45
  344. data/app/helpers/alchemy/essences_helper.rb +0 -119
  345. data/app/models/concerns/alchemy/content_touching.rb +0 -23
  346. data/app/serializers/alchemy/legacy_element_serializer.rb +0 -15
  347. data/app/views/alchemy/admin/contents/_missing.html.erb +0 -17
  348. data/app/views/alchemy/admin/pages/_menu_fields.html.erb +0 -37
  349. data/app/views/alchemy/admin/pages/configure_external.html.erb +0 -32
  350. data/app/views/alchemy/elements/_editor_not_found.html.erb +0 -4
  351. data/app/views/alchemy/navigation/_image_link.html.erb +0 -14
  352. data/app/views/alchemy/navigation/_link.html.erb +0 -19
  353. data/app/views/alchemy/navigation/_renderer.html.erb +0 -29
  354. data/db/migrate/20180226123013_alchemy_four_point_zero.rb +0 -363
  355. data/db/migrate/20180227224537_migrate_tags_to_gutentag.rb +0 -41
  356. data/db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb +0 -6
  357. data/db/migrate/20191016073858_create_alchemy_essence_pages.rb +0 -8
  358. data/db/migrate/20191029212236_create_alchemy_nodes.rb +0 -24
  359. data/db/migrate/20200226081535_add_site_id_to_alchemy_nodes.rb +0 -15
  360. data/lib/alchemy/ssl_protection.rb +0 -34
  361. data/lib/alchemy/tasks/helpers.rb +0 -81
  362. data/lib/alchemy/test_support/controller_requests.rb +0 -93
  363. data/lib/alchemy/upgrader/four_point_four.rb +0 -52
  364. data/lib/alchemy/upgrader/four_point_one.rb +0 -42
  365. data/lib/alchemy/upgrader/four_point_six.rb +0 -50
  366. data/lib/alchemy/upgrader/four_point_two.rb +0 -85
  367. data/lib/alchemy/upgrader/tasks/cells_migration.rb +0 -43
  368. data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +0 -148
  369. data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb +0 -28
  370. data/lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb +0 -27
  371. data/lib/alchemy/upgrader/tasks/picture_gallery_migration.rb +0 -65
  372. data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +0 -210
  373. data/lib/rails/generators/alchemy/essence/templates/editor.html.erb +0 -15
  374. data/lib/rails/generators/alchemy/install/install_generator.rb +0 -60
  375. data/lib/tasks/alchemy/convert.rake +0 -97
  376. data/vendor/assets/javascripts/sortable/Sortable.min.js +0 -2
  377. data/vendor/assets/stylesheets/fontawesome/fa-regular.scss +0 -22
  378. data/vendor/assets/stylesheets/fontawesome/fa-solid.scss +0 -23
@@ -1,19 +0,0 @@
1
- <% if page.definition['redirects_to_external'] %>
2
- <%= link_to(
3
- h(page.name),
4
- page.external_urlname,
5
- title: options[:show_title] == true ? page.title : nil,
6
- target: configuration(:open_external_links_in_new_tab) ? '_blank' : nil,
7
- class: external_page_css_class(page)
8
- ) %>
9
- <% else %>
10
- <%= link_to(
11
- h(page.name),
12
- @preview_mode ? 'javascript: void(0)' : show_alchemy_page_path(page),
13
- {
14
- class: (page_active?(page) ? 'active' : nil),
15
- title: (options[:show_title] ? page.title : nil),
16
- data: {'page-id' => page.id}
17
- }
18
- ) %>
19
- <% end %>
@@ -1,29 +0,0 @@
1
- <% if pages.present? %>
2
- <%= content_tag(
3
- 'ul',
4
- html_options.reverse_merge(class: "navigation level_#{pages.first.level - 1}")
5
- ) do %>
6
- <% pages.each do |page| %>
7
- <% position = 'first' if page == pages.first %>
8
- <% position = 'last' if page == pages.last %>
9
- <%= content_tag(
10
- 'li',
11
- :class => [page.slug, position, page_active?(page) ? 'active' : nil].compact.join(' ')
12
- ) do %>
13
- <%= render options[:navigation_link_partial], :page => page, :options => options %>
14
- <% options[:from_page] = page %>
15
- <% if options[:reverse_children] %>
16
- <% options[:reverse] = true %>
17
- <% end %>
18
- <% if options[:show_nonactive] %>
19
- <%= render_navigation(options) if options[:submenu] %>
20
- <% else %>
21
- <%= render_navigation(options) if (options[:submenu] && page_active?(page)) || options[:all_sub_menues] %>
22
- <% end %>
23
- <% end %>
24
- <% if options[:spacer].present? && position != 'last' %>
25
- <%= content_tag :li, options[:spacer].html_safe, class: 'navigation_spacer' %>
26
- <% end %>
27
- <% end %>
28
- <% end %>
29
- <% end %>
@@ -1,363 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- class AlchemyFourPointZero < ActiveRecord::Migration[5.0]
4
- def up
5
- unless table_exists?(:alchemy_attachments)
6
- create_table :alchemy_attachments do |t|
7
- t.string "name"
8
- t.string "file_name"
9
- t.string "file_mime_type"
10
- t.integer "file_size"
11
- t.integer "creator_id"
12
- t.integer "updater_id"
13
- t.datetime "created_at", null: false, precision: 6
14
- t.datetime "updated_at", null: false, precision: 6
15
- t.text "cached_tag_list"
16
- t.string "file_uid"
17
- t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
18
- end
19
- end
20
-
21
- unless table_exists?(:alchemy_contents)
22
- create_table :alchemy_contents do |t|
23
- t.string "name"
24
- t.string "essence_type", null: false
25
- t.integer "essence_id", null: false
26
- t.integer "element_id", null: false
27
- t.integer "position"
28
- t.datetime "created_at", null: false, precision: 6
29
- t.datetime "updated_at", null: false, precision: 6
30
- t.integer "creator_id"
31
- t.integer "updater_id"
32
- t.index ["element_id", "position"], name: "index_contents_on_element_id_and_position"
33
- t.index ["essence_id", "essence_type"], name: "index_alchemy_contents_on_essence_id_and_essence_type", unique: true
34
- end
35
- end
36
-
37
- unless table_exists?(:alchemy_elements)
38
- create_table :alchemy_elements do |t|
39
- t.string "name"
40
- t.integer "position"
41
- t.integer "page_id", null: false
42
- t.boolean "public", default: true
43
- t.boolean "folded", default: false
44
- t.boolean "unique", default: false
45
- t.datetime "created_at", null: false, precision: 6
46
- t.datetime "updated_at", null: false, precision: 6
47
- t.integer "creator_id"
48
- t.integer "updater_id"
49
- t.text "cached_tag_list"
50
- t.integer "parent_element_id"
51
- t.index ["page_id", "parent_element_id"], name: "index_alchemy_elements_on_page_id_and_parent_element_id"
52
- t.index ["page_id", "position"], name: "index_elements_on_page_id_and_position"
53
- end
54
- end
55
-
56
- unless table_exists?(:alchemy_elements_alchemy_pages)
57
- create_table :alchemy_elements_alchemy_pages, id: false do |t|
58
- t.integer "element_id"
59
- t.integer "page_id"
60
- end
61
- end
62
-
63
- unless table_exists?(:alchemy_essence_booleans)
64
- create_table :alchemy_essence_booleans do |t|
65
- t.boolean "value"
66
- t.datetime "created_at", null: false, precision: 6
67
- t.datetime "updated_at", null: false, precision: 6
68
- t.integer "creator_id"
69
- t.integer "updater_id"
70
- t.index ["value"], name: "index_alchemy_essence_booleans_on_value"
71
- end
72
- end
73
-
74
- unless table_exists?(:alchemy_essence_dates)
75
- create_table :alchemy_essence_dates do |t|
76
- t.datetime "date"
77
- t.integer "creator_id"
78
- t.integer "updater_id"
79
- t.datetime "created_at", null: false, precision: 6
80
- t.datetime "updated_at", null: false, precision: 6
81
- end
82
- end
83
-
84
- unless table_exists?(:alchemy_essence_files)
85
- create_table :alchemy_essence_files do |t|
86
- t.integer "attachment_id"
87
- t.string "title"
88
- t.string "css_class"
89
- t.integer "creator_id"
90
- t.integer "updater_id"
91
- t.datetime "created_at", null: false, precision: 6
92
- t.datetime "updated_at", null: false, precision: 6
93
- t.string "link_text"
94
- t.index ["attachment_id"], name: "index_alchemy_essence_files_on_attachment_id"
95
- end
96
- end
97
-
98
- unless table_exists?(:alchemy_essence_htmls)
99
- create_table :alchemy_essence_htmls do |t|
100
- t.text "source"
101
- t.integer "creator_id"
102
- t.integer "updater_id"
103
- t.datetime "created_at", null: false, precision: 6
104
- t.datetime "updated_at", null: false, precision: 6
105
- end
106
- end
107
-
108
- unless table_exists?(:alchemy_essence_links)
109
- create_table :alchemy_essence_links do |t|
110
- t.string "link"
111
- t.string "link_title"
112
- t.string "link_target"
113
- t.string "link_class_name"
114
- t.datetime "created_at", null: false, precision: 6
115
- t.datetime "updated_at", null: false, precision: 6
116
- t.integer "creator_id"
117
- t.integer "updater_id"
118
- end
119
- end
120
-
121
- unless table_exists?(:alchemy_essence_pictures)
122
- create_table :alchemy_essence_pictures do |t|
123
- t.integer "picture_id"
124
- t.string "caption"
125
- t.string "title"
126
- t.string "alt_tag"
127
- t.string "link"
128
- t.string "link_class_name"
129
- t.string "link_title"
130
- t.string "css_class"
131
- t.string "link_target"
132
- t.integer "creator_id"
133
- t.integer "updater_id"
134
- t.datetime "created_at", null: false, precision: 6
135
- t.datetime "updated_at", null: false, precision: 6
136
- t.string "crop_from"
137
- t.string "crop_size"
138
- t.string "render_size"
139
- t.index ["picture_id"], name: "index_alchemy_essence_pictures_on_picture_id"
140
- end
141
- end
142
-
143
- unless table_exists?(:alchemy_essence_richtexts)
144
- create_table :alchemy_essence_richtexts do |t|
145
- t.text "body"
146
- t.text "stripped_body"
147
- t.boolean "public"
148
- t.integer "creator_id"
149
- t.integer "updater_id"
150
- t.datetime "created_at", null: false, precision: 6
151
- t.datetime "updated_at", null: false, precision: 6
152
- end
153
- end
154
-
155
- unless table_exists?(:alchemy_essence_selects)
156
- create_table :alchemy_essence_selects do |t|
157
- t.string "value"
158
- t.datetime "created_at", null: false, precision: 6
159
- t.datetime "updated_at", null: false, precision: 6
160
- t.integer "creator_id"
161
- t.integer "updater_id"
162
- t.index ["value"], name: "index_alchemy_essence_selects_on_value"
163
- end
164
- end
165
-
166
- unless table_exists?(:alchemy_essence_texts)
167
- create_table :alchemy_essence_texts do |t|
168
- t.text "body"
169
- t.string "link"
170
- t.string "link_title"
171
- t.string "link_class_name"
172
- t.boolean "public", default: false
173
- t.string "link_target"
174
- t.integer "creator_id"
175
- t.integer "updater_id"
176
- t.datetime "created_at", null: false, precision: 6
177
- t.datetime "updated_at", null: false, precision: 6
178
- end
179
- end
180
-
181
- unless table_exists?(:alchemy_folded_pages)
182
- create_table :alchemy_folded_pages do |t|
183
- t.integer "page_id", null: false
184
- t.integer "user_id", null: false
185
- t.boolean "folded", default: false
186
- t.index ["page_id", "user_id"], name: "index_alchemy_folded_pages_on_page_id_and_user_id", unique: true
187
- end
188
- end
189
-
190
- unless table_exists?(:alchemy_languages)
191
- create_table :alchemy_languages do |t|
192
- t.string "name"
193
- t.string "language_code"
194
- t.string "frontpage_name"
195
- t.string "page_layout", default: "intro"
196
- t.boolean "public", default: false
197
- t.datetime "created_at", null: false, precision: 6
198
- t.datetime "updated_at", null: false, precision: 6
199
- t.integer "creator_id"
200
- t.integer "updater_id"
201
- t.boolean "default", default: false
202
- t.string "country_code", default: "", null: false
203
- t.integer "site_id", null: false
204
- t.string "locale"
205
- t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
206
- t.index ["language_code"], name: "index_alchemy_languages_on_language_code"
207
- t.index ["site_id"], name: "index_alchemy_languages_on_site_id"
208
- end
209
- end
210
-
211
- unless table_exists?(:alchemy_legacy_page_urls)
212
- create_table :alchemy_legacy_page_urls do |t|
213
- t.string "urlname", null: false
214
- t.integer "page_id", null: false
215
- t.datetime "created_at", null: false, precision: 6
216
- t.datetime "updated_at", null: false, precision: 6
217
- t.index ["page_id"], name: "index_alchemy_legacy_page_urls_on_page_id"
218
- t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
219
- end
220
- end
221
-
222
- unless table_exists?(:alchemy_pages)
223
- create_table :alchemy_pages do |t|
224
- t.string "name"
225
- t.string "urlname"
226
- t.string "title"
227
- t.string "language_code"
228
- t.boolean "language_root"
229
- t.string "page_layout"
230
- t.text "meta_keywords"
231
- t.text "meta_description"
232
- t.integer "lft"
233
- t.integer "rgt"
234
- t.integer "parent_id"
235
- t.integer "depth"
236
- t.boolean "visible", default: false
237
- t.integer "locked_by"
238
- t.boolean "restricted", default: false
239
- t.boolean "robot_index", default: true
240
- t.boolean "robot_follow", default: true
241
- t.boolean "sitemap", default: true
242
- t.boolean "layoutpage", default: false
243
- t.datetime "created_at", null: false, precision: 6
244
- t.datetime "updated_at", null: false, precision: 6
245
- t.integer "creator_id"
246
- t.integer "updater_id"
247
- t.integer "language_id"
248
- t.text "cached_tag_list"
249
- t.datetime "published_at"
250
- t.datetime "public_on"
251
- t.datetime "public_until"
252
- t.datetime "locked_at"
253
- t.index ["language_id"], name: "index_pages_on_language_id"
254
- t.index ["locked_at", "locked_by"], name: "index_alchemy_pages_on_locked_at_and_locked_by"
255
- t.index ["parent_id", "lft"], name: "index_pages_on_parent_id_and_lft"
256
- t.index ["public_on", "public_until"], name: "index_alchemy_pages_on_public_on_and_public_until"
257
- t.index ["rgt"], name: "index_alchemy_pages_on_rgt"
258
- t.index ["urlname"], name: "index_pages_on_urlname"
259
- end
260
- end
261
-
262
- unless table_exists?(:alchemy_pictures)
263
- create_table :alchemy_pictures do |t|
264
- t.string "name"
265
- t.string "image_file_name"
266
- t.integer "image_file_width"
267
- t.integer "image_file_height"
268
- t.datetime "created_at", null: false, precision: 6
269
- t.datetime "updated_at", null: false, precision: 6
270
- t.integer "creator_id"
271
- t.integer "updater_id"
272
- t.string "upload_hash"
273
- t.text "cached_tag_list"
274
- t.string "image_file_uid"
275
- t.integer "image_file_size"
276
- t.string "image_file_format"
277
- end
278
- end
279
-
280
- unless table_exists?(:alchemy_sites)
281
- create_table :alchemy_sites do |t|
282
- t.string "host"
283
- t.string "name"
284
- t.datetime "created_at", null: false, precision: 6
285
- t.datetime "updated_at", null: false, precision: 6
286
- t.boolean "public", default: false
287
- t.text "aliases"
288
- t.boolean "redirect_to_primary_host"
289
- t.index ["host", "public"], name: "alchemy_sites_public_hosts_idx"
290
- t.index ["host"], name: "index_alchemy_sites_on_host"
291
- end
292
- end
293
-
294
- unless table_exists?(:taggings)
295
- create_table :taggings do |t|
296
- t.integer "tag_id"
297
- t.string "taggable_type"
298
- t.integer "taggable_id"
299
- t.string "tagger_type"
300
- t.integer "tagger_id"
301
- t.string "context", limit: 128
302
- t.datetime "created_at", precision: 6
303
- t.index ["context"], name: "index_taggings_on_context"
304
- t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
305
- t.index ["tag_id"], name: "index_taggings_on_tag_id"
306
- t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
307
- t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
308
- t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
309
- t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
310
- t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
311
- t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
312
- end
313
- end
314
-
315
- unless table_exists?(:tags)
316
- create_table :tags do |t|
317
- t.string "name"
318
- t.integer "taggings_count", default: 0
319
- t.index ["name"], name: "index_tags_on_name", unique: true
320
- end
321
- end
322
-
323
- unless foreign_key_exists?(:alchemy_contents, column: :element_id)
324
- add_foreign_key :alchemy_contents, :alchemy_elements,
325
- column: :element_id,
326
- on_update: :cascade,
327
- on_delete: :cascade,
328
- name: :alchemy_contents_element_id_fkey
329
- end
330
-
331
- unless foreign_key_exists?(:alchemy_elements, column: :page_id)
332
- add_foreign_key :alchemy_elements, :alchemy_pages,
333
- column: :page_id,
334
- on_update: :cascade,
335
- on_delete: :cascade,
336
- name: :alchemy_elements_page_id_fkey
337
- end
338
- end
339
-
340
- def down
341
- drop_table(:alchemy_attachments) if table_exists?(:alchemy_attachments)
342
- drop_table(:alchemy_contents) if table_exists?(:alchemy_contents)
343
- drop_table(:alchemy_elements) if table_exists?(:alchemy_elements)
344
- drop_table(:alchemy_elements_alchemy_pages) if table_exists?(:alchemy_elements_alchemy_pages)
345
- drop_table(:alchemy_essence_booleans) if table_exists?(:alchemy_essence_booleans)
346
- drop_table(:alchemy_essence_dates) if table_exists?(:alchemy_essence_dates)
347
- drop_table(:alchemy_essence_files) if table_exists?(:alchemy_essence_files)
348
- drop_table(:alchemy_essence_htmls) if table_exists?(:alchemy_essence_htmls)
349
- drop_table(:alchemy_essence_links) if table_exists?(:alchemy_essence_links)
350
- drop_table(:alchemy_essence_pictures) if table_exists?(:alchemy_essence_pictures)
351
- drop_table(:alchemy_essence_richtexts) if table_exists?(:alchemy_essence_richtexts)
352
- drop_table(:alchemy_essence_selects) if table_exists?(:alchemy_essence_selects)
353
- drop_table(:alchemy_essence_texts) if table_exists?(:alchemy_essence_texts)
354
- drop_table(:alchemy_folded_pages) if table_exists?(:alchemy_folded_pages)
355
- drop_table(:alchemy_languages) if table_exists?(:alchemy_languages)
356
- drop_table(:alchemy_legacy_page_urls) if table_exists?(:alchemy_legacy_page_urls)
357
- drop_table(:alchemy_pages) if table_exists?(:alchemy_pages)
358
- drop_table(:alchemy_pictures) if table_exists?(:alchemy_pictures)
359
- drop_table(:alchemy_sites) if table_exists?(:alchemy_sites)
360
- drop_table(:taggings) if table_exists?(:taggings)
361
- drop_table(:tags) if table_exists?(:tags)
362
- end
363
- end
@@ -1,41 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- class MigrateTagsToGutentag < ActiveRecord::Migration[5.0]
4
- def up
5
- return if table_exists?(:gutentag_tags)
6
-
7
- remove_index :taggings, :taggable_id
8
- remove_column :taggings, :tagger_id, :integer
9
- remove_index :taggings, :taggable_type
10
- remove_column :taggings, :tagger_type, :string
11
- remove_index :taggings, column: [:taggable_id, :taggable_type, :context], name: 'index_taggings_on_taggable_id_and_taggable_type_and_context'
12
- remove_column :taggings, :context, :string, limit: 128
13
- if index_exists? :taggings, [:tag_id, :taggable_id, :taggable_type], unique: true, name: 'taggings_idx'
14
- rename_index :taggings, 'taggings_idx', 'unique_taggings'
15
- else
16
- add_index :taggings, [:taggable_type, :taggable_id, :tag_id], unique: true, name: 'unique_taggings'
17
- end
18
- if index_exists? :taggings, [:taggable_id, :taggable_type], name: 'taggings_idy'
19
- rename_index :taggings, 'taggings_idy', 'index_gutentag_taggings_on_taggable_id_and_taggable_type'
20
- else
21
- add_index :taggings, [:taggable_type, :taggable_id]
22
- end
23
- add_column :taggings, :updated_at, :datetime, precision: 6
24
- change_column_null :taggings, :tag_id, false
25
- change_column_null :taggings, :taggable_id, false
26
- change_column_null :taggings, :taggable_type, false
27
- change_column_null :taggings, :created_at, false, Time.current
28
- change_column_null :taggings, :updated_at, false, Time.current
29
- rename_table :taggings, :gutentag_taggings
30
-
31
- change_column_null :tags, :name, false
32
- add_index :tags, :taggings_count
33
- rename_table :tags, :gutentag_tags
34
-
35
- %i(alchemy_attachments alchemy_elements alchemy_pages alchemy_pictures).each do |table|
36
- if column_exists? table, :cached_tag_list
37
- remove_column table, :cached_tag_list
38
- end
39
- end
40
- end
41
- end