Skip to content

Commit

Permalink
fix: type errors
Browse files Browse the repository at this point in the history
  • Loading branch information
vinitkumar committed Jan 5, 2021
1 parent 4eb56cd commit 3d19703
Show file tree
Hide file tree
Showing 29 changed files with 133 additions and 76 deletions.
2 changes: 2 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


# Contributor Covenant Code of Conduct

## Our Pledge
Expand Down
28 changes: 14 additions & 14 deletions app/controllers/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ const Analytics = mongoose.model("Analytics");
const logger = require("../middlewares/logger");
import {Request, Response, NextFunction} from "express";

exports.signin = (req: Request, res: Response) => {};
exports.signin = (req: CustomRequest, res: Response) => {};

exports.authCallback = (req: Request, res: Response) => {
exports.authCallback = (req: CustomRequest, res: Response) => {
res.redirect("/");
};

exports.login = (req: Request, res: Response) => {
exports.login = (req: CustomRequest, res: Response) => {
let tweetCount, userCount, analyticsCount;
let options = {};
Analytics.list(options)
Expand Down Expand Up @@ -41,23 +41,23 @@ exports.login = (req: Request, res: Response) => {
});
};

exports.signup = (req: Request, res: Response) => {
exports.signup = (req: CustomRequest, res: Response) => {
res.render("pages/login", {
title: "Sign up",
user: new User()
});
};

exports.logout = (req: Request, res: Response) => {
exports.logout = (req: CustomRequest, res: Response) => {
req.logout();
res.redirect("/login");
};

exports.session = (req: Request, res: Response) => {
exports.session = (req: CustomRequest, res: Response) => {
res.redirect("/");
};

exports.create = (req: Request, res: Response, next) => {
exports.create = (req: CustomRequest, res: Response, next) => {
const user = new User(req.body);
user.provider = "local";
user
Expand All @@ -76,7 +76,7 @@ exports.create = (req: Request, res: Response, next) => {
});
};

exports.list = (req: Request, res: Response) => {
exports.list = (req: CustomRequest, res: Response) => {
const page = (req.query.page > 0 ? req.query.page : 1) - 1;
const perPage = 5;
const options = {
Expand Down Expand Up @@ -104,7 +104,7 @@ exports.list = (req: Request, res: Response) => {
});
};

exports.show = (req: Request, res: Response) => {
exports.show = (req: CustomRequest, res: Response) => {
const user = req.profile;
const reqUserId = user._id;
const userId = reqUserId.toString();
Expand Down Expand Up @@ -139,7 +139,7 @@ exports.show = (req: Request, res: Response) => {
});
};

exports.user = (req: Request, res: Response, next, id) => {
exports.user = (req: CustomRequest, res: Response, next, id) => {
User.findOne({ _id: id }).exec((err: mongoose.Error, user: User) => {
if (err) {
return next(err);
Expand All @@ -152,15 +152,15 @@ exports.user = (req: Request, res: Response, next, id) => {
});
};

exports.showFollowers = (req: Request, res: Response) => {
exports.showFollowers = (req: CustomRequest, res: Response) => {
showFollowers(req, res, "followers");
};

exports.showFollowing = (req: Request, res: Response) => {
exports.showFollowing = (req: CustomRequest, res: Response) => {
showFollowers(req, res, "following");
};

exports.delete = (req: Request, res: Response) => {
exports.delete = (req: CustomRequest, res: Response) => {
Tweet.remove({ user: req.user._id })
.then(() => {
User.findByIdAndRemove(req.user._id)
Expand All @@ -176,7 +176,7 @@ exports.delete = (req: Request, res: Response) => {
});
};

function showFollowers(req: Request, res: Response, type: string) {
function showFollowers(req: CustomRequest, res: Response, type: string) {
let user = req.profile;
let followers = user[type];
let tweetCount;
Expand Down
9 changes: 8 additions & 1 deletion app/models/analytics.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const Schema = mongoose.Schema;

export type AnalyticsDocument = mongoose.Document & {
ip: string,
user: UserDocument,
url: string,
createdAt: Date
};

const AnalyticsSchema = new Schema({
ip: String,
user: { type: Schema.ObjectId, ref: "User" },
Expand Down
2 changes: 1 addition & 1 deletion dist/config/middlewares/authorization.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/config/middlewares/logger.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/controllers/analytics.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions dist/controllers/chat.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3d19703

Please sign in to comment.