Tar bort dubbel kod

Längre intervall på healthcheck
Implement server-side authentication and update login UI texts
2025-01-24 23:37:19 +01:00 · 2025-01-24 23:17:02 +01:00 · 2025-01-24 21:54:05 +01:00 · 2025-01-24 21:40:16 +01:00 · 2025-01-24 21:34:53 +01:00 · 2025-01-24 21:33:09 +01:00
17 changed files with 414 additions and 111 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,10 +9,20 @@ services:
    volumes:
      - /srv/swarm/org-todo-pwa/data:/data
    user: "1000:1000"
+    environment:
+      - DEBUG=app
+      - AUTH_USERNAME=fredrik
+      - AUTH_PASSWORD=apa
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3044"]
+      interval: 5m
+      timeout: 10s
+      retries: 3
    deploy:
      labels:
        - "traefik.enable=true"
        - "traefik.http.routers.plan.tls=true"
        - "traefik.http.routers.plan.tls.certresolver=myhttpchallenge"
        - "traefik.http.routers.plan.rule=Host(`todo.casablanca.wahlberg.se`)"
-        - "traefik.http.routers.plan.entrypoints=websecure"
+        - "traefik.http.routers.plan.entrypoints=websecure"
+        
--- a/favicon.ico
+++ b/favicon.ico
--- a/logger.js
+++ b/logger.js
@@ -0,0 +1,16 @@
+const { createLogger, format, transports } = require('winston');
+
+const logger = createLogger({
+    level: 'info',
+    format: format.combine(
+        format.timestamp(),
+        format.json()
+    ),
+    transports: [
+        new transports.Console(),
+        new transports.File({ filename: 'app.log' })
+    ]
+});
+
+module.exports = logger;
+
--- a/middleware/auth.js
+++ b/middleware/auth.js
@@ -0,0 +1,16 @@
+const basicAuth = require('basic-auth');
+
+const auth = (req, res, next) => {
+    const user = basicAuth(req);
+    const username = process.env.AUTH_USERNAME; // Use environment variables
+    const password = process.env.AUTH_PASSWORD; // Use environment variables
+
+    if (user && user.name === username && user.pass === password) {
+        return next();
+    } else {
+        res.set('WWW-Authenticate', 'Basic realm="401"');
+        return res.status(401).send('Authentication required.');
+    }
+};
+
+module.exports = auth;
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,10 +12,35 @@
        "basic-auth": "^2.0.1",
        "body-parser": "^1.20.3",
        "debug": "^4.4.0",
+        "dotenv": "^16.4.7",
        "express": "^4.21.2",
-        "fs": "^0.0.1-security"
+        "fs": "^0.0.1-security",
+        "winston": "^3.17.0"
      }
    },
+    "node_modules/@colors/colors": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz",
+      "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==",
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/@dabh/diagnostics": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
+      "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
+      "dependencies": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
+    "node_modules/@types/triple-beam": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz",
+      "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw=="
+    },
    "node_modules/accepts": {
      "version": "1.3.8",
      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -33,6 +58,11 @@
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
+    },
    "node_modules/basic-auth": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz",
@@ -120,6 +150,46 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "dependencies": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/colorspace": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
+      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+      "dependencies": {
+        "color": "^3.1.3",
+        "text-hex": "1.0.x"
+      }
+    },
    "node_modules/content-disposition": {
      "version": "0.5.4",
      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -185,6 +255,17 @@
        "npm": "1.2.8000 || >= 1.4.16"
      }
    },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
    "node_modules/dunder-proto": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -203,6 +284,11 @@
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
    },
+    "node_modules/enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
+    },
    "node_modules/encodeurl": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
@@ -309,6 +395,11 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
+    "node_modules/fecha": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
+      "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
+    },
    "node_modules/finalhandler": {
      "version": "1.3.1",
      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
@@ -339,6 +430,11 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
+    "node_modules/fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+    },
    "node_modules/forwarded": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -475,6 +571,43 @@
        "node": ">= 0.10"
      }
    },
+    "node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
+    },
+    "node_modules/logform": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.7.0.tgz",
+      "integrity": "sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==",
+      "dependencies": {
+        "@colors/colors": "1.6.0",
+        "@types/triple-beam": "^1.3.2",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "safe-stable-stringify": "^2.3.1",
+        "triple-beam": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
    "node_modules/math-intrinsics": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -572,6 +705,14 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+      "dependencies": {
+        "fn.name": "1.x.x"
+      }
+    },
    "node_modules/parseurl": {
      "version": "1.3.3",
      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -633,6 +774,19 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -652,6 +806,14 @@
        }
      ]
    },
+    "node_modules/safe-stable-stringify": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
+      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/safer-buffer": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -788,6 +950,22 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==",
+      "engines": {
+        "node": "*"
+      }
+    },
    "node_modules/statuses": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -796,6 +974,19 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+    },
    "node_modules/toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -804,6 +995,14 @@
        "node": ">=0.6"
      }
    },
+    "node_modules/triple-beam": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz",
+      "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==",
+      "engines": {
+        "node": ">= 14.0.0"
+      }
+    },
    "node_modules/type-is": {
      "version": "1.6.18",
      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -824,6 +1023,11 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
    "node_modules/utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -839,6 +1043,40 @@
      "engines": {
        "node": ">= 0.8"
      }
+    },
+    "node_modules/winston": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
+      "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
+      "dependencies": {
+        "@colors/colors": "^1.6.0",
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.2.3",
+        "is-stream": "^2.0.0",
+        "logform": "^2.7.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "safe-stable-stringify": "^2.3.1",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.9.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/winston-transport": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.9.0.tgz",
+      "integrity": "sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==",
+      "dependencies": {
+        "logform": "^2.7.0",
+        "readable-stream": "^3.6.2",
+        "triple-beam": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
    "basic-auth": "^2.0.1",
    "body-parser": "^1.20.3",
    "debug": "^4.4.0",
+    "dotenv": "^16.4.7",
    "express": "^4.21.2",
-    "fs": "^0.0.1-security"
+    "fs": "^0.0.1-security",
+    "winston": "^3.17.0"
  }
 }
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/app.js
+++ b/public/app.js
@@ -29,15 +29,27 @@ document.addEventListener('DOMContentLoaded', function() {
        const username = document.getElementById('username').value;
        const password = document.getElementById('password').value;

-        // Simple authentication check (replace with your own logic)
-        if (username === 'fredrik' && password === 'apa') {
-            sessionStorage.setItem('loggedIn', 'true');
-            loginContainer.style.display = 'none';
-            appContainer.style.display = 'block';
-            loadTags();
-        } else {
-            loginMessage.textContent = 'Invalid username or password';
-        }
+        // Send credentials to the server for validation
+        fetch('/login', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Basic ' + btoa(username + ':' + password)
+            }
+        })
+        .then(response => {
+            if (response.ok) {
+                sessionStorage.setItem('loggedIn', 'true');
+                loginContainer.style.display = 'none';
+                appContainer.style.display = 'block';
+                loadTags();
+            } else {
+                loginMessage.textContent = 'Invalid username or password';
+            }
+        })
+        .catch(error => {
+            loginMessage.textContent = 'Error logging in';
+        });
    });

    document.getElementById('taskForm').addEventListener('submit', function(e) {
@@ -52,7 +64,7 @@ document.addEventListener('DOMContentLoaded', function() {

        // Structure data for Org mode
        const taskData = {
-            subject: `${subject} :${tags}:`,
+            subject: tags ? `${subject} :${tags}:` : subject,
            description,
            scheduled
        };
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon-16x16.png
+++ b/public/favicon-16x16.png
--- a/public/favicon-32x32.png
+++ b/public/favicon-32x32.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -14,14 +14,14 @@
 </head>
 <body>
    <div id="loginContainer" class="container">
-        <h1 class="center-align">Login</h1>
+        <h1 class="center-align">Logga in</h1>
        <form id="loginForm">
            <div class="input-field">
-                <label for="username">Username:</label>
+                <label for="username">Användarnamn:</label>
                <input type="text" id="username" required>
            </div>
            <div class="input-field">
-                <label for="password">Password:</label>
+                <label for="password">Lösenord:</label>
                <input type="password" id="password" required>
            </div>
            <button class="btn waves-effect waves-light" type="submit">Login</button>
@@ -48,7 +48,7 @@
            </div>

            <div class="input-field">
-                <label for="tags">Tags (separated by commas):</label>
+                <label for="tags">Taggar (separera med komma):</label>
                <input type="text" id="tags" class="autocomplete">
            </div>

--- a/routes/auth.js
+++ b/routes/auth.js
@@ -0,0 +1,17 @@
+const express = require('express');
+const basicAuth = require('basic-auth');
+const router = express.Router();
+
+router.post('/login', (req, res) => {
+    const user = basicAuth(req);
+    const username = process.env.AUTH_USERNAME;
+    const password = process.env.AUTH_PASSWORD;
+
+    if (user && user.name === username && user.pass === password) {
+        res.status(200).send('Login successful');
+    } else {
+        res.status(401).send('Authentication required');
+    }
+});
+
+module.exports = router;
--- a/routes/tasks.js
+++ b/routes/tasks.js
@@ -0,0 +1,81 @@
+const express = require('express');
+const fs = require('fs');
+const path = require('path');
+const auth = require('../middleware/auth');
+const logger = require('../logger');
+
+const router = express.Router();
+const dataDir = '/data';
+
+// Ensure the /data directory exists
+if (!fs.existsSync(dataDir)) {
+    fs.mkdirSync(dataDir, { recursive: true });
+}
+
+// Ensure the tags.json file exists
+const tagsFilePath = path.join(dataDir, 'tags.json');
+if (!fs.existsSync(tagsFilePath)) {
+    fs.writeFileSync(tagsFilePath, JSON.stringify([]));
+}
+
+// Protect the /add-task endpoint with authentication
+router.post('/add-task', auth, async (req, res) => {
+    const { subject, description, scheduled } = req.body;
+    const currentDateTime = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
+
+    let orgFormattedData = `
+* TODO ${subject}
+  SCHEDULED: <${scheduled}>
+  :LOGBOOK:
+  - State "TODO" from "TODO" [${currentDateTime}]
+  :END:
+    `;
+
+    if (description) {
+        orgFormattedData = `
+* TODO ${subject}
+  ${description}
+  SCHEDULED: <${scheduled}>
+  :LOGBOOK:
+  - State "TODO" from "TODO" [${currentDateTime}]
+  :END:
+        `;
+    }
+
+    const filePath = path.join(dataDir, 'tasks.org');
+    try {
+        await fs.promises.appendFile(filePath, orgFormattedData);
+        res.send({ message: 'Task added successfully!' });
+    } catch (err) {
+        logger.error('Error writing to file:', err);
+        res.status(500).send('Error writing to file.');
+    }
+});
+
+// Endpoint to save tags
+router.post('/save-tags', auth, async (req, res) => {
+    const { tags } = req.body;
+    const filePath = path.join(dataDir, 'tags.json');
+    try {
+        await fs.promises.writeFile(filePath, JSON.stringify(tags));
+        res.send({ message: 'Tags saved successfully!' });
+    } catch (err) {
+        logger.error('Error saving tags:', err);
+        res.status(500).send('Error saving tags.');
+    }
+});
+
+// Endpoint to retrieve tags
+router.get('/get-tags', auth, async (req, res) => {
+    const filePath = path.join(dataDir, 'tags.json');
+    try {
+        const data = await fs.promises.readFile(filePath, 'utf-8');
+        const tags = JSON.parse(data);
+        res.json(tags);
+    } catch (err) {
+        logger.error('Error retrieving tags:', err);
+        res.status(500).json({ error: 'Error retrieving tags' });
+    }
+});
+
+module.exports = router;
--- a/server.js
+++ b/server.js
@@ -1,106 +1,17 @@
+require('dotenv').config();
 const express = require('express');
 const bodyParser = require('body-parser');
-const fs = require('fs');
-const path = require('path');
-const basicAuth = require('basic-auth');
 const debug = require('debug')('app');
+const tasksRouter = require('./routes/tasks');
+const authRouter = require('./routes/auth');

 const app = express();
 const port = 3044;

 app.use(bodyParser.json());
 app.use(express.static('public'));
-
-// Ensure the /data directory exists
-const dataDir = '/data';
-if (!fs.existsSync(dataDir)) {
-    fs.mkdirSync(dataDir, { recursive: true });
-}
-
-// Ensure the tags.json file exists
-const tagsFilePath = path.join(dataDir, 'tags.json');
-if (!fs.existsSync(tagsFilePath)) {
-    fs.writeFileSync(tagsFilePath, JSON.stringify([]));
-}
-
-// Authentication middleware
-const auth = (req, res, next) => {
-    const user = basicAuth(req);
-    const username = 'fredrik'; // Replace with your desired username
-    const password = 'apa'; // Replace with your desired password
-
-    if (user && user.name === username && user.pass === password) {
-        return next();
-    } else {
-        res.set('WWW-Authenticate', 'Basic realm="401"');
-        return res.status(401).send('Authentication required.');
-    }
-};
-
-// Protect the /add-task endpoint with authentication
-app.post('/add-task', auth, (req, res) => {
-    const { subject, description, scheduled } = req.body;
-    const currentDateTime = new Date().toISOString().replace(/T/, ' ').replace(/\..+/, '');
-
-    let orgFormattedData = `
-* TODO ${subject}
-  SCHEDULED: <${scheduled}>
-  :LOGBOOK:
-  - State "TODO" from "TODO" [${currentDateTime}]
-  :END:
-    `;
-
-    if (description) {
-        orgFormattedData = `
-* TODO ${subject}
-  ${description}
-  SCHEDULED: <${scheduled}>
-  :LOGBOOK:
-  - State "TODO" from "TODO" [${currentDateTime}]
-  :END:
-        `;
-    }
-
-    const filePath = path.join(dataDir, 'tasks.org');
-    fs.appendFile(filePath, orgFormattedData, (err) => {
-        if (err) {
-            debug('Error writing to file:', err);
-            return res.status(500).send('Error writing to file.');
-        }
-        res.send({ message: 'Task added successfully!' });
-    });
-});
-
-// Endpoint to save tags
-app.post('/save-tags', auth, (req, res) => {
-    const { tags } = req.body;
-    const filePath = path.join(dataDir, 'tags.json');
-    fs.writeFile(filePath, JSON.stringify(tags), (err) => {
-        if (err) {
-            debug('Error saving tags:', err);
-            return res.status(500).send('Error saving tags.');
-        }
-        res.send({ message: 'Tags saved successfully!' });
-    });
-});
-
-// Endpoint to retrieve tags
-app.get('/get-tags', auth, (req, res) => {
-    const filePath = path.join(dataDir, 'tags.json');
-    fs.readFile(filePath, (err, data) => {
-        if (err) {
-            debug('Error retrieving tags:', err);
-            return res.status(500).send('Error retrieving tags.');
-        }
-        try {
-            const tags = JSON.parse(data);
-            res.send(tags);
-        } catch (e) {
-            debug('Error parsing tags JSON:', e);
-            res.send([]);
-        }
-    });
-});
+app.use('/', tasksRouter);
+app.use('/', authRouter);

 app.listen(port, () => {
    debug(`Server running at http://localhost:${port}`);
Author	SHA1	Message	Date
Fredrik Wahlberg	90d7f2a5d2	Tar bort dubbel kod	2025-01-24 23:37:19 +01:00
Fredrik Wahlberg	87feaa9880	Längre intervall på healthcheck	2025-01-24 23:17:02 +01:00
Fredrik Wahlberg	da2f568acf	Implement server-side authentication and update login UI texts	2025-01-24 21:54:05 +01:00
Fredrik Wahlberg	1edcefbd64	Ta bort kolon vid tomma taggar. Fixar #12	2025-01-24 21:40:16 +01:00
fredrik	276587f1dc	Merge pull request 'cleanup' (#11 ) from cleanup into main Reviewed-on: #11	2025-01-24 21:34:53 +01:00
Fredrik Wahlberg	adbe5fcfb4	Lägg till hälsokontroll för tjänsten i docker-compose, fixes #8	2025-01-24 21:33:09 +01:00
Fredrik Wahlberg	a58da5398c	Lägg till hälsokontroll för tjänsten i docker-compose	2025-01-24 21:30:19 +01:00
fredrik	51656c0ee4	Merge pull request 'Lägg till autentisering och loggning, refaktorisera uppgifter till router' (#9 ) from cleanup into main Reviewed-on: #9	2025-01-24 21:26:50 +01:00
Fredrik Wahlberg	e091da93e9	Lägg till autentisering och loggning, refaktorisera uppgifter till router	2025-01-24 21:26:06 +01:00
Fredrik Wahlberg	70365715fe	Uppdaterar iconerna	2025-01-24 21:08:18 +01:00