From 24f197a0642bb4ca1bdafc028f5ee59a132c6aae Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Fri, 25 Dec 2020 21:53:14 +0100 Subject: [PATCH] Move legacy javascript folder out of packs/ --- .gitignore | 2 +- .../legacy/answerbox/comment.coffee | 0 .../legacy/answerbox/comment/destroy.coffee | 0 .../legacy/answerbox/comment/report.coffee | 0 .../legacy/answerbox/comment/smile.coffee | 0 .../legacy/answerbox/destroy.coffee | 0 .../{packs => }/legacy/answerbox/index.coffee | 0 .../legacy/answerbox/report.coffee | 0 .../{packs => }/legacy/answerbox/smile.coffee | 0 .../legacy/answerbox/subscribe.coffee | 0 .../{packs => }/legacy/bootstrap.coffee | 0 .../{packs => }/legacy/inbox.coffee | 0 .../{packs => }/legacy/jquery.coffee | 0 .../{packs => }/legacy/lists.coffee | 0 .../{packs => }/legacy/locale-box.coffee | 0 .../{packs => }/legacy/memes.coffee | 0 .../{packs => }/legacy/moderation/ban.coffee | 0 .../legacy/moderation/comment.coffee | 0 .../legacy/moderation/destroy.coffee | 0 .../legacy/moderation/privileges.coffee | 0 .../{packs => }/legacy/moderation/vote.coffee | 0 .../{packs => }/legacy/notifications.coffee | 0 .../{packs => }/legacy/pagination.coffee | 0 .../{packs => }/legacy/question.coffee | 0 .../{packs => }/legacy/questionbox/all.coffee | 0 .../legacy/questionbox/destroy.coffee | 0 .../legacy/questionbox/index.coffee | 0 .../legacy/questionbox/report.coffee | 0 .../legacy/questionbox/user.coffee | 0 .../{packs => }/legacy/report.coffee | 0 .../{packs => }/legacy/settings.coffee | 0 app/javascript/{packs => }/legacy/user.coffee | 0 app/javascript/{packs => }/legacy/util.coffee | 0 app/javascript/packs/legacy-moderation.coffee | 11 +++++++ .../application.coffee => legacy.coffee} | 32 +++++++++---------- app/javascript/packs/legacy/i18n/.keep | 0 .../packs/legacy/moderation/index.coffee | 11 ------- app/views/layouts/base.haml | 6 ++-- config/i18n-js.yml | 2 +- 39 files changed, 32 insertions(+), 32 deletions(-) rename app/javascript/{packs => }/legacy/answerbox/comment.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/comment/destroy.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/comment/report.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/comment/smile.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/destroy.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/index.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/report.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/smile.coffee (100%) rename app/javascript/{packs => }/legacy/answerbox/subscribe.coffee (100%) rename app/javascript/{packs => }/legacy/bootstrap.coffee (100%) rename app/javascript/{packs => }/legacy/inbox.coffee (100%) rename app/javascript/{packs => }/legacy/jquery.coffee (100%) rename app/javascript/{packs => }/legacy/lists.coffee (100%) rename app/javascript/{packs => }/legacy/locale-box.coffee (100%) rename app/javascript/{packs => }/legacy/memes.coffee (100%) rename app/javascript/{packs => }/legacy/moderation/ban.coffee (100%) rename app/javascript/{packs => }/legacy/moderation/comment.coffee (100%) rename app/javascript/{packs => }/legacy/moderation/destroy.coffee (100%) rename app/javascript/{packs => }/legacy/moderation/privileges.coffee (100%) rename app/javascript/{packs => }/legacy/moderation/vote.coffee (100%) rename app/javascript/{packs => }/legacy/notifications.coffee (100%) rename app/javascript/{packs => }/legacy/pagination.coffee (100%) rename app/javascript/{packs => }/legacy/question.coffee (100%) rename app/javascript/{packs => }/legacy/questionbox/all.coffee (100%) rename app/javascript/{packs => }/legacy/questionbox/destroy.coffee (100%) rename app/javascript/{packs => }/legacy/questionbox/index.coffee (100%) rename app/javascript/{packs => }/legacy/questionbox/report.coffee (100%) rename app/javascript/{packs => }/legacy/questionbox/user.coffee (100%) rename app/javascript/{packs => }/legacy/report.coffee (100%) rename app/javascript/{packs => }/legacy/settings.coffee (100%) rename app/javascript/{packs => }/legacy/user.coffee (100%) rename app/javascript/{packs => }/legacy/util.coffee (100%) create mode 100644 app/javascript/packs/legacy-moderation.coffee rename app/javascript/packs/{legacy/application.coffee => legacy.coffee} (83%) delete mode 100644 app/javascript/packs/legacy/i18n/.keep delete mode 100644 app/javascript/packs/legacy/moderation/index.coffee diff --git a/.gitignore b/.gitignore index 273a0962..e65d398e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ coverage/ # dont push generated js translations to repository /app/assets/javascripts/i18n/*.js -/app/javascript/packs/legacy/i18n.js +/app/javascript/legacy/i18n.js # every fucking time, dolphin .directory diff --git a/app/javascript/packs/legacy/answerbox/comment.coffee b/app/javascript/legacy/answerbox/comment.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/comment.coffee rename to app/javascript/legacy/answerbox/comment.coffee diff --git a/app/javascript/packs/legacy/answerbox/comment/destroy.coffee b/app/javascript/legacy/answerbox/comment/destroy.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/comment/destroy.coffee rename to app/javascript/legacy/answerbox/comment/destroy.coffee diff --git a/app/javascript/packs/legacy/answerbox/comment/report.coffee b/app/javascript/legacy/answerbox/comment/report.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/comment/report.coffee rename to app/javascript/legacy/answerbox/comment/report.coffee diff --git a/app/javascript/packs/legacy/answerbox/comment/smile.coffee b/app/javascript/legacy/answerbox/comment/smile.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/comment/smile.coffee rename to app/javascript/legacy/answerbox/comment/smile.coffee diff --git a/app/javascript/packs/legacy/answerbox/destroy.coffee b/app/javascript/legacy/answerbox/destroy.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/destroy.coffee rename to app/javascript/legacy/answerbox/destroy.coffee diff --git a/app/javascript/packs/legacy/answerbox/index.coffee b/app/javascript/legacy/answerbox/index.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/index.coffee rename to app/javascript/legacy/answerbox/index.coffee diff --git a/app/javascript/packs/legacy/answerbox/report.coffee b/app/javascript/legacy/answerbox/report.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/report.coffee rename to app/javascript/legacy/answerbox/report.coffee diff --git a/app/javascript/packs/legacy/answerbox/smile.coffee b/app/javascript/legacy/answerbox/smile.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/smile.coffee rename to app/javascript/legacy/answerbox/smile.coffee diff --git a/app/javascript/packs/legacy/answerbox/subscribe.coffee b/app/javascript/legacy/answerbox/subscribe.coffee similarity index 100% rename from app/javascript/packs/legacy/answerbox/subscribe.coffee rename to app/javascript/legacy/answerbox/subscribe.coffee diff --git a/app/javascript/packs/legacy/bootstrap.coffee b/app/javascript/legacy/bootstrap.coffee similarity index 100% rename from app/javascript/packs/legacy/bootstrap.coffee rename to app/javascript/legacy/bootstrap.coffee diff --git a/app/javascript/packs/legacy/inbox.coffee b/app/javascript/legacy/inbox.coffee similarity index 100% rename from app/javascript/packs/legacy/inbox.coffee rename to app/javascript/legacy/inbox.coffee diff --git a/app/javascript/packs/legacy/jquery.coffee b/app/javascript/legacy/jquery.coffee similarity index 100% rename from app/javascript/packs/legacy/jquery.coffee rename to app/javascript/legacy/jquery.coffee diff --git a/app/javascript/packs/legacy/lists.coffee b/app/javascript/legacy/lists.coffee similarity index 100% rename from app/javascript/packs/legacy/lists.coffee rename to app/javascript/legacy/lists.coffee diff --git a/app/javascript/packs/legacy/locale-box.coffee b/app/javascript/legacy/locale-box.coffee similarity index 100% rename from app/javascript/packs/legacy/locale-box.coffee rename to app/javascript/legacy/locale-box.coffee diff --git a/app/javascript/packs/legacy/memes.coffee b/app/javascript/legacy/memes.coffee similarity index 100% rename from app/javascript/packs/legacy/memes.coffee rename to app/javascript/legacy/memes.coffee diff --git a/app/javascript/packs/legacy/moderation/ban.coffee b/app/javascript/legacy/moderation/ban.coffee similarity index 100% rename from app/javascript/packs/legacy/moderation/ban.coffee rename to app/javascript/legacy/moderation/ban.coffee diff --git a/app/javascript/packs/legacy/moderation/comment.coffee b/app/javascript/legacy/moderation/comment.coffee similarity index 100% rename from app/javascript/packs/legacy/moderation/comment.coffee rename to app/javascript/legacy/moderation/comment.coffee diff --git a/app/javascript/packs/legacy/moderation/destroy.coffee b/app/javascript/legacy/moderation/destroy.coffee similarity index 100% rename from app/javascript/packs/legacy/moderation/destroy.coffee rename to app/javascript/legacy/moderation/destroy.coffee diff --git a/app/javascript/packs/legacy/moderation/privileges.coffee b/app/javascript/legacy/moderation/privileges.coffee similarity index 100% rename from app/javascript/packs/legacy/moderation/privileges.coffee rename to app/javascript/legacy/moderation/privileges.coffee diff --git a/app/javascript/packs/legacy/moderation/vote.coffee b/app/javascript/legacy/moderation/vote.coffee similarity index 100% rename from app/javascript/packs/legacy/moderation/vote.coffee rename to app/javascript/legacy/moderation/vote.coffee diff --git a/app/javascript/packs/legacy/notifications.coffee b/app/javascript/legacy/notifications.coffee similarity index 100% rename from app/javascript/packs/legacy/notifications.coffee rename to app/javascript/legacy/notifications.coffee diff --git a/app/javascript/packs/legacy/pagination.coffee b/app/javascript/legacy/pagination.coffee similarity index 100% rename from app/javascript/packs/legacy/pagination.coffee rename to app/javascript/legacy/pagination.coffee diff --git a/app/javascript/packs/legacy/question.coffee b/app/javascript/legacy/question.coffee similarity index 100% rename from app/javascript/packs/legacy/question.coffee rename to app/javascript/legacy/question.coffee diff --git a/app/javascript/packs/legacy/questionbox/all.coffee b/app/javascript/legacy/questionbox/all.coffee similarity index 100% rename from app/javascript/packs/legacy/questionbox/all.coffee rename to app/javascript/legacy/questionbox/all.coffee diff --git a/app/javascript/packs/legacy/questionbox/destroy.coffee b/app/javascript/legacy/questionbox/destroy.coffee similarity index 100% rename from app/javascript/packs/legacy/questionbox/destroy.coffee rename to app/javascript/legacy/questionbox/destroy.coffee diff --git a/app/javascript/packs/legacy/questionbox/index.coffee b/app/javascript/legacy/questionbox/index.coffee similarity index 100% rename from app/javascript/packs/legacy/questionbox/index.coffee rename to app/javascript/legacy/questionbox/index.coffee diff --git a/app/javascript/packs/legacy/questionbox/report.coffee b/app/javascript/legacy/questionbox/report.coffee similarity index 100% rename from app/javascript/packs/legacy/questionbox/report.coffee rename to app/javascript/legacy/questionbox/report.coffee diff --git a/app/javascript/packs/legacy/questionbox/user.coffee b/app/javascript/legacy/questionbox/user.coffee similarity index 100% rename from app/javascript/packs/legacy/questionbox/user.coffee rename to app/javascript/legacy/questionbox/user.coffee diff --git a/app/javascript/packs/legacy/report.coffee b/app/javascript/legacy/report.coffee similarity index 100% rename from app/javascript/packs/legacy/report.coffee rename to app/javascript/legacy/report.coffee diff --git a/app/javascript/packs/legacy/settings.coffee b/app/javascript/legacy/settings.coffee similarity index 100% rename from app/javascript/packs/legacy/settings.coffee rename to app/javascript/legacy/settings.coffee diff --git a/app/javascript/packs/legacy/user.coffee b/app/javascript/legacy/user.coffee similarity index 100% rename from app/javascript/packs/legacy/user.coffee rename to app/javascript/legacy/user.coffee diff --git a/app/javascript/packs/legacy/util.coffee b/app/javascript/legacy/util.coffee similarity index 100% rename from app/javascript/packs/legacy/util.coffee rename to app/javascript/legacy/util.coffee diff --git a/app/javascript/packs/legacy-moderation.coffee b/app/javascript/packs/legacy-moderation.coffee new file mode 100644 index 00000000..4f8cafe9 --- /dev/null +++ b/app/javascript/packs/legacy-moderation.coffee @@ -0,0 +1,11 @@ +import 'tempusdominus-bootstrap-4' + +require('tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css') + +import '../legacy/moderation/ban' +import '../legacy/moderation/comment' +import '../legacy/moderation/destroy' +import '../legacy/moderation/privileges' +import '../legacy/moderation/vote' + +$('.datetimepicker-input').datetimepicker({}) \ No newline at end of file diff --git a/app/javascript/packs/legacy/application.coffee b/app/javascript/packs/legacy.coffee similarity index 83% rename from app/javascript/packs/legacy/application.coffee rename to app/javascript/packs/legacy.coffee index e75efdb2..1853ba5f 100644 --- a/app/javascript/packs/legacy/application.coffee +++ b/app/javascript/packs/legacy.coffee @@ -1,8 +1,8 @@ import 'core-js/stable' import 'regenerator-runtime/runtime' -import './jquery' -import './bootstrap' +import '../legacy/jquery' +import '../legacy/bootstrap' import {} from 'jquery-ujs' import 'jquery.turbolinks/src/jquery.turbolinks' import 'jquery.guillotine' @@ -19,21 +19,21 @@ require('jquery.guillotine/css/jquery.guillotine.css') require('sweetalert/dist/sweetalert.css') # this file is generated by Rails -import I18n from './i18n' +import I18n from '../legacy/i18n' -import './answerbox' -import './questionbox' -import './inbox' -import './lists' -import './memes' -import './notifications' -import './pagination' -import './question' -import './settings' -import './user' -import './report' -import './locale-box' -import './util' +import '../legacy/answerbox' +import '../legacy/questionbox' +import '../legacy/inbox' +import '../legacy/lists' +import '../legacy/memes' +import '../legacy/notifications' +import '../legacy/pagination' +import '../legacy/question' +import '../legacy/settings' +import '../legacy/user' +import '../legacy/report' +import '../legacy/locale-box' +import '../legacy/util' window.moment = moment diff --git a/app/javascript/packs/legacy/i18n/.keep b/app/javascript/packs/legacy/i18n/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/app/javascript/packs/legacy/moderation/index.coffee b/app/javascript/packs/legacy/moderation/index.coffee deleted file mode 100644 index a9d21d6c..00000000 --- a/app/javascript/packs/legacy/moderation/index.coffee +++ /dev/null @@ -1,11 +0,0 @@ -import 'tempusdominus-bootstrap-4' - -require('tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css') - -import './ban' -import './comment' -import './destroy' -import './privileges' -import './vote' - -$('.datetimepicker-input').datetimepicker({}) \ No newline at end of file diff --git a/app/views/layouts/base.haml b/app/views/layouts/base.haml index 2527df5d..643a4d1c 100644 --- a/app/views/layouts/base.haml +++ b/app/views/layouts/base.haml @@ -11,11 +11,11 @@ %link{ rel: 'icon', href: '/images/favicon/favicon-32.png', sizes: '32x32' } %title= yield(:title) = stylesheet_link_tag 'application', media: 'all', data: { 'turbolinks-track': true } - = javascript_pack_tag 'legacy/application', data: { 'turbolinks-track': true } + = javascript_pack_tag 'legacy', data: { 'turbolinks-track': true } = javascript_pack_tag 'hello_typescript' - = stylesheet_pack_tag 'legacy/application', data: { 'turbolinks-track': true } + = stylesheet_pack_tag 'legacy', data: { 'turbolinks-track': true } - if user_signed_in? && current_user.mod? - = javascript_pack_tag 'legacy/moderation/index', data: { 'turbolinks-track': true } + = javascript_pack_tag 'legacy-moderation', data: { 'turbolinks-track': true } = csrf_meta_tags %body - if user_signed_in? diff --git a/config/i18n-js.yml b/config/i18n-js.yml index 8de53b36..60a7d077 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -24,7 +24,7 @@ fallbacks: :default_locale translations: - - file: 'app/javascript/packs/legacy/i18n.js' + - file: 'app/javascript/legacy/i18n.js' only: ['*.frontend.*', '*.views.actions.*'] prefix: "import I18n from 'i18n-js'\n" suffix: "\nexport default I18n"