Skip to content

Commit 570fb89

Browse files
Copilotalexanmtz
andauthored
Convert remaining JavaScript files in src/app to TypeScript (#1367)
* Initial plan * Convert all JS files in src/app to TypeScript Co-authored-by: alexanmtz <88840+alexanmtz@users.noreply.github.com> * Fix TypeScript build errors by adding type assertions for SECRET_PHRASE Co-authored-by: alexanmtz <88840+alexanmtz@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: alexanmtz <88840+alexanmtz@users.noreply.github.com>
1 parent bc78b3a commit 570fb89

35 files changed

Lines changed: 206 additions & 172 deletions

package-lock.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
"@types/express": "^5.0.4",
140140
"@types/i18n": "^0.13.12",
141141
"@types/jasmine": "2.5.38",
142+
"@types/jsonwebtoken": "^9.0.10",
142143
"@types/node": "^18.19.130",
143144
"@types/passport": "^1.0.17",
144145
"@types/request-promise": "^4.1.51",

src/app/controllers/webhooks/webhook-github.js renamed to src/app/controllers/webhooks/webhook-github.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ if (process.env.NODE_ENV !== 'production') {
33
require('dotenv').config()
44
}
55

6-
const i18n = require('i18n')
6+
import i18n from 'i18n'
77
const dateFormat = require('dateformat')
8-
const moment = require('moment')
8+
import moment from 'moment'
99
const models = require('../../../models')
1010
const constants = require('../../../modules/mail/constants')
1111
const TaskMail = require('../../../modules/mail/task')
1212
const SendMail = require('../../../modules/mail/mail')
1313
const IssueClosedMail = require('../../../modules/mail/issueClosed')
14+
import type { Request, Response } from 'express'
1415

15-
exports.github = async (req, res) => {
16-
const response = req.body || res.body
16+
export const github = async (req: Request, res: Response) => {
17+
const response = req.body || (res as any).body
1718
const labels = response && response.issue && response.issue.labels
1819
if (req.headers.authorization === `Bearer ${process.env.GITHUB_WEBHOOK_APP_TOKEN}`) {
1920
// below would update issue status if someone updates it on Github
@@ -55,9 +56,9 @@ exports.github = async (req, res) => {
5556
}
5657
if (response.action === 'labeled') {
5758
try {
58-
const totalLabelResponse = []
59+
const totalLabelResponse: any[] = []
5960
await Promise.all(
60-
labels.map(async (label) => {
61+
labels.map(async (label: any) => {
6162
let persistedLabel = await models.Label.findOne({
6263
where: {
6364
name: label.name
@@ -70,7 +71,7 @@ exports.github = async (req, res) => {
7071
}
7172
const labelId = persistedLabel.dataValues.id
7273
if (label.name === 'notify') {
73-
let finalResponse = {}
74+
let finalResponse: any = {}
7475
try {
7576
console.log('it is labeled notify')
7677
const user = await models.User.findOne({
@@ -155,7 +156,7 @@ exports.github = async (req, res) => {
155156
if (label.name === 'gitpay') {
156157
// eslint-disable-next-line no-console
157158
console.log('it is labeled Gitpay')
158-
let finalResponse = {}
159+
let finalResponse: any = {}
159160
try {
160161
const user = await models.User.findOne({
161162
where: {

src/app/index.js renamed to src/app/index.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
const express = require('express')
2-
require('../models')
3-
4-
const routerProject = require('./routes/projects')
5-
const routerTask = require('./routes/tasks')
6-
const routerTeam = require('./routes/team')
7-
const routerOrder = require('./routes/orders')
8-
const routerWebhook = require('./routes/webhooks')
9-
const routerInfo = require('./routes/info')
10-
const routerOrganization = require('./routes/organization')
11-
const routerContact = require('./routes/contact')
12-
const routerTypes = require('./routes/types')
13-
const routerTaskSolution = require('./routes/taskSolutions')
14-
const routerCoupon = require('./routes/coupon')
15-
const routerLabel = require('./routes/label')
16-
const routerOffer = require('./routes/offer')
17-
const routerTransfer = require('./routes/transfer')
18-
const routerPayout = require('./routes/payout')
19-
const routerWallet = require('./routes/wallet')
20-
const routerWalletOrder = require('./routes/walletOrder')
21-
const routerLanguage = require('./routes/language')
22-
const routerPaymentRequest = require('./routes/paymentRequest')
23-
const routerPaymentRequestTransfer = require('./routes/paymentRequestTransfer')
1+
import express from 'express'
2+
import '../models'
243

4+
import routerProject from './routes/projects'
5+
import routerTask from './routes/tasks'
6+
import routerTeam from './routes/team'
7+
import routerOrder from './routes/orders'
8+
import routerWebhook from './routes/webhooks'
9+
import routerInfo from './routes/info'
10+
import routerOrganization from './routes/organization'
11+
import routerContact from './routes/contact'
12+
import routerTypes from './routes/types'
13+
import routerTaskSolution from './routes/taskSolutions'
14+
import routerCoupon from './routes/coupon'
15+
import routerLabel from './routes/label'
16+
import routerOffer from './routes/offer'
17+
import routerTransfer from './routes/transfer'
18+
import routerPayout from './routes/payout'
19+
import routerWallet from './routes/wallet'
20+
import routerWalletOrder from './routes/walletOrder'
21+
import routerLanguage from './routes/language'
22+
import routerPaymentRequest from './routes/paymentRequest'
23+
import routerPaymentRequestTransfer from './routes/paymentRequestTransfer'
2524
import routerAuth from './routes/auth'
2625
import routerUsers from './routes/users'
2726
import routerUser from './routes/user'
2827
import routerPaymentRequestPayments from './routes/paymentRequestPayment'
2928
import routerPaymentRequestBalance from './routes/paymentRequestBalance'
3029
import routerDashboard from './routes/dashboard'
30+
import type { Express } from 'express'
3131

32-
exports.init = (app) => {
32+
export const init = (app: Express) => {
3333
app.use('/webhooks', express.raw({ type: 'application/json' }), routerWebhook)
3434

3535
app.use(express.json())

src/app/routes/contact.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/app/routes/contact.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import express from 'express'
2+
import * as controllers from '../controllers/contact'
3+
4+
const router = express.Router()
5+
6+
router.post('/recruiters', controllers.contactRecruiters)
7+
8+
export default router

src/app/routes/coupon.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/app/routes/coupon.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import express from 'express'
2+
import '../../modules/authenticationHelpers'
3+
import * as controllers from '../controllers/coupon'
4+
import secure from './secure'
5+
6+
const router = express.Router()
7+
8+
router.use(secure)
9+
10+
router.post('/validate', controllers.validateCoupon)
11+
12+
export default router

src/app/routes/info.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/app/routes/info.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import express from 'express'
2+
import '../../models'
3+
import '../../modules/authenticationHelpers'
4+
import * as controllers from '../controllers/info'
5+
6+
const router = express.Router()
7+
8+
router.get('/all', controllers.info)
9+
10+
export default router

0 commit comments

Comments
 (0)