mirror of
https://github.com/linux-odyssey/linux-odyssey.git
synced 2026-11-06 11:30:13 +08:00
fix: import path and dev server using tsc and nodemon
This commit is contained in:
1 parent
ea33434bea
commit
48dbac7907
16 files changed
+34
-28
No files matched your search
@@ -1,3 +1,9 @@
|
||||
import dotenv from 'dotenv'
|
||||
|
||||
if (process.env.NODE_ENV !== 'production') {
|
||||
dotenv.config({ path: '.env.dev' })
|
||||
}
|
||||
|
||||
function getOrFailed(key: string): string {
|
||||
if (!process.env[key]) {
|
||||
throw new Error(`Missing required environment variable: ${key}`)
|
||||
@@ -16,13 +22,13 @@ interface Config {
|
||||
|
||||
const config: Config = {
|
||||
host: process.env.HOST || 'localhost',
|
||||
port: process.env.PORT ? parseInt(process.env.PORT) : 3001,
|
||||
port: process.env.PORT ? parseInt(process.env.PORT, 10) : 3001,
|
||||
db: process.env.MONGO_URL || 'mongodb://localhost:27017/odyssey-test',
|
||||
username: getOrFailed('ADMIN_USERNAME'),
|
||||
password: getOrFailed('ADMIN_PASSWORD'),
|
||||
baseUrl:
|
||||
process.env.BASE_URL ||
|
||||
`http://${process.env.HOST || 'localhost'}:${process.env.PORT ? parseInt(process.env.PORT) : 3001}`,
|
||||
`http://${process.env.HOST || 'localhost'}:${process.env.PORT ? parseInt(process.env.PORT, 10) : 3001}`,
|
||||
}
|
||||
|
||||
export default config
|
||||
@@ -1,5 +1,5 @@
|
||||
/* eslint-disable object-shorthand */
|
||||
import Pagination from '../models/pagination.ts'
|
||||
import Pagination from '../models/pagination.js'
|
||||
import { errorCommands } from '../models/commands.js'
|
||||
|
||||
// eslint-disable-next-line import/prefer-default-export
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { userCount } from '../models/users.js'
|
||||
import { questList } from '../models/quests.ts'
|
||||
import { questList } from '../models/quests.js'
|
||||
|
||||
// eslint-disable-next-line import/prefer-default-export
|
||||
export async function homeController(req: any, res: any) {
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import Pagination from '../models/pagination.ts'
|
||||
import { sessionList, sessionDetail } from '../models/sessions.ts'
|
||||
import { Request, Response } from 'express'
|
||||
import type { Request, Response } from 'express'
|
||||
import Pagination from '../models/pagination.js'
|
||||
import { sessionList, sessionDetail } from '../models/sessions.js'
|
||||
|
||||
export async function sessionListController(req: any, res: any) {
|
||||
const { nextKey, order } = req.query
|
||||
const itemsPerPage = 50
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import Pagination from '../models/pagination.ts'
|
||||
import Pagination from '../models/pagination.js'
|
||||
import { userList } from '../models/users.js'
|
||||
|
||||
export async function userListController(req: any, res: any) {
|
||||
|
||||
@@ -2,8 +2,8 @@ import connectDB from '@linux-odyssey/models'
|
||||
import express from 'express'
|
||||
import { engine } from 'express-handlebars'
|
||||
import basicAuth from 'express-basic-auth'
|
||||
import config from './config.ts'
|
||||
import router from './router.ts'
|
||||
import config from './config.js'
|
||||
import router from './router.js'
|
||||
|
||||
async function main() {
|
||||
await connectDB(config.db)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Command } from '@linux-odyssey/models'
|
||||
import Pagination from './pagination.ts'
|
||||
import Pagination from './pagination.js'
|
||||
|
||||
// eslint-disable-next-line import/prefer-default-export
|
||||
export async function errorCommands(pagination: Pagination) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Command, Session } from '@linux-odyssey/models'
|
||||
import Pagination from './pagination.ts'
|
||||
import { Types } from 'mongoose'
|
||||
import Pagination from './pagination.js'
|
||||
|
||||
function formatTime(time: number) {
|
||||
const seconds = Math.floor(time / 1000)
|
||||
@@ -44,7 +44,6 @@ export async function sessionList(pagination: Pagination): Promise<any[]> {
|
||||
commands,
|
||||
lastActivityAt,
|
||||
} = session
|
||||
console.log(finishedAt)
|
||||
return {
|
||||
_id,
|
||||
user: user.username, // Assuming `user` is always populated.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Session, User } from '@linux-odyssey/models'
|
||||
import Pagination from './pagination.ts'
|
||||
import Pagination from './pagination.js'
|
||||
|
||||
function loginMethods(user: any) {
|
||||
const methods = []
|
||||
|
||||
@@ -2,12 +2,12 @@ import { Router } from 'express'
|
||||
|
||||
import { homeController } from './controllers/index.js'
|
||||
import { userListController } from './controllers/users.js'
|
||||
import { questListController } from './controllers/quests.ts'
|
||||
import { commandListController } from './controllers/commands.ts'
|
||||
import { questListController } from './controllers/quests.js'
|
||||
import { commandListController } from './controllers/commands.js'
|
||||
import {
|
||||
sessionDetailController,
|
||||
sessionListController,
|
||||
} from './controllers/sessions.ts'
|
||||
} from './controllers/sessions.js'
|
||||
|
||||
const router = Router()
|
||||
|
||||
|
||||
Reference in new issue
Block a user