Tanya

README.md

@@ -14,7 +14,7 @@ It uses:
 
 ## Card wall
 
-REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
+(https://trello.com/b/9wjGVeJU/kittens)
 
 ## Quickstart
 

app.js

@@ -10,6 +10,7 @@ const homeRouter = require("./routes/home");
 const postsRouter = require("./routes/posts");
 const sessionsRouter = require("./routes/sessions");
 const usersRouter = require("./routes/users");
+const friendsRouter = require("./routes/friends");
 
 const app = express();
 
@@ -56,8 +57,14 @@ const sessionChecker = (req, res, next) => {
 // route setup
 app.use("/", homeRouter);
 app.use("/posts", sessionChecker, postsRouter);
+app.use("posts/explore", sessionChecker, postsRouter); //do we need this for it to work?
 app.use("/sessions", sessionsRouter);
 app.use("/users", usersRouter);
+app.use("/friends", sessionChecker, friendsRouter) //added SC to check user is logged in
+
+//posts router to listen to a post request to the id/act
+app.use("/posts/:id/act", postsRouter)
+//app.use("/users/:id/befriend", postsRouter)
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => {

controllers/friends.js

@@ -0,0 +1,19 @@
+const User = require("../models/user");
+
+
+const FriendsController = {
+    Index: (req, res) => {
+      const user = req.session.user.username
+      User.find({username: user}, { friends: 1 }, (err, friendsArray) => {
+      if (err) {
+        throw err
+
+      }
+      //console.log(friendsArray[0].friends) - the find returns a list of objects which includes ids as well 
+      //list of friends to be sent as an argument - this needs usercontroller and a method to list it
+      res.render("friends/index", { title: "Furrends", shownavbar:true, friendslist:friendsArray[0], user:user });
+    })
+  }
+}
+
+  module.exports = FriendsController;

controllers/home.js

@@ -1,6 +1,6 @@
 const HomeController = {
   Index: (req, res) => {
-    res.render("home/index", { title: "Acebook" });
+    res.render("home/index", { title: "Acebook", shownavbar:false });
   },
 };
 

controllers/posts.js

@@ -1,28 +1,149 @@
 const Post = require("../models/post");
+const User = require("../models/user");
 
 const PostsController = {
   Index: (req, res) => {
+    //do we only see posts from users that are friends?  yes
+    const postIds = req.params.id
+    console.log(postIds)
+    // const postauthor = Post.findOne({ _id:  })
+    const user = req.session.user
+    const friendsList = user.friends
+    friendsList.push(user.username)
+    Post.find({author: {$in: friendsList}},(err, posts) => {
+
+      if (err) {
+        throw err;
+      }
+      posts = posts.sort((a,b) => b.date-a.date ) //sorts the posts by date order before rendering
+      res.render("posts/index", { posts: posts, shownavbar:true, user: user});
+    }); 
+  },
+  Explore: (req, res) => {
+    //page to see all posts make it happen
+    const user = req.session.user
     Post.find((err, posts) => {
       if (err) {
         throw err;
       }
-
-      res.render("posts/index", { posts: posts });
-    });
+      posts = posts.sort((a,b) => b.date-a.date ) //sorts the posts by date order before rendering
+      res.render("posts/explore", { posts: posts, shownavbar:true, user: user});
+    }); 
   },
+
   New: (req, res) => {
-    res.render("posts/new", {});
+    res.render("posts/new", {shownavbar:true});
   },
+
   Create: (req, res) => {
-    const post = new Post(req.body);
+    const post = new Post({message:req.body.message,author:req.session.user.username,image:req.body.photoURL.trim()});
     post.save((err) => {
       if (err) {
         throw err;
       }
-
       res.status(201).redirect("/posts");
     });
   },
+  //added a like object that has an anonymous f(x) for the PostController 'class'
+  //this should send a post request to update the db using the postID retrieved from the 
+  Like: (req, res) => {
+    const postId = req.params.id;
+    const action = req.body.action;
+    if (action === 'Like') {
+      Post.updateOne({ _id: postId }, { $inc: { likes: 1 } }, function (error) {
+        if (error) {
+          res.send(error);
+          console.log(error)
+        } else {
+          console.log('like updated')
+          res.send('Like added');
+        }
+      });
+    } else if (action === 'Unlike') {
+      Post.updateOne({ _id: postId }, { $inc: { likes: -1 } }, function (error) {
+        if (error) {
+          res.send(error);
+        } else {
+          res.send('Unlike added');
+        }
+      });
+    } 
+  },
+
+  Love: (req, res) => {
+    const postId = req.params.id;
+    const action = req.body.action;
+    if (action === 'Love') {
+      Post.updateOne({ _id: postId }, { $inc: { loves: 1 } }, function (error) {
+        if (error) {
+          res.send(error);
+          console.log(error)
+        } else {
+          console.log('love updated')
+          res.send('Love added');
+        }
+      });
+    } else if (action === 'Hate') {
+      Post.updateOne({ _id: postId }, { $inc: { loves: -1 } }, function (error) {
+        if (error) {
+          res.send(error);
+        } else {
+          res.send('Hate added');
+        }
+      });
+    } 
+  },
+  //added a follow object THIS IS ACTUALLY A MESS ATM
+  Follow: (req,res) => {
+    //const postId = req.params.id;
+    const usersname = req.body.main //gets the main user (user who's friend list is created)
+    // console.log(req.param.id)
+    // console.log(req.body.friend)
+    // console.log(req.body.action)
+    // console.log(req.body.main)
+    const friend = req.body.friend; //get friend to add from the post req body
+    const action = req.body.action; //get action
+    if (action === 'Follow') {
+      //use addToSet because want unique values to be added only
+      User.updateOne({ username: usersname }, {$addToSet:{ friends: friend}}, function (error) {
+        if (error) {
+          res.send(error);
+          console.log(error)
+        } else {
+          console.log('Followed');
+        }
+      });
+    } else if (action === 'Unfollow') {
+      User.updateOne({ username: usersname }, { $pull: { friends: friend } }, function (error) {
+        if (error) {
+          res.send(error);
+        } else {
+          console.log('Unfollowed');
+        }
+      });
+    } 
+
+},
+  Comment: (req, res) => {
+
+    // const usersname = req.body.main //gets the main user (user who's friend list is created)
+    // const friend = req.body.friend; //get friend to add from the post req body
+    // const action = req.body.action; //get action
+      const postId = req.params.id
+      const comment = req.body.comment
+      const commenter = req.session.user.username
+      const commentObject = {comment:comment, user:commenter}
+      Post.updateOne({ _id: postId }, {$push: {comments:commentObject}}, {new:true}, function 
+      (error) {
+        if (error) {
+          res.send(error);
+          console.log(error)
+       }
+
+      });
+      res.status(201).redirect("/posts");
+    }
 };
 
+
 module.exports = PostsController;

controllers/sessions.js

@@ -2,7 +2,7 @@ const User = require("../models/user");
 
 const SessionsController = {
   New: (req, res) => {
-    res.render("sessions/new", {});
+    res.render("sessions/new", {shownavbar:false});
   },
 
   Create: (req, res) => {
@@ -11,10 +11,14 @@ const SessionsController = {
     const password = req.body.password;
 
     User.findOne({ email: email }).then((user) => {
+      //if user doesn't exist in the db, redirects to /new which creates a new account
       if (!user) {
-        res.redirect("/sessions/new");
+        var wronguser = true;
+        res.render("home/index", {wronguser});
+        //if the userpassword doesn't match it redirects
       } else if (user.password != password) {
-        res.redirect("/sessions/new");
+        var wrongpass = true;
+        res.render("home/index",{wrongpass});
       } else {
         req.session.user = user;
         res.redirect("/posts");

controllers/users.js

@@ -2,18 +2,41 @@ const User = require("../models/user");
 
 const UsersController = {
   New: (req, res) => {
-    res.render("users/new", {});
+    res.render("users/new", {shownavbar:true});
   },
-
   Create: (req, res) => {
-    const user = new User(req.body);
-    user.save((err) => {
+    const newuser = new User(req.body);
+    const email = req.body.email
+    const username = req.body.username
+    User.findOne({ email: email }).then((user) => {
+      //if user doesn't exist in the db, redirects to /new which creates a new account
+      if (!user)       {
+        User.findOne({ username: username }).then((name) => {
+            if (!name) {                 
+        newuser.save((err) => {
       if (err) {
         throw err;
       }
-      res.status(201).redirect("/posts");
-    });
-  },
-};
+        var accountCreated = true;
+        res.render("home/index", {accountCreated})
+    })}
+    else
+      {
+        console.log('User already exists!')
+        var usernameExists = true;
+        res.render("home/index", {usernameExists})
+      } 
+  })}
+    //if user email and name doesn't exist, save it
+    else
+      {
+        console.log('User already exists!')
+        var emailExists = true;        
+        res.render("home/index", {emailExists})
+      } 
+  })
+  }
+  }
+
 
-module.exports = UsersController;
+module.exports = UsersController;

models/post.js

@@ -1,10 +1,22 @@
 const mongoose = require("mongoose");
 
+
 const PostSchema = new mongoose.Schema({
-  message: String,
-  likes: { type: Number, default: 0 }
+  message: {type:String, required:true},
+  author: {type:String, required:true}, //required true means it is needed when a post is created, we can then pass an objecrt including user info to the new post initialisation.
+  likes: { type: Number, default: 0 },
+  loves: { type: Number, default: 0 },
+  date: { type: Date, default:Date.now },
+  image: {type:String},
+  comments: [{
+    date: { type: Date, default: Date.now },
+    comment: {type: String},
+    user: {type:String}
+}]
+
 });
 
+
 const Post = mongoose.model("Post", PostSchema);
 
 module.exports = Post;

models/user.js

@@ -1,10 +1,22 @@
 const mongoose = require("mongoose");
 
 const UserSchema = new mongoose.Schema({
-  email: String,
+  username: {type: String, unique: true},
+  email: {type: String, unique: true},
   password: String,
+  profilepic: {type:String},
+  friends: {type: [String], default: []}
 });
 
 const User = mongoose.model("User", UserSchema);
+//const friend = new User({username: "Kitten", email: "kitten@kitten.com", password: "password "})
+//friend.friends.push("Steve")
 
-module.exports = User;
+//friend.save()
+// User.findOneAndUpdate(
+//   { _id:	"63bc4bc14dbd82782c7cc65c" }, 
+//   { $push: { 
+//             friends : "Steve"
+//           } 
+//   })
+module.exports = User;