Merge pull request #23 from collabo-community/@Gh-25

Fix: Angular/NestJs MVC folder structure style for controllers, services, routes and models in TS template

Author: Akpjunior94

…it/src/api/controllers/app.controller.ts …sm-async-await/src/api/app.controller.tsts-esm-async-await/src/api/controllers/app.controller.ts renamed to ts-esm-async-await/src/api/app.controller.ts ts-esm-async-await/src/api/controllers/app.controller.ts renamed to ts-esm-async-await/src/api/app.controller.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { success } from '../../lib/helpers';
+import { success } from '../lib/helpers';
 
 export const getAppController = async (req: Request, res: Response) => {
   const message = 'App works!';

…-async-await/src/api/routes/app.route.ts ts-esm-async-await/src/api/app.route.tsts-esm-async-await/src/api/routes/app.route.ts renamed to ts-esm-async-await/src/api/app.route.ts ts-esm-async-await/src/api/routes/app.route.ts renamed to ts-esm-async-await/src/api/app.route.ts

@@ -1,5 +1,5 @@
 import express, { IRouter } from 'express';
-import { getAppController } from '../controllers/app.controller';
+import { getAppController } from './app.controller';
 
 const router: IRouter = express.Router();
 

…t/src/api/controllers/auth.controller.ts …wait/src/api/auth/api/auth.controller.tsts-esm-async-await/src/api/controllers/auth.controller.ts renamed to ts-esm-async-await/src/api/auth/api/auth.controller.ts ts-esm-async-await/src/api/controllers/auth.controller.ts renamed to ts-esm-async-await/src/api/auth/api/auth.controller.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from 'express';
-import { success } from '../../lib/helpers';
+import { success } from '../../../lib/helpers';
 import passport from 'passport';
-import { UserDocument } from '../models/user.model';
+import { UserDocument } from '../../user/user.model';
 import jwt from 'jsonwebtoken'; 
 import dotenv from 'dotenv';
 dotenv.config();

…async-await/src/api/routes/auth.route.ts …ync-await/src/api/auth/api/auth.route.tsts-esm-async-await/src/api/routes/auth.route.ts renamed to ts-esm-async-await/src/api/auth/api/auth.route.ts ts-esm-async-await/src/api/routes/auth.route.ts renamed to ts-esm-async-await/src/api/auth/api/auth.route.ts

@@ -4,9 +4,9 @@ import {
   loginWithLocalController,
   signupOrLoginWithGithubController,
   signupOrLoginWithGoogleController,
-} from '../controllers/auth.controller';
-import { authWithGithub } from '../auth/middlewares/auth.middleware';
-import { authWithGoogle } from '../auth/middlewares/auth.middleware';
+} from './auth.controller';
+import { authWithGithub } from '../middlewares/auth.middleware';
+import { authWithGoogle } from '../middlewares/auth.middleware';
 
 const router: IRouter = express.Router();
 

ts-esm-async-await/src/api/auth/middlewares/auth.middleware.ts

@@ -1,7 +1,7 @@
 import { NextFunction, Response } from "express";
 import passport from 'passport';
 import { Payload, ReqUser } from '../../../types';
-import { UserRole } from "../../models/user.model";
+import { UserRole } from "../../user/user.model";
 import { unAuthorizedErr } from '../../../lib/errors/Errors';
 
 // -----------------------------------------------------------------------------------------------------------//

ts-esm-async-await/src/api/auth/passport-auth-config/strategies/github.strategy.ts

@@ -1,6 +1,6 @@
 
 import {Profile, Strategy} from 'passport-github2';
-import { UserModel as User } from '../../../models/user.model';
+import { UserModel as User } from '../../../user/user.model';
 import { DoneCallback } from 'passport';
 import { badRequestErr } from '../../../../lib/errors/Errors';
 import { success } from '../../../../lib/helpers';

ts-esm-async-await/src/api/auth/passport-auth-config/strategies/google.strategy.ts

@@ -1,5 +1,5 @@
 import {Profile, Strategy} from 'passport-google-oauth20';
-import { UserModel as User } from '../../../models/user.model';
+import { UserModel as User } from '../../../user/user.model';
 // import bcrypt from 'bcrypt';
 import { DoneCallback } from 'passport';
 import { badRequestErr } from '../../../../lib/errors/Errors';

ts-esm-async-await/src/api/auth/passport-auth-config/strategies/local.login.strategy.ts

@@ -1,5 +1,5 @@
 import {Strategy} from 'passport-local';
-import { UserModel as User } from '../../../models/user.model';
+import { UserModel as User } from '../../../user/user.model';
 import bcrypt from 'bcrypt';
 import { DoneCallback } from 'passport';
 import { badRequestErr } from '../../../../lib/errors/Errors';

ts-esm-async-await/src/api/auth/passport-auth-config/strategies/local.signup.strategy.ts

@@ -1,5 +1,5 @@
 import {Strategy} from 'passport-local';
-import { UserModel as User } from '../../../models/user.model';
+import { UserModel as User } from '../../../user/user.model';
 import { DoneCallback } from 'passport';
 
 export const localSignupStrategy = new Strategy(

…t/src/api/controllers/demo.controller.ts …nc-await/src/api/demo/demo.controller.tsts-esm-async-await/src/api/controllers/demo.controller.ts renamed to ts-esm-async-await/src/api/demo/demo.controller.ts ts-esm-async-await/src/api/controllers/demo.controller.ts renamed to ts-esm-async-await/src/api/demo/demo.controller.ts

@@ -6,7 +6,7 @@ import {
   deleteDemoItemService,
   updateOneDemoItemPropertyValueService,
   updateDemoItemPropertyValuesService,
-} from '../services/demo.service';
+} from './demo.service';
 import { success } from '../../lib/helpers';
 
 const routeName = 'demo';