Skip to content

Commit

Permalink
Update syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
John Forster committed Mar 11, 2022
1 parent a20e4db commit 035ea7d
Show file tree
Hide file tree
Showing 18 changed files with 175 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"SharedArrayBuffer": "readonly"
},
"parserOptions": {
"ecmaVersion": 2018
"ecmaVersion": 2022
},
"plugins": [
"cypress",
Expand Down
8 changes: 4 additions & 4 deletions controllers/home.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var HomeController = {
Index: function(req, res) {
res.render('home/index', { title: 'Acebook' });
}
const HomeController = {
Index: (req, res) => {
res.render("home/index", { title: "Acebook" });
},
};

module.exports = HomeController;
32 changes: 18 additions & 14 deletions controllers/posts.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
var Post = require('../models/post');
const Post = require("../models/post");

var PostsController = {
Index: function(req, res) {
Post.find(function(err, posts) {
if (err) { throw err; }
const PostsController = {
Index: (req, res) => {
Post.find((err, posts) => {
if (err) {
throw err;
}

res.render('posts/index', { posts: posts });
res.render("posts/index", { posts: posts });
});
},
New: function(req, res) {
res.render('posts/new', {});
New: (req, res) => {
res.render("posts/new", {});
},
Create: function(req, res) {
var post = new Post(req.body);
post.save(function(err) {
if (err) { throw err; }
Create: (req, res) => {
const post = new Post(req.body);
post.save((err) => {
if (err) {
throw err;
}

res.status(201).redirect('/posts');
res.status(201).redirect("/posts");
});
}
},
};

module.exports = PostsController;
48 changes: 23 additions & 25 deletions controllers/sessions.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
var User = require('../models/user');
const User = require("../models/user");

var SessionsController = {
New: function(req, res) {
res.render('sessions/new', {});
const SessionsController = {
New: (req, res) => {
res.render("sessions/new", {});
},

Create: function(req, res) {
console.log('trying to log in')
var email = req.body.email;
var password = req.body.password;
Create: (req, res) => {
console.log("trying to log in");
const email = req.body.email;
const password = req.body.password;

User.findOne({email: email}).then(
(user) => {
if(!user) {
res.redirect('/sessions/new');
} else if(user.password != password) {
res.redirect('/sessions/new');
} else {
req.session.user = user;
res.redirect('/posts');
}
User.findOne({ email: email }).then((user) => {
if (!user) {
res.redirect("/sessions/new");
} else if (user.password != password) {
res.redirect("/sessions/new");
} else {
req.session.user = user;
res.redirect("/posts");
}
)
});
},

Destroy: function(req, res) {
console.log('logging out')
if (req.session.user && req.cookies.user_sid) {
res.clearCookie('user_sid');
Destroy: (req, res) => {
console.log("logging out");
if (req.session.user && req.cookies.user_sid) {
res.clearCookie("user_sid");
}
res.redirect('/sessions/new');
}
res.redirect("/sessions/new");
},
};

module.exports = SessionsController;
22 changes: 12 additions & 10 deletions controllers/users.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
var User = require('../models/user');
const User = require("../models/user");

var UsersController = {
New: function(req, res) {
res.render('users/new', {});
const UsersController = {
New: (req, res) => {
res.render("users/new", {});
},

Create: function(req, res) {
var user = new User(req.body);
user.save(function(err) {
if (err) { throw err; }
res.status(201).redirect('/posts');
Create: (req, res) => {
const user = new User(req.body);
user.save((err) => {
if (err) {
throw err;
}
res.status(201).redirect("/posts");
});
}
},
};

module.exports = UsersController;
2 changes: 1 addition & 1 deletion cypress.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"baseUrl": "http://localhost:3000"
"baseUrl": "http://localhost:3030"
}
8 changes: 4 additions & 4 deletions cypress/integration/home_page_spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe('Home page', function() {
it('has a title', function() {
cy.visit('/');
cy.get('.title').should('contain', 'Acebook');
describe("Home page", () => {
it("has a title", () => {
cy.visit("/");
cy.get(".title").should("contain", "Acebook");
});
});
24 changes: 12 additions & 12 deletions cypress/integration/user_can_sign_in_spec.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
describe('Authentication', function() {
it('A user signs in and is redirected to /posts', function() {
describe("Authentication", () => {
it("A user signs in and is redirected to /posts", () => {
// sign up
cy.visit('/users/new')
cy.get('#email').type('[email protected]')
cy.get('#password').type('password')
cy.get('#submit').click()
cy.visit("/users/new");
cy.get("#email").type("[email protected]");
cy.get("#password").type("password");
cy.get("#submit").click();

// sign in
cy.visit('/sessions/new')
cy.get('#email').type('[email protected]')
cy.get('#password').type('password')
cy.get('#submit').click()
cy.visit("/sessions/new");
cy.get("#email").type("[email protected]");
cy.get("#password").type("password");
cy.get("#submit").click();

cy.url().should('include', '/posts')
cy.contains('a', 'New post')
cy.url().should("include", "/posts");
cy.contains("a", "New post");
});
});
14 changes: 7 additions & 7 deletions cypress/integration/user_can_sign_up_spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
describe('Registration', function() {
it('A user signs up and is redirected to sign in', function() {
describe("Registration", () => {
it("A user signs up and is redirected to sign in", () => {
// sign up
cy.visit('/users/new')
cy.get('#email').type('[email protected]')
cy.get('#password').type('password')
cy.get('#submit').click()
cy.visit("/users/new");
cy.get("#email").type("[email protected]");
cy.get("#password").type("password");
cy.get("#submit").click();

cy.url().should('include', '/sessions/new')
cy.url().should("include", "/sessions/new");
});
});
30 changes: 15 additions & 15 deletions cypress/integration/user_can_submit_posts_spec.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
describe('Timeline', function() {
it('can submit posts, when signed in, and view them', function() {
describe("Timeline", () => {
it("can submit posts, when signed in, and view them", () => {
// sign up
cy.visit('/users/new')
cy.get('#email').type('[email protected]')
cy.get('#password').type('password')
cy.get('#submit').click()
cy.visit("/users/new");
cy.get("#email").type("[email protected]");
cy.get("#password").type("password");
cy.get("#submit").click();

// sign in
cy.visit('/sessions/new')
cy.get('#email').type('[email protected]')
cy.get('#password').type('password')
cy.get('#submit').click()
cy.visit("/sessions/new");
cy.get("#email").type("[email protected]");
cy.get("#password").type("password");
cy.get("#submit").click();

// submit a post
cy.visit('/posts');
cy.contains('New post').click();
cy.visit("/posts");
cy.contains("New post").click();

cy.get('#new-post-form').find('[type="text"]').type('Hello, world!');
cy.get('#new-post-form').submit();
cy.get("#new-post-form").find('[type="text"]').type("Hello, world!");
cy.get("#new-post-form").submit();

cy.get('.posts').should('contain', 'Hello, world!');
cy.get(".posts").should("contain", "Hello, world!");
});
});
6 changes: 3 additions & 3 deletions models/post.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var mongoose = require('mongoose');
const mongoose = require("mongoose");

var PostSchema = new mongoose.Schema({
const PostSchema = new mongoose.Schema({
message: String,
});

var Post = mongoose.model('Post', PostSchema);
const Post = mongoose.model("Post", PostSchema);

module.exports = Post;
6 changes: 3 additions & 3 deletions models/user.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
var mongoose = require('mongoose');
const mongoose = require("mongoose");

var UserSchema = new mongoose.Schema({
const UserSchema = new mongoose.Schema({
email: String,
password: String,
});

var User = mongoose.model('User', UserSchema);
const User = mongoose.model("User", UserSchema);

module.exports = User;
8 changes: 4 additions & 4 deletions routes/home.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

var HomeController = require('../controllers/home');
const HomeController = require("../controllers/home");

router.get('/', HomeController.Index);
router.get("/", HomeController.Index);

module.exports = router;
12 changes: 6 additions & 6 deletions routes/posts.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

var PostsController = require('../controllers/posts')
const PostsController = require("../controllers/posts");

router.get('/', PostsController.Index);
router.post('/', PostsController.Create);
router.get('/new', PostsController.New);
router.get("/", PostsController.Index);
router.post("/", PostsController.Create);
router.get("/new", PostsController.New);

module.exports = router;
12 changes: 6 additions & 6 deletions routes/sessions.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

var SessionsController = require('../controllers/sessions');
const SessionsController = require("../controllers/sessions");

router.get('/new', SessionsController.New);
router.post('/', SessionsController.Create);
router.delete('/', SessionsController.Destroy);
router.get("/new", SessionsController.New);
router.post("/", SessionsController.Create);
router.delete("/", SessionsController.Destroy);

module.exports = router;
10 changes: 5 additions & 5 deletions routes/users.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var express = require('express');
var router = express.Router();
const express = require("express");
const router = express.Router();

var UsersController = require('../controllers/users');
const UsersController = require("../controllers/users");

router.get('/new', UsersController.New);
router.post('/', UsersController.Create);
router.get("/new", UsersController.New);
router.post("/", UsersController.Create);

module.exports = router;
Loading

0 comments on commit 035ea7d

Please sign in to comment.