Starter/TypeScript-Node-Starter
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript-Node-Starter.git synced 2025-11-09 00:37:27 +00:00
Code Issues Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Bowden Kelly
2019-05-10 12:37:34 -07:00
parent 36c1f1d972 a8547a4758
commit 610a8f6365
4 changed files with 2299 additions and 4156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/models/User.ts
View File

@@ -2,7 +2,7 @@ import bcrypt from "bcrypt-nodejs";
import crypto from "crypto";
import mongoose from "mongoose";
export type UserModel = mongoose.Document & {
export type UserDocument = mongoose.Document & {
email: string,
password: string,
passwordResetToken: string,
@@ -88,6 +88,4 @@ userSchema.methods.gravatar = function (size: number) {
return `https://gravatar.com/avatar/${md5}?s=${size}&d=retro`;
};
// export const User: UserType = mongoose.model<UserType>('User', userSchema);
const User = mongoose.model("User", userSchema);
export default User;
export const User = mongoose.model<UserDocument>("User", userSchema);