Updated home css

.eslintrc.json

@@ -1,27 +1,16 @@
 {
-    "env": {
-        "commonjs": true,
-        "es6": true,
-        "node": true,
-        "jest/globals": true,
-        "cypress/globals": true
-    },
-    "extends": [
-      "eslint:recommended",
-      "plugin:node/recommended"
-    ],
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2022
-    },
-    "plugins": [
-      "cypress",
-      "jest",
-      "node"
-    ],
-    "rules": {
-    }
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": ["eslint:recommended", "plugin:react/recommended"],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["react"],
+  "rules": {
+    "no-useless-catch": "off",
+    "no-undef": "off"
+  }
 }

.github/workflows/main.yml

@@ -0,0 +1,33 @@
+name: Continuous Integration
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Start MongoDB
+        uses: supercharge/[email protected]
+        with:
+          mongodb-version: 6.0
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Start server
+        run: npm run start:test &
+
+      - name: Run unit tests
+        run: npm run test:unit
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v5

.gitignore

@@ -63,3 +63,5 @@ typings/
 # cypress.io
 cypress/screenshots
 cypress/videos
+
+.DS_Store

K6/K6CreateAccount.js

@@ -0,0 +1,90 @@
+import http from 'k6/http';
+import { htmlReport } from "https://raw.githubusercontent.com/benc-uk/k6-reporter/main/dist/bundle.js";
+
+// TEST OPTIONS EXPLANATION:
+// executor: https://k6.io/docs/using-k6/scenarios/#scenario-executors
+// rate 1 timeUnit 1 Means rate: 1, timeUnit: '1s' means "try to start 1 iteration every second"
+// duration: Run test for this duration
+// maxVus: Stop test if this is reached
+// Pre-allocated vus loads a number of iterations into memory before the test starts to ensure consistent reporting
+
+export const options = {
+  scenarios: {
+    constant_request_rate: {
+      executor: 'constant-arrival-rate',
+      rate: 5,
+      timeUnit: '1s',
+      duration: '15s',
+      preAllocatedVUs: 20,
+      maxVUs: 1000,
+    },
+  },
+};
+
+// Specify Key URLS to HTTP Request Here:
+const home = 'http://127.0.0.1:3030/';
+//const home = 'https://acebook-main.onrender.com/';
+const signUp = home + 'users/new';
+const signIn = home + 'sessions/new';
+const usersUrl = home + 'users/';
+const newPost = home + 'posts/new';
+
+const headers = {
+  'Content-Type': 'application/x-www-form-urlencoded',
+};
+
+// THIS IS THE SCENARIO THAT WILL BE EXECUTED PER ITERATION
+
+export default function () {
+
+// Helper Method to Make a Random String
+  function generateRandomString() {
+    const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+      let randomString = '';
+      for (let i = 0; i < 8; i++) {
+        randomString += characters[Math.floor(Math.random() * characters.length)];
+      }
+    return randomString;
+  }
+
+// SCENARIO:
+// 1) Visit Home
+// 2) Visit signUp
+// 3) Create Account
+// 4) Log In
+
+
+  // Create Random user
+  let randUser = `user${generateRandomString()}`; 
+  let body = 'username=' + randUser + '%40test.com&email=' + randUser + '%40test.com&password=$' + randUser;
+
+  // Sign Up
+  http.get(home);
+  http.get(signUp);
+  const thisPost = http.post(usersUrl, body, { headers: headers });
+
+  // Account Creation Reporting Block
+  if(thisPost.status=="200"){
+    console.log('Response Code:', thisPost.status);
+    console.log(`${randUser} Account Created`);
+  }else{
+    console.log('Response Code:', thisPost.status);
+    console.log(`${randUser} Account Creation Failed`);
+  }
+
+  // // Sign In
+  // http.get(newPost);
+
+  // // Make a Post
+  // http.get(newPost);
+}
+
+// THIS FUNCTION GENERATES A SUMMARY REPORT AS HTML
+export function handleSummary(data) {
+  return {
+    "K6/CreateAccountSummary.html": htmlReport(data),
+  };
+}
+
+// TO EXECUTE TEST: k6 run K6CreateAccount.js
+// TO EXECUTE WITH OPTIONAL CSV DATA: 6 run --out csv=<CSVFILENAME>.csv K6CreateAccount.js

README.md

@@ -1,3 +1,31 @@
+# Rules For Pushing
+
+Before making a pull request. From your branch:
+
+1. stage any changes git add . & git commit -m "meaningful message"
+2. git checkout main
+3. update your local main git pull origin main5
+4. go back to your branch git checkout branch-name
+5. merge your branch with main git merge main
+6. resolve any conflicts locally; speak with the person who wrote the conflicting code if necessary
+7. repeat step 1
+8. open a PR git push origin branch-name
+
+To add, if you ever want to make your branch available for everyone else, simply:
+
+- git push origin branch-name just don’t open up a PR after, and everyone can then check out your branch
+
+# Collaborator User Names
+
+- Louis - Loo-Ashworth
+- Adrian - adrianHards
+- Laura - Lmason14
+- Joe - Joecunliffe98
+- Terry - terenceroach
+- Lisa - lisaoausb
+- Emma - emmadavids
+- Joan -JoanKalanzi
+
 # Acebook
 
 This is a Node.js template for the Acebook engineering project.
@@ -14,7 +42,7 @@ It uses:
 
 ## Card wall
 
-REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
+<a href="https://miro.com/app/board/uXjVM_xqOSQ=/"> Miro Board</a>
 
 ## Quickstart
 
@@ -46,7 +74,7 @@ REPLACE THIS TEXT WITH A LINK TO YOUR CARD WALL
    brew tap mongodb/brew
    brew install [email protected]
    ```
-   *Note:* If you see a message that says `If you need to have [email protected] first in your PATH, run:`, follow the instruction. Restart your terminal after this.
+   _Note:_ If you see a message that says `If you need to have [email protected] first in your PATH, run:`, follow the instruction. Restart your terminal after this.
 7. Start MongoDB
    ```
    brew services start [email protected]
@@ -93,3 +121,10 @@ 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!
+
+Requirements
+Bcrypt - for pw hashing
+Validator
+Cloudinary
+Multer
+dotenv

app.js

@@ -5,15 +5,18 @@ const cookieParser = require("cookie-parser");
 const logger = require("morgan");
 const session = require("express-session");
 const methodOverride = require("method-override");
+require("dotenv").config();
 
 const homeRouter = require("./routes/home");
 const postsRouter = require("./routes/posts");
 const sessionsRouter = require("./routes/sessions");
 const usersRouter = require("./routes/users");
+const likesRouter = require("./routes/likes");
+const commentsRouter = require("./routes/comments");
+const friendsRouter = require("./routes/friends");
 
 const app = express();
 
-// view engine setup
 app.set("views", path.join(__dirname, "views"));
 app.set("view engine", "hbs");
 
@@ -36,15 +39,13 @@ app.use(
   })
 );
 
-// clear the cookies after user logs out
 app.use((req, res, next) => {
   if (req.cookies.user_sid && !req.session.user) {
     res.clearCookie("user_sid");
   }
   next();
 });
 
-// middleware function to check for logged-in users
 const sessionChecker = (req, res, next) => {
   if (!req.session.user && !req.cookies.user_sid) {
     res.redirect("/sessions/new");
@@ -53,26 +54,49 @@ const sessionChecker = (req, res, next) => {
   }
 };
 
-// route setup
+app.use((req, res, next) => {
+  if (req.session.user) {
+    res.locals.user = req.session.user;
+  }
+  next();
+});
+
+app.post("/signup", async (req, res) => {
+  try {
+    if (req.body.password !== req.body.password2) {
+      throw new Error("Passwords don't match. Try again.");
+    }
+
+    const user = new User(req.body);
+    await user.save();
+  } catch (error) {
+    res.status(400).send(error);
+  }
+});
+
 app.use("/", homeRouter);
 app.use("/posts", sessionChecker, postsRouter);
 app.use("/sessions", sessionsRouter);
 app.use("/users", usersRouter);
+app.use("/likes", likesRouter);
+app.use("/comments", commentsRouter);
+app.use("/friends", friendsRouter);
 
-// catch 404 and forward to error handler
 app.use((req, res, next) => {
   next(createError(404));
 });
 
-// error handler
-app.use((err, req, res) => {
-  // set locals, only providing error in development
-  res.locals.message = err.message;
-  res.locals.error = req.app.get("env") === "development" ? err : {};
+app.use((err, req, res, next) => {
+  req.session.save((err2) => {
+    if (err2) {
+      return next(err2);
+    }
+    res.locals.message = err.message;
+    res.locals.error = req.app.get("env") === "development" ? err : {};
 
-  // render the error page
-  res.status(err.status || 500);
-  res.render("error");
+    res.status(err.status || 500);
+    res.render("error");
+  });
 });
 
 module.exports = app;

bin/www

@@ -24,6 +24,7 @@ var mongoDbUrl = process.env.MONGODB_URL || "mongodb://0.0.0.0/acebook";
 mongoose.connect(mongoDbUrl, {
   useNewUrlParser: true,
   useUnifiedTopology: true,
+  useCreateIndex: true,
 });
 
 var db = mongoose.connection;

cloudinary.js

@@ -0,0 +1,18 @@
+const cloudinary = require("cloudinary").v2;
+const { CloudinaryStorage } = require("multer-storage-cloudinary");
+const multer = require("multer");
+
+cloudinary.config({
+  cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
+  api_key: process.env.CLOUDINARY_API_KEY,
+  api_secret: process.env.CLOUDINARY_API_SECRET,
+});
+
+const storage = new CloudinaryStorage({
+  cloudinary: cloudinary,
+  folder: "userProfiles",
+  allowedFormats: ["jpg", "png", "jpeg"],
+});
+
+const parser = multer({ storage: storage });
+module.exports = { cloudinary, parser };

controllers/comments.js

@@ -0,0 +1,21 @@
+const Comment = require("../models/comment");
+
+const CommentsController = {
+  Create: async (req, res) => {
+    const comment = new Comment({
+      post: req.body.postId,
+      user: req.session.user.username,
+      content: req.body.commentContent,
+    });
+
+    try {
+      await comment.save();
+      res.redirect("/posts");
+    } catch (err) {
+      req.flash("error", err.message);
+      res.redirect("/posts");
+    }
+  },
+};
+
+module.exports = CommentsController;