Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhnmht30
rhnmht30 authored Oct 2, 2019
2 parents e4a0802 + 7fe709d commit 4c7a5d2
Show file tree
Hide file tree
Showing 6 changed files with 378 additions and 389 deletions.
155 changes: 76 additions & 79 deletions controllers/projects_controller.js
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,91 @@
const { deleteImg } = require('../config/imgUpload');
const { deleteImg } = require("../config/imgUpload");

module.exports.projects = async (req, res) => {
try {
let projects = await Project.find().sort({ updatedAt: 'desc' });
if (projects.length === 0) {
res.status(404).json({ message: 'No Projects Found!!' });
} else {
res.status(200).json({ message: 'success', projects });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let projects = await Project.find().sort({ updatedAt: "desc" });

res.status(200).json({ message: "success", projects });
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.addProject = async (req, res) => {
let { title, description } = req.body;
if (!req.file) {
res.status(400).json({ message: 'Please upload an image!!' });
} else {
try {
let project = await Project.findOne({ title });
if (project) {
res.status(400).json({
message: 'Project title already exists!!'
});
} else {
let newProject = {
title,
description,
img: {
id: req.file.public_id,
url: req.file.secure_url
}
};
await Project.create(newProject);
res.status(200).json({ message: 'success' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
}
let { title, description } = req.body;
if (!req.file) {
res.status(400).json({ message: "Please upload an image!!" });
} else {
try {
let project = await Project.findOne({ title });
if (project) {
res.status(400).json({
message: "Project title already exists!!"
});
} else {
let newProject = {
title,
description,
img: {
id: req.file.public_id,
url: req.file.secure_url
}
};
await Project.create(newProject);
res.status(200).json({ message: "success" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
}
};

module.exports.updateProject = async (req, res) => {
let { title, description } = req.body;
let img = {};
try {
let project = await Project.findById(req.params.id);
if (project) {
if (req.file) {
await deleteImg(project.img.id);
project.img.id = req.file.public_id;
project.img.url = req.file.secure_url;
}
project.title = title;
project.description = description;
await project.save();
res.status(200).json({ message: 'success' });
} else {
res.status(404).json({ message: 'Invalid Project' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
let { title, description } = req.body;
let img = {};
try {
let project = await Project.findById(req.params.id);
if (project) {
if (req.file) {
await deleteImg(project.img.id);
project.img.id = req.file.public_id;
project.img.url = req.file.secure_url;
}
project.title = title;
project.description = description;
await project.save();
res.status(200).json({ message: "success" });
} else {
res.status(404).json({ message: "Invalid Project" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.deleteProject = async (req, res) => {
try {
let project = await Project.findById(req.params.id);
if (project) {
await deleteImg(project.img.id);
await Project.findByIdAndDelete(req.params.id);
res.status(200).json({ message: 'success' });
} else {
res.status(404).json({ message: 'Invalid Project' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let project = await Project.findById(req.params.id);
if (project) {
await deleteImg(project.img.id);
await Project.findByIdAndDelete(req.params.id);
res.status(200).json({ message: "success" });
} else {
res.status(404).json({ message: "Invalid Project" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.viewProject = async (req, res) => {
try {
let project = await Project.findById(req.params.id);
if (project) {
res.status(200).json({ message: 'success', project });
} else {
res.status(404).json({ message: 'Invalid Project' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let project = await Project.findById(req.params.id);
if (project) {
res.status(200).json({ message: "success", project });
} else {
res.status(404).json({ message: "Invalid Project" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};
173 changes: 86 additions & 87 deletions controllers/team_controller.js
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,101 @@
const { deleteImg } = require('../config/imgUpload');
const { deleteImg } = require("../config/imgUpload");

module.exports.team = async (req, res) => {
try {
let team = await Team.find().sort({ position: 'asc' });
if (team.length === 0) {
res.status(404).json({ message: 'No team members Found!!' });
} else {
res.status(200).json({ message: 'success', team });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let team = await Team.find().sort({ createdAt: "desc" });

res.status(200).json({ message: "success", team });
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.addTeamMember = async (req, res) => {
let { name, position, fb, insta, linkedin, phone, email } = req.body;
if (!req.file) {
res.status(400).json({ message: 'Please upload an image!!' });
} else {
try {
let team = await Team.findOne({ name, position });
if (team) {
res.status(400).json({
message: 'Team Member already exists!!'
});
} else {
let newTeamMember = {
name,
position,
fb,
insta,
linkedin,
phone,
email,
img: {
id: req.file.public_id,
url: req.file.secure_url
}
};
await Team.create(newTeamMember);
res.status(200).json({ message: 'success' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
}
let { name, position, role, fb, insta, linkedin, phone, email } = req.body;

if (!req.file) {
res.status(400).json({ message: "Please upload an image!!" });
} else {
try {
let team = await Team.findOne({ name, position });
if (team) {
res.status(400).json({
message: "Team Member already exists!!"
});
} else {
let newTeamMember = {
name,
position,
role,
fb,
insta,
linkedin,
phone,
email,
img: {
id: req.file.public_id,
url: req.file.secure_url
}
};
await Team.create(newTeamMember);
res.status(200).json({ message: "success" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
}
};

module.exports.updateTeamMember = async (req, res) => {
let { position, fb, insta, linkedin, phone, email } = req.body; // name field readonly in frontend
try {
let team = await Team.findById(req.params.id);
if (team) {
if (req.file) {
await deleteImg(team.img.id);
team.img.id = req.file.public_id;
team.img.url = req.file.secure_url;
}
team.position = position;
team.fb = fb;
team.insta = insta;
team.linkedin = linkedin;
team.phone = phone;
team.email = email;
await team.save();
res.status(200).json({ message: 'success' });
} else {
res.status(404).json({ message: 'Invalid Request' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
let { position, fb, insta, linkedin, phone, email } = req.body; // name field readonly in frontend
try {
let team = await Team.findById(req.params.id);
if (team) {
if (req.file) {
await deleteImg(team.img.id);
team.img.id = req.file.public_id;
team.img.url = req.file.secure_url;
}
team.position = position;
team.fb = fb;
team.insta = insta;
team.linkedin = linkedin;
team.phone = phone;
team.email = email;
await team.save();
res.status(200).json({ message: "success" });
} else {
res.status(404).json({ message: "Invalid Request" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.deleteTeamMember = async (req, res) => {
try {
let team = await Team.findById(req.params.id);
if (team) {
await deleteImg(team.img.id);
await Team.findByIdAndDelete(req.params.id);
res.status(200).json({ message: 'success' });
} else {
res.status(404).json({ message: 'Invalid Team Member' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let team = await Team.findById(req.params.id);
if (team) {
await deleteImg(team.img.id);
await Team.findByIdAndDelete(req.params.id);
res.status(200).json({ message: "success" });
} else {
res.status(404).json({ message: "Invalid Team Member" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};

module.exports.viewTeamMember = async (req, res) => {
try {
let team = await Team.findById(req.params.id);
if (team) {
res.status(200).json({ message: 'success', team });
} else {
res.status(404).json({ message: 'Invalid Team Member' });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
try {
let team = await Team.findById(req.params.id);
if (team) {
res.status(200).json({ message: "success", team });
} else {
res.status(404).json({ message: "Invalid Team Member" });
}
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
};
7 changes: 2 additions & 5 deletions controllers/users_controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,8 @@ module.exports.users = async (req, res) => {
updatedAt: "desc",
role: "asc"
});
if (users.length === 0) {
res.status(404).json({ message: "No users Found!!" });
} else {
res.status(200).json({ message: "success", users });
}

res.status(200).json({ message: "success", users });
} catch (err) {
res.status(500).json({ message: err.message, error: true });
}
Expand Down
Loading

0 comments on commit 4c7a5d2

Please sign in to comment.