mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-01 11:37:58 +00:00
# Pull Request Template ## Description This PR fixes RTL alignment issues in the new conversation form, removes the unused [`form-checkbox`](https://github.com/chatwoot/chatwoot/pull/12151#discussion_r2266333315) class name and drops the `app-rtl--wrapper` class, which was previously used for RTL detection in `rtl.scss` (removed earlier) Fixes https://linear.app/chatwoot/issue/CW-5410/rtl-issues ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? ### Screenshots <img width="868" height="474" alt="image" src="https://github.com/user-attachments/assets/45995652-2895-49d5-a651-179090c949ec" /> <img width="868" height="656" alt="image" src="https://github.com/user-attachments/assets/a1cb4415-3fd4-4c9a-bc46-5e07e437d757" /> <img width="868" height="656" alt="image" src="https://github.com/user-attachments/assets/77c8981f-364e-4bf0-bea8-a4c42a76d065" /> ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
180 lines
5.1 KiB
Vue
180 lines
5.1 KiB
Vue
<script>
|
|
import { mapGetters } from 'vuex';
|
|
import AddAccountModal from './components/app/AddAccountModal.vue';
|
|
import LoadingState from './components/widgets/LoadingState.vue';
|
|
import NetworkNotification from './components/NetworkNotification.vue';
|
|
import UpdateBanner from './components/app/UpdateBanner.vue';
|
|
import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
|
|
import PendingEmailVerificationBanner from './components/app/PendingEmailVerificationBanner.vue';
|
|
import vueActionCable from './helper/actionCable';
|
|
import { useRouter } from 'vue-router';
|
|
import { useStore } from 'dashboard/composables/store';
|
|
import WootSnackbarBox from './components/SnackbarContainer.vue';
|
|
import { setColorTheme } from './helper/themeHelper';
|
|
import { isOnOnboardingView } from 'v3/helpers/RouteHelper';
|
|
import { useAccount } from 'dashboard/composables/useAccount';
|
|
import { useFontSize } from 'dashboard/composables/useFontSize';
|
|
import {
|
|
registerSubscription,
|
|
verifyServiceWorkerExistence,
|
|
} from './helper/pushHelper';
|
|
import ReconnectService from 'dashboard/helper/ReconnectService';
|
|
|
|
export default {
|
|
name: 'App',
|
|
|
|
components: {
|
|
AddAccountModal,
|
|
LoadingState,
|
|
NetworkNotification,
|
|
UpdateBanner,
|
|
PaymentPendingBanner,
|
|
WootSnackbarBox,
|
|
PendingEmailVerificationBanner,
|
|
},
|
|
setup() {
|
|
const router = useRouter();
|
|
const store = useStore();
|
|
const { accountId } = useAccount();
|
|
// Use the font size composable (it automatically sets up the watcher)
|
|
const { currentFontSize } = useFontSize();
|
|
|
|
return {
|
|
router,
|
|
store,
|
|
currentAccountId: accountId,
|
|
currentFontSize,
|
|
};
|
|
},
|
|
data() {
|
|
return {
|
|
showAddAccountModal: false,
|
|
latestChatwootVersion: null,
|
|
reconnectService: null,
|
|
};
|
|
},
|
|
computed: {
|
|
...mapGetters({
|
|
getAccount: 'accounts/getAccount',
|
|
isRTL: 'accounts/isRTL',
|
|
currentUser: 'getCurrentUser',
|
|
authUIFlags: 'getAuthUIFlags',
|
|
accountUIFlags: 'accounts/getUIFlags',
|
|
}),
|
|
hasAccounts() {
|
|
const { accounts = [] } = this.currentUser || {};
|
|
return accounts.length > 0;
|
|
},
|
|
hideOnOnboardingView() {
|
|
return !isOnOnboardingView(this.$route);
|
|
},
|
|
},
|
|
|
|
watch: {
|
|
currentUser() {
|
|
if (!this.hasAccounts) {
|
|
this.showAddAccountModal = true;
|
|
}
|
|
},
|
|
currentAccountId: {
|
|
immediate: true,
|
|
handler() {
|
|
if (this.currentAccountId) {
|
|
this.initializeAccount();
|
|
}
|
|
},
|
|
},
|
|
},
|
|
mounted() {
|
|
this.initializeColorTheme();
|
|
this.listenToThemeChanges();
|
|
this.setLocale(window.chatwootConfig.selectedLocale);
|
|
},
|
|
unmounted() {
|
|
if (this.reconnectService) {
|
|
this.reconnectService.disconnect();
|
|
}
|
|
},
|
|
methods: {
|
|
initializeColorTheme() {
|
|
setColorTheme(window.matchMedia('(prefers-color-scheme: dark)').matches);
|
|
},
|
|
listenToThemeChanges() {
|
|
const mql = window.matchMedia('(prefers-color-scheme: dark)');
|
|
mql.onchange = e => setColorTheme(e.matches);
|
|
},
|
|
setLocale(locale) {
|
|
this.$root.$i18n.locale = locale;
|
|
},
|
|
async initializeAccount() {
|
|
await this.$store.dispatch('accounts/get');
|
|
this.$store.dispatch('setActiveAccount', {
|
|
accountId: this.currentAccountId,
|
|
});
|
|
const { locale, latest_chatwoot_version: latestChatwootVersion } =
|
|
this.getAccount(this.currentAccountId);
|
|
const { pubsub_token: pubsubToken } = this.currentUser || {};
|
|
this.setLocale(locale);
|
|
this.latestChatwootVersion = latestChatwootVersion;
|
|
vueActionCable.init(this.store, pubsubToken);
|
|
this.reconnectService = new ReconnectService(this.store, this.router);
|
|
window.reconnectService = this.reconnectService;
|
|
|
|
verifyServiceWorkerExistence(registration =>
|
|
registration.pushManager.getSubscription().then(subscription => {
|
|
if (subscription) {
|
|
registerSubscription();
|
|
}
|
|
})
|
|
);
|
|
},
|
|
},
|
|
};
|
|
</script>
|
|
|
|
<template>
|
|
<div
|
|
v-if="!authUIFlags.isFetching && !accountUIFlags.isFetchingItem"
|
|
id="app"
|
|
class="flex flex-col w-full h-screen min-h-0"
|
|
:dir="isRTL ? 'rtl' : 'ltr'"
|
|
>
|
|
<UpdateBanner :latest-chatwoot-version="latestChatwootVersion" />
|
|
<template v-if="currentAccountId">
|
|
<PendingEmailVerificationBanner v-if="hideOnOnboardingView" />
|
|
<PaymentPendingBanner v-if="hideOnOnboardingView" />
|
|
</template>
|
|
<router-view v-slot="{ Component }">
|
|
<transition name="fade" mode="out-in">
|
|
<component :is="Component" />
|
|
</transition>
|
|
</router-view>
|
|
<AddAccountModal :show="showAddAccountModal" :has-accounts="hasAccounts" />
|
|
<WootSnackbarBox />
|
|
<NetworkNotification />
|
|
</div>
|
|
<LoadingState v-else />
|
|
</template>
|
|
|
|
<style lang="scss">
|
|
@import './assets/scss/app';
|
|
|
|
.v-popper--theme-tooltip .v-popper__inner {
|
|
background: black !important;
|
|
font-size: 0.75rem;
|
|
padding: 4px 8px !important;
|
|
border-radius: 6px;
|
|
font-weight: 400;
|
|
}
|
|
|
|
.v-popper--theme-tooltip .v-popper__arrow-container {
|
|
display: none;
|
|
}
|
|
|
|
.multiselect__input {
|
|
margin-bottom: 0px !important;
|
|
}
|
|
</style>
|
|
|
|
<style src="vue-multiselect/dist/vue-multiselect.css"></style>
|