Merge pull request #4 from FAC29A/AlexVOiceover/issue3

Dynamic Routes
FAC29A · Jan 26, 2024 · 5cc348c · 5cc348c
2 parents ea98e03 + b561818
commit 5cc348c
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 21 deletions.
diff --git a/public/styles.css b/public/styles.css
@@ -35,6 +35,11 @@ p {
 	justify-content: center;
 	gap: 1rem;
 	max-width: 100%;
+	white-space: normal;
+	overflow-wrap: break-word;
+	text-overflow: ellipsis;
+	display: block;
+	width: 100%;
 }
 
 .message {
@@ -53,14 +58,35 @@ button {
 	align-self: flex-end;
 }
 
+.marginTop-button {
+	margin-top: 1rem;
+}
+
+.buttonsGroup {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	gap: 1rem;
+	justify-content: space-between;
+}
+
 input,
 textarea {
 	border: 1px solid var(--secondary-light);
 	border-radius: 4px;
 	max-width: 100%;
+	width: 100%;
 	box-sizing: border-box;
 }
 
+textarea.medium {
+	min-height: 6rem;
+}
+
+textarea.tall {
+	min-height: 8rem;
+}
+
 form {
 	display: flex;
 	flex-direction: column;
@@ -92,14 +118,30 @@ ul {
 	padding: 0;
 }
 
-li {
+.singlePost {
+	line-height: 2rem;
+}
+
+label {
+	font-weight: bold;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display: inline-block; /* Make label inline-block to respect width */
+	max-width: 100%;
+}
+
+label.topAligned {
+	vertical-align: top;
+}
+
+.singlePost {
 	border: 0.2rem solid var(--neutral);
 	background-color: var(--primary-light);
 	margin-bottom: 1rem;
 	padding: 1rem;
 	border-radius: 2px;
 	box-shadow: 6px 2px 4px rgba(0, 0, 0, 0.4);
-	gap: 0.5 rem;
+	gap: 0.5rem;
 }
 
 .error {
@@ -108,15 +150,15 @@ li {
 	text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 }
 
-@media (max-width: 600px) {
+@media (max-width: 300px) {
 	main {
 		padding: 1rem;
 	}
 	h1 {
 		font-size: 1.5rem;
 	}
-	input,
-	textarea {
-		width: 100%; /* Adjust width to 100% for small screens */
+	label {
+		white-space: normal; /* Allow wrapping on narrow screens */
+		text-overflow: clip;
 	}
 }
diff --git a/src/server.js b/src/server.js
@@ -43,14 +43,12 @@ server.post('/', express.urlencoded({ extended: false }), (req, res) => {
 		errors.message = 'Please enter a message'
 	}
 	if (Object.keys(errors).length) {
-		//const body = home(posts, errors, req.body)
 		res.render('formPage', {
 			title: 'New Post',
 			sanitize: sanitize,
 			values: req.body || {},
 			errors: errors,
 		})
-		//res.status(400).send(body)
 	} else {
 		const created = Date.now()
 		//Create a random unique ID
@@ -60,7 +58,7 @@ server.post('/', express.urlencoded({ extended: false }), (req, res) => {
 	}
 })
 
-server.post('/delete/:id', (req, res) => {
+server.get('/delete/:id', (req, res) => {
 	const id = req.params.id
 	const index = posts.findIndex((post) => post.id.toString() === id)
 	if (index !== -1) {
@@ -69,11 +67,42 @@ server.post('/delete/:id', (req, res) => {
 	res.redirect('/posts')
 })
 
-server.post('/back', (req, res) => {
+server.get('/openEdit/:id', (req, res) => {
+	const id = req.params.id
+	const post = posts.find((post) => post.id === id)
+
+	if (post) {
+		res.render('singlePost', {
+			title: 'Edit Post',
+			post: post,
+			sanitize: sanitize,
+		})
+	} else {
+		res.status(404).send('Post not found')
+	}
+})
+
+server.post(
+	'/edit/:id',
+	express.urlencoded({ extended: false }),
+	(req, res) => {
+		const id = req.params.id
+		const index = posts.findIndex((post) => post.id === id)
+		if (index !== -1) {
+			posts[index].message = req.body.message
+			posts[index].created = Date.now()
+			res.redirect('/posts')
+		} else {
+			res.status(404).send('Post not found')
+		}
+	}
+)
+
+server.get('/back', (req, res) => {
 	res.redirect('/')
 })
 
-server.post('/showPosts', (req, res) => {
+server.get('/showPosts', (req, res) => {
 	res.redirect('/posts')
 })
 

diff --git a/views/formPage.ejs b/views/formPage.ejs
@@ -18,7 +18,7 @@
 
 			<p>
 				<label for="message">Text</label>
-				<textarea id="message" name="message">
+				<textarea id="message" class="medium" name="message">
 <%- values.message ? sanitize(values.message) : '' %></textarea
 				>
 			</p>
@@ -29,7 +29,7 @@
 			<button class="right-button">Send</button>
 		</form>
 		<p></p>
-		<form class="buttonForm" action="/showPosts" method="POST">
+		<form class="buttonForm" action="/showPosts" method="GET">
 			<button type="submit">Show Posts</button>
 		</form>
 	</body>

diff --git a/views/postsPage.ejs b/views/postsPage.ejs
@@ -7,17 +7,28 @@
 			<% posts.forEach((post) => { const date = new Date(post.created); const
 			prettyDate = date.toLocaleString('en-GB'); %>
 			<li>
-				<p class="message"><%- sanitize(post.message) %></p>
-				<p class="nameAndDate">
-					<%- sanitize(post.nickname) %> | <%= prettyDate %>
-				</p>
-				<form class="buttonForm" action="/delete/<%= post.id %>" method="POST">
-					<button type="submit" class="right-button">Delete</button>
-				</form>
+				<div class="singlePost">
+					<p class="message"><%- sanitize(post.message) %></p>
+					<p class="nameAndDate">
+						by: "<%- sanitize(post.nickname) %>" on: <%= prettyDate %>
+					</p>
+					<div class="buttonsGroup">
+						<form class="buttonForm" action="/openEdit/<%= post.id %>" method="GET">
+							<button type="submit">Edit Post</button>
+						</form>
+						<form
+							class="buttonForm"
+							action="/delete/<%= post.id %>"
+							method="GET"
+						>
+							<button type="submit" class="right-button">Delete</button>
+						</form>
+					</div>
+				</div>
 			</li>
 			<% }); %>
 		</ul>
-		<form class="buttonForm" action="/back" method="POST">
+		<form class="buttonForm" action="/back" method="GET">
 			<button type="submit">Back</button>
 		</form>
 	</body>

diff --git a/views/singlePost.ejs b/views/singlePost.ejs
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+	<%- include('header') %>
+	<body>
+		<h1>Post</h1>
+		<div class="singlePost">
+			<div><label>Name:&nbsp;</label><%- sanitize(post.nickname) %></div>
+			<div>
+				<label>Date:&nbsp;</label><%= new
+				Date(post.created).toLocaleString('en-GB') %>
+			</div>
+			<div>
+				<label for="message" class="topAligned">Text: </label>
+			</div>
+
+			<form action="/edit/<%= post.id %>" method="POST">
+				<textarea id="message" class="tall" name="message">
+<%- post.message ? sanitize(post.message) : '' %></textarea>
+
+				<button class="right-button marginTop-button" type="submit">
+					Modify Post
+				</button>
+			</form>
+
+			<form class="buttonForm" action="/delete/<%= post.id %>" method="GET">
+				<button type="submit" class="right-button marginTop-button">
+					Delete
+				</button>
+			</form>
+		</div>
+		<form class="buttonForm" action="/showPosts" method="GET">
+			<button type="submit">Back</button>
+		</form>
+	</body>
+</html>