Merge branch 'ts-analytics' of https://github.com/linux-odyssey/linux-odyssey into ts-analytics

packages/analytics/src/controllers/quests.ts

@@ -1,4 +1,4 @@
-import { questList } from '../models/quests.ts'
+import { questList } from '../models/quests.js'
 // eslint-disable-next-line import/prefer-default-export
 export async function questListController(req: any, res: any) {
   const quests = await questList()

packages/analytics/src/controllers/users.ts

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 import Pagination from '../models/pagination.ts'
 import { userList, userDetail, idToUser } from '../models/users.js'
+=======
+import Pagination from '../models/pagination.js'
+import { userList } from '../models/users.js'
+>>>>>>> bb4a11b20c8fdad8459ac3b7a0fdb8d9d9221e31
 
 export async function userListController(req: any, res: any) {
   const { nextKey, order } = req.query
@@ -20,6 +25,7 @@ export async function userListController(req: any, res: any) {
     res.status(500).send('Error fetching user data')
   }
 }
+<<<<<<< HEAD
 export async function userDetailController(req: any, res: any) {
   const { id } = req.params
   const sessions = await userDetail(id)
@@ -31,3 +37,5 @@ export async function userDetailController(req: any, res: any) {
     res.status(500).send('Error fetching user data')
   }
 }
+=======
+>>>>>>> bb4a11b20c8fdad8459ac3b7a0fdb8d9d9221e31