diff --git a/frontend/index.html b/frontend/index.html index 0ce72b41..86a3dece 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -42,6 +42,7 @@ diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue index 9b2ec1c4..b049c3be 100644 --- a/frontend/src/components/AppSidebar.vue +++ b/frontend/src/components/AppSidebar.vue @@ -62,25 +62,31 @@ - - - +
+ + + + +
+ + + + + diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue index 9f928e76..d8c5f7f7 100644 --- a/frontend/src/components/UserDropdown.vue +++ b/frontend/src/components/UserDropdown.vue @@ -59,13 +59,22 @@ v-if="userResource.data?.is_moderator" v-model="showSettingsModal" /> + diff --git a/frontend/vite.config.js b/frontend/vite.config.js index fac998e6..2263cd75 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -15,7 +15,7 @@ export default defineConfig({ }), ], server: { - allowedHosts: ['fs'], + allowedHosts: ['fs', 'bs'], }, resolve: { alias: { diff --git a/lms/lms/api.py b/lms/lms/api.py index afae3e15..4a502628 100644 --- a/lms/lms/api.py +++ b/lms/lms/api.py @@ -22,7 +22,7 @@ from frappe.utils import ( from lms.lms.utils import get_average_rating, get_lesson_count from xml.dom.minidom import parseString from lms.lms.doctype.course_lesson.course_lesson import save_progress -from frappe.core.doctype.communication.email import make +from frappe.integrations.frappe_providers.frappecloud_billing import is_fc_site @frappe.whitelist() @@ -175,6 +175,7 @@ def get_user_info(): user.is_moderator = "Moderator" in user.roles user.is_evaluator = "Batch Evaluator" in user.roles user.is_student = "LMS Student" in user.roles + user.is_fc_site = is_fc_site() return user diff --git a/lms/www/lms.py b/lms/www/lms.py index 0b1f47fb..67a9f235 100644 --- a/lms/www/lms.py +++ b/lms/www/lms.py @@ -1,8 +1,9 @@ import frappe -from frappe.utils.telemetry import capture -from frappe import _ -from bs4 import BeautifulSoup import re +from bs4 import BeautifulSoup +from frappe import _ +from frappe.utils.telemetry import capture +from frappe.utils import cint no_cache = 1 @@ -17,6 +18,7 @@ def get_context(): csrf_token = frappe.sessions.get_csrf_token() frappe.db.commit() # nosemgrep context.csrf_token = csrf_token + context.setup_complete = cint(frappe.get_system_settings("setup_complete")) capture("active_site", "lms") context.favicon = frappe.db.get_single_value("Website Settings", "favicon") return context