Renamed js files to ts

This commit is contained in:
mrfry 2020-11-23 15:10:24 +01:00
parent 0bddef2b78
commit 7fcb15da88
54 changed files with 8521 additions and 60 deletions

View file

@ -19,20 +19,20 @@
------------------------------------------------------------------------- */
// package requires
const express = require('express')
const bodyParser = require('body-parser')
const busboy = require('connect-busboy')
const { v4: uuidv4 } = require('uuid')
const fs = require('fs')
const app = express()
import express from 'express'
import bodyParser from 'body-parser'
import busboy from 'connect-busboy'
import { uuidv4 } from 'uuid'
import fs from 'fs'
// other requires
const logger = require('../../utils/logger.js')
const utils = require('../../utils/utils.js')
const actions = require('../../utils/actions')
const dbtools = require('../../utils/dbtools.js')
const auth = require('../../middlewares/auth.middleware.js')
const { dataToString, searchData } = require('../../utils/classes.js')
import logger from '../../utils/logger.js'
import utils from '../../utils/utils.js'
import actions from '../../utils/actions'
import dbtools from '../../utils/dbtools.js'
import auth from '../../middlewares/auth.middleware.js'
import { dataToString, searchData } from '../../utils/classes.js'
// files
const msgFile = 'stats/msgs'
@ -59,7 +59,14 @@ let userDB
let url // eslint-disable-line
let publicdirs = []
export interface DataFile {
path: string
name: string
}
function GetApp() {
const app = express()
const publicDir = publicdirs[0]
if (!publicDir) {
throw new Error(`No public dir! ( API )`)
@ -68,7 +75,7 @@ function GetApp() {
// files in public dirs
const recivedFiles = publicDir + 'recivedfiles'
const uloadFiles = publicDir + 'f'
const dataFiles = [
const dataFiles: Array<DataFile> = [
{ path: `${publicDir}oldData.json`, name: 'oldData' },
{ path: `${publicDir}data.json`, name: 'newData' },
]
@ -116,11 +123,11 @@ function GetApp() {
})
)
var questionDbs = actions.LoadJSON(dataFiles)
var version = ''
var motd = ''
var userSpecificMotd = {}
var testUsers = []
const questionDbs = actions.LoadJSON(dataFiles)
const version = ''
const motd = ''
const userSpecificMotd = {}
const testUsers = []
function mergeObjSum(a, b) {
const res = { ...b }
@ -752,14 +759,14 @@ function GetApp() {
function UploadFile(req, res, path, next) {
try {
var fstream
const fstream
req.pipe(req.busboy)
req.busboy.on('file', function(fieldname, file, filename) {
logger.Log('Uploading: ' + filename, logger.GetColor('blue'))
utils.CreatePath(path, true)
let date = new Date()
let fn =
const date = new Date()
const fn =
date.getHours() +
'' +
date.getMinutes() +
@ -824,7 +831,12 @@ function GetApp() {
// editedQuestions: editedQuestions
// })
const { count, initialCount, editedQuestions, password, newData } = req.body
const {
count,
initialCount,
editedQuestions,
password /*, newData*/,
} = req.body
const respStatuses = {
invalidPass: 'invalidPass',
ok: 'ok',
@ -958,8 +970,8 @@ function GetApp() {
})
} else {
if (req.query.q && req.query.data) {
let subj = req.query.subj || ''
let question = req.query.q
const subj = req.query.subj || ''
const question = req.query.q
let recData = {}
try {
recData = JSON.parse(req.query.data)
@ -1040,7 +1052,7 @@ function GetApp() {
app.get('/infos', function(req, res) {
const user = req.session.user
let result = {
const result = {
result: 'success',
uid: user.id,
}
@ -1104,7 +1116,7 @@ function GetApp() {
}
function getDayDiff(dateString) {
let msdiff = new Date() - new Date(dateString)
const msdiff = new Date() - new Date(dateString)
return Math.floor(msdiff / (1000 * 3600 * 24))
}