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

Fixed conflict markers in Auth.js #326

Merged
merged 1 commit into from
Jun 16, 2024
Merged

Fixed conflict markers in Auth.js #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions server/controllers/Auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@ const User = require("../models/studentLoginInfo");
const jwt = require("jsonwebtoken");
const Canteen = require("../models/canteenLoginInfo");
const Session = require("../models/session");
<<<<<<< HEAD
const Contact = require('../models/Contact');
=======
const {
forgotPasswordToken,
verifyToken,
findUserByEmail,
findUserById,
} = require("../utils/PasswordTokenAndUser");
const nodemailer = require("nodemailer");
>>>>>>> upstream/main

require("dotenv").config();

exports.studentSignup = async (req, res) => {
Expand Down Expand Up @@ -445,8 +441,6 @@ exports.changeCanteenPassword = async (req, res) => {
});
};

<<<<<<< HEAD

//contactUs

exports.saveContactMessage = async (req, res) => {
Expand All @@ -463,8 +457,6 @@ exports.saveContactMessage = async (req, res) => {
res.status(500).send('Error saving message');
}
};

=======
// verify user for reset password
exports.forgotPassword = async (req, res) => {
try {
Expand Down Expand Up @@ -602,4 +594,4 @@ exports.resetPassword = async (req, res) => {
res.status(500).json("Some error occurred!");
}
};
>>>>>>> upstream/main

Loading