feat: configuration to disable pwa

This commit is contained in:
Jannat Patel
2025-12-10 18:05:50 +05:30
parent 0877e32e1b
commit 80a217e646
11 changed files with 46 additions and 68 deletions

View File

@@ -3,7 +3,7 @@
<Layout class="isolate text-base">
<router-view />
</Layout>
<InstallPrompt v-if="isMobile" />
<InstallPrompt v-if="isMobile && !settings.data?.disable_pwa" />
<Dialogs />
</FrappeUIProvider>
</template>
@@ -13,6 +13,7 @@ import { Dialogs } from '@/utils/dialogs'
import { computed, onUnmounted, ref, watch } from 'vue'
import { useScreenSize } from './utils/composables'
import { usersStore } from '@/stores/user'
import { useSettings } from '@/stores/settings'
import { useRouter } from 'vue-router'
import { posthogSettings } from '@/telemetry'
import DesktopLayout from './components/DesktopLayout.vue'
@@ -24,6 +25,7 @@ const { isMobile } = useScreenSize()
const router = useRouter()
const noSidebar = ref(false)
const { userResource } = usersStore()
const { settings } = useSettings()
router.beforeEach((to, from, next) => {
if (to.query.fromLesson || to.path === '/persona') {

View File

@@ -48,7 +48,7 @@ const settingsStore = useSettings()
const sendMail = (close: Function) => {
call('frappe.core.doctype.communication.email.make', {
recipients: settingsStore.contactUsEmail?.data,
recipients: settingsStore.settings?.data?.contact_us_email,
subject: subject.value,
content: message.value,
send_email: true,

View File

@@ -120,6 +120,13 @@ const tabsStructure = computed(() => {
description:
'If enabled, users will no able to move forward in a video',
},
{
label: 'Disable PWA',
name: 'disable_pwa',
type: 'checkbox',
description:
'If checked, users will not be able to install the application as a Progressive Web App.',
},
{
label: 'Send calendar invite for evaluations',
name: 'send_calendar_invite_for_evaluations',

View File

@@ -239,8 +239,7 @@ const showPageModal = ref(false)
const isModerator = ref(false)
const isInstructor = ref(false)
const pageToEdit = ref(null)
const settingsStore = useSettings()
const { sidebarSettings } = settingsStore
const { settings, sidebarSettings, activeTab, isSettingsOpen } = useSettings()
const showOnboarding = ref(false)
const showIntermediateModal = ref(false)
const currentStep = ref({})
@@ -393,7 +392,7 @@ const addPrograms = async () => {
}
const addContactUsDetails = () => {
if (!settingsStore.contactUsEmail?.data && !settingsStore.contactUsURL?.data)
if (!settings?.data?.contact_us_email && !settings?.data?.contact_us_url)
return
const contactUsLinkExists = sidebarLinks.value.some(
@@ -403,10 +402,10 @@ const addContactUsDetails = () => {
sidebarLinks.value.push({
label: 'Contact Us',
icon: settingsStore.contactUsURL?.data ? 'Headset' : 'Mail',
to: settingsStore.contactUsURL?.data
? settingsStore.contactUsURL.data
: settingsStore.contactUsEmail?.data,
icon: settings.data?.contact_us_url ? 'Headset' : 'Mail',
to: settings.data?.contact_us_url
? settings.data?.contact_us_url
: settings.data?.contact_us_email,
})
}
@@ -540,8 +539,8 @@ const steps = reactive([
completed: false,
onClick: () => {
minimize.value = true
settingsStore.activeTab = 'Members'
settingsStore.isSettingsOpen = true
activeTab.value = 'Members'
isSettingsOpen.value = true
},
},
{

View File

@@ -171,7 +171,7 @@ const showQuizLoader = ref(false)
const quizLoadTimer = ref(0)
const currentQuiz = ref(null)
const nextQuiz = ref({})
const { preventSkippingVideos } = useSettings()
const { settings } = useSettings()
const props = defineProps({
file: {
@@ -299,7 +299,7 @@ const toggleMute = () => {
const changeCurrentTime = () => {
if (
preventSkippingVideos.data &&
settings.data?.prevent_skipping_videos &&
currentTime.value > videoRef.value.currentTime
)
return

View File

@@ -168,7 +168,7 @@ const testCaseSection = ref<HTMLElement | null>(null)
const testCases = ref<TestCase[]>([])
const boilerplate = ref<string>('')
const { brand } = sessionStore()
const { livecodeURL } = useSettings()
const { settings } = useSettings()
const router = useRouter()
const fromLesson = ref(false)
const falconURL = ref<string>('https://falcon.frappe.io/')
@@ -291,8 +291,8 @@ watch(
)
const loadFalcon = () => {
if (livecodeURL.data) {
falconURL.value = livecodeURL.data
if (settings.data) {
falconURL.value = settings.data.livecode_url
}
return new Promise((resolve, reject) => {
const script = document.createElement('script')

View File

@@ -270,7 +270,7 @@ let router = createRouter({
router.beforeEach(async (to, from, next) => {
const { userResource } = usersStore()
let { isLoggedIn } = sessionStore()
const { allowGuestAccess } = useSettings()
const { settings } = useSettings()
try {
if (isLoggedIn) {
@@ -283,8 +283,8 @@ router.beforeEach(async (to, from, next) => {
if (!isLoggedIn) {
if (to.name == 'Home') router.push({ name: 'Courses' })
await allowGuestAccess.promise
if (!allowGuestAccess.data) {
await settings.promise
if (!settings.data.allow_guest_access) {
window.location.href = '/login'
return
}

View File

@@ -7,32 +7,10 @@ export const useSettings = defineStore('settings', () => {
const isSettingsOpen = ref(false)
const activeTab = ref(null)
const allowGuestAccess = createResource({
url: 'lms.lms.api.get_lms_setting',
params: { field: 'allow_guest_access' },
const settings = createResource({
url: 'lms.lms.api.get_lms_settings',
auto: true,
cache: ['allowGuestAccess'],
})
const preventSkippingVideos = createResource({
url: 'lms.lms.api.get_lms_setting',
params: { field: 'prevent_skipping_videos' },
auto: true,
cache: ['preventSkippingVideos'],
})
const contactUsEmail = createResource({
url: 'lms.lms.api.get_lms_setting',
params: { field: 'contact_us_email' },
auto: true,
cache: ['contactUsEmail'],
})
const contactUsURL = createResource({
url: 'lms.lms.api.get_lms_setting',
params: { field: 'contact_us_url' },
auto: true,
cache: ['contactUsURL'],
cache: 'LMS Settings',
})
const sidebarSettings = createResource({
@@ -41,21 +19,10 @@ export const useSettings = defineStore('settings', () => {
auto: false,
})
const livecodeURL = createResource({
url: 'lms.lms.api.get_lms_setting',
params: { field: 'livecode_url' },
auto: true,
cache: ['livecodeURL'],
})
return {
isSettingsOpen,
activeTab,
allowGuestAccess,
preventSkippingVideos,
contactUsEmail,
contactUsURL,
settings,
sidebarSettings,
livecodeURL,
}
})

View File

@@ -612,7 +612,7 @@ const setupPlyrForVideo = (video, players) => {
const current_time = player.currentTime
const newTime = getTargetTime(player, e)
if (
useSettings().preventSkippingVideos.data &&
useSettings().settings.data?.prevent_skipping_videos &&
parseFloat(newTime) > current_time
) {
e.preventDefault()