Move more MUC related views and components to muc-views plugin

src/modals/templates/user-settings.js

@@ -1,4 +1,3 @@
-import '../../components/adhoc-commands.js';
 import xss from "xss/dist/xss";
 import { __ } from '../../i18n';
 import { api } from "@converse/headless/core";

src/plugins/muc-views/adhoc-commands.js

@@ -1,7 +1,7 @@
 import 'shared/autocomplete/index.js';
 import log from "@converse/headless/log";
-import { CustomElement } from './element.js';
-import { __ } from '../i18n';
+import { CustomElement } from 'components/element.js';
+import { __ } from 'i18n';
 import { api, converse } from "@converse/headless/core";
 import { html } from "lit-html";
 

src/plugins/muc-views/index.js

@@ -6,6 +6,7 @@
  */
 import '../chatview/index.js';
 import '../modal.js';
+import './adhoc-commands.js';
 import MUCView from './muc.js';
 import MUCConfigForm from './config-form.js';
 import MUCPasswordForm from './password-form.js';

src/plugins/muc-views/modals/add-muc.js

@@ -1,6 +1,6 @@
-import tpl_add_muc from "./templates/add-muc.js";
-import BootstrapModal from "./base.js";
-import { __ } from '../i18n';
+import tpl_add_muc from "../templates/add-muc.js";
+import BootstrapModal from "modals/base.js";
+import { __ } from 'i18n';
 import { _converse, api, converse } from "@converse/headless/core";
 
 const u = converse.env.utils;

src/plugins/muc-views/modals/muc-list.js

@@ -1,7 +1,7 @@
-import BootstrapModal from "./base.js";
+import BootstrapModal from "modals/base.js";
 import log from "@converse/headless/log";
-import tpl_list_chatrooms_modal from "./templates/muc-list.js";
-import tpl_room_description from "templates/room_description.js";
+import tpl_list_chatrooms_modal from "../templates/muc-list.js";
+import tpl_muc_description from "../templates/muc_description.js";
 import tpl_spinner from "templates/spinner.js";
 import { __ } from 'i18n';
 import { _converse, api, converse } from "@converse/headless/core";
@@ -23,7 +23,7 @@ function insertRoomInfo (el, stanza) {
     el.querySelector('a.room-info').classList.add('selected');
     el.insertAdjacentHTML(
         'beforeEnd',
-        u.getElementFromTemplateResult(tpl_room_description({
+        u.getElementFromTemplateResult(tpl_muc_description({
             'jid': stanza.getAttribute('from'),
             'desc': head(sizzle('field[var="muc#roominfo_description"] value', stanza))?.textContent,
             'occ': head(sizzle('field[var="muc#roominfo_occupants"] value', stanza))?.textContent,

src/plugins/muc-views/templates/add-muc.js

@@ -1,7 +1,7 @@
 import xss from "xss/dist/xss";
-import { __ } from '../../i18n';
+import { __ } from 'i18n';
 import { html } from "lit-html";
-import { modal_header_close_button } from "./buttons"
+import { modal_header_close_button } from "modals/templates/buttons.js"
 import { unsafeHTML } from "lit-html/directives/unsafe-html.js";
 
 

src/plugins/muc-views/templates/muc-list.js

@@ -1,8 +1,8 @@
-import { __ } from '../../i18n';
+import { __ } from 'i18n';
 import { html } from "lit-html";
 import { repeat } from 'lit-html/directives/repeat.js';
-import { modal_close_button, modal_header_close_button } from "./buttons.js"
-import spinner from "../../templates/spinner.js";
+import { modal_close_button, modal_header_close_button } from "modals/templates/buttons.js"
+import spinner from "templates/spinner.js";
 
 
 const form = (o) => {

src/plugins/roomslist/templates/roomslist.js

@@ -1,5 +1,5 @@
-import AddMUCModal from 'modals/add-muc.js';
-import MUCListModal from 'modals/muc-list.js';
+import AddMUCModal from 'plugins/muc-views/modals/add-muc.js';
+import MUCListModal from 'plugins/muc-views/modals/muc-list.js';
 import { __ } from 'i18n';
 import { _converse, api } from "@converse/headless/core";
 import { html } from "lit-html";