Updated like button

.github/workflows/cypress-tests.yml

@@ -0,0 +1,28 @@
+name: Cypress Tests
+on: [push]
+jobs:
+  cypress-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          build: npm run build
+
+
+      # Install NPM dependencies, cache them correctly
+      # and run all Cypress tests
+      - name: Create mongoDB Docker container
+        run: sudo docker run -d -p 27017:27017 mongo:latest
+      - name: start server
+        uses: cypress-io/[email protected] # use the explicit version number
+        with:
+          wait-on: "http://localhost:3030"
+          config-file: cypress.config.cjs
+          # build: npm run build
+          start: npm run start:test
+        env:
+          MONGODB_URI: "mongodb://0.0.0.0:27017/"
+          MONGODB_DATABASE: "acebook_test"
+      - name: run cypress component test
+        run: npm run test:unit

.gitignore

@@ -63,3 +63,9 @@ typings/
 # cypress.io
 cypress/screenshots
 cypress/videos
+
+# Webstorm config folder
+.idea
+
+# DS_STORE FILE
+.DS_Store

README.md

@@ -14,7 +14,7 @@ It uses:
 
 ## Card wall
 
-REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
+Link to Trello: https://trello.com/b/TpjSuBYO/jam-a-pc
 
 ## Quickstart
 
@@ -31,6 +31,17 @@ REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
    nvm install 18
    ```
 
+_Note: you if you get an error when running `nvm install 18`, completeing the following commands might help:_
+
+`curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash`
+
+`source ~/.zshrc`
+
+`nvm install node`
+
+`nvm use node`
+
+
 ### Set up your project
 
 1. Fork this repository
@@ -74,6 +85,9 @@ so that integration tests do not interact with the development server.
 
 ### Test
 
+_Note: if at any point you get a 'this is your first time running cypress' message telling you that you need to verify it, enter the following command to verify:_
+`npx cypress verify`
+
 - Run all tests
   ```
   npm test
@@ -93,3 +107,47 @@ Some people occasionally experience MongoDB connection errors when running the t
 - Check that it's running using `brew services list`
 
 If you have issues that are not resolved by these tips, please reach out to a coach and, once the issue is resolved, we can add a new tip!
+
+# General Rules:
+
+To be used as a guide, will fluctuate day to day as work needs
+
+1. **0930** - Previous cohort/team standup
+	1. shared learning
+	2. ideas sharing
+	3. shared unblocking
+
+
+2. **1000** - JAMA PC standup
+	1. completed items
+	2. plans for the day
+	3. new items to add
+	4. items to remove
+	5. any issues?
+
+
+3. **1230-1400** LUNCH
+
+
+5. **1400** - Afternoon catchup
+
+
+7. **1700** - daily roundup
+	1. completed items
+	2. plans for the day
+	3. new items to add
+	4. items to remove
+	5. any issues?
+
+
+## Quality - for the group is:
+- understandable code
+- fully functional to the MVP - or above if time
+- looks nice as well
+
+Maybe we need to consider:
+- Usability
+- Accessibility
+- Security
+- Testability
+- Longevity

controllers/posts.js

@@ -1,28 +1,150 @@
 const Post = require("../models/post");
+const Comment = require("../models/comment");
+const User = require("../models/user");
 
 const PostsController = {
   Index: (req, res) => {
-    Post.find((err, posts) => {
+    Post.find((err) => {
       if (err) {
         throw err;
       }
-
-      res.render("posts/index", { posts: posts });
-    });
+    }).sort({date:-1}).then((post) => {
+      let collection = [];
+      async function post_set(post, i) {
+        await User.findById(post[i].user_id, (err, user) => {
+          if (err) {
+            throw err;
+          }
+          let regex = /^\w*[^@]/g;
+          let username = user.email.match(regex);
+          let isPicture = post[i].picture !== "";
+          collection.push({post: post[i], picture: user.picture, username: username, isPicture: isPicture});
+        })
+      }
+      async function increment(post) {
+        for(let i = 0; i < post.length; i++) {
+        await post_set(post, i);
+      }
+      res.render("posts/index", { collection: collection , session_user: req.session.user});
+      }
+      increment(post);
+    })
   },
   New: (req, res) => {
-    res.render("posts/new", {});
+    res.render("posts/new", {session_user: req.session.user});
   },
   Create: (req, res) => {
     const post = new Post(req.body);
-    post.save((err) => {
+    post.date = Date.now();
+    post.user_id = req.session.user._id;
+    if (post.message === "" || post.message.length > 250) {
+      res.status(201).redirect("/posts/new");
+    } else if (post.message[0] === " ") {
+      const trimmed_post = post.message.trim();
+      if (trimmed_post.length != 0) {
+        post.message = trimmed_post;
+        post.save((err) => {
+          if (err) {
+            throw err;
+          }
+
+          res.status(201).redirect(`/posts/`);
+        });
+      } else {
+        res.status(201).redirect(`/posts/new`);
+      }
+    } else {
+      post.save((err) => {
+        if (err) {
+          throw err;
+        }
+
+        res.status(201).redirect("/posts");
+      });
+    }
+  },
+
+  Like: (req, res) => {
+    const postId = req.params.id;
+    const userId = req.session.user._id
+
+    Post.findById(postId, (err, post) => {
       if (err) {
         throw err;
       }
-
-      res.status(201).redirect("/posts");
+
+      const alreadyLiked = post.liked_by.includes(userId);
+
+      if (!alreadyLiked) {
+        post.likes = post.likes + 1;
+        post.liked_by.push(userId);
+      } else {
+        post.likes = post.likes - 1;
+        post.liked_by = post.liked_by.filter(id => id !== userId);
+      }
+
+      post.save((err) => {
+        if (err) {
+          throw err;
+        }
+
+        res.redirect("/posts");
+      });
     });
   },
+
+  Details: (req, res) => {
+    const postId = req.params.id;
+    Post.findById(postId, (err, post) => {
+      if (err) {
+        throw err;
+      }
+
+      return post;
+    }).then((post) => (
+      Comment.find((err, comments) => {
+        if (err) {
+          throw err;
+        }
+        res.render("posts/details", {comments: comments, post: post, session_user: req.session.user});
+      }).where({post_id: postId})
+    ));
+  },
+
+  CreateComment: (req, res) => {
+      const postId = req.params.id;
+      const userId = req.session.user._id
+
+      const comment = new Comment(req.body);
+      comment.post_id = postId;
+      comment.user_id = userId;
+
+      if (comment.message === "" || comment.message.length > 250) { 
+        res.status(201).redirect(`/posts/${postId}`); 
+      } else if (comment.message[0] === " ") {
+        const trimmed = comment.message.trim();
+        if (trimmed.length != 0) {
+          comment.message = trimmed;
+          comment.save((err) => {
+            if (err) {
+              throw err;
+            }
+
+            res.status(201).redirect(`/posts/${postId}`);
+          });
+        } else {
+          res.status(201).redirect(`/posts/${postId}`);
+        }
+      } else {
+        comment.save((err) => {
+          if (err) {
+            throw err;
+          }
+
+          res.status(201).redirect(`/posts/${postId}`);
+        });
+      }
+  }
 };
 
 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", {error: req.session.error});
   },
 
   Create: (req, res) => {
@@ -11,9 +11,8 @@ const SessionsController = {
     const password = req.body.password;
 
     User.findOne({ email: email }).then((user) => {
-      if (!user) {
-        res.redirect("/sessions/new");
-      } else if (user.password != password) {
+      if (!user || user.password != password) {
+        req.session.error = "INVALID USERNAME OR PASSWORD";
         res.redirect("/sessions/new");
       } else {
         req.session.user = user;