From f15862cef45683f5fbe9e0fcde377c4ef9a17591 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Tue, 19 Mar 2024 12:51:11 +0530 Subject: [PATCH] fix: router --- frontend/package.json | 9 +++++---- frontend/src/components/Discussions.vue | 4 +++- frontend/src/router.js | 2 +- lms/www/learning.py | 12 ++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 lms/www/learning.py diff --git a/frontend/package.json b/frontend/package.json index 13a37a86..49d10e36 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -3,9 +3,10 @@ "private": true, "version": "0.0.0", "scripts": { - "dev": "vite --host", - "build": "vite build", - "preview": "vite preview" + "dev": "vite", + "serve": "vite preview", + "build": "vite build --base=/assets/lms/frontend/ && yarn copy-html-entry", + "copy-html-entry": "cp ../lms/public/frontend/index.html ../lms/www/learning.html" }, "dependencies": { "@editorjs/checklist": "^1.6.0", @@ -34,4 +35,4 @@ "postcss": "^8.4.5", "vite": "^5.0.11" } -} +} \ No newline at end of file diff --git a/frontend/src/components/Discussions.vue b/frontend/src/components/Discussions.vue index 69b4c5e0..bc1d55ae 100644 --- a/frontend/src/components/Discussions.vue +++ b/frontend/src/components/Discussions.vue @@ -71,6 +71,7 @@ import { MessageSquareIcon } from 'lucide-vue-next' const showTopics = ref(true) const currentTopic = ref(null) const socket = inject('$socket') +const user = inject('$user') const showTopicModal = ref(false) const props = defineProps({ @@ -101,6 +102,8 @@ const props = defineProps({ }) onMounted(() => { + if (user.data) topics.reload() + socket.on('new_discussion_topic', (data) => { topics.refresh() }) @@ -116,7 +119,6 @@ const topics = createResource({ single_thread: props.singleThread, } }, - auto: true, }) const showReplies = (topic) => { diff --git a/frontend/src/router.js b/frontend/src/router.js index d12883fe..b9bc13b5 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -97,7 +97,7 @@ const routes = [ ] let router = createRouter({ - history: createWebHistory('/'), + history: createWebHistory('/learning'), routes, }) diff --git a/lms/www/learning.py b/lms/www/learning.py new file mode 100644 index 00000000..54d77071 --- /dev/null +++ b/lms/www/learning.py @@ -0,0 +1,12 @@ +import frappe +from frappe.utils.telemetry import capture + +no_cache = 1 + + +def get_context(context): + csrf_token = frappe.sessions.get_csrf_token() + frappe.db.commit() + if frappe.session.user != "Guest": + capture("active_site", "lms") + context.csrf_token = csrf_token