Skip to content

Commit dcb1a73

Browse files
Merge pull request #11 from upayanmazumder-DevLabs/dev
Refactored imports
2 parents 62db922 + 5a6104e commit dcb1a73

44 files changed

Lines changed: 71 additions & 63 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ dmypy.json
159159
# pytype static type analyzer
160160
.pytype/
161161

162+
*.tsbuildinfo
163+
162164
# Cython debug symbols
163165
cython_debug/
164166

@@ -199,4 +201,4 @@ node_modules
199201
.DS_Store
200202

201203
*.txt
202-
test
204+
test

api/src/api.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@ import session from 'express-session';
44
import passport from 'passport';
55
import cookieParser from 'cookie-parser';
66
import morgan from 'morgan';
7+
8+
import env from './config/env';
9+
10+
import './auth/passport';
11+
import './auth/local.strategy';
12+
713
import authRoutes from './routes/auth.routes';
814
import githubRoutes from './routes/github.routes';
915
import applicationRoutes from './routes/application.routes';
1016
import userRoutes from './routes/user.routes';
1117
import planRoutes from './routes/plan.routes';
1218
import metricsRoutes from './routes/metrics.routes';
19+
1320
import log from './utils/logging/logger';
14-
import env from './config/env';
15-
import './auth/passport';
16-
import './auth/local.strategy';
1721

1822
const app = express();
1923
const frontendUrl = env.FRONTEND_URL;

api/src/auth/passport/github.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import passport from 'passport';
22
import { Strategy as GitHubStrategy } from 'passport-github2';
3+
import env from '../../config/env';
34
import User from '../../models/user.model';
45
import Plan from '../../models/plan.model';
56
import log from '../../utils/logging/logger';
6-
import env from '../../config/env';
77

88
export function setupGitHubStrategy() {
99
passport.use(

api/src/auth/passport/google.strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import passport from 'passport';
22
import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
3+
import env from '../../config/env';
34
import User from '../../models/user.model';
45
import Plan from '../../models/plan.model';
56
import log from '../../utils/logging/logger';
6-
import env from '../../config/env';
77

88
export function setupGoogleStrategy() {
99
passport.use(

api/src/auth/role.middleware.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Request, Response, NextFunction } from 'express';
2-
import IUser from '../types/user.types';
32
import log, { formatNotification } from '../utils/logging/logger';
3+
import IUser from '../types/user.types';
44

55
// Middleware to check if user is admin or superadmin
66
export function ensureAdmin(req: Request, res: Response, next: NextFunction): void {

api/src/controllers/application/applyApplication.controller.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import fs from 'fs';
33
import path from 'path';
44
import { exec as execCb } from 'child_process';
55
import { promisify } from 'util';
6-
import { createPvcIfNotExists } from '../../utils/k8sPvcManager';
6+
import type { Document } from 'mongoose';
7+
import env from '../../config/env';
78
import Application from '../../models/application.model';
9+
import { createPvcIfNotExists } from '../../utils/k8sPvcManager';
810
import asyncHandler from '../../utils/handlers/asyncHandler';
911
import generateK8sManifests from '../../utils/k8s/k8sManifests';
1012
import log, { formatNotification } from '../../utils/logging/logger';
1113
import type IApplication from '../../types/application.types';
12-
import type { Document } from 'mongoose';
13-
import env from '../../config/env';
1414

1515
const exec = promisify(execCb);
1616

api/src/controllers/application/deleteApplication.controller.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Request, Response } from 'express';
22
import Application from '../../models/application.model';
33
import asyncHandler from '../../utils/handlers/asyncHandler';
4-
import log, { formatNotification } from '../../utils/logging/logger';
54
import { spawn } from 'child_process';
65
import fs from 'fs';
76
import path from 'path';

api/src/controllers/application/getApplication.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Request, Response } from 'express';
2+
import type { Document } from 'mongoose';
23
import Application from '../../models/application.model';
34
import asyncHandler from '../../utils/handlers/asyncHandler';
45
import log, { formatNotification } from '../../utils/logging/logger';
56
import type IApplication from '../../types/application.types';
6-
import type { Document } from 'mongoose';
77

88
const getApplication = asyncHandler(async (req: Request, res: Response) => {
99
const app = (await Application.findById(req.params.id)) as (IApplication & Document) | null;

api/src/controllers/application/getApplicationMetrics.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Request, Response } from 'express';
22
import axios from 'axios';
3+
import env from '../../config/env';
34
import Application from '../../models/application.model';
45
import asyncHandler from '../../utils/handlers/asyncHandler';
56
import log, { formatNotification } from '../../utils/logging/logger';
6-
import env from '../../config/env';
77

88
const prometheusBaseUrl = (env as any).PROMETHEUS_URL;
99

api/src/controllers/application/getApplicationsStatus.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Request, Response } from 'express';
2+
import { exec } from 'child_process';
23
import Application from '../../models/application.model';
34
import asyncHandler from '../../utils/handlers/asyncHandler';
4-
import { exec } from 'child_process';
55

66
function getK8sStatus(namespace: string, deployment: string): Promise<string> {
77
return new Promise((resolve) => {

0 commit comments

Comments
 (0)