Merge pull request #197 from kgpmask/query-params

changed params to querystring

routes/govportal.js

@@ -26,8 +26,8 @@ router.get('/post-management', async (req, res) => {
 	const posts = (await dbh.getPosts().limit(20)).map(post => post.toObject());
 	return res.renderFile(`govportal/post-management.njk`, { posts });
 });
-router.get('/edit-post/:id', async (req, res) => {
-	const id = req.params.id;
+router.get('/edit-post', async (req, res) => {
+	const id = req.query.id;
 	const data = (await dbh.getPost(id)).toObject();
 	return res.renderFile(`govportal/edit-post.njk`, { ...data, date: data.date.toISOString().slice(0, 10) });
 });
@@ -43,8 +43,8 @@ router.get('/add-poll', (req, res) => {
 	return res.renderFile(`govportal/add-poll.njk`, { date: date.toISOString().slice(0, 10) });
 });
 
-router.get('/edit-poll/:id', async (req, res) => {
-	const id = req.params.id;
+router.get('/edit-poll', async (req, res) => {
+	const id = req.query.id;
 	const poll = (await dbh.getPoll(id)).toObject();
 	return res.renderFile(`govportal/edit-poll.njk`, { ...poll, endTime: poll.endTime.toISOString().slice(0, 10) });
 });

routes/polls.js

@@ -3,9 +3,9 @@ const router = require('express').Router();
 const dbh = require('../database/handler');
 
 // Route for opening poll or poll list
-router.get('/:pollId?', async (req, res) => {
+router.get('/', async (req, res) => {
 	if (!req.loggedIn) return res.loginRedirect(req, res);
-	const pollId = req.params.pollId;
+	const pollId = req.query.id;
 	const activePolls = await dbh.getActivePolls();
 	if (!pollId) return res.renderFile('poll_list.njk', {
 		activePolls,
@@ -38,9 +38,9 @@ router.post('/', async (req, res) => {
 });
 
 // Route for displaying poll results
-router.get('/results/:id?', async (req, res) => {
+router.get('/results', async (req, res) => {
 	if (!req.loggedIn) return res.loginRedirect(req, res);
-	const pollId = req.params.id;
+	const pollId = req.query.id;
 	if (!pollId) return res.notFound('No ID given.');
 	const activePolls = await dbh.getActivePolls();
 	const poll = activePolls.find(poll => poll._id === pollId);

templates/govportal/poll-management.njk

@@ -197,9 +197,9 @@
 			}
 		}
 		async function editPoll (id) {
-			await axios.get(`/gov-portal/edit-poll/${id}`)
+			await axios.get(`/gov-portal/edit-poll?id=${id}`)
 			 .then(res => {
-				window.location.href = `/gov-portal/edit-poll/${id}`; 
+				window.location.href = `/gov-portal/edit-poll?id=${id}`; 
 			 });
 		}
 		function deletePoll (id) {

templates/govportal/post-management.njk

@@ -193,9 +193,9 @@
 			}
 		}
 		async function editPost (id) {
-			await axios.get(`/gov-portal/edit-post/${id}`)
+			await axios.get(`/gov-portal/edit-post?id=${id}`)
 			 .then(res => {
-				window.location.href = `/gov-portal/edit-post/${id}`; 
+				window.location.href = `/gov-portal/edit-post?id=${id}`; 
 			 });
 		}
 		function deletePost (link) {

templates/poll_list.njk

@@ -18,8 +18,8 @@
 					<div class="poll">
 						<div class="title"> {{ poll.title }} </div>
 						<div class="buttons">
-							<button onclick="window.location.href = '/polls/{{ poll._id }}'">Vote</button>
-							<button onclick="window.location.href = '/polls/results/{{ poll._id }}'">Result</button>
+							<button onclick="window.location.href = '/polls?id={{ poll._id }}'">Vote</button>
+							<button onclick="window.location.href = '/polls/results?id={{ poll._id }}'">Result</button>
 						</div>
 					</div>
 				{% endfor %}

templates/poll_vote.njk

@@ -53,7 +53,7 @@
 			setTimeout(function () {e.classList.add('hidden')}, 2000);
 			if (response.success) {
 				setTimeout(function () {
-					window.location.href  = "/polls/results/{{ poll._id }}";
+					window.location.href  = "/polls/results?id={{ poll._id }}";
 				}, 3000);
 			}
 		}