pug different view if logged in or out

This commit is contained in:
2025-02-12 18:44:30 +01:00
parent b547fc3b5e
commit 5cfb29131c
7 changed files with 69 additions and 60 deletions

View File

@ -2,12 +2,10 @@ const path = require('path');
const mainController = { const mainController = {
root: (req, res) => { root: (req, res) => {
if (typeof req.session.publicKey === 'undefined') { let pubKey = req.session.publicKey;
// main page when not logged in console.log(pubKey);
res.render('index'); let isLoggedIn = typeof pubKey !== 'undefined';
} else { res.render('index', {isLoggedIn, pubKey});
res.render('index');
}
}, },
style: (req, res) => { style: (req, res) => {
res.sendFile(path.resolve(__dirname + '/../public/style.css')); res.sendFile(path.resolve(__dirname + '/../public/style.css'));
@ -20,6 +18,9 @@ const mainController = {
}, },
popups: (req, res) => { popups: (req, res) => {
res.sendFile(path.resolve(__dirname + '/../public/popups.js')); res.sendFile(path.resolve(__dirname + '/../public/popups.js'));
},
chat : (req, res) => {
res.sendFile(path.resolve(__dirname + '/../public/chat.js'));
} }
}; };

11
src/public/chat.js Normal file
View File

@ -0,0 +1,11 @@
const socket = io();
const form = document.getElementById('form');
const input = document.getElementById('input');
form.addEventListener('submit', function(e) {
e.preventDefault();
if (input.value) {
socket.emit('chat message', input.value);
input.value = '';
}
});

View File

@ -1,7 +1,6 @@
const currentUrl = window.location.href; const currentUrl = window.location.href;
import { ab2str, exportedKeyToPem, pemToKey, genKey } from "./ecc.js"; import { ab2str, exportedKeyToPem, pemToKey, genKey } from "./ecc.js";
// close popups with escape key // close popups with escape key
document.addEventListener("keydown", (event) => { document.addEventListener("keydown", (event) => {
if (event.isComposing || event.key === 'Escape') { if (event.isComposing || event.key === 'Escape') {
@ -109,8 +108,9 @@ document.getElementById("loginconfirm").addEventListener("click", async function
if (!verifyResponse.ok) { if (!verifyResponse.ok) {
throw new Error('Failed to verify the challenge'); throw new Error('Failed to verify the challenge');
} } else {
const verifyResult = await verifyResponse.json(); const verifyResult = await verifyResponse.json();
console.log("Verification result:", verifyResult); console.log("Verification result:", verifyResult);
location.reload();
}
}); });

View File

@ -1,14 +1,2 @@
var jswarn = document.getElementById('jswarn'); var jswarn = document.getElementById('jswarn');
jswarn.innerText = ''; jswarn.innerText = '';
var socket = io();
var form = document.getElementById('form');
var input = document.getElementById('input');
form.addEventListener('submit', function(e) {
e.preventDefault();
if (input.value) {
socket.emit('chat message', input.value);
input.value = '';
}
});

View File

@ -22,4 +22,8 @@ router
.route("/popups.js") .route("/popups.js")
.get(mainController.popups); .get(mainController.popups);
router
.route("/chat.js")
.get(mainController.chat);
module.exports = router; module.exports = router;

View File

@ -14,10 +14,15 @@ html(lang="en-US")
#mainbody #mainbody
#jswarn Please enable Javascript to use this app. #jswarn Please enable Javascript to use this app.
if !isLoggedIn
.btn-toolbar.btn-group-sm(role="toolbar", aria-label="Toolbar") .btn-toolbar.btn-group-sm(role="toolbar", aria-label="Toolbar")
.btn-group.mr-2(role="group", aria-label="register") .btn-group.mr-2(role="group", aria-label="register")
button#register.btn.btn-secondary(type="button") register button#register.btn.btn-secondary(type="button") register
button#login.btn.btn-secondary(type="button") login button#login.btn.btn-secondary(type="button") login
else
.btn-toolbar.btn-group-sm(role="toolbar", aria-label="Toolbar")
.btn-group.mr-2(role="group", aria-label="logout")
button#logout.btn.btn-secondary(type="button") logout
#registerPopup.popup #registerPopup.popup
.popup-content .popup-content