Merge remote-tracking branch 'origin/develop' into codex/locale-loader-audit
# Conflicts: # app/javascript/dashboard/i18n/index.js # app/javascript/dashboard/i18n/locale/am/index.js # app/javascript/dashboard/i18n/locale/ar/index.js # app/javascript/dashboard/i18n/locale/az/index.js # app/javascript/dashboard/i18n/locale/bg/index.js # app/javascript/dashboard/i18n/locale/ca/index.js # app/javascript/dashboard/i18n/locale/cs/index.js # app/javascript/dashboard/i18n/locale/da/index.js # app/javascript/dashboard/i18n/locale/de/index.js # app/javascript/dashboard/i18n/locale/el/index.js # app/javascript/dashboard/i18n/locale/en/index.js # app/javascript/dashboard/i18n/locale/es/index.js # app/javascript/dashboard/i18n/locale/fa/index.js # app/javascript/dashboard/i18n/locale/fi/index.js # app/javascript/dashboard/i18n/locale/fr/index.js # app/javascript/dashboard/i18n/locale/he/index.js # app/javascript/dashboard/i18n/locale/hi/index.js # app/javascript/dashboard/i18n/locale/hr/index.js # app/javascript/dashboard/i18n/locale/hu/index.js # app/javascript/dashboard/i18n/locale/hy/index.js # app/javascript/dashboard/i18n/locale/id/index.js # app/javascript/dashboard/i18n/locale/is/index.js # app/javascript/dashboard/i18n/locale/it/index.js # app/javascript/dashboard/i18n/locale/ja/index.js # app/javascript/dashboard/i18n/locale/ka/index.js # app/javascript/dashboard/i18n/locale/ko/index.js # app/javascript/dashboard/i18n/locale/lt/index.js # app/javascript/dashboard/i18n/locale/lv/index.js # app/javascript/dashboard/i18n/locale/ml/index.js # app/javascript/dashboard/i18n/locale/ms/index.js # app/javascript/dashboard/i18n/locale/ne/index.js # app/javascript/dashboard/i18n/locale/nl/index.js # app/javascript/dashboard/i18n/locale/no/index.js # app/javascript/dashboard/i18n/locale/pl/index.js # app/javascript/dashboard/i18n/locale/pt/index.js # app/javascript/dashboard/i18n/locale/pt_BR/index.js # app/javascript/dashboard/i18n/locale/ro/index.js # app/javascript/dashboard/i18n/locale/ru/index.js # app/javascript/dashboard/i18n/locale/sh/index.js # app/javascript/dashboard/i18n/locale/sk/index.js # app/javascript/dashboard/i18n/locale/sl/index.js # app/javascript/dashboard/i18n/locale/sq/index.js # app/javascript/dashboard/i18n/locale/sr/index.js # app/javascript/dashboard/i18n/locale/sv/index.js # app/javascript/dashboard/i18n/locale/ta/index.js # app/javascript/dashboard/i18n/locale/th/index.js # app/javascript/dashboard/i18n/locale/tl/index.js # app/javascript/dashboard/i18n/locale/tr/index.js # app/javascript/dashboard/i18n/locale/uk/index.js # app/javascript/dashboard/i18n/locale/ur/index.js # app/javascript/dashboard/i18n/locale/ur_IN/index.js # app/javascript/dashboard/i18n/locale/vi/index.js # app/javascript/dashboard/i18n/locale/zh_CN/index.js # app/javascript/dashboard/i18n/locale/zh_TW/index.js
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import Rails from '@rails/ujs';
|
||||
import Turbolinks from 'turbolinks';
|
||||
import { Turbo } from '@hotwired/turbo-rails';
|
||||
import '../portal/application.scss';
|
||||
import { InitializationHelpers } from '../portal/portalHelpers';
|
||||
|
||||
Rails.start();
|
||||
Turbolinks.start();
|
||||
Turbo.start();
|
||||
|
||||
document.addEventListener('turbolinks:load', InitializationHelpers.onLoad);
|
||||
document.addEventListener('turbo:load', InitializationHelpers.onLoad);
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { createApp } from 'vue';
|
||||
import { createI18n } from 'vue-i18n';
|
||||
import VueDOMPurifyHTML from 'vue-dompurify-html';
|
||||
import store from '../survey/store';
|
||||
import i18nMessages from '../survey/i18n';
|
||||
import App from '../survey/App.vue';
|
||||
import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
|
||||
|
||||
const app = createApp(App);
|
||||
const i18n = createI18n({
|
||||
@@ -12,6 +14,7 @@ const i18n = createI18n({
|
||||
|
||||
app.use(i18n);
|
||||
app.use(store);
|
||||
app.use(VueDOMPurifyHTML, domPurifyConfig);
|
||||
|
||||
window.onload = () => {
|
||||
window.WOOT_SURVEY = app.mount('#app');
|
||||
|
||||
Reference in New Issue
Block a user