@@ -49,7 +55,7 @@
-
+
diff --git a/public/style.css b/public/style.css
index 3a61573..8441460 100644
--- a/public/style.css
+++ b/public/style.css
@@ -24,3 +24,42 @@ h1 {
text-align: center;
color: green;
}
+
+.menu {
+ position: relative;
+ display: inline-block;
+}
+
+.hamburger {
+ font-size: 24px;
+ cursor: pointer;
+ background: none;
+ border: none;
+}
+
+.menu-content {
+ display: none;
+ position: absolute;
+ background-color: #f9f9f9;
+ box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+ z-index: 1;
+}
+
+.menu-content button {
+ color: black;
+ padding: 12px 16px;
+ text-decoration: none;
+ display: block;
+ background: none;
+ border: none;
+ width: 100%;
+ text-align: left;
+}
+
+.menu-content button:hover {
+ background-color: #f1f1f1;
+}
+
+.menu.show .menu-content {
+ display: block;
+}
diff --git a/routes/auth.js b/routes/auth.js
index 1827016..a3145e0 100644
--- a/routes/auth.js
+++ b/routes/auth.js
@@ -20,8 +20,17 @@ router.post('/logout', (req, res) => {
if (err) {
return res.status(500).send('Error logging out');
}
+ res.clearCookie('connect.sid');
res.status(200).send('Logout successful');
});
});
+router.get('/check-session', (req, res) => {
+ if (req.session.user) {
+ res.json({ loggedIn: true });
+ } else {
+ res.json({ loggedIn: false });
+ }
+});
+
module.exports = router;
\ No newline at end of file
diff --git a/routes/tasks.js b/routes/tasks.js
index 456c308..88fa183 100644
--- a/routes/tasks.js
+++ b/routes/tasks.js
@@ -1,8 +1,8 @@
const express = require('express');
const fs = require('fs');
const path = require('path');
-const debug = require('debug')('app');
const auth = require('../middleware/auth');
+const logger = require('../logger');
const router = express.Router();
const dataDir = '/data';
@@ -28,7 +28,8 @@ router.post('/add-task', auth, async (req, res) => {
SCHEDULED: <${scheduled}>
:LOGBOOK:
- State "TODO" from "TODO" [${currentDateTime}]
- :END:`;
+ :END:
+ `;
if (description) {
orgFormattedData = `
@@ -37,7 +38,8 @@ router.post('/add-task', auth, async (req, res) => {
SCHEDULED: <${scheduled}>
:LOGBOOK:
- State "TODO" from "TODO" [${currentDateTime}]
- :END:`;
+ :END:
+ `;
}
const filePath = path.join(dataDir, 'tasks.org');
@@ -45,7 +47,7 @@ router.post('/add-task', auth, async (req, res) => {
await fs.promises.appendFile(filePath, orgFormattedData);
res.send({ message: 'Task added successfully!' });
} catch (err) {
- debug('Error writing to file:', err);
+ logger.error('Error writing to file:', err);
res.status(500).send('Error writing to file.');
}
});
@@ -58,7 +60,7 @@ router.post('/save-tags', auth, async (req, res) => {
await fs.promises.writeFile(filePath, JSON.stringify(tags));
res.send({ message: 'Tags saved successfully!' });
} catch (err) {
- debug('Error saving tags:', err);
+ logger.error('Error saving tags:', err);
res.status(500).send('Error saving tags.');
}
});
@@ -67,12 +69,12 @@ router.post('/save-tags', auth, async (req, res) => {
router.get('/get-tags', auth, async (req, res) => {
const filePath = path.join(dataDir, 'tags.json');
try {
- const data = await fs.promises.readFile(filePath);
+ const data = await fs.promises.readFile(filePath, 'utf-8');
const tags = JSON.parse(data);
- res.send(tags);
+ res.json(tags);
} catch (err) {
- debug('Error retrieving tags:', err);
- res.status(500).send('Error retrieving tags.');
+ logger.error('Error retrieving tags:', err);
+ res.status(500).json({ error: 'Error retrieving tags' });
}
});
diff --git a/server.js b/server.js
index 636adb1..7387e5a 100644
--- a/server.js
+++ b/server.js
@@ -2,26 +2,29 @@ require('dotenv').config();
const express = require('express');
const bodyParser = require('body-parser');
const session = require('express-session');
+const cookieParser = require('cookie-parser');
const debug = require('debug')('app');
const tasksRouter = require('./routes/tasks');
const authRouter = require('./routes/auth');
+const authMiddleware = require('./middleware/auth');
const app = express();
const port = 3044;
app.use(bodyParser.json());
+app.use(cookieParser());
app.use(express.static('public'));
// Configure session middleware
app.use(session({
secret: process.env.SESSION_SECRET || 'default_secret', // Use a strong secret in production
resave: false,
- saveUninitialized: true,
- cookie: { secure: false } // Set to true if using HTTPS
+ saveUninitialized: false,
+ cookie: { secure: false, maxAge: 24 * 60 * 60 * 1000 } // 1 day
}));
-app.use('/', tasksRouter);
app.use('/', authRouter);
+app.use('/', authMiddleware, tasksRouter);
app.listen(port, () => {
debug(`Server running at http://localhost:${port}`);