From 061e58a48279bb0142d3f094ab7baa0c6a13321a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Szab=C3=B3?= <tamas@szaboo.com>
Date: Mon, 27 Nov 2017 03:01:59 +0100
Subject: [PATCH] date and delete works
---
middleware/serie/deleteSerie.js | 1 +
middleware/serie/postSerie.js | 1 +
models/serie.js | 1 +
routes/index.js | 18 +++++++++---------
views/episodeEdit.ejs | 9 ++++-----
views/serieEdit.ejs | 7 +++----
views/series.ejs | 2 +-
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/middleware/serie/deleteSerie.js b/middleware/serie/deleteSerie.js
index 4688fc6..21d1175 100644
--- a/middleware/serie/deleteSerie.js
+++ b/middleware/serie/deleteSerie.js
@@ -7,6 +7,7 @@ const ObjectId = require('mongoose').Types.ObjectId;
module.exports = (objectRepository) => {
const serieModel = requireOption(objectRepository, 'serieModel');
return (req, res, next) => {
+ console.log(req.params.id);
serieModel.findByIdAndRemove(new ObjectId(req.params.id))
.then(() => next())
.catch(err => next(err))
diff --git a/middleware/serie/postSerie.js b/middleware/serie/postSerie.js
index 4269cc7..1091ad6 100644
--- a/middleware/serie/postSerie.js
+++ b/middleware/serie/postSerie.js
@@ -14,6 +14,7 @@ module.exports = (objectRepository) => {
title,
image,
description,
+ createdAt: new Date(),
progress: 0
});
diff --git a/models/serie.js b/models/serie.js
index 24fe893..2d90566 100644
--- a/models/serie.js
+++ b/models/serie.js
@@ -6,6 +6,7 @@ const Serie = db.model('Serie', {
image: String,
description: String,
progress: Number,
+ createdAt: Date,
});
module.exports = Serie;
diff --git a/routes/index.js b/routes/index.js
index 4ff67c0..54d15c9 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -59,7 +59,7 @@ module.exports = (app) => {
app.get('/series/:id/delete',
deleteSerieMW(objectRepository),
(req, res, next) => (
- res.redirect('/series')
+ res.redirect('/')
)
);
@@ -89,14 +89,14 @@ module.exports = (app) => {
)
);
- app.post('/series/:id/episode/:episodeId/update',
- getSerieMW(objectRepository),
- getEpisodeMW(objectRepository),
- updateEpisodeMW(objectRepository),
- (req, res, next) => (
- res.redirect(`/series/${req.params.id}/episode/${req.params.episodeId}`)
- )
- );
+ // app.post('/series/:id/episode/:episodeId/update',
+ // getSerieMW(objectRepository),
+ // getEpisodeMW(objectRepository),
+ // updateEpisodeMW(objectRepository),
+ // (req, res, next) => (
+ // res.redirect(`/series/${req.params.id}/episode/${req.params.episodeId}`)
+ // )
+ // );
app.get('/series/:id/episode/:episodeId/delete',
deleteEpisodeMW(objectRepository),
diff --git a/views/episodeEdit.ejs b/views/episodeEdit.ejs
index 08b2504..974167c 100644
--- a/views/episodeEdit.ejs
+++ b/views/episodeEdit.ejs
@@ -23,14 +23,13 @@
</div>
</div>
<div class="ui buttons right floated">
- <form method="GET" action="/series/<%= serieId %>/episode/<% episodeId %>/delete">
- <button type="submit" class="ui negative button submit">Delete</button>
- </form>
- <div class="or"></div>
<button type="submit" class="ui positive button submit">Save</button>
</div>
</div>
- </from>
+ </form>
+ <form method="GET" action="/series/<%= serieId %>/episode/<%= episodeId %>/delete">
+ <button type="submit" class="ui negative button submit">Delete</button>
+ </form>
</div>
<script>
$('.rating')
diff --git a/views/serieEdit.ejs b/views/serieEdit.ejs
index 9c49b83..c0131a9 100644
--- a/views/serieEdit.ejs
+++ b/views/serieEdit.ejs
@@ -32,13 +32,12 @@
</div>
</div>
<div class="ui buttons right floated">
- <form action="/series/<%= serieId %>/delete" method="GET">
- <button type="submit" class="ui negative button su.-bmit">Delete</button>
- </form>
- <div class="or"></div>
<button type="submit" class="ui positive button submit">Save</button>
</div>
</div>
</form>
+ <form method="GET" action="/series/<%= serieId %>/delete">
+ <button type="submit" class="ui negative button submit">Delete</button>
+ </form>
</div>
<%- include('footer') %>
diff --git a/views/series.ejs b/views/series.ejs
index 29cf9c2..9c96701 100644
--- a/views/series.ejs
+++ b/views/series.ejs
@@ -14,7 +14,7 @@
<div class="content">
<a class="header" href="/series/<%= serie.id %>"><%= serie.title %></a>
<div class="meta">
- <span class="date">Added on <% serie._createdAt %></span>
+ <span class="date">Added on <%= new Date(serie.createdAt).toLocaleDateString() %></span>
</div>
</div>
<div class="extra content">
--
GitLab