diff --git a/.gitignore b/.gitignore index 0a8b03749d8..6322b83c8d1 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,5 @@ dist # Copyright Deposits copyright + +yarn-error.log diff --git a/app/assets/javascripts/admin/adapters/api-key.js b/app/assets/javascripts/admin/addon/adapters/api-key.js similarity index 100% rename from app/assets/javascripts/admin/adapters/api-key.js rename to app/assets/javascripts/admin/addon/adapters/api-key.js diff --git a/app/assets/javascripts/admin/adapters/build-plugin.js b/app/assets/javascripts/admin/addon/adapters/build-plugin.js similarity index 100% rename from app/assets/javascripts/admin/adapters/build-plugin.js rename to app/assets/javascripts/admin/addon/adapters/build-plugin.js diff --git a/app/assets/javascripts/admin/adapters/customization-base.js b/app/assets/javascripts/admin/addon/adapters/customization-base.js similarity index 100% rename from app/assets/javascripts/admin/adapters/customization-base.js rename to app/assets/javascripts/admin/addon/adapters/customization-base.js diff --git a/app/assets/javascripts/admin/adapters/email-style.js b/app/assets/javascripts/admin/addon/adapters/email-style.js similarity index 100% rename from app/assets/javascripts/admin/adapters/email-style.js rename to app/assets/javascripts/admin/addon/adapters/email-style.js diff --git a/app/assets/javascripts/admin/adapters/embedding.js b/app/assets/javascripts/admin/addon/adapters/embedding.js similarity index 100% rename from app/assets/javascripts/admin/adapters/embedding.js rename to app/assets/javascripts/admin/addon/adapters/embedding.js diff --git a/app/assets/javascripts/admin/adapters/site-text.js b/app/assets/javascripts/admin/addon/adapters/site-text.js similarity index 100% rename from app/assets/javascripts/admin/adapters/site-text.js rename to app/assets/javascripts/admin/addon/adapters/site-text.js diff --git a/app/assets/javascripts/admin/adapters/staff-action-log.js b/app/assets/javascripts/admin/addon/adapters/staff-action-log.js similarity index 100% rename from app/assets/javascripts/admin/adapters/staff-action-log.js rename to app/assets/javascripts/admin/addon/adapters/staff-action-log.js diff --git a/app/assets/javascripts/admin/adapters/tag-group.js b/app/assets/javascripts/admin/addon/adapters/tag-group.js similarity index 100% rename from app/assets/javascripts/admin/adapters/tag-group.js rename to app/assets/javascripts/admin/addon/adapters/tag-group.js diff --git a/app/assets/javascripts/admin/adapters/theme.js b/app/assets/javascripts/admin/addon/adapters/theme.js similarity index 100% rename from app/assets/javascripts/admin/adapters/theme.js rename to app/assets/javascripts/admin/addon/adapters/theme.js diff --git a/app/assets/javascripts/admin/adapters/user-field.js b/app/assets/javascripts/admin/addon/adapters/user-field.js similarity index 100% rename from app/assets/javascripts/admin/adapters/user-field.js rename to app/assets/javascripts/admin/addon/adapters/user-field.js diff --git a/app/assets/javascripts/admin/adapters/web-hook-event.js b/app/assets/javascripts/admin/addon/adapters/web-hook-event.js similarity index 100% rename from app/assets/javascripts/admin/adapters/web-hook-event.js rename to app/assets/javascripts/admin/addon/adapters/web-hook-event.js diff --git a/app/assets/javascripts/admin/adapters/web-hook.js b/app/assets/javascripts/admin/addon/adapters/web-hook.js similarity index 100% rename from app/assets/javascripts/admin/adapters/web-hook.js rename to app/assets/javascripts/admin/addon/adapters/web-hook.js diff --git a/app/assets/javascripts/admin/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js similarity index 100% rename from app/assets/javascripts/admin/components/ace-editor.js rename to app/assets/javascripts/admin/addon/components/ace-editor.js diff --git a/app/assets/javascripts/admin/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-backups-logs.js rename to app/assets/javascripts/admin/addon/components/admin-backups-logs.js diff --git a/app/assets/javascripts/admin/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-editable-field.js rename to app/assets/javascripts/admin/addon/components/admin-editable-field.js diff --git a/app/assets/javascripts/admin/components/admin-form-row.js b/app/assets/javascripts/admin/addon/components/admin-form-row.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-form-row.js rename to app/assets/javascripts/admin/addon/components/admin-form-row.js diff --git a/app/assets/javascripts/admin/components/admin-graph.js b/app/assets/javascripts/admin/addon/components/admin-graph.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-graph.js rename to app/assets/javascripts/admin/addon/components/admin-graph.js diff --git a/app/assets/javascripts/admin/components/admin-nav.js b/app/assets/javascripts/admin/addon/components/admin-nav.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-nav.js rename to app/assets/javascripts/admin/addon/components/admin-nav.js diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-chart.js rename to app/assets/javascripts/admin/addon/components/admin-report-chart.js diff --git a/app/assets/javascripts/admin/components/admin-report-counters.js b/app/assets/javascripts/admin/addon/components/admin-report-counters.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-counters.js rename to app/assets/javascripts/admin/addon/components/admin-report-counters.js diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-counts.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-counts.js rename to app/assets/javascripts/admin/addon/components/admin-report-counts.js diff --git a/app/assets/javascripts/admin/components/admin-report-inline-table.js b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-inline-table.js rename to app/assets/javascripts/admin/addon/components/admin-report-inline-table.js diff --git a/app/assets/javascripts/admin/components/admin-report-per-day-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-per-day-counts.js rename to app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-stacked-chart.js rename to app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js diff --git a/app/assets/javascripts/admin/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-storage-stats.js rename to app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js diff --git a/app/assets/javascripts/admin/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-table-cell.js rename to app/assets/javascripts/admin/addon/components/admin-report-table-cell.js diff --git a/app/assets/javascripts/admin/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-table-header.js rename to app/assets/javascripts/admin/addon/components/admin-report-table-header.js diff --git a/app/assets/javascripts/admin/components/admin-report-table-row.js b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-table-row.js rename to app/assets/javascripts/admin/addon/components/admin-report-table-row.js diff --git a/app/assets/javascripts/admin/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-table.js rename to app/assets/javascripts/admin/addon/components/admin-report-table.js diff --git a/app/assets/javascripts/admin/components/admin-report-trust-level-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report-trust-level-counts.js rename to app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js diff --git a/app/assets/javascripts/admin/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-report.js rename to app/assets/javascripts/admin/addon/components/admin-report.js diff --git a/app/assets/javascripts/admin/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-theme-editor.js rename to app/assets/javascripts/admin/addon/components/admin-theme-editor.js diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-user-field-item.js rename to app/assets/javascripts/admin/addon/components/admin-user-field-item.js diff --git a/app/assets/javascripts/admin/components/admin-watched-word.js b/app/assets/javascripts/admin/addon/components/admin-watched-word.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-watched-word.js rename to app/assets/javascripts/admin/addon/components/admin-watched-word.js diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-web-hook-event-chooser.js rename to app/assets/javascripts/admin/addon/components/admin-web-hook-event-chooser.js diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-event.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-web-hook-event.js rename to app/assets/javascripts/admin/addon/components/admin-web-hook-event.js diff --git a/app/assets/javascripts/admin/components/admin-web-hook-status.js b/app/assets/javascripts/admin/addon/components/admin-web-hook-status.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-web-hook-status.js rename to app/assets/javascripts/admin/addon/components/admin-web-hook-status.js diff --git a/app/assets/javascripts/admin/components/admin-wrapper.js b/app/assets/javascripts/admin/addon/components/admin-wrapper.js similarity index 100% rename from app/assets/javascripts/admin/components/admin-wrapper.js rename to app/assets/javascripts/admin/addon/components/admin-wrapper.js diff --git a/app/assets/javascripts/admin/components/cancel-link.js b/app/assets/javascripts/admin/addon/components/cancel-link.js similarity index 100% rename from app/assets/javascripts/admin/components/cancel-link.js rename to app/assets/javascripts/admin/addon/components/cancel-link.js diff --git a/app/assets/javascripts/admin/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js similarity index 100% rename from app/assets/javascripts/admin/components/color-input.js rename to app/assets/javascripts/admin/addon/components/color-input.js diff --git a/app/assets/javascripts/admin/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js similarity index 100% rename from app/assets/javascripts/admin/components/email-styles-editor.js rename to app/assets/javascripts/admin/addon/components/email-styles-editor.js diff --git a/app/assets/javascripts/admin/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js similarity index 100% rename from app/assets/javascripts/admin/components/embeddable-host.js rename to app/assets/javascripts/admin/addon/components/embeddable-host.js diff --git a/app/assets/javascripts/admin/components/embedding-setting.js b/app/assets/javascripts/admin/addon/components/embedding-setting.js similarity index 100% rename from app/assets/javascripts/admin/components/embedding-setting.js rename to app/assets/javascripts/admin/addon/components/embedding-setting.js diff --git a/app/assets/javascripts/admin/components/flag-user-lists.js b/app/assets/javascripts/admin/addon/components/flag-user-lists.js similarity index 100% rename from app/assets/javascripts/admin/components/flag-user-lists.js rename to app/assets/javascripts/admin/addon/components/flag-user-lists.js diff --git a/app/assets/javascripts/admin/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js similarity index 100% rename from app/assets/javascripts/admin/components/highlighted-code.js rename to app/assets/javascripts/admin/addon/components/highlighted-code.js diff --git a/app/assets/javascripts/admin/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js similarity index 100% rename from app/assets/javascripts/admin/components/inline-edit-checkbox.js rename to app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js diff --git a/app/assets/javascripts/admin/components/install-theme-item.js b/app/assets/javascripts/admin/addon/components/install-theme-item.js similarity index 100% rename from app/assets/javascripts/admin/components/install-theme-item.js rename to app/assets/javascripts/admin/addon/components/install-theme-item.js diff --git a/app/assets/javascripts/admin/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js similarity index 100% rename from app/assets/javascripts/admin/components/ip-lookup.js rename to app/assets/javascripts/admin/addon/components/ip-lookup.js diff --git a/app/assets/javascripts/admin/components/moderation-history-item.js b/app/assets/javascripts/admin/addon/components/moderation-history-item.js similarity index 100% rename from app/assets/javascripts/admin/components/moderation-history-item.js rename to app/assets/javascripts/admin/addon/components/moderation-history-item.js diff --git a/app/assets/javascripts/admin/components/penalty-post-action.js b/app/assets/javascripts/admin/addon/components/penalty-post-action.js similarity index 100% rename from app/assets/javascripts/admin/components/penalty-post-action.js rename to app/assets/javascripts/admin/addon/components/penalty-post-action.js diff --git a/app/assets/javascripts/admin/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js similarity index 100% rename from app/assets/javascripts/admin/components/permalink-form.js rename to app/assets/javascripts/admin/addon/components/permalink-form.js diff --git a/app/assets/javascripts/admin/components/report-filters/bool.js b/app/assets/javascripts/admin/addon/components/report-filters/bool.js similarity index 100% rename from app/assets/javascripts/admin/components/report-filters/bool.js rename to app/assets/javascripts/admin/addon/components/report-filters/bool.js diff --git a/app/assets/javascripts/admin/components/report-filters/category.js b/app/assets/javascripts/admin/addon/components/report-filters/category.js similarity index 100% rename from app/assets/javascripts/admin/components/report-filters/category.js rename to app/assets/javascripts/admin/addon/components/report-filters/category.js diff --git a/app/assets/javascripts/admin/components/report-filters/filter.js b/app/assets/javascripts/admin/addon/components/report-filters/filter.js similarity index 100% rename from app/assets/javascripts/admin/components/report-filters/filter.js rename to app/assets/javascripts/admin/addon/components/report-filters/filter.js diff --git a/app/assets/javascripts/admin/components/report-filters/group.js b/app/assets/javascripts/admin/addon/components/report-filters/group.js similarity index 100% rename from app/assets/javascripts/admin/components/report-filters/group.js rename to app/assets/javascripts/admin/addon/components/report-filters/group.js diff --git a/app/assets/javascripts/admin/components/report-filters/list.js b/app/assets/javascripts/admin/addon/components/report-filters/list.js similarity index 100% rename from app/assets/javascripts/admin/components/report-filters/list.js rename to app/assets/javascripts/admin/addon/components/report-filters/list.js diff --git a/app/assets/javascripts/admin/components/resumable-upload.js b/app/assets/javascripts/admin/addon/components/resumable-upload.js similarity index 100% rename from app/assets/javascripts/admin/components/resumable-upload.js rename to app/assets/javascripts/admin/addon/components/resumable-upload.js diff --git a/app/assets/javascripts/admin/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js similarity index 100% rename from app/assets/javascripts/admin/components/screened-ip-address-form.js rename to app/assets/javascripts/admin/addon/components/screened-ip-address-form.js diff --git a/app/assets/javascripts/admin/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js similarity index 100% rename from app/assets/javascripts/admin/components/secret-value-list.js rename to app/assets/javascripts/admin/addon/components/secret-value-list.js diff --git a/app/assets/javascripts/admin/components/silence-details.js b/app/assets/javascripts/admin/addon/components/silence-details.js similarity index 100% rename from app/assets/javascripts/admin/components/silence-details.js rename to app/assets/javascripts/admin/addon/components/silence-details.js diff --git a/app/assets/javascripts/admin/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js similarity index 100% rename from app/assets/javascripts/admin/components/simple-list.js rename to app/assets/javascripts/admin/addon/components/simple-list.js diff --git a/app/assets/javascripts/admin/components/site-setting.js b/app/assets/javascripts/admin/addon/components/site-setting.js similarity index 100% rename from app/assets/javascripts/admin/components/site-setting.js rename to app/assets/javascripts/admin/addon/components/site-setting.js diff --git a/app/assets/javascripts/admin/components/site-settings-image-uploader.js b/app/assets/javascripts/admin/addon/components/site-settings-image-uploader.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings-image-uploader.js rename to app/assets/javascripts/admin/addon/components/site-settings-image-uploader.js diff --git a/app/assets/javascripts/admin/components/site-settings/bool.js b/app/assets/javascripts/admin/addon/components/site-settings/bool.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/bool.js rename to app/assets/javascripts/admin/addon/components/site-settings/bool.js diff --git a/app/assets/javascripts/admin/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/category-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/category-list.js diff --git a/app/assets/javascripts/admin/components/site-settings/color.js b/app/assets/javascripts/admin/addon/components/site-settings/color.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/color.js rename to app/assets/javascripts/admin/addon/components/site-settings/color.js diff --git a/app/assets/javascripts/admin/components/site-settings/compact-list.js b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/compact-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/compact-list.js diff --git a/app/assets/javascripts/admin/components/site-settings/group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/group-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/group-list.js diff --git a/app/assets/javascripts/admin/components/site-settings/simple-list.js b/app/assets/javascripts/admin/addon/components/site-settings/simple-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/simple-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/simple-list.js diff --git a/app/assets/javascripts/admin/components/site-settings/tag-list.js b/app/assets/javascripts/admin/addon/components/site-settings/tag-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/tag-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/tag-list.js diff --git a/app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js b/app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js similarity index 100% rename from app/assets/javascripts/admin/components/site-settings/uploaded-image-list.js rename to app/assets/javascripts/admin/addon/components/site-settings/uploaded-image-list.js diff --git a/app/assets/javascripts/admin/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js similarity index 100% rename from app/assets/javascripts/admin/components/site-text-summary.js rename to app/assets/javascripts/admin/addon/components/site-text-summary.js diff --git a/app/assets/javascripts/admin/components/staff-actions.js b/app/assets/javascripts/admin/addon/components/staff-actions.js similarity index 100% rename from app/assets/javascripts/admin/components/staff-actions.js rename to app/assets/javascripts/admin/addon/components/staff-actions.js diff --git a/app/assets/javascripts/admin/components/suspension-details.js b/app/assets/javascripts/admin/addon/components/suspension-details.js similarity index 100% rename from app/assets/javascripts/admin/components/suspension-details.js rename to app/assets/javascripts/admin/addon/components/suspension-details.js diff --git a/app/assets/javascripts/admin/components/tags-uploader.js b/app/assets/javascripts/admin/addon/components/tags-uploader.js similarity index 100% rename from app/assets/javascripts/admin/components/tags-uploader.js rename to app/assets/javascripts/admin/addon/components/tags-uploader.js diff --git a/app/assets/javascripts/admin/components/theme-setting-editor.js b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js similarity index 100% rename from app/assets/javascripts/admin/components/theme-setting-editor.js rename to app/assets/javascripts/admin/addon/components/theme-setting-editor.js diff --git a/app/assets/javascripts/admin/components/theme-setting-relatives-selector.js b/app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js similarity index 100% rename from app/assets/javascripts/admin/components/theme-setting-relatives-selector.js rename to app/assets/javascripts/admin/addon/components/theme-setting-relatives-selector.js diff --git a/app/assets/javascripts/admin/components/theme-translation.js b/app/assets/javascripts/admin/addon/components/theme-translation.js similarity index 100% rename from app/assets/javascripts/admin/components/theme-translation.js rename to app/assets/javascripts/admin/addon/components/theme-translation.js diff --git a/app/assets/javascripts/admin/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js similarity index 100% rename from app/assets/javascripts/admin/components/themes-list-item.js rename to app/assets/javascripts/admin/addon/components/themes-list-item.js diff --git a/app/assets/javascripts/admin/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js similarity index 100% rename from app/assets/javascripts/admin/components/themes-list.js rename to app/assets/javascripts/admin/addon/components/themes-list.js diff --git a/app/assets/javascripts/admin/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js similarity index 100% rename from app/assets/javascripts/admin/components/value-list.js rename to app/assets/javascripts/admin/addon/components/value-list.js diff --git a/app/assets/javascripts/admin/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js similarity index 100% rename from app/assets/javascripts/admin/components/watched-word-form.js rename to app/assets/javascripts/admin/addon/components/watched-word-form.js diff --git a/app/assets/javascripts/admin/components/watched-word-uploader.js b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js similarity index 100% rename from app/assets/javascripts/admin/components/watched-word-uploader.js rename to app/assets/javascripts/admin/addon/components/watched-word-uploader.js diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-index.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-api-keys-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-api-keys-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-api-keys-new.js rename to app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-api-keys-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-api-keys.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-api-keys.js rename to app/assets/javascripts/admin/addon/controllers/admin-api-keys.js diff --git a/app/assets/javascripts/admin/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-backups-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-backups-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-backups-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-backups-logs.js rename to app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js diff --git a/app/assets/javascripts/admin/controllers/admin-backups.js b/app/assets/javascripts/admin/addon/controllers/admin-backups.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-backups.js rename to app/assets/javascripts/admin/addon/controllers/admin-backups.js diff --git a/app/assets/javascripts/admin/controllers/admin-badges-award.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-award.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-badges-award.js rename to app/assets/javascripts/admin/addon/controllers/admin-badges-award.js diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-badges-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-badges-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-badges.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-badges.js rename to app/assets/javascripts/admin/addon/controllers/admin-badges.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-colors-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-colors.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-email-style-edit.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates-edit.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-email-templates.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-robots-txt.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-themes-edit.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-themes-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-customize-themes.js rename to app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-dashboard-general.js rename to app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-dashboard-moderation.js rename to app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-dashboard-reports.js rename to app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js diff --git a/app/assets/javascripts/admin/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-dashboard.js rename to app/assets/javascripts/admin/addon/controllers/admin-dashboard.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-advanced-test.js b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-advanced-test.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-bounced.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-logs.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-logs.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-preview-digest.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-received.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-received.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-rejected.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-sent.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-sent.js diff --git a/app/assets/javascripts/admin/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-email-skipped.js rename to app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js diff --git a/app/assets/javascripts/admin/controllers/admin-embedding.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-embedding.js rename to app/assets/javascripts/admin/addon/controllers/admin-embedding.js diff --git a/app/assets/javascripts/admin/controllers/admin-emojis.js b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-emojis.js rename to app/assets/javascripts/admin/addon/controllers/admin-emojis.js diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js rename to app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js rename to app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js rename to app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js rename to app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js diff --git a/app/assets/javascripts/admin/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-permalinks.js rename to app/assets/javascripts/admin/addon/controllers/admin-permalinks.js diff --git a/app/assets/javascripts/admin/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-plugins.js rename to app/assets/javascripts/admin/addon/controllers/admin-plugins.js diff --git a/app/assets/javascripts/admin/controllers/admin-reports-show.js b/app/assets/javascripts/admin/addon/controllers/admin-reports-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-reports-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-reports-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-search-logs-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-search-logs-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-search-logs-term.js rename to app/assets/javascripts/admin/addon/controllers/admin-search-logs-term.js diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-site-settings-category.js rename to app/assets/javascripts/admin/addon/controllers/admin-site-settings-category.js diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-site-settings.js rename to app/assets/javascripts/admin/addon/controllers/admin-site-settings.js diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-site-text-edit.js rename to app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-site-text-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-user-badges.js rename to app/assets/javascripts/admin/addon/controllers/admin-user-badges.js diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-user-fields.js rename to app/assets/javascripts/admin/addon/controllers/admin-user-fields.js diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-user-index.js rename to app/assets/javascripts/admin/addon/controllers/admin-user-index.js diff --git a/app/assets/javascripts/admin/controllers/admin-user.js b/app/assets/javascripts/admin/addon/controllers/admin-user.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-user.js rename to app/assets/javascripts/admin/addon/controllers/admin-user.js diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-users-list-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-watched-words-action.js rename to app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js diff --git a/app/assets/javascripts/admin/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-watched-words.js rename to app/assets/javascripts/admin/addon/controllers/admin-watched-words.js diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show-events.js rename to app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show-events.js diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-web-hooks-show.js rename to app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js diff --git a/app/assets/javascripts/admin/controllers/admin-web-hooks.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin-web-hooks.js rename to app/assets/javascripts/admin/addon/controllers/admin-web-hooks.js diff --git a/app/assets/javascripts/admin/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js similarity index 100% rename from app/assets/javascripts/admin/controllers/admin.js rename to app/assets/javascripts/admin/addon/controllers/admin.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-add-upload.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-add-upload.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-add-upload.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-badge-preview.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-badge-preview.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-color-scheme-select-base.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-color-scheme-select-base.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-edit-badge-groupings.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-edit-badge-groupings.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-incoming-email.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-install-theme.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-install-theme.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-install-theme.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-merge-users-confirmation.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-confirmation.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-merge-users-prompt.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-merge-users-prompt.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-reseed.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-reseed.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-reseed.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-silence-user.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-silence-user.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-silence-user.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-staff-action-log-details.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-staff-action-log-details.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-start-backup.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-start-backup.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-start-backup.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-suspend-user.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-suspend-user.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-theme-change.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-theme-change.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-theme-change.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-uploaded-image-list.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-uploaded-image-list.js diff --git a/app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js b/app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/admin-watched-word-test.js rename to app/assets/javascripts/admin/addon/controllers/modals/admin-watched-word-test.js diff --git a/app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js b/app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js similarity index 100% rename from app/assets/javascripts/admin/controllers/modals/site-setting-default-categories.js rename to app/assets/javascripts/admin/addon/controllers/modals/site-setting-default-categories.js diff --git a/app/assets/javascripts/admin/helpers/check-icon.js b/app/assets/javascripts/admin/addon/helpers/check-icon.js similarity index 100% rename from app/assets/javascripts/admin/helpers/check-icon.js rename to app/assets/javascripts/admin/addon/helpers/check-icon.js diff --git a/app/assets/javascripts/admin/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js similarity index 100% rename from app/assets/javascripts/admin/helpers/disposition-icon.js rename to app/assets/javascripts/admin/addon/helpers/disposition-icon.js diff --git a/app/assets/javascripts/admin/helpers/human-size.js b/app/assets/javascripts/admin/addon/helpers/human-size.js similarity index 100% rename from app/assets/javascripts/admin/helpers/human-size.js rename to app/assets/javascripts/admin/addon/helpers/human-size.js diff --git a/app/assets/javascripts/admin/helpers/post-action-title.js b/app/assets/javascripts/admin/addon/helpers/post-action-title.js similarity index 100% rename from app/assets/javascripts/admin/helpers/post-action-title.js rename to app/assets/javascripts/admin/addon/helpers/post-action-title.js diff --git a/app/assets/javascripts/admin/helpers/preserve-newlines.js b/app/assets/javascripts/admin/addon/helpers/preserve-newlines.js similarity index 100% rename from app/assets/javascripts/admin/helpers/preserve-newlines.js rename to app/assets/javascripts/admin/addon/helpers/preserve-newlines.js diff --git a/app/assets/javascripts/admin/helpers/value-at-tl.js b/app/assets/javascripts/admin/addon/helpers/value-at-tl.js similarity index 100% rename from app/assets/javascripts/admin/helpers/value-at-tl.js rename to app/assets/javascripts/admin/addon/helpers/value-at-tl.js diff --git a/app/assets/javascripts/admin/mixins/penalty-controller.js b/app/assets/javascripts/admin/addon/mixins/penalty-controller.js similarity index 100% rename from app/assets/javascripts/admin/mixins/penalty-controller.js rename to app/assets/javascripts/admin/addon/mixins/penalty-controller.js diff --git a/app/assets/javascripts/admin/mixins/period-computation.js b/app/assets/javascripts/admin/addon/mixins/period-computation.js similarity index 100% rename from app/assets/javascripts/admin/mixins/period-computation.js rename to app/assets/javascripts/admin/addon/mixins/period-computation.js diff --git a/app/assets/javascripts/admin/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js similarity index 100% rename from app/assets/javascripts/admin/mixins/setting-component.js rename to app/assets/javascripts/admin/addon/mixins/setting-component.js diff --git a/app/assets/javascripts/admin/mixins/setting-object.js b/app/assets/javascripts/admin/addon/mixins/setting-object.js similarity index 100% rename from app/assets/javascripts/admin/mixins/setting-object.js rename to app/assets/javascripts/admin/addon/mixins/setting-object.js diff --git a/app/assets/javascripts/admin/models/admin-dashboard.js b/app/assets/javascripts/admin/addon/models/admin-dashboard.js similarity index 100% rename from app/assets/javascripts/admin/models/admin-dashboard.js rename to app/assets/javascripts/admin/addon/models/admin-dashboard.js diff --git a/app/assets/javascripts/admin/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js similarity index 100% rename from app/assets/javascripts/admin/models/admin-user.js rename to app/assets/javascripts/admin/addon/models/admin-user.js diff --git a/app/assets/javascripts/admin/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js similarity index 100% rename from app/assets/javascripts/admin/models/api-key.js rename to app/assets/javascripts/admin/addon/models/api-key.js diff --git a/app/assets/javascripts/admin/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js similarity index 100% rename from app/assets/javascripts/admin/models/backup-status.js rename to app/assets/javascripts/admin/addon/models/backup-status.js diff --git a/app/assets/javascripts/admin/models/backup.js b/app/assets/javascripts/admin/addon/models/backup.js similarity index 100% rename from app/assets/javascripts/admin/models/backup.js rename to app/assets/javascripts/admin/addon/models/backup.js diff --git a/app/assets/javascripts/admin/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js similarity index 100% rename from app/assets/javascripts/admin/models/color-scheme-color.js rename to app/assets/javascripts/admin/addon/models/color-scheme-color.js diff --git a/app/assets/javascripts/admin/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js similarity index 100% rename from app/assets/javascripts/admin/models/color-scheme.js rename to app/assets/javascripts/admin/addon/models/color-scheme.js diff --git a/app/assets/javascripts/admin/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js similarity index 100% rename from app/assets/javascripts/admin/models/email-log.js rename to app/assets/javascripts/admin/addon/models/email-log.js diff --git a/app/assets/javascripts/admin/models/email-preview.js b/app/assets/javascripts/admin/addon/models/email-preview.js similarity index 100% rename from app/assets/javascripts/admin/models/email-preview.js rename to app/assets/javascripts/admin/addon/models/email-preview.js diff --git a/app/assets/javascripts/admin/models/email-settings.js b/app/assets/javascripts/admin/addon/models/email-settings.js similarity index 100% rename from app/assets/javascripts/admin/models/email-settings.js rename to app/assets/javascripts/admin/addon/models/email-settings.js diff --git a/app/assets/javascripts/admin/models/email-style.js b/app/assets/javascripts/admin/addon/models/email-style.js similarity index 100% rename from app/assets/javascripts/admin/models/email-style.js rename to app/assets/javascripts/admin/addon/models/email-style.js diff --git a/app/assets/javascripts/admin/models/email-template.js b/app/assets/javascripts/admin/addon/models/email-template.js similarity index 100% rename from app/assets/javascripts/admin/models/email-template.js rename to app/assets/javascripts/admin/addon/models/email-template.js diff --git a/app/assets/javascripts/admin/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js similarity index 100% rename from app/assets/javascripts/admin/models/flag-type.js rename to app/assets/javascripts/admin/addon/models/flag-type.js diff --git a/app/assets/javascripts/admin/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js similarity index 100% rename from app/assets/javascripts/admin/models/incoming-email.js rename to app/assets/javascripts/admin/addon/models/incoming-email.js diff --git a/app/assets/javascripts/admin/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js similarity index 100% rename from app/assets/javascripts/admin/models/permalink.js rename to app/assets/javascripts/admin/addon/models/permalink.js diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/addon/models/report.js similarity index 100% rename from app/assets/javascripts/admin/models/report.js rename to app/assets/javascripts/admin/addon/models/report.js diff --git a/app/assets/javascripts/admin/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js similarity index 100% rename from app/assets/javascripts/admin/models/screened-email.js rename to app/assets/javascripts/admin/addon/models/screened-email.js diff --git a/app/assets/javascripts/admin/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js similarity index 100% rename from app/assets/javascripts/admin/models/screened-ip-address.js rename to app/assets/javascripts/admin/addon/models/screened-ip-address.js diff --git a/app/assets/javascripts/admin/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js similarity index 100% rename from app/assets/javascripts/admin/models/screened-url.js rename to app/assets/javascripts/admin/addon/models/screened-url.js diff --git a/app/assets/javascripts/admin/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js similarity index 100% rename from app/assets/javascripts/admin/models/site-setting.js rename to app/assets/javascripts/admin/addon/models/site-setting.js diff --git a/app/assets/javascripts/admin/models/site-text.js b/app/assets/javascripts/admin/addon/models/site-text.js similarity index 100% rename from app/assets/javascripts/admin/models/site-text.js rename to app/assets/javascripts/admin/addon/models/site-text.js diff --git a/app/assets/javascripts/admin/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js similarity index 100% rename from app/assets/javascripts/admin/models/staff-action-log.js rename to app/assets/javascripts/admin/addon/models/staff-action-log.js diff --git a/app/assets/javascripts/admin/models/theme-settings.js b/app/assets/javascripts/admin/addon/models/theme-settings.js similarity index 100% rename from app/assets/javascripts/admin/models/theme-settings.js rename to app/assets/javascripts/admin/addon/models/theme-settings.js diff --git a/app/assets/javascripts/admin/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js similarity index 100% rename from app/assets/javascripts/admin/models/theme.js rename to app/assets/javascripts/admin/addon/models/theme.js diff --git a/app/assets/javascripts/admin/models/tl3-requirements.js b/app/assets/javascripts/admin/addon/models/tl3-requirements.js similarity index 100% rename from app/assets/javascripts/admin/models/tl3-requirements.js rename to app/assets/javascripts/admin/addon/models/tl3-requirements.js diff --git a/app/assets/javascripts/admin/models/user-field.js b/app/assets/javascripts/admin/addon/models/user-field.js similarity index 100% rename from app/assets/javascripts/admin/models/user-field.js rename to app/assets/javascripts/admin/addon/models/user-field.js diff --git a/app/assets/javascripts/admin/models/version-check.js b/app/assets/javascripts/admin/addon/models/version-check.js similarity index 100% rename from app/assets/javascripts/admin/models/version-check.js rename to app/assets/javascripts/admin/addon/models/version-check.js diff --git a/app/assets/javascripts/admin/models/watched-word.js b/app/assets/javascripts/admin/addon/models/watched-word.js similarity index 100% rename from app/assets/javascripts/admin/models/watched-word.js rename to app/assets/javascripts/admin/addon/models/watched-word.js diff --git a/app/assets/javascripts/admin/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js similarity index 100% rename from app/assets/javascripts/admin/models/web-hook.js rename to app/assets/javascripts/admin/addon/models/web-hook.js diff --git a/app/assets/javascripts/admin/routes/admin-api-index.js b/app/assets/javascripts/admin/addon/routes/admin-api-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-api-index.js rename to app/assets/javascripts/admin/addon/routes/admin-api-index.js diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-index.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-api-keys-index.js rename to app/assets/javascripts/admin/addon/routes/admin-api-keys-index.js diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-api-keys-new.js rename to app/assets/javascripts/admin/addon/routes/admin-api-keys-new.js diff --git a/app/assets/javascripts/admin/routes/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-api-keys-show.js rename to app/assets/javascripts/admin/addon/routes/admin-api-keys-show.js diff --git a/app/assets/javascripts/admin/routes/admin-api-keys.js b/app/assets/javascripts/admin/addon/routes/admin-api-keys.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-api-keys.js rename to app/assets/javascripts/admin/addon/routes/admin-api-keys.js diff --git a/app/assets/javascripts/admin/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-backups-index.js rename to app/assets/javascripts/admin/addon/routes/admin-backups-index.js diff --git a/app/assets/javascripts/admin/routes/admin-backups-logs.js b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-backups-logs.js rename to app/assets/javascripts/admin/addon/routes/admin-backups-logs.js diff --git a/app/assets/javascripts/admin/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-backups.js rename to app/assets/javascripts/admin/addon/routes/admin-backups.js diff --git a/app/assets/javascripts/admin/routes/admin-badges-award.js b/app/assets/javascripts/admin/addon/routes/admin-badges-award.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-badges-award.js rename to app/assets/javascripts/admin/addon/routes/admin-badges-award.js diff --git a/app/assets/javascripts/admin/routes/admin-badges-index.js b/app/assets/javascripts/admin/addon/routes/admin-badges-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-badges-index.js rename to app/assets/javascripts/admin/addon/routes/admin-badges-index.js diff --git a/app/assets/javascripts/admin/routes/admin-badges-show.js b/app/assets/javascripts/admin/addon/routes/admin-badges-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-badges-show.js rename to app/assets/javascripts/admin/addon/routes/admin-badges-show.js diff --git a/app/assets/javascripts/admin/routes/admin-badges.js b/app/assets/javascripts/admin/addon/routes/admin-badges.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-badges.js rename to app/assets/javascripts/admin/addon/routes/admin-badges.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-colors-show.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-colors-show.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-colors.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-colors.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-colors.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-email-style-edit.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-email-style-index.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-email-style-index.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-style.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-email-style.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-email-style.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-email-templates-edit.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-email-templates-edit.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-email-templates.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-index.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-index.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-robots-txt.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-robots-txt.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-themes-edit.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-themes-index.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-themes-index.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-themes-show.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-customize-themes.js rename to app/assets/javascripts/admin/addon/routes/admin-customize-themes.js diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-dashboard-general.js rename to app/assets/javascripts/admin/addon/routes/admin-dashboard-general.js diff --git a/app/assets/javascripts/admin/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-dashboard-reports.js rename to app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-dashboard.js rename to app/assets/javascripts/admin/addon/routes/admin-dashboard.js diff --git a/app/assets/javascripts/admin/routes/admin-email-bounced.js b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-bounced.js rename to app/assets/javascripts/admin/addon/routes/admin-email-bounced.js diff --git a/app/assets/javascripts/admin/routes/admin-email-incomings.js b/app/assets/javascripts/admin/addon/routes/admin-email-incomings.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-incomings.js rename to app/assets/javascripts/admin/addon/routes/admin-email-incomings.js diff --git a/app/assets/javascripts/admin/routes/admin-email-index.js b/app/assets/javascripts/admin/addon/routes/admin-email-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-index.js rename to app/assets/javascripts/admin/addon/routes/admin-email-index.js diff --git a/app/assets/javascripts/admin/routes/admin-email-logs.js b/app/assets/javascripts/admin/addon/routes/admin-email-logs.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-logs.js rename to app/assets/javascripts/admin/addon/routes/admin-email-logs.js diff --git a/app/assets/javascripts/admin/routes/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-preview-digest.js rename to app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js diff --git a/app/assets/javascripts/admin/routes/admin-email-received.js b/app/assets/javascripts/admin/addon/routes/admin-email-received.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-received.js rename to app/assets/javascripts/admin/addon/routes/admin-email-received.js diff --git a/app/assets/javascripts/admin/routes/admin-email-rejected.js b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-rejected.js rename to app/assets/javascripts/admin/addon/routes/admin-email-rejected.js diff --git a/app/assets/javascripts/admin/routes/admin-email-sent.js b/app/assets/javascripts/admin/addon/routes/admin-email-sent.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-sent.js rename to app/assets/javascripts/admin/addon/routes/admin-email-sent.js diff --git a/app/assets/javascripts/admin/routes/admin-email-skipped.js b/app/assets/javascripts/admin/addon/routes/admin-email-skipped.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-email-skipped.js rename to app/assets/javascripts/admin/addon/routes/admin-email-skipped.js diff --git a/app/assets/javascripts/admin/routes/admin-embedding.js b/app/assets/javascripts/admin/addon/routes/admin-embedding.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-embedding.js rename to app/assets/javascripts/admin/addon/routes/admin-embedding.js diff --git a/app/assets/javascripts/admin/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-emojis.js rename to app/assets/javascripts/admin/addon/routes/admin-emojis.js diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-active.js b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-flags-posts-active.js rename to app/assets/javascripts/admin/addon/routes/admin-flags-posts-active.js diff --git a/app/assets/javascripts/admin/routes/admin-flags-posts-old.js b/app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-flags-posts-old.js rename to app/assets/javascripts/admin/addon/routes/admin-flags-posts-old.js diff --git a/app/assets/javascripts/admin/routes/admin-flags-topics-index.js b/app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-flags-topics-index.js rename to app/assets/javascripts/admin/addon/routes/admin-flags-topics-index.js diff --git a/app/assets/javascripts/admin/routes/admin-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-logs-index.js rename to app/assets/javascripts/admin/addon/routes/admin-logs-index.js diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-logs-screened-emails.js rename to app/assets/javascripts/admin/addon/routes/admin-logs-screened-emails.js diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-logs-screened-ip-addresses.js rename to app/assets/javascripts/admin/addon/routes/admin-logs-screened-ip-addresses.js diff --git a/app/assets/javascripts/admin/routes/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-logs-screened-urls.js rename to app/assets/javascripts/admin/addon/routes/admin-logs-screened-urls.js diff --git a/app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-logs-staff-action-logs.js rename to app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js diff --git a/app/assets/javascripts/admin/routes/admin-permalinks.js b/app/assets/javascripts/admin/addon/routes/admin-permalinks.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-permalinks.js rename to app/assets/javascripts/admin/addon/routes/admin-permalinks.js diff --git a/app/assets/javascripts/admin/routes/admin-plugins.js b/app/assets/javascripts/admin/addon/routes/admin-plugins.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-plugins.js rename to app/assets/javascripts/admin/addon/routes/admin-plugins.js diff --git a/app/assets/javascripts/admin/routes/admin-reports-index.js b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-reports-index.js rename to app/assets/javascripts/admin/addon/routes/admin-reports-index.js diff --git a/app/assets/javascripts/admin/routes/admin-reports-show.js b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-reports-show.js rename to app/assets/javascripts/admin/addon/routes/admin-reports-show.js diff --git a/app/assets/javascripts/admin/routes/admin-route-map.js b/app/assets/javascripts/admin/addon/routes/admin-route-map.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-route-map.js rename to app/assets/javascripts/admin/addon/routes/admin-route-map.js diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-search-logs-index.js rename to app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js diff --git a/app/assets/javascripts/admin/routes/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-search-logs-term.js rename to app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-site-settings-category.js rename to app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js diff --git a/app/assets/javascripts/admin/routes/admin-site-settings-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-site-settings-index.js rename to app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-site-settings.js rename to app/assets/javascripts/admin/addon/routes/admin-site-settings.js diff --git a/app/assets/javascripts/admin/routes/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-site-text-edit.js rename to app/assets/javascripts/admin/addon/routes/admin-site-text-edit.js diff --git a/app/assets/javascripts/admin/routes/admin-site-text-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-site-text-index.js rename to app/assets/javascripts/admin/addon/routes/admin-site-text-index.js diff --git a/app/assets/javascripts/admin/routes/admin-user-badges.js b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-user-badges.js rename to app/assets/javascripts/admin/addon/routes/admin-user-badges.js diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js b/app/assets/javascripts/admin/addon/routes/admin-user-fields.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-user-fields.js rename to app/assets/javascripts/admin/addon/routes/admin-user-fields.js diff --git a/app/assets/javascripts/admin/routes/admin-user-index.js b/app/assets/javascripts/admin/addon/routes/admin-user-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-user-index.js rename to app/assets/javascripts/admin/addon/routes/admin-user-index.js diff --git a/app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js b/app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-user-tl3-requirements.js rename to app/assets/javascripts/admin/addon/routes/admin-user-tl3-requirements.js diff --git a/app/assets/javascripts/admin/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-user.js rename to app/assets/javascripts/admin/addon/routes/admin-user.js diff --git a/app/assets/javascripts/admin/routes/admin-users-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-users-index.js rename to app/assets/javascripts/admin/addon/routes/admin-users-index.js diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-users-list-index.js rename to app/assets/javascripts/admin/addon/routes/admin-users-list-index.js diff --git a/app/assets/javascripts/admin/routes/admin-users-list-show.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-users-list-show.js rename to app/assets/javascripts/admin/addon/routes/admin-users-list-show.js diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js b/app/assets/javascripts/admin/addon/routes/admin-users-list.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-users-list.js rename to app/assets/javascripts/admin/addon/routes/admin-users-list.js diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-watched-words-action.js rename to app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js diff --git a/app/assets/javascripts/admin/routes/admin-watched-words-index.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-watched-words-index.js rename to app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js diff --git a/app/assets/javascripts/admin/routes/admin-watched-words.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-watched-words.js rename to app/assets/javascripts/admin/addon/routes/admin-watched-words.js diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-web-hooks-show-events.js rename to app/assets/javascripts/admin/addon/routes/admin-web-hooks-show-events.js diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-web-hooks-show.js rename to app/assets/javascripts/admin/addon/routes/admin-web-hooks-show.js diff --git a/app/assets/javascripts/admin/routes/admin-web-hooks.js b/app/assets/javascripts/admin/addon/routes/admin-web-hooks.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin-web-hooks.js rename to app/assets/javascripts/admin/addon/routes/admin-web-hooks.js diff --git a/app/assets/javascripts/admin/routes/admin.js b/app/assets/javascripts/admin/addon/routes/admin.js similarity index 100% rename from app/assets/javascripts/admin/routes/admin.js rename to app/assets/javascripts/admin/addon/routes/admin.js diff --git a/app/assets/javascripts/admin/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js similarity index 100% rename from app/assets/javascripts/admin/services/admin-tools.js rename to app/assets/javascripts/admin/addon/services/admin-tools.js diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/addon/templates/admin.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/admin.hbs rename to app/assets/javascripts/admin/addon/templates/admin.hbs diff --git a/app/assets/javascripts/admin/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/api-keys-index.hbs rename to app/assets/javascripts/admin/addon/templates/api-keys-index.hbs diff --git a/app/assets/javascripts/admin/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/api-keys-new.hbs rename to app/assets/javascripts/admin/addon/templates/api-keys-new.hbs diff --git a/app/assets/javascripts/admin/templates/api-keys-show.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/api-keys-show.hbs rename to app/assets/javascripts/admin/addon/templates/api-keys-show.hbs diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/addon/templates/api.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/api.hbs rename to app/assets/javascripts/admin/addon/templates/api.hbs diff --git a/app/assets/javascripts/admin/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/backups-index.hbs rename to app/assets/javascripts/admin/addon/templates/backups-index.hbs diff --git a/app/assets/javascripts/admin/templates/backups-logs.hbs b/app/assets/javascripts/admin/addon/templates/backups-logs.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/backups-logs.hbs rename to app/assets/javascripts/admin/addon/templates/backups-logs.hbs diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/addon/templates/backups.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/backups.hbs rename to app/assets/javascripts/admin/addon/templates/backups.hbs diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/addon/templates/badges-award.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/badges-award.hbs rename to app/assets/javascripts/admin/addon/templates/badges-award.hbs diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/addon/templates/badges-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/badges-index.hbs rename to app/assets/javascripts/admin/addon/templates/badges-index.hbs diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/addon/templates/badges-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/badges-show.hbs rename to app/assets/javascripts/admin/addon/templates/badges-show.hbs diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/addon/templates/badges.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/badges.hbs rename to app/assets/javascripts/admin/addon/templates/badges.hbs diff --git a/app/assets/javascripts/admin/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/ace-editor.hbs rename to app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-backups-logs.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-backups-logs.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-editable-field.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-form-row.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-nav.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-nav.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-nav.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-nav.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-chart.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-chart.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-chart.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-chart.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-counters.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-counts.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-inline-table.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-per-day-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-per-day-counts.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-stacked-chart.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-stacked-chart.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-stacked-chart.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-storage-stats.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-table-cell.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-table-header.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table-row.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-table-row.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-table.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-report.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-report.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-report.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-watched-word.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-watched-word.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event-chooser.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-web-hook-event-chooser.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-web-hook-event.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs diff --git a/app/assets/javascripts/admin/templates/components/admin-web-hook-status.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/admin-web-hook-status.hbs rename to app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs diff --git a/app/assets/javascripts/admin/templates/components/dashboard-problems.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/dashboard-problems.hbs rename to app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs diff --git a/app/assets/javascripts/admin/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/email-styles-editor.hbs rename to app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs diff --git a/app/assets/javascripts/admin/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/embeddable-host.hbs rename to app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs diff --git a/app/assets/javascripts/admin/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/embedding-setting.hbs rename to app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs diff --git a/app/assets/javascripts/admin/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/flag-user-lists.hbs rename to app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs diff --git a/app/assets/javascripts/admin/templates/components/flag-user.hbs b/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/flag-user.hbs rename to app/assets/javascripts/admin/addon/templates/components/flag-user.hbs diff --git a/app/assets/javascripts/admin/templates/components/highlighted-code.hbs b/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/highlighted-code.hbs rename to app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs diff --git a/app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/inline-edit-checkbox.hbs rename to app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs diff --git a/app/assets/javascripts/admin/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/install-theme-item.hbs rename to app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs diff --git a/app/assets/javascripts/admin/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/penalty-post-action.hbs rename to app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs diff --git a/app/assets/javascripts/admin/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/permalink-form.hbs rename to app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs diff --git a/app/assets/javascripts/admin/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/report-filters/bool.hbs rename to app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs diff --git a/app/assets/javascripts/admin/templates/components/report-filters/category.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/report-filters/category.hbs rename to app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs diff --git a/app/assets/javascripts/admin/templates/components/report-filters/group.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/report-filters/group.hbs rename to app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs diff --git a/app/assets/javascripts/admin/templates/components/report-filters/list.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/report-filters/list.hbs rename to app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs diff --git a/app/assets/javascripts/admin/templates/components/resumable-upload.hbs b/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/resumable-upload.hbs rename to app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs diff --git a/app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/screened-ip-address-form.hbs rename to app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs diff --git a/app/assets/javascripts/admin/templates/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/secret-value-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/setting-validation-message.hbs rename to app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs diff --git a/app/assets/javascripts/admin/templates/components/silence-details.hbs b/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/silence-details.hbs rename to app/assets/javascripts/admin/addon/templates/components/silence-details.hbs diff --git a/app/assets/javascripts/admin/templates/components/simple-list.hbs b/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/simple-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/simple-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-customization-change-details.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-customization-change-field.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-setting.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-setting.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/bool.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/category-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/category.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/color.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/compact-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/enum.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/group-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/host-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/secret-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/simple-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/string.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/tag-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/upload.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/uploaded-image-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/url-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-settings/value-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/site-text-summary.hbs rename to app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs diff --git a/app/assets/javascripts/admin/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/suspension-details.hbs rename to app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs diff --git a/app/assets/javascripts/admin/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/tags-uploader.hbs rename to app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs diff --git a/app/assets/javascripts/admin/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/themes-list-item.hbs rename to app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/themes-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/themes-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/value-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/value-list.hbs rename to app/assets/javascripts/admin/addon/templates/components/value-list.hbs diff --git a/app/assets/javascripts/admin/templates/components/version-checks.hbs b/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/version-checks.hbs rename to app/assets/javascripts/admin/addon/templates/components/version-checks.hbs diff --git a/app/assets/javascripts/admin/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/watched-word-form.hbs rename to app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs diff --git a/app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/watched-word-uploader.hbs rename to app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs diff --git a/app/assets/javascripts/admin/templates/customize-colors-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-colors-index.hbs rename to app/assets/javascripts/admin/addon/templates/customize-colors-index.hbs diff --git a/app/assets/javascripts/admin/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-colors-show.hbs rename to app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs diff --git a/app/assets/javascripts/admin/templates/customize-colors.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-colors.hbs rename to app/assets/javascripts/admin/addon/templates/customize-colors.hbs diff --git a/app/assets/javascripts/admin/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-email-style-edit.hbs rename to app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs diff --git a/app/assets/javascripts/admin/templates/customize-email-style.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-email-style.hbs rename to app/assets/javascripts/admin/addon/templates/customize-email-style.hbs diff --git a/app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-email-templates-edit.hbs rename to app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs diff --git a/app/assets/javascripts/admin/templates/customize-email-templates.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-templates.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-email-templates.hbs rename to app/assets/javascripts/admin/addon/templates/customize-email-templates.hbs diff --git a/app/assets/javascripts/admin/templates/customize-robots-txt.hbs b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-robots-txt.hbs rename to app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs diff --git a/app/assets/javascripts/admin/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-themes-edit.hbs rename to app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-themes-index.hbs rename to app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-themes-show.hbs rename to app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs diff --git a/app/assets/javascripts/admin/templates/customize-themes.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize-themes.hbs rename to app/assets/javascripts/admin/addon/templates/customize-themes.hbs diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/addon/templates/customize.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/customize.hbs rename to app/assets/javascripts/admin/addon/templates/customize.hbs diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/addon/templates/dashboard.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/dashboard.hbs rename to app/assets/javascripts/admin/addon/templates/dashboard.hbs diff --git a/app/assets/javascripts/admin/templates/dashboard_general.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/dashboard_general.hbs rename to app/assets/javascripts/admin/addon/templates/dashboard_general.hbs diff --git a/app/assets/javascripts/admin/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/dashboard_moderation.hbs rename to app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs diff --git a/app/assets/javascripts/admin/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/dashboard_reports.hbs rename to app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs diff --git a/app/assets/javascripts/admin/templates/dashboard_security.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/dashboard_security.hbs rename to app/assets/javascripts/admin/addon/templates/dashboard_security.hbs diff --git a/app/assets/javascripts/admin/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-advanced-test.hbs rename to app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs diff --git a/app/assets/javascripts/admin/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-bounced.hbs rename to app/assets/javascripts/admin/addon/templates/email-bounced.hbs diff --git a/app/assets/javascripts/admin/templates/email-index.hbs b/app/assets/javascripts/admin/addon/templates/email-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-index.hbs rename to app/assets/javascripts/admin/addon/templates/email-index.hbs diff --git a/app/assets/javascripts/admin/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-preview-digest.hbs rename to app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs diff --git a/app/assets/javascripts/admin/templates/email-received.hbs b/app/assets/javascripts/admin/addon/templates/email-received.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-received.hbs rename to app/assets/javascripts/admin/addon/templates/email-received.hbs diff --git a/app/assets/javascripts/admin/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-rejected.hbs rename to app/assets/javascripts/admin/addon/templates/email-rejected.hbs diff --git a/app/assets/javascripts/admin/templates/email-sent.hbs b/app/assets/javascripts/admin/addon/templates/email-sent.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-sent.hbs rename to app/assets/javascripts/admin/addon/templates/email-sent.hbs diff --git a/app/assets/javascripts/admin/templates/email-skipped.hbs b/app/assets/javascripts/admin/addon/templates/email-skipped.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email-skipped.hbs rename to app/assets/javascripts/admin/addon/templates/email-skipped.hbs diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/addon/templates/email.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/email.hbs rename to app/assets/javascripts/admin/addon/templates/email.hbs diff --git a/app/assets/javascripts/admin/templates/embedding.hbs b/app/assets/javascripts/admin/addon/templates/embedding.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/embedding.hbs rename to app/assets/javascripts/admin/addon/templates/embedding.hbs diff --git a/app/assets/javascripts/admin/templates/emojis.hbs b/app/assets/javascripts/admin/addon/templates/emojis.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/emojis.hbs rename to app/assets/javascripts/admin/addon/templates/emojis.hbs diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/addon/templates/logs.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs.hbs rename to app/assets/javascripts/admin/addon/templates/logs.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened-emails.hbs rename to app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs rename to app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs diff --git a/app/assets/javascripts/admin/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/screened-urls.hbs rename to app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs diff --git a/app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/logs/staff-action-logs.hbs rename to app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-add-upload.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-api-key-urls.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-api-key-urls.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-badge-preview.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-color-scheme-select-base.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-edit-badge-groupings.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-incoming-email.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-install-theme.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-merge-users-confirmation.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-merge-users-prompt.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-reseed.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-reseed.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-silence-user.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-staff-action-log-details.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-start-backup.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-start-backup.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-start-backup.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-suspend-user.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-theme-change.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-theme-item.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-uploaded-image-list.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs diff --git a/app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/admin-watched-word-test.hbs rename to app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs diff --git a/app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/modal/site-setting-default-categories.hbs rename to app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/permalinks.hbs rename to app/assets/javascripts/admin/addon/templates/permalinks.hbs diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/plugins-index.hbs rename to app/assets/javascripts/admin/addon/templates/plugins-index.hbs diff --git a/app/assets/javascripts/admin/templates/plugins.hbs b/app/assets/javascripts/admin/addon/templates/plugins.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/plugins.hbs rename to app/assets/javascripts/admin/addon/templates/plugins.hbs diff --git a/app/assets/javascripts/admin/templates/reports-show.hbs b/app/assets/javascripts/admin/addon/templates/reports-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/reports-show.hbs rename to app/assets/javascripts/admin/addon/templates/reports-show.hbs diff --git a/app/assets/javascripts/admin/templates/search-logs-index.hbs b/app/assets/javascripts/admin/addon/templates/search-logs-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/search-logs-index.hbs rename to app/assets/javascripts/admin/addon/templates/search-logs-index.hbs diff --git a/app/assets/javascripts/admin/templates/search-logs-term.hbs b/app/assets/javascripts/admin/addon/templates/search-logs-term.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/search-logs-term.hbs rename to app/assets/javascripts/admin/addon/templates/search-logs-term.hbs diff --git a/app/assets/javascripts/admin/templates/site-settings-category.hbs b/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site-settings-category.hbs rename to app/assets/javascripts/admin/addon/templates/site-settings-category.hbs diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/addon/templates/site-settings.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site-settings.hbs rename to app/assets/javascripts/admin/addon/templates/site-settings.hbs diff --git a/app/assets/javascripts/admin/templates/site-text-edit.hbs b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site-text-edit.hbs rename to app/assets/javascripts/admin/addon/templates/site-text-edit.hbs diff --git a/app/assets/javascripts/admin/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site-text-index.hbs rename to app/assets/javascripts/admin/addon/templates/site-text-index.hbs diff --git a/app/assets/javascripts/admin/templates/site-text.hbs b/app/assets/javascripts/admin/addon/templates/site-text.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/site-text.hbs rename to app/assets/javascripts/admin/addon/templates/site-text.hbs diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/addon/templates/user-badges.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user-badges.hbs rename to app/assets/javascripts/admin/addon/templates/user-badges.hbs diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/addon/templates/user-fields.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user-fields.hbs rename to app/assets/javascripts/admin/addon/templates/user-fields.hbs diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user-index.hbs rename to app/assets/javascripts/admin/addon/templates/user-index.hbs diff --git a/app/assets/javascripts/admin/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user-tl3-requirements.hbs rename to app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs diff --git a/app/assets/javascripts/admin/templates/user.hbs b/app/assets/javascripts/admin/addon/templates/user.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/user.hbs rename to app/assets/javascripts/admin/addon/templates/user.hbs diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/users-list-show.hbs rename to app/assets/javascripts/admin/addon/templates/users-list-show.hbs diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/addon/templates/users-list.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/users-list.hbs rename to app/assets/javascripts/admin/addon/templates/users-list.hbs diff --git a/app/assets/javascripts/admin/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/watched-words-action.hbs rename to app/assets/javascripts/admin/addon/templates/watched-words-action.hbs diff --git a/app/assets/javascripts/admin/templates/watched-words.hbs b/app/assets/javascripts/admin/addon/templates/watched-words.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/watched-words.hbs rename to app/assets/javascripts/admin/addon/templates/watched-words.hbs diff --git a/app/assets/javascripts/admin/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/web-hooks-show-events.hbs rename to app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs diff --git a/app/assets/javascripts/admin/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/web-hooks-show.hbs rename to app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs diff --git a/app/assets/javascripts/admin/templates/web-hooks.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/web-hooks.hbs rename to app/assets/javascripts/admin/addon/templates/web-hooks.hbs diff --git a/app/assets/javascripts/admin/app/.gitkeep b/app/assets/javascripts/admin/app/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/assets/javascripts/admin/ember-cli-build.js b/app/assets/javascripts/admin/ember-cli-build.js new file mode 100644 index 00000000000..81a8a5e9aa3 --- /dev/null +++ b/app/assets/javascripts/admin/ember-cli-build.js @@ -0,0 +1,9 @@ +"use strict"; + +const EmberAddon = require("ember-cli/lib/broccoli/ember-addon"); + +module.exports = function (defaults) { + let app = new EmberAddon(defaults, {}); + + return app.toTree(); +}; diff --git a/app/assets/javascripts/admin/index.js b/app/assets/javascripts/admin/index.js new file mode 100644 index 00000000000..02238e5b63c --- /dev/null +++ b/app/assets/javascripts/admin/index.js @@ -0,0 +1,20 @@ +"use strict"; + +const calculateCacheKeyForTree = require("calculate-cache-key-for-tree"); + +module.exports = { + name: require("./package").name, + treeForAddon(tree) { + let app = this._findHost(); + app.options.adminTree = this._super.treeForAddon.call(this, tree); + return; + }, + + cacheKeyForTree(tree) { + return calculateCacheKeyForTree(tree, this); + }, + + isDevelopingAddon() { + return true; + }, +}; diff --git a/app/assets/javascripts/admin/package.json b/app/assets/javascripts/admin/package.json new file mode 100644 index 00000000000..71f324cfbaa --- /dev/null +++ b/app/assets/javascripts/admin/package.json @@ -0,0 +1,53 @@ +{ + "name": "admin", + "version": "1.0.0", + "description": "Discourse's admin section", + "author": "Discourse", + "license": "GPL-2.0-only", + "keywords": [ + "ember-addon" + ], + "repository": "", + "scripts": { + "build": "ember build", + "lint:hbs": "ember-template-lint .", + "lint:js": "eslint .", + "start": "ember serve" + }, + "dependencies": { + "ember-auto-import": "^1.5.3", + "ember-cli-babel": "^7.13.0", + "ember-cli-htmlbars": "^4.2.0", + "xss": "^1.0.8" + }, + "devDependencies": { + "@ember/optional-features": "^1.1.0", + "@glimmer/component": "^1.0.0", + "babel-eslint": "^10.0.3", + "broccoli-asset-rev": "^3.0.0", + "ember-cli": "~3.15.2", + "ember-cli-dependency-checker": "^3.2.0", + "ember-cli-eslint": "^5.1.0", + "ember-cli-inject-live-reload": "^2.0.1", + "ember-cli-sri": "^2.1.1", + "ember-cli-template-lint": "^1.0.0-beta.3", + "ember-cli-uglify": "^3.0.0", + "ember-disable-prototype-extensions": "^1.1.3", + "ember-export-application-global": "^2.0.1", + "ember-load-initializers": "^2.1.1", + "ember-maybe-import-regenerator": "^0.1.6", + "ember-resolver": "^7.0.0", + "ember-source": "~3.15.0", + "ember-source-channel-url": "^2.0.1", + "ember-try": "^1.4.0", + "eslint-plugin-ember": "^7.7.1", + "eslint-plugin-node": "^10.0.0", + "loader.js": "^4.7.0" + }, + "engines": { + "node": "8.* || >= 10.*" + }, + "ember": { + "edition": "octane" + } +} diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js index 6606bef2695..6f6a3861019 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js +++ b/app/assets/javascripts/discourse-common/addon/lib/raw-handlebars-helpers.js @@ -1,5 +1,9 @@ import { get } from "@ember/object"; +export const RUNTIME_OPTIONS = { + allowProtoPropertiesByDefault: true, +}; + export function registerRawHelpers(hbs, handlebarsClass) { if (!hbs.helpers) { hbs.helpers = Object.create(handlebarsClass.helpers); @@ -31,6 +35,9 @@ export function registerRawHelpers(hbs, handlebarsClass) { contextName, options ) { + if (typeof contextName === "undefined") { + return; + } var list = get(this, contextName); var output = []; var innerContext = Object.create(this); diff --git a/app/assets/javascripts/discourse-common/index.js b/app/assets/javascripts/discourse-common/index.js index 1d5c926b5fe..e912e37ba5f 100644 --- a/app/assets/javascripts/discourse-common/index.js +++ b/app/assets/javascripts/discourse-common/index.js @@ -9,4 +9,8 @@ module.exports = { }, }, }, + + isDevelopingAddon() { + return true; + }, }; diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js index 749ce2b116e..3b275bd8f59 100644 --- a/app/assets/javascripts/main_include_admin.js +++ b/app/assets/javascripts/main_include_admin.js @@ -1,11 +1,3 @@ -//= require admin/models/user-field -//= require admin/models/site-setting -//= require admin/models/screened-ip-address -//= require admin/models/api-key -//= require admin/models/tl3-requirements -//= require admin/models/admin-user -//= require_tree ./admin/models //= require discourse/app/lib/export-result -//= require_tree ./admin - +//= require_tree ./admin/addon //= require resumable.js diff --git a/app/assets/javascripts/pretty-text/index.js b/app/assets/javascripts/pretty-text/index.js index c5dd687c47c..d4a9ef20380 100644 --- a/app/assets/javascripts/pretty-text/index.js +++ b/app/assets/javascripts/pretty-text/index.js @@ -2,4 +2,7 @@ module.exports = { name: require("./package").name, + isDevelopingAddon() { + return true; + }, }; diff --git a/app/assets/javascripts/select-kit/index.js b/app/assets/javascripts/select-kit/index.js index 26c8d056a40..28c7dca628f 100644 --- a/app/assets/javascripts/select-kit/index.js +++ b/app/assets/javascripts/select-kit/index.js @@ -3,4 +3,7 @@ module.exports = { name: require("./package").name, options: {}, + isDevelopingAddon() { + return true; + }, }; diff --git a/config/application.rb b/config/application.rb index f05f95dc41f..d84148df119 100644 --- a/config/application.rb +++ b/config/application.rb @@ -261,6 +261,7 @@ module Discourse # Our templates shouldn't start with 'discourse/app/templates' config.handlebars.templates_root = { 'discourse/app/templates' => '', + 'admin/addon/templates' => 'admin/templates/', 'select-kit/addon/templates' => 'select-kit/templates/' } diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb index f5227cdcfb3..e5893ce4602 100644 --- a/lib/discourse_js_processor.rb +++ b/lib/discourse_js_processor.rb @@ -161,7 +161,7 @@ JS end # We need to strip the app subdirectory to replicate how ember-cli works. - path || logical_path&.gsub('app/', '')&.gsub('addon/', '') + path || logical_path&.gsub('app/', '')&.gsub('addon/', '')&.gsub('admin/addon', 'admin') end end diff --git a/lib/javascripts/widget-hbs-compiler.js b/lib/javascripts/widget-hbs-compiler.js index d8228205f80..6573efbe4e2 100644 --- a/lib/javascripts/widget-hbs-compiler.js +++ b/lib/javascripts/widget-hbs-compiler.js @@ -22,7 +22,7 @@ function sexpValue(value) { function pairsToObj(pairs) { let result = []; - pairs.forEach(p => { + pairs.forEach((p) => { result.push(`"${p.key}": ${sexpValue(p.value)}`); }); @@ -47,7 +47,7 @@ function sexp(value) { if (value.path.original === "concat") { let result = []; - value.params.forEach(p => { + value.params.forEach((p) => { result.push(sexpValue(p)); }); return result.join(" + "); @@ -86,9 +86,11 @@ function mustacheValue(node, state) { switch (path) { case "attach": - let widgetName = argValue(node.hash.pairs.find(p => p.key === "widget")); + let widgetName = argValue( + node.hash.pairs.find((p) => p.key === "widget") + ); - let attrs = node.hash.pairs.find(p => p.key === "attrs"); + let attrs = node.hash.pairs.find((p) => p.key === "attrs"); if (attrs) { return `this.attach(${widgetName}, ${argValue(attrs)})`; } @@ -102,9 +104,13 @@ function mustacheValue(node, state) { return i18n(node); break; case "avatar": - let template = argValue(node.hash.pairs.find(p => p.key === "template")); - let username = argValue(node.hash.pairs.find(p => p.key === "username")); - let size = argValue(node.hash.pairs.find(p => p.key === "size")); + let template = argValue( + node.hash.pairs.find((p) => p.key === "template") + ); + let username = argValue( + node.hash.pairs.find((p) => p.key === "username") + ); + let size = argValue(node.hash.pairs.find((p) => p.key === "size")); return `${useHelper( state, "avatar" @@ -149,7 +155,7 @@ class Compiler { this.state = { helpersUsed: {}, - helperNumber: 0 + helperNumber: 0, }; } @@ -163,7 +169,8 @@ class Compiler { switch (node.type) { case "Program": - node.body.forEach(bodyNode => { + case "Template": + node.body.forEach((bodyNode) => { instructions = instructions.concat( this.processNode(parentAcc, bodyNode) ); @@ -172,7 +179,7 @@ class Compiler { case "ElementNode": innerAcc = this.newAcc(); instructions.push(`var ${innerAcc} = [];`); - node.children.forEach(child => { + node.children.forEach((child) => { instructions = instructions.concat(this.processNode(innerAcc, child)); }); @@ -180,7 +187,7 @@ class Compiler { let attributes = []; let properties = []; - node.attributes.forEach(a => { + node.attributes.forEach((a) => { const name = a.name; const value = a.value.type === "MustacheStatement" @@ -227,7 +234,7 @@ class Compiler { instructions.push( `if (${negate}${resolve(node.params[0].original)}) {` ); - node.program.body.forEach(child => { + node.program.body.forEach((child) => { instructions = instructions.concat( this.processNode(parentAcc, child) ); @@ -235,7 +242,7 @@ class Compiler { if (node.inverse) { instructions.push(`} else {`); - node.inverse.body.forEach(child => { + node.inverse.body.forEach((child) => { instructions = instructions.concat( this.processNode(parentAcc, child) ); @@ -249,7 +256,7 @@ class Compiler { instructions.push( ` ${collection}.forEach(${node.program.blockParams[0]} => {` ); - node.program.body.forEach(child => { + node.program.body.forEach((child) => { instructions = instructions.concat( this.processNode(parentAcc, child) ); @@ -281,7 +288,7 @@ function compile(template) { let imports = ""; - Object.keys(compiler.state.helpersUsed).forEach(h => { + Object.keys(compiler.state.helpersUsed).forEach((h) => { let id = compiler.state.helpersUsed[h]; imports += `var __h${id} = __widget_helpers.${h}; `; }); @@ -298,7 +305,7 @@ function error(path, state, msg) { ); } -exports.WidgetHbsCompiler = function(babel) { +exports.WidgetHbsCompiler = function (babel) { let t = babel.types; return { visitor: { @@ -342,7 +349,7 @@ exports.WidgetHbsCompiler = function(babel) { } let template = path.node.quasi.quasis - .map(quasi => quasi.value.cooked) + .map((quasi) => quasi.value.cooked) .join(""); try { @@ -350,7 +357,7 @@ exports.WidgetHbsCompiler = function(babel) { } catch (e) { return error(path, state, e.toString()); } - } - } + }, + }, }; };