Skip to content

Commit

Permalink
Merge pull request shoel-uddin#67 from shoel-uddin/josh_branch
Browse files Browse the repository at this point in the history
fixed some things
  • Loading branch information
k5tuck authored Jan 15, 2021
2 parents 02eaaf1 + c4cbcd9 commit ed82c1d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
Binary file added public/images/tron.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/stylesheets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ul {
}

body {
background-image: url("/images/mariobackground.jpg");
background-image: url("/images/tron.png");
background-attachment: fixed;
opacity: 90%;
}
Expand Down
25 changes: 14 additions & 11 deletions routers/member.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
const express = require('express');
const router = express.Router();
const { requireLogin } = require("../auth");
const { memberController } = require('../controllers');
const {
requireLogin
} = require("../auth");
const {
memberController
} = require('../controllers');
const UPLOAD_URL = "/uploads/media/";
const multer = require("multer");
const upload = multer({ dest: "public" + UPLOAD_URL });
const upload = multer({
dest: "public" + UPLOAD_URL
});

router
.get("/", requireLogin, memberController.member)
Expand All @@ -15,15 +21,12 @@ router
.post("/create", requireLogin, upload.single("media"), memberController.processPost)

.get("/post/:id/edit", requireLogin, memberController.editPost)
.post(
"/members/post/:id/edit",
requireLogin,
upload.single("media"), memberController.processEditPost)
.post("/post/:id/edit", requireLogin, upload.single("media"), memberController.processEditPost)

.get("/post/:id/delete", requireLogin, memberController.deletePost)
.post("/members/post/:id/delete", requireLogin, memberController.processDeletePost)
.post("/post/:id/delete", requireLogin, memberController.processDeletePost)

router
router
.get("/post/:id/comment", requireLogin, memberController.createComment)
.post("/post/:id/comment", requireLogin, memberController.processComment)

Expand All @@ -42,9 +45,9 @@ router
.get('/game/:id', requireLogin, memberController.game)

router
.get("/about", requireLogin, memberController.about )
.get("/about", requireLogin, memberController.about)

.get("/contact", requireLogin, memberController.contact)
.get("/contact", requireLogin, memberController.contact)

router
.get('/logout', memberController.logout);
Expand Down

0 comments on commit ed82c1d

Please sign in to comment.