Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Fix backend addteammembers api is Fixed #876

Merged
merged 12 commits into from
May 15, 2024
Merged

[Bug] Fix backend addteammembers api is Fixed #876

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
13fc721
BATM is fixed
Hemu21 May 13, 2024
5ccd84c
typo error fixed
Hemu21 May 14, 2024
a1d9abf
multer error
Hemu21 May 14, 2024
31ebecc
Merge branch 'HITK-TECH-Community:main' into BATM
Hemu21 May 15, 2024
eca573b
Update updateFaq.js
Hemu21 May 15, 2024
201ba97
Update deleteJoinUs.js
Hemu21 May 15, 2024
18e9090
Update deleteTeamMember.js
Hemu21 May 15, 2024
21caa1e
Update deleteTeamMember.js
Hemu21 May 15, 2024
8666e9a
Update deleteTeamMember.js
Hemu21 May 15, 2024
b27a053
Update deleteTeamMember.js
Hemu21 May 15, 2024
06a0c7f
Update deleteTeamMember.js
Hemu21 May 15, 2024
b327507
Update deleteTeamMember.js
Hemu21 May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions backend/app/routes/faq/updateFaq.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/* eslint-disable no-shadow */
/* eslint-disable prefer-arrow-callback */
/* eslint-disable prefer-destructuring */
/* eslint-disable prefer-const */
/* eslint-disable consistent-return */
/* eslint-disable no-unused-vars */
/* eslint-disable prettier/prettier */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please remove these un-necessary changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kajol-Kumari If i remove those 4 line while commiting the changes it askes to change the entire file.

const FAQ = require('../../models/faq');

module.exports = async(req,res,next) => {
Expand All @@ -7,6 +14,7 @@ module.exports = async(req,res,next) => {
if(faq == null) {
return res.json({message:"invalid id"});
}

const updatedFaq = {question:req.body.question,answer:req.body.answer,isActive:req.body.isActive,tags:req.body.tags};
FAQ.findByIdAndUpdate(faqId,{$set:updatedFaq},{new:true},function(err,faq) {
if (err) return res.status(500).send({error: err});
Expand Down
8 changes: 8 additions & 0 deletions backend/app/routes/joinUs/deleteJoinUs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/* eslint-disable import/newline-after-import */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[neat]please remove these un-necessary changes.

/* eslint-disable no-shadow */
/* eslint-disable prefer-arrow-callback */
/* eslint-disable prefer-destructuring */
/* eslint-disable prefer-const */
/* eslint-disable consistent-return */
/* eslint-disable no-unused-vars */
/* eslint-disable prettier/prettier */
const joinUsModel = require('../../models/joinUs');
module.exports = async(req,res,next) => {
try {
Expand Down
15 changes: 7 additions & 8 deletions backend/app/routes/teamMember/addTeam.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ module.exports = async (req, res, next) => {
res.status(401).json({ error: 'You are not an admin' });
}

const { fullName, description, linkedlinUrl, githubUrl, twitterUrl, teams } = req.body;
const teammember = new TeamMemberModel({
full_name: fullName,
image: req.file.path,
description,
linkedlin_url: linkedlinUrl,
github_url: githubUrl,
twitter_url: twitterUrl,
teams,
full_name: req.body?.full_name,
image: req.body?.image,
description: req.body?.description,
linkedin_url: req.body?.linkedin_url,
github_url: req.body?.github_url,
twitter_url: req.body?.twitter_url,
teams: req.body?.teams,
});

const [err, result] = await to(teammember.save());
Expand Down
8 changes: 8 additions & 0 deletions backend/app/routes/teamMember/deleteTeamMember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
/* eslint-disable import/newline-after-import */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[neat]please remove these un-necessary changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kajol-Kumari @Kajol-Kumari If i remove those 4 line while commiting the changes it askes to change the entire file. Changing the entire file may effect other function so i added that comments. They are unnecessary. but to commit changes they are necessary other wise we have to change all those files. I hope you understand.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the problem is these lines are disabling all the linting checks and so i can't allow it to be merged. can you please raise a new pr with just those 2 required change?

/* eslint-disable no-shadow */
/* eslint-disable prefer-arrow-callback */
/* eslint-disable prefer-destructuring */
/* eslint-disable prefer-const */
/* eslint-disable consistent-return */
/* eslint-disable no-unused-vars */
/* eslint-disable prettier/prettier */
const teamMemberModel = require('../../models/TeamMember');
module.exports = async(req,res,next) => {
try {
Expand Down
Loading