Marketing enhancements

Author: dyakovri

.env.development

@@ -5,5 +5,5 @@ VUE_APP_API_PRINTER=https://printer.api.test.profcomff.com
 VUE_APP_API_REPORT=https://report.api.test.profcomff.com
 VUE_APP_API_TIMETABLE=https://timetable.api.test.profcomff.com
 VUE_APP_API_NAVBAR=https://navbar.api.test.profcomff.com
-VUE_APP_API_MARKETING=https://marketing.api.test.profcomff.com
-VUE_APP_FEEDBACK_FORM=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
+VUE_APP_API_MARKETING=https://marketing.api.test.profcomff.com/v1
+VUE_APP_FEEDBACK_FORM=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/

.env.production

@@ -5,5 +5,5 @@ VUE_APP_API_PRINTER=https://printer.api.profcomff.com
 VUE_APP_API_REPORT=https://report.api.profcomff.com
 VUE_APP_API_TIMETABLE=https://timetable.api.profcomff.com
 VUE_APP_API_NAVBAR=https://navbar.api.profcomff.com
-VUE_APP_API_MARKETING=https://marketing.api.profcomff.com
-FEEDBACK_FORM=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/
+VUE_APP_API_MARKETING=https://marketing.api.profcomff.com/v1
+FEEDBACK_FORM=https://forms.yandex.ru/u/635d013b068ff0587320bfc9/

src/router/index.js

@@ -34,16 +34,28 @@ const router = createRouter({
     routes,
 });
 
-router.beforeEach((to, from, next) => {
-    console.log(to);
+router.beforeEach((to, from) => {
+    // Log to marketing API
+    fetch(`${process.env.VUE_APP_API_MARKETING}/action`, {
+        method: 'POST',
+        cache: 'no-cache',
+        redirect: 'follow',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            user_id: localStorage.getItem('marketing-id'),
+            action: 'route to',
+            path_from: from.fullPath || null,
+            path_to: to.fullPath || null,
+        }),
+    }).catch();
+
     if (
         to.meta.requiresGroupSelection &&
         (localStorage.getItem('timetable-group-id') === null ||
             localStorage.getItem('timetable-group-id') === undefined ||
             localStorage.getItem('timetable-group-id') === '-1')
     )
-        next({ name: 'init' });
-    else next();
+        return { name: 'init' };
 });
 
 export default router;

src/views/EventView.vue

@@ -77,6 +77,7 @@
 import GroupRow from '@/components/GroupRow.vue';
 import LecturerRow from '@/components/LecturerRow.vue';
 import RoomRow from '@/components/RoomRow.vue';
+
 export default {
     components: { LecturerRow, RoomRow, GroupRow },
     data() {
@@ -104,7 +105,6 @@ export default {
             document.dispatchEvent(changeHeaderLayoutEvent);
         },
     },
-
     beforeMount() {
         this.loadEventInfo();
         console.log(this.eventInfo);
@@ -155,41 +155,9 @@ export default {
         },
         clickRoom(roomId) {
             this.$router.push(`/timetable/room/${roomId}`);
-            try {
-                fetch(`${process.env.VUE_APP_API_MARKETING}/action`, {
-                    method: 'POST',
-                    cache: 'no-cache',
-                    redirect: 'follow',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        user_id: localStorage.getItem('marketing-id'),
-                        action: 'route to',
-                        path_from: '/timetable',
-                        path_to: '/timetable/room',
-                    }),
-                });
-            } catch {
-                //Failed, skips
-            }
         },
         clickLecturer(lecturerId) {
             this.$router.push(`/timetable/lecturer/${lecturerId}`);
-            try {
-                fetch(`${process.env.VUE_APP_API_MARKETING}/action`, {
-                    method: 'POST',
-                    cache: 'no-cache',
-                    redirect: 'follow',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        user_id: localStorage.getItem('marketing-id'),
-                        action: 'route to',
-                        path_from: '/timetable',
-                        path_to: '/timetable/lecturer',
-                    }),
-                });
-            } catch {
-                //Failed, skips
-            }
         },
         getCurComments() {
             let cur = this.comments[this.eventId];

src/views/TimetableView.vue

@@ -48,7 +48,7 @@
 import EventRow from '@/components/EventRow.vue';
 import retry from '@/utils/Retrying.js';
 import { fetchTimetable } from '@/utils/FetchTimetable.js';
-import { getMonday, isToday } from '@/utils/Dates.js';
+import { getMonday, isToday, getIsoDate } from '@/utils/Dates.js';
 
 export default {
     components: {
@@ -100,10 +100,28 @@ export default {
         },
     },
     watch: {
-        date(newDate) {
+        date(newDate, oldDate) {
             this.loaded = false;
             // 5 раз с интервалом в 1 секунду попробуй скачать расписание
             this.loadTimetableOnDate(newDate);
+
+            fetch(`${process.env.VUE_APP_API_MARKETING}/action`, {
+                method: 'POST',
+                cache: 'no-cache',
+                redirect: 'follow',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    user_id: localStorage.getItem('marketing-id'),
+                    action: 'timetable change date',
+                    path_from: '/timetable',
+                    path_to: '/timetable',
+                    additional_data: JSON.stringify({
+                        date: getIsoDate(newDate),
+                        prev_date: getIsoDate(oldDate),
+                        group: this.groupInfo || { id: this.groupId } || null,
+                    }),
+                }),
+            });
         },
     },
     beforeMount() {