Skip to content

Commit 50b04f6

Browse files
saloni-dhiwisesaloni-dhiwise
authored
Merge pull request #16 from DhiWise/feature/code-comments
Comments in generated code
2 parents 22b7cb5 + 373ecbd commit 50b04f6

88 files changed

Lines changed: 2073 additions & 724 deletions

File tree

Some content is hidden

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

‎packages/client/src/container/Shared/TechnologySetStep/index.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ const TechnologySetStep = () => {
103103
return (
104104
<Layout hideHeader bodyClass="flex-col h-full">
105105
<>
106-
<div className="relative border-b border-gray-200 py-2 headTop pl-2 md:pl-16">
106+
<div className="flex px-3 py-2 bg-gray-200 justify-center relative header flex-shrink-0">
107+
{/* <div className="w-full"> */}
108+
<img
109+
className="absolute left-4 top-2.5 z-1 w-20"
110+
src="https://dxuoui1db8w1y.cloudfront.net/DhiWise-white.svg"
111+
alt="logo"
112+
/>
113+
{/* </div> */}
107114
<ContainerBox className="py-0 text-center">
108115
<div className="full">
109116
<Heading className="hidden md:block" variant="h5">

‎packages/server/usecase/application/node-generator/createApplication/createController/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ async function generateController (apis, platformName, controllers, ormProvider,
157157

158158
// ? filter By LoggedInUser
159159
Object.assign(apiObject, {
160-
isLogin: value.isAuth,
160+
isLogin: value.isAuth && controllers.auth.isAuth,
161161
addedBy: 'addedBy',
162162
login: controllers.auth.userModel,
163163
});

‎packages/server/usecase/application/node-generator/createApplication/createStaticFiles.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,23 @@ async function generateStaticFilesForCC (templateFolderName, dir, userDirectoryS
55
writeOperations.copyTemplateMulti(`${templateFolderName}/utils`, `${dir}${userDirectoryStructure.utilsFolderPath}`, '*.js');
66
writeOperations.copyTemplate(`${templateFolderName}/validation/genericValidator.js`, `${dir}${userDirectoryStructure.validationFolderPath}/genericValidator.js`);
77
writeOperations.copyTemplate(`${templateFolderName}/services/dbService.js`, `${dir}${userDirectoryStructure.serviceFolderPath}/mongoDbService.js`);
8+
writeOperations.copyTemplate(`${templateFolderName}/views/index.ejs`, `${dir}${userDirectoryStructure.viewsFolderPath}/index.ejs`);
89
}
910

1011
async function generateStaticFilesForMVC (templateFolderName, dir, userDirectoryStructure) {
1112
writeOperations.copyTemplateMulti(`${templateFolderName}/utils`, `${dir}${userDirectoryStructure.utilsFolderPath}`, '*.js');
13+
writeOperations.copyTemplate(`${templateFolderName}/views/index.ejs`, `${dir}${userDirectoryStructure.viewsFolderPath}/index.ejs`);
1214
}
1315
async function generateStaticFilesForMVCSequelize (templateFolderName, dir, userDirectoryStructure) {
1416
writeOperations.copyTemplateMulti(`${templateFolderName}/utils`, `${dir}${userDirectoryStructure.utilsFolderPath}`, '*.js');
17+
writeOperations.copyTemplate(`${templateFolderName}/views/index.ejs`, `${dir}${userDirectoryStructure.viewsFolderPath}/index.ejs`);
1518
}
1619
async function generateStaticFilesForCCSequelize (templateFolderName, dir) {
1720
writeOperations.copyTemplateMulti(`${templateFolderName}/helpers`, `${dir}/helpers`, '*.js');
1821
writeOperations.copyTemplateMulti(`${templateFolderName}/utils`, `${dir}/utils`, '*.js');
1922
writeOperations.copyTemplate(`${templateFolderName}/validation/genericValidator.js`, `${dir}/validation/genericValidator.js`);
2023
writeOperations.copyTemplate(`${templateFolderName}/services/dbService.js`, `${dir}/services/dbService.js`);
24+
writeOperations.copyTemplate(`${templateFolderName}/views/index.ejs`, `${dir}/views/index.ejs`);
2125
}
2226
async function addRolePermissionService (templateFolderName) {
2327
const rolePermissionService = writeOperations.loadTemplate(`${templateFolderName}/checkRolePermission.js`);

‎packages/server/usecase/application/node-generator/createApplication/render/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ async function createConstantFiles (templateFolder, dir, constants, toPath) {
1616
_.forEach(constants, (value, key) => {
1717
const requestConstant = writeOperations.loadTemplate(`${templateFolder}/requestConstant.js`);
1818
requestConstant.locals.CONSTANTS = JSON.stringify(value);
19+
requestConstant.locals.FILE_NAME = key;
1920
writeOperations.write(path.join(dir, `${toPath}/${key}.js`), requestConstant.render());
2021
});
2122
}

‎packages/server/usecase/application/node-generator/createApplication/service/index.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,9 @@ async function createValidationFile (validationFilePath, jsonData, auth, adapter
535535
}
536536
validationTemp.locals.UPDATE_VALIDATION_KEY = updateValStr;
537537
validationTemp.locals.VALIDATION_KEY = valStr;
538+
validationTemp.locals.MODEL_NAME = key;
538539
validationTemp.locals.PATH = validationFilePath.validationFolderPath;
540+
validationTemp.locals.MODEL_NAME = key;
539541
if (!isEmpty(jsonData.validationVariables) && !isEmpty(jsonData.validationVariables[key])) {
540542
validationTemp.locals.VARIABLES = jsonData.validationVariables[key];
541543
}

‎packages/server/usecase/application/node-generator/generator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ async function main (inputFilepath) {
4141
jsonData,
4242
});
4343
} catch (err) {
44-
// console.log(err);
44+
console.log(err);
4545
throw new Error(err);
4646
}
4747
}

‎packages/server/usecase/application/node-generator/templates/cleanCode/app.js.ejs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ app.use(routes)
5757
app.use(<%= mount.path %>, <%- mount.code %>);
5858
<% }); -%>
5959

60+
app.get('/', (req, res) => {
61+
res.render('index');
62+
})
63+
6064
if (process.env.NODE_ENV !== 'test' ) {
6165
<%_if(SHOULD_ADD_ROLE_PERMISSION){_%>
6266
const seeder = require('./seeders');

‎packages/server/usecase/application/node-generator/templates/cleanCode/services/auth.js.ejs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const jwt = require("jsonwebtoken");
66
const common = require("../utils/common");
77
const dayjs = require("dayjs");
88
const emailService = require("./email/emailService");
9-
const sendSMS = require("./sms/smsService");
9+
const smsService = require("./sms/smsService");
1010
<%_if(FORGOT_WITH_LINK){_%>
1111
const uuid = require("uuid").v4;
1212
<%_}_%>
@@ -234,7 +234,7 @@ function makeAuthService({model,<%-MODEL%>Service,userTokenService<%_if(ROLE_PER
234234
message:msg
235235
}
236236
try{
237-
await sendSMS(smsObj);
237+
await smsService.sendSMS(smsObj);
238238
resultOfSMS = true;
239239
}catch(error){
240240
console.log(error)
@@ -249,7 +249,7 @@ function makeAuthService({model,<%-MODEL%>Service,userTokenService<%_if(ROLE_PER
249249
message:msg
250250
}
251251
try{
252-
await sendSMS(smsObj);
252+
await smsService.sendSMS(smsObj);
253253
resultOfSMS = true;
254254
}catch(error){
255255
console.log(error)
@@ -325,7 +325,7 @@ function makeAuthService({model,<%-MODEL%>Service,userTokenService<%_if(ROLE_PER
325325
message:msg
326326
}
327327
try{
328-
await sendSMS(smsObj);
328+
await smsService.sendSMS(smsObj);
329329
resultOfSMS = true;
330330
}catch(error){
331331
console.log(error)
@@ -338,7 +338,7 @@ function makeAuthService({model,<%-MODEL%>Service,userTokenService<%_if(ROLE_PER
338338
to: user.<%-MOBILE_FIELD%>,
339339
};
340340
try{
341-
await sendSMS(smsObj);
341+
await smsService.sendSMS(smsObj);
342342
resultOfSMS = true;
343343
}catch(error){
344344
console.log(error)

‎packages/server/usecase/application/node-generator/templates/cleanCode/services/smsService.js.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const axios = require('axios')
2-
const sendSms = async (obj) => {
2+
const sendSMS = async (obj) => {
33
console.log('SMS---', obj);
44
if (obj.to) {
55
obj.mobiles = obj.to;
@@ -45,4 +45,4 @@ const sendSms = async (obj) => {
4545
});
4646
});
4747
}
48-
module.exports = sendSms
48+
module.exports = {sendSMS}

‎packages/server/usecase/application/node-generator/templates/cleanCode/utils/common.js.ejs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ return Object.freeze({ uniqueValidation });
6262
return `${minutes} minute and ${seconds} second`;
6363
};
6464
<%_}_%>
65-
<%_if(ROLE_PERMISSION){ _%>
65+
<%_if(IS_AUTH && ROLE_PERMISSION){ _%>
6666
/*
6767
* getRoleAccessData: return roleAccess of User
6868
* @param userRoleService : user role db service
@@ -115,7 +115,7 @@ module.exports = {
115115
makeUniqueValidation,
116116
getDifferenceOfTwoDatesInTime,
117117
<%_}_%>
118-
<%_if(ROLE_PERMISSION){ _%>
118+
<%_if(IS_AUTH && ROLE_PERMISSION){ _%>
119119
getRoleAccessData,
120120
<%_}_%>
121121
};

0 commit comments

Comments
 (0)