make keys unique for the new tooltip

.env.example

@@ -4,3 +4,4 @@ EVE_SSO_SECRET=Secret Key
 EVE_SSO_CALLBACK_URL=Callback URL (This should be the domain you are hosting at or if run locally it should be http://localhost:3000)
 NEXT_PUBLIC_PRAISAL_URL=https://praisal.avanto.tk/appraisal/structured.json?persist=no
 SENTRY_AUTH_TOKEN=Sentry token for error reporting.
+LOG_LEVEL=warn

compose.yml

@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   eve-pi:
     image: ghcr.io/calli-eve/eve-pi:latest
@@ -10,6 +8,7 @@ services:
       - EVE_SSO_SECRET=${EVE_SSO_SECRET}
       - NEXT_PUBLIC_PRAISAL_URL=${NEXT_PUBLIC_PRAISAL_URL}
       - SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
+      - LOG_LEVEL=warn
     ports:
       - 3000:3000
     restart: unless-stopped

package-lock.json

@@ -16,6 +16,7 @@
         "@mui/material": "^5.13.5",
         "@sentry/nextjs": "^8.2.1",
         "@types/node": "20.3.1",
+        "@types/pino": "^7.0.4",
         "@types/react": "18.2.12",
         "@types/react-dom": "18.2.5",
         "autoprefixer": "10.4.14",
@@ -25,6 +26,8 @@
         "luxon": "^3.6.1",
         "next": "^14.2.23",
         "next-plausible": "^3.12.0",
+        "pino": "^9.6.0",
+        "pino-pretty": "^13.0.0",
         "react": "^18.3.1",
         "react-chartjs-2": "^5.3.0",
         "react-color": "^2.19.3",
@@ -2561,6 +2564,15 @@
         "@types/pg": "*"
       }
     },
+    "node_modules/@types/pino": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pino/-/pino-7.0.4.tgz",
+      "integrity": "sha512-yKw1UbZOTe7vP1xMQT+oz3FexwgIpBTrM+AC62vWgAkNRULgLTJWfYX+H5/sKPm8VXFbIcXkC3VZPyuaNioZFg==",
+      "license": "MIT",
+      "dependencies": {
+        "pino": "*"
+      }
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.5",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -3175,6 +3187,15 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/atomic-sleep": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.14",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
@@ -3713,6 +3734,12 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "license": "MIT"
+    },
     "node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -3845,6 +3872,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -5046,6 +5082,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/fast-copy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
+      "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==",
+      "license": "MIT"
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5102,6 +5144,21 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
+    "node_modules/fast-redact": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
+      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
+    },
     "node_modules/fast-uri": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
@@ -5607,6 +5664,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==",
+      "license": "MIT"
+    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -6302,6 +6365,15 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -6942,6 +7014,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/on-exit-leak-free": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
+      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -7189,6 +7270,67 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pino": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-9.6.0.tgz",
+      "integrity": "sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==",
+      "license": "MIT",
+      "dependencies": {
+        "atomic-sleep": "^1.0.0",
+        "fast-redact": "^3.1.1",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pino-std-serializers": "^7.0.0",
+        "process-warning": "^4.0.0",
+        "quick-format-unescaped": "^4.0.3",
+        "real-require": "^0.2.0",
+        "safe-stable-stringify": "^2.3.1",
+        "sonic-boom": "^4.0.1",
+        "thread-stream": "^3.0.0"
+      },
+      "bin": {
+        "pino": "bin.js"
+      }
+    },
+    "node_modules/pino-abstract-transport": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
+      "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
+      "license": "MIT",
+      "dependencies": {
+        "split2": "^4.0.0"
+      }
+    },
+    "node_modules/pino-pretty": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.0.0.tgz",
+      "integrity": "sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==",
+      "license": "MIT",
+      "dependencies": {
+        "colorette": "^2.0.7",
+        "dateformat": "^4.6.3",
+        "fast-copy": "^3.0.2",
+        "fast-safe-stringify": "^2.1.1",
+        "help-me": "^5.0.0",
+        "joycon": "^3.1.1",
+        "minimist": "^1.2.6",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pump": "^3.0.0",
+        "secure-json-parse": "^2.4.0",
+        "sonic-boom": "^4.0.1",
+        "strip-json-comments": "^3.1.1"
+      },
+      "bin": {
+        "pino-pretty": "bin.js"
+      }
+    },
+    "node_modules/pino-std-serializers": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
+      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==",
+      "license": "MIT"
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -7332,6 +7474,22 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/process-warning": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.1.tgz",
+      "integrity": "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -7393,6 +7551,12 @@
         }
       ]
     },
+    "node_modules/quick-format-unescaped": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
+      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==",
+      "license": "MIT"
+    },
     "node_modules/raf-schd": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -7548,6 +7712,15 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/real-require": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
+      "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
     "node_modules/redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -7900,6 +8073,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/scheduler": {
       "version": "0.23.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -7928,6 +8110,12 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/secure-json-parse": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
+      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==",
+      "license": "BSD-3-Clause"
+    },
     "node_modules/semver": {
       "version": "7.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
@@ -8210,6 +8398,15 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
+    "node_modules/sonic-boom": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
+      "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
+      "license": "MIT",
+      "dependencies": {
+        "atomic-sleep": "^1.0.0"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -8248,6 +8445,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/stacktrace-parser": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
@@ -8746,6 +8952,15 @@
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
+    "node_modules/thread-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
+      "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
+      "license": "MIT",
+      "dependencies": {
+        "real-require": "^0.2.0"
+      }
+    },
     "node_modules/three": {
       "version": "0.154.0",
       "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz",
@@ -11006,6 +11221,14 @@
         "@types/pg": "*"
       }
     },
+    "@types/pino": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pino/-/pino-7.0.4.tgz",
+      "integrity": "sha512-yKw1UbZOTe7vP1xMQT+oz3FexwgIpBTrM+AC62vWgAkNRULgLTJWfYX+H5/sKPm8VXFbIcXkC3VZPyuaNioZFg==",
+      "requires": {
+        "pino": "*"
+      }
+    },
     "@types/prop-types": {
       "version": "15.7.5",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
@@ -11494,6 +11717,11 @@
       "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "dev": true
     },
+    "atomic-sleep": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
+      "integrity": "sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="
+    },
     "autoprefixer": {
       "version": "10.4.14",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
@@ -11828,6 +12056,11 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
+    },
     "commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -11928,6 +12161,11 @@
         "is-data-view": "^1.0.1"
       }
     },
+    "dateformat": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+      "integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="
+    },
     "debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -12757,6 +12995,11 @@
       "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
     },
+    "fast-copy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-3.0.2.tgz",
+      "integrity": "sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ=="
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -12807,6 +13050,16 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
+    "fast-redact": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/fast-redact/-/fast-redact-3.5.0.tgz",
+      "integrity": "sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A=="
+    },
+    "fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+    },
     "fast-uri": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
@@ -13135,6 +13388,11 @@
         "function-bind": "^1.1.2"
       }
     },
+    "help-me": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz",
+      "integrity": "sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg=="
+    },
     "hoist-non-react-statics": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -13565,6 +13823,11 @@
         }
       }
     },
+    "joycon": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",
+      "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -13985,6 +14248,11 @@
         "es-object-atoms": "^1.0.0"
       }
     },
+    "on-exit-leak-free": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz",
+      "integrity": "sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA=="
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -14151,6 +14419,57 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
+    "pino": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/pino/-/pino-9.6.0.tgz",
+      "integrity": "sha512-i85pKRCt4qMjZ1+L7sy2Ag4t1atFcdbEt76+7iRJn1g2BvsnRMGu9p8pivl9fs63M2kF/A0OacFZhTub+m/qMg==",
+      "requires": {
+        "atomic-sleep": "^1.0.0",
+        "fast-redact": "^3.1.1",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pino-std-serializers": "^7.0.0",
+        "process-warning": "^4.0.0",
+        "quick-format-unescaped": "^4.0.3",
+        "real-require": "^0.2.0",
+        "safe-stable-stringify": "^2.3.1",
+        "sonic-boom": "^4.0.1",
+        "thread-stream": "^3.0.0"
+      }
+    },
+    "pino-abstract-transport": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
+      "integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
+      "requires": {
+        "split2": "^4.0.0"
+      }
+    },
+    "pino-pretty": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/pino-pretty/-/pino-pretty-13.0.0.tgz",
+      "integrity": "sha512-cQBBIVG3YajgoUjo1FdKVRX6t9XPxwB9lcNJVD5GCnNM4Y6T12YYx8c6zEejxQsU0wrg9TwmDulcE9LR7qcJqA==",
+      "requires": {
+        "colorette": "^2.0.7",
+        "dateformat": "^4.6.3",
+        "fast-copy": "^3.0.2",
+        "fast-safe-stringify": "^2.1.1",
+        "help-me": "^5.0.0",
+        "joycon": "^3.1.1",
+        "minimist": "^1.2.6",
+        "on-exit-leak-free": "^2.1.0",
+        "pino-abstract-transport": "^2.0.0",
+        "pump": "^3.0.0",
+        "secure-json-parse": "^2.4.0",
+        "sonic-boom": "^4.0.1",
+        "strip-json-comments": "^3.1.1"
+      }
+    },
+    "pino-std-serializers": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-7.0.0.tgz",
+      "integrity": "sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA=="
+    },
     "possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -14235,6 +14554,11 @@
         "fast-diff": "^1.1.2"
       }
     },
+    "process-warning": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/process-warning/-/process-warning-4.0.1.tgz",
+      "integrity": "sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q=="
+    },
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -14274,6 +14598,11 @@
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
+    "quick-format-unescaped": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz",
+      "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg=="
+    },
     "raf-schd": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz",
@@ -14393,6 +14722,11 @@
         "picomatch": "^2.2.1"
       }
     },
+    "real-require": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
+      "integrity": "sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg=="
+    },
     "redux": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
@@ -14608,6 +14942,11 @@
         "is-regex": "^1.2.1"
       }
     },
+    "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=="
+    },
     "scheduler": {
       "version": "0.23.2",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
@@ -14627,6 +14966,11 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "secure-json-parse": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz",
+      "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw=="
+    },
     "semver": {
       "version": "7.7.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
@@ -14818,6 +15162,14 @@
         }
       }
     },
+    "sonic-boom": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",
+      "integrity": "sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==",
+      "requires": {
+        "atomic-sleep": "^1.0.0"
+      }
+    },
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -14846,6 +15198,11 @@
         }
       }
     },
+    "split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="
+    },
     "stacktrace-parser": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz",
@@ -15177,6 +15534,14 @@
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
+    "thread-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",
+      "integrity": "sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==",
+      "requires": {
+        "real-require": "^0.2.0"
+      }
+    },
     "three": {
       "version": "0.154.0",
       "resolved": "https://registry.npmjs.org/three/-/three-0.154.0.tgz",

package.json

@@ -18,6 +18,7 @@
     "@mui/material": "^5.13.5",
     "@sentry/nextjs": "^8.2.1",
     "@types/node": "20.3.1",
+    "@types/pino": "^7.0.4",
     "@types/react": "18.2.12",
     "@types/react-dom": "18.2.5",
     "autoprefixer": "10.4.14",
@@ -27,6 +28,8 @@
     "luxon": "^3.6.1",
     "next": "^14.2.23",
     "next-plausible": "^3.12.0",
+    "pino": "^9.6.0",
+    "pino-pretty": "^13.0.0",
     "react": "^18.3.1",
     "react-chartjs-2": "^5.3.0",
     "react-color": "^2.19.3",

src/app/components/Account/AccountCard.tsx

@@ -1,4 +1,4 @@
-import { AccessToken } from "@/types";
+import { AccessToken, PlanetWithInfo, Pin } from "@/types";
 import { Box, Stack, Typography, useTheme, Paper, IconButton, Divider } from "@mui/material";
 import { CharacterRow } from "../Characters/CharacterRow";
 import { PlanetaryInteractionRow } from "../PlanetaryInteraction/PlanetaryInteractionRow";
@@ -9,7 +9,9 @@ import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
 import KeyboardArrowUpIcon from '@mui/icons-material/KeyboardArrowUp';
 import { planetCalculations } from "@/planets";
 import { EvePraisalResult } from "@/eve-praisal";
-import { STORAGE_IDS } from "@/const";
+import { STORAGE_IDS, PI_SCHEMATICS, PI_PRODUCT_VOLUMES, STORAGE_CAPACITIES } from "@/const";
+import { DateTime } from "luxon";
+import { PlanetCalculations, AlertState, StorageContent, StorageInfo } from "@/types/planet";
 
 interface AccountTotals {
   monthlyEstimate: number;
@@ -20,6 +22,146 @@ interface AccountTotals {
   totalExtractors: number;
 }
 
+const calculateAlertState = (planetDetails: PlanetCalculations): AlertState => {
+  const hasLowStorage = planetDetails.storageInfo.some(storage => storage.fillRate > 60);
+  const hasLowImports = planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24);
+  
+  return {
+    expired: planetDetails.expired,
+    hasLowStorage,
+    hasLowImports,
+    hasLargeExtractorDifference: planetDetails.hasLargeExtractorDifference
+  };
+};
+
+const calculatePlanetDetails = (planet: PlanetWithInfo, piPrices: EvePraisalResult | undefined, balanceThreshold: number): PlanetCalculations => {
+  const { expired, extractors, localProduction: rawProduction, localImports, localExports: rawExports } = planetCalculations(planet);
+  
+  // Convert localProduction to include factoryCount
+  const localProduction = new Map(Array.from(rawProduction).map(([key, value]) => [
+    key,
+    {
+      ...value,
+      factoryCount: value.count || 1
+    }
+  ]));
+
+  // Calculate extractor averages and check for large differences
+  const extractorAverages = extractors
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
+    .map(e => {
+      const cycleTime = e.extractor_details?.cycle_time || 3600;
+      const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
+      return {
+        typeId: e.extractor_details!.product_type_id!,
+        averagePerHour: (qtyPerCycle * 3600) / cycleTime
+      };
+    });
+
+  const hasLargeExtractorDifference = extractorAverages.length === 2 && 
+    Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
+
+  // Calculate storage info
+  const storageFacilities = planet.info.pins.filter((pin: Pin) => 
+    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
+  );
+
+  const storageInfo = storageFacilities.map((storage: Pin) => {
+    if (!storage || !storage.contents) return null;
+
+    const storageType = STORAGE_IDS().find(s => s.type_id === storage.type_id)?.name || 'Unknown';
+    const storageCapacity = STORAGE_CAPACITIES[storage.type_id] || 0;
+    
+    const totalVolume = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
+        return sum + (item.amount * volume);
+      }, 0);
+
+    const totalValue = (storage.contents || [])
+      .reduce((sum: number, item: StorageContent) => {
+        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
+        return sum + (item.amount * price);
+      }, 0);
+
+    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
+
+    return {
+      type: storageType,
+      type_id: storage.type_id,
+      capacity: storageCapacity,
+      used: totalVolume,
+      fillRate: fillRate,
+      value: totalValue
+    };
+  }).filter(Boolean) as StorageInfo[];
+
+  // Calculate import depletion times
+  const importDepletionTimes = localImports.map(i => {
+    // Find all storage facilities containing this import
+    const storagesWithImport = storageFacilities.filter((storage: Pin) => 
+      storage.contents?.some((content: StorageContent) => content.type_id === i.type_id)
+    );
+    
+    // Get the total amount in all storage facilities
+    const totalAmount = storagesWithImport.reduce((sum: number, storage: Pin) => {
+      const content = storage.contents?.find((content: StorageContent) => content.type_id === i.type_id);
+      return sum + (content?.amount ?? 0);
+    }, 0);
+
+    // Calculate consumption rate per hour
+    const schematic = PI_SCHEMATICS.find(s => s.schematic_id === i.schematic_id);
+    const cycleTime = schematic?.cycle_time ?? 3600;
+    const consumptionPerHour = i.quantity * i.factoryCount * (3600 / cycleTime);
+
+    // Calculate time until depletion in hours, starting from last_update
+    const lastUpdate = DateTime.fromISO(planet.last_update);
+    const now = DateTime.now();
+    const hoursSinceUpdate = now.diff(lastUpdate, 'hours').hours;
+    const remainingAmount = Math.max(0, totalAmount - (consumptionPerHour * hoursSinceUpdate));
+    const hoursUntilDepletion = consumptionPerHour > 0 ? remainingAmount / consumptionPerHour : 0;
+
+    // Calculate monthly cost
+    const price = piPrices?.appraisal.items.find((a) => a.typeID === i.type_id)?.prices.sell.min ?? 0;
+    const monthlyCost = (consumptionPerHour * 24 * 30 * price) / 1000000; // Cost in millions
+
+    return {
+      typeId: i.type_id,
+      hoursUntilDepletion,
+      monthlyCost
+    };
+  });
+
+  // Convert localExports to match the LocalExport interface
+  const localExports = rawExports.map(e => {
+    const schematic = PI_SCHEMATICS.flatMap(s => s.outputs)
+      .find(s => s.type_id === e.typeId)?.schematic_id ?? 0;
+    const factoryCount = planet.info.pins
+      .filter(p => p.schematic_id === schematic)
+      .length;
+    
+    return {
+      type_id: e.typeId,
+      schematic_id: schematic,
+      quantity: e.amount / factoryCount, // Convert total amount back to per-factory quantity
+      factoryCount
+    };
+  });
+
+  return {
+    expired,
+    extractors,
+    localProduction,
+    localImports,
+    localExports,
+    storageInfo,
+    extractorAverages,
+    hasLargeExtractorDifference,
+    importDepletionTimes,
+    visibility: 'visible' as const
+  };
+};
+
 const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalResult | undefined): AccountTotals => {
   let totalMonthlyEstimate = 0;
   let totalStorageValue = 0;
@@ -86,14 +228,49 @@ const calculateAccountTotals = (characters: AccessToken[], piPrices: EvePraisalR
 export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { characters: AccessToken[], isCollapsed?: boolean }) => {
   const theme = useTheme();
   const [localIsCollapsed, setLocalIsCollapsed] = useState(false);
-  const { planMode, piPrices } = useContext(SessionContext);
+  const { planMode, piPrices, alertMode, balanceThreshold } = useContext(SessionContext);
   const { monthlyEstimate, storageValue, planetCount, characterCount, runningExtractors, totalExtractors } = calculateAccountTotals(characters, piPrices);
 
+  // Calculate planet details and alert states for each planet
+  const planetDetails = characters.reduce((acc, character) => {
+    character.planets.forEach(planet => {
+      const details = calculatePlanetDetails(planet, piPrices, balanceThreshold);
+      acc[`${character.character.characterId}-${planet.planet_id}`] = {
+        ...details,
+        alertState: calculateAlertState(details)
+      };
+    });
+    return acc;
+  }, {} as Record<string, PlanetCalculations & { alertState: AlertState }>);
+
   // Update local collapse state when prop changes
   useEffect(() => {
     setLocalIsCollapsed(propIsCollapsed ?? false);
   }, [propIsCollapsed]);
 
+  const getAlertVisibility = (alertState: AlertState) => {
+    if (!alertMode) return 'visible';
+    if (alertState.expired) return 'visible';
+    if (alertState.hasLowStorage) return 'visible';
+    if (alertState.hasLowImports) return 'visible';
+    if (alertState.hasLargeExtractorDifference) return 'visible';
+    return 'hidden';
+  };
+
+  // Check if any planet in the account has alerts
+  const hasAnyAlerts = Object.values(planetDetails).some(details => {
+    const alertState = calculateAlertState(details);
+    return alertState.expired || 
+           alertState.hasLowStorage || 
+           alertState.hasLowImports || 
+           alertState.hasLargeExtractorDifference;
+  });
+
+  // If in alert mode and no alerts, hide the entire card
+  if (alertMode && !hasAnyAlerts) {
+    return null;
+  }
+
   return (
     <Paper
       elevation={2}
@@ -221,7 +398,17 @@ export const AccountCard = ({ characters, isCollapsed: propIsCollapsed }: { char
             {planMode ? (
               <PlanRow character={c} />
             ) : (
-              <PlanetaryInteractionRow character={c} />
+              <PlanetaryInteractionRow 
+                character={c} 
+                planetDetails={c.planets.reduce((acc, planet) => {
+                  const details = planetDetails[`${c.character.characterId}-${planet.planet_id}`];
+                  acc[planet.planet_id] = {
+                    ...details,
+                    visibility: getAlertVisibility(details.alertState)
+                  };
+                  return acc;
+                }, {} as Record<number, PlanetCalculations & { visibility: string }>)}
+              />
             )}
           </Stack>
         ))}

src/app/components/MainGrid.tsx

@@ -49,7 +49,7 @@ declare module "@mui/material/styles" {
 
 export const MainGrid = () => {
   const { characters, updateCharacter } = useContext(CharacterContext);
-  const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode } = useContext(SessionContext);
+  const { compactMode, toggleCompactMode, alertMode, toggleAlertMode, planMode, togglePlanMode, extractionTimeMode, toggleExtractionTimeMode } = useContext(SessionContext);
   const [accountOrder, setAccountOrder] = useState<string[]>([]);
   const [allCollapsed, setAllCollapsed] = useState(false);
 
@@ -170,7 +170,7 @@ export const MainGrid = () => {
               size="small"
               style={{
                 backgroundColor: compactMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                   : "inherit",
               }}
               onClick={toggleCompactMode}
@@ -183,7 +183,7 @@ export const MainGrid = () => {
               size="small"
               style={{
                 backgroundColor: alertMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                   : "inherit",
               }}
               onClick={toggleAlertMode}
@@ -196,7 +196,7 @@ export const MainGrid = () => {
               size="small"
               style={{
                 backgroundColor: planMode
-                  ? "rgba(144, 202, 249, 0.08)"
+                  ? "rgba(144, 202, 249, 0.16)"
                   : "inherit",
               }}
               onClick={togglePlanMode}
@@ -204,6 +204,19 @@ export const MainGrid = () => {
               Plan mode
             </Button>
           </Tooltip>
+          <Tooltip title="Toggle extraction time display mode">
+            <Button
+              size="small"
+              style={{
+                backgroundColor: extractionTimeMode
+                  ? "rgba(144, 202, 249, 0.16)"
+                  : "inherit",
+              }}
+              onClick={toggleExtractionTimeMode}
+            >
+              Extraction datetime
+            </Button>
+          </Tooltip>
         </Box>
         <DragDropContextComponent onDragEnd={handleDragEnd}>
           <DroppableComponent droppableId="accounts">

src/app/components/PlanetConfig/PlanetConfigDialog.tsx

@@ -13,7 +13,7 @@ import {
 } from "@mui/material";
 import { DateTime } from "luxon";
 import Countdown from "react-countdown";
-import { timeColor } from "../PlanetaryInteraction/timeColors";
+import { timeColor } from "../PlanetaryInteraction/alerts";
 import Image from "next/image";
 import { ColorContext, SessionContext } from "@/app/context/Context";
 import { useContext } from "react";

src/app/components/PlanetaryInteraction/PlanetCard.tsx

@@ -4,18 +4,21 @@ import {
   AccessToken,
   PlanetWithInfo,
 } from "@/types";
+import { PlanetCalculations } from "@/types/planet";
 import React, { useContext } from "react";
 import { DateTime } from "luxon";
-import { EXTRACTOR_TYPE_IDS } from "@/const";
 import Countdown from "react-countdown";
-import { getProgramOutputPrediction } from "./ExtractionSimulation";
+import { ColorContext } from "@/app/context/Context";
-import {
-  alertModeVisibility,
-  extractorsHaveExpired,
-  timeColor,
-} from "./timeColors";
-import { ColorContext, SessionContext } from "@/app/context/Context";
 import { ExtractionSimulationTooltip } from "./ExtractionSimulationTooltip";
+import { timeColor } from "./alerts";
+
+interface ExtractorConfig {
+  typeId: number;
+  baseValue: number;
+  cycleTime: number;
+  installTime: string;
+  expiryTime: string;
+}
 
 const StackItem = styled(Stack)(({ theme }) => ({
   ...theme.typography.body2,
@@ -29,82 +32,31 @@ const StackItem = styled(Stack)(({ theme }) => ({
 export const PlanetCard = ({
   character,
   planet,
+  planetDetails,
 }: {
   character: AccessToken;
   planet: PlanetWithInfo;
+  planetDetails: PlanetCalculations;
 }) => {
-  const { alertMode } = useContext(SessionContext);
-
-  const planetInfo = planet.info;
-  const planetInfoUniverse = planet.infoUniverse;
-
   const theme = useTheme();
-
-  const extractorsExpiryTime =
-    (planetInfo &&
-      planetInfo.pins
-        .filter((p) => EXTRACTOR_TYPE_IDS.some((e) => e === p.type_id))
-        .map((p) => p.expiry_time)) ??
-    [];
-
   const { colors } = useContext(ColorContext);
-  const expired = extractorsHaveExpired(extractorsExpiryTime);
 
-  const CYCLE_TIME = 30 * 60; // 30 minutes in seconds
+  const extractorConfigs: ExtractorConfig[] = planetDetails.extractors
-
+    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
-  const extractors = planetInfo?.pins
+    .map(e => ({
-    .filter((p) => EXTRACTOR_TYPE_IDS.some((e) => e === p.type_id))
+      typeId: e.extractor_details!.product_type_id!,
-    .map((p) => ({
+      baseValue: e.extractor_details!.qty_per_cycle!,
-      typeId: p.type_id,
+      cycleTime: e.extractor_details?.cycle_time || 3600,
-      baseValue: p.extractor_details?.qty_per_cycle || 0,
+      installTime: e.install_time ?? "",
-      cycleTime: p.extractor_details?.cycle_time || 3600,
+      expiryTime: e.expiry_time ?? ""
-      installTime: p.install_time || "",
+    }));
-      expiryTime: p.expiry_time || "",
-      installedSchematicId: p.extractor_details?.product_type_id || undefined
-    })) || [];
-
-  // Calculate program duration and cycles for each extractor
-  const extractorPrograms = extractors.map(extractor => {
-    const installDate = new Date(extractor.installTime);
-    const expiryDate = new Date(extractor.expiryTime);
-    const programDuration = (expiryDate.getTime() - installDate.getTime()) / 1000; // Convert to seconds
-    return {
-      ...extractor,
-      programDuration,
-      cycles: Math.floor(programDuration / CYCLE_TIME)
-    };
-  });
-
-
-  // Get output predictions for each extractor
-  const extractorOutputs = extractorPrograms.map(extractor => ({
-    typeId: extractor.typeId,
-    cycleTime: CYCLE_TIME,
-    cycles: extractor.cycles,
-    prediction: getProgramOutputPrediction(
-      extractor.baseValue,
-      CYCLE_TIME,
-      extractor.cycles
-    )
-  }));
-
-  // Calculate average per hour for each extractor
-  const extractorAverages = extractorOutputs.map(extractor => {
-    const totalOutput = extractor.prediction.reduce((sum, val) => sum + val, 0);
-    const programDuration = extractor.cycles * CYCLE_TIME;
-    const averagePerHour = (totalOutput / programDuration) * 3600;
-    return {
-      typeId: extractor.typeId,
-      averagePerHour
-    };
-  });
 
   return (
     <Tooltip
       title={
-        extractors.length > 0 ? (
+        planetDetails.extractors.length > 0 ? (
           <ExtractionSimulationTooltip
-            extractors={extractors}
+            extractors={extractorConfigs}
           />
         ) : null
       }
@@ -121,14 +73,13 @@ export const PlanetCard = ({
         }
       }}
     >
-    <StackItem
+      <StackItem
-      alignItems="flex-start"
+        alignItems="flex-start"
-      height="100%"
+        height="100%"
-      position="relative"
+        position="relative"
-      minHeight={theme.custom.cardMinHeight}
+        minHeight={theme.custom.cardMinHeight}
-      visibility={alertModeVisibility(alertMode, expired)}
+        style={{ visibility: planetDetails.visibility }}
-    >
+      >
-      
         <div style={{ position: 'relative' }}>
           <Image
             unoptimized
@@ -153,55 +104,53 @@ export const PlanetCard = ({
             borderRadius: 8,
           }} />
         </div>
-     
+        {planetDetails.expired && (
-      {expired && (
+          <Image
-        <Image
+            width={32}
-          width={32}
+            height={32}
-          height={32}
+            src={`/stopped.png`}
-          src={`/stopped.png`}
+            alt=""
-          alt=""
+            style={{ position: "absolute", top: theme.custom.stoppedPosition }}
-          style={{ position: "absolute", top: theme.custom.stoppedPosition }}
+          />
-        />
+        )}
-      )}
+        <div style={{ position: "absolute", top: 5, left: 10 }}>
-      <div style={{ position: "absolute", top: 5, left: 10 }}>
+          <Typography fontSize={theme.custom.smallText}>
-        <Typography fontSize={theme.custom.smallText}>
+            {planet.infoUniverse?.name}
-          {planetInfoUniverse?.name}
+          </Typography>
-        </Typography>
+          {planetDetails.extractors.map((e, idx) => {
-        {extractorsExpiryTime.map((e, idx) => {
+            const average = planetDetails.extractorAverages[idx];
-          const extractor = extractors[idx];
+            return (
-          const average = extractorAverages[idx];
+              <div key={`${e}-${idx}-${character.character.characterId}`}>
-          return (
+                <Typography
-            <div key={`${e}-${idx}-${character.character.characterId}`}>
+                  color={timeColor(e.expiry_time, colors)}
-              <Typography
+                  fontSize={theme.custom.smallText}
-                color={timeColor(e, colors)}
+                >
-                fontSize={theme.custom.smallText}
+                  {!planetDetails.expired && e.expiry_time && <Countdown
-              >
+                      overtime={true}
-                {!expired && e && <Countdown
+                      date={DateTime.fromISO(e.expiry_time).toMillis()}
-                    overtime={true}
+                    />
-                    date={DateTime.fromISO(e).toMillis()}
+                  }
-                  />
+                </Typography>
-                }
+                {!planetDetails.expired && e && average && (
-              </Typography>
+                  <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
-              {!expired && extractor && average && (
+                    <Image
-                <div style={{ display: 'flex', alignItems: 'center', gap: 4 }}>
+                      unoptimized
-                  <Image
+                      src={`https://images.evetech.net/types/${e.extractor_details?.product_type_id}/icon?size=32`}
-                    unoptimized
+                      alt=""
-                    src={`https://images.evetech.net/types/${extractor.installedSchematicId}/icon?size=32`}
+                      width={16}
-                    alt=""
+                      height={16}
-                    width={16}
+                      style={{ borderRadius: 4 }}
-                    height={16}
+                    />
-                    style={{ borderRadius: 4 }}
+                    <Typography fontSize={theme.custom.smallText}>
-                  />
+                      {average.averagePerHour.toFixed(1)}/h
-                  <Typography fontSize={theme.custom.smallText}>
+                    </Typography>
-                    {average.averagePerHour.toFixed(1)}/h
+                  </div>
-                  </Typography>
+                )}
-                </div>
+              </div>
-              )}
+            );
-            </div>
+          })}
-          );
+        </div>
-        })}
+      </StackItem>
-      </div>
-    </StackItem>
     </Tooltip>
   );
 };

src/app/components/PlanetaryInteraction/PlanetTableRow.tsx

@@ -1,7 +1,8 @@
 import { ColorContext, SessionContext } from "@/app/context/Context";
-import { PI_TYPES_MAP, STORAGE_IDS, STORAGE_CAPACITIES, PI_PRODUCT_VOLUMES, EVE_IMAGE_URL } from "@/const";
+import { PI_TYPES_MAP, STORAGE_IDS, STORAGE_CAPACITIES, PI_PRODUCT_VOLUMES, EVE_IMAGE_URL, PI_SCHEMATICS, LAUNCHPAD_IDS } from "@/const";
 import { planetCalculations } from "@/planets";
 import { AccessToken, PlanetWithInfo } from "@/types";
+import { PlanetCalculations, StorageInfo } from "@/types/planet";
 import CloseIcon from "@mui/icons-material/Close";
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { Button, Tooltip, Typography, useTheme, Menu, MenuItem, IconButton, Checkbox, FormControlLabel } from "@mui/material";
@@ -18,11 +19,13 @@ import React, { forwardRef, useContext, useState } from "react";
 import Countdown from "react-countdown";
 import { PlanetConfigDialog } from "../PlanetConfig/PlanetConfigDialog";
 import PinsCanvas3D from "./PinsCanvas3D";
-import { alertModeVisibility, timeColor } from "./timeColors";
+import { timeColor } from "./alerts";
 import { ExtractionSimulationDisplay } from './ExtractionSimulationDisplay';
 import { ExtractionSimulationTooltip } from './ExtractionSimulationTooltip';
-import { ProductionNode } from './ExtractionSimulation';
 import { Collapse, Box, Stack } from "@mui/material";
+import Table from "@mui/material/Table";
+import TableHead from "@mui/material/TableHead";
+import TableBody from "@mui/material/TableBody";
 
 const Transition = forwardRef(function Transition(
   props: TransitionProps & {
@@ -33,15 +36,28 @@ const Transition = forwardRef(function Transition(
   return <Slide direction="up" ref={ref} {...props} />;
 });
 
+interface SchematicInput {
+  type_id: number;
+  quantity: number;
+}
+
+interface SchematicOutput {
+  type_id: number;
+  quantity: number;
+}
+
 export const PlanetTableRow = ({
   planet,
   character,
+  planetDetails,
 }: {
   planet: PlanetWithInfo;
   character: AccessToken;
+  planetDetails: PlanetCalculations;
 }) => {
   const theme = useTheme();
-  const { showProductIcons } = useContext(SessionContext);
+  const { showProductIcons, extractionTimeMode, alertMode } = useContext(SessionContext);
+  const { colors } = useContext(ColorContext);
 
   const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
   const [planetConfigOpen, setPlanetConfigOpen] = useState(false);
@@ -72,80 +88,13 @@ export const PlanetTableRow = ({
     setPlanetConfigOpen(false);
   };
 
-  const { piPrices, alertMode, updatePlanetConfig, readPlanetConfig, balanceThreshold } = useContext(SessionContext);
+  const { piPrices, updatePlanetConfig, readPlanetConfig } = useContext(SessionContext);
   const planetInfo = planet.info;
   const planetInfoUniverse = planet.infoUniverse;
-  const { expired, extractors, localProduction, localImports, localExports } =
-    planetCalculations(planet);
   const planetConfig = readPlanetConfig({
     characterId: character.character.characterId,
     planetId: planet.planet_id,
   });
-  const { colors } = useContext(ColorContext);
-  // Convert local production to ProductionNode array for simulation
-  const productionNodes: ProductionNode[] = Array.from(localProduction).map(([schematicId, schematic]) => ({
-    schematicId: schematicId,
-    typeId: schematic.outputs[0].type_id,
-    name: schematic.name,
-    inputs: schematic.inputs.map(input => ({
-      typeId: input.type_id,
-      quantity: input.quantity
-    })),
-    outputs: schematic.outputs.map(output => ({
-      typeId: output.type_id,
-      quantity: output.quantity
-    })),
-    cycleTime: schematic.cycle_time,
-    factoryCount: schematic.count || 1
-  }));
-
-  // Calculate extractor averages and check for large differences
-  const extractorAverages = extractors
-    .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
-    .map(e => {
-      const cycleTime = e.extractor_details?.cycle_time || 3600;
-      const qtyPerCycle = e.extractor_details?.qty_per_cycle || 0;
-      return {
-        typeId: e.extractor_details!.product_type_id!,
-        averagePerHour: (qtyPerCycle * 3600) / cycleTime
-      };
-    });
-
-  const hasLargeExtractorDifference = extractorAverages.length === 2 && 
-    Math.abs(extractorAverages[0].averagePerHour - extractorAverages[1].averagePerHour) > balanceThreshold;
-
-  const storageFacilities = planetInfo.pins.filter(pin => 
-    STORAGE_IDS().some(storage => storage.type_id === pin.type_id)
-  );
-
-  const getStorageInfo = (pin: any) => {
-    if (!pin || !pin.contents) return null;
-
-    const storageType = PI_TYPES_MAP[pin.type_id].name;
-    const storageCapacity = STORAGE_CAPACITIES[pin.type_id] || 0;
-    
-    const totalVolume = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const volume = PI_PRODUCT_VOLUMES[item.type_id] || 0;
-        return sum + (item.amount * volume);
-      }, 0);
-
-    const totalValue = (pin.contents || [])
-      .reduce((sum: number, item: any) => {
-        const price = piPrices?.appraisal.items.find((a) => a.typeID === item.type_id)?.prices.sell.min ?? 0;
-        return sum + (item.amount * price);
-      }, 0);
-
-    const fillRate = storageCapacity > 0 ? (totalVolume / storageCapacity) * 100 : 0;
-
-    return {
-      type: storageType,
-      capacity: storageCapacity,
-      used: totalVolume,
-      fillRate: fillRate,
-      value: totalValue
-    };
-  };
 
   const handleExcludeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     updatePlanetConfig({
@@ -154,7 +103,35 @@ export const PlanetTableRow = ({
     });
   };
 
+  // Check if there are any alerts
+  const hasAlerts = alertMode && (
+    planetDetails.expired ||
+    planetDetails.storageInfo.some(storage => storage.fillRate > 60) ||
+    planetDetails.importDepletionTimes.some(depletion => depletion.hoursUntilDepletion < 24) ||
+    planetDetails.hasLargeExtractorDifference
+  );
+
+  // If in alert mode and no alerts, hide the row
+  if (alertMode && !hasAlerts) {
+    return null;
+  }
+
   const renderProductDisplay = (typeId: number, amount?: number) => {
+    if (!typeId || !PI_TYPES_MAP[typeId]) {
+      return (
+        <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%" }}>
+          <Typography fontSize={theme.custom.smallText} color="text.secondary">
+            No product
+          </Typography>
+          {amount !== undefined && (
+            <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px", flexShrink: 0 }}>
+              {amount}
+            </Typography>
+          )}
+        </div>
+      );
+    }
+
     if (showProductIcons) {
       return (
         <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%" }}>
@@ -190,7 +167,7 @@ export const PlanetTableRow = ({
   return (
     <>
       <TableRow
-        style={{ visibility: alertModeVisibility(alertMode, expired) }}
+        style={{ visibility: planetDetails.visibility }}
         sx={{ 
           "&:last-child td, &:last-child th": { border: 0 },
           cursor: 'pointer',
@@ -198,7 +175,7 @@ export const PlanetTableRow = ({
             backgroundColor: 'action.hover'
           }
         }}
-        onClick={(e) => {
+        onClick={(e: React.MouseEvent<HTMLTableRowElement>) => {
           if (!(e.target as HTMLElement).closest('.clickable-cell')) return;
           setSimulationOpen(!simulationOpen);
         }}
@@ -221,9 +198,9 @@ export const PlanetTableRow = ({
               <Tooltip
                 placement="right"
                 title={
-                  extractors.length > 0 ? (
+                  planetDetails.extractors.length > 0 ? (
                     <ExtractionSimulationTooltip
-                      extractors={extractors
+                      extractors={planetDetails.extractors
                         .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
                         .map(e => ({
                           typeId: e.extractor_details!.product_type_id!,
@@ -251,11 +228,11 @@ export const PlanetTableRow = ({
                 <Stack spacing={0}>
                   <Typography 
                     fontSize={theme.custom.smallText}
-                    color={hasLargeExtractorDifference ? 'error' : 'inherit'}
+                    color={planetDetails.hasLargeExtractorDifference ? 'error' : 'inherit'}
                   >
                     {planetInfoUniverse?.name}
                   </Typography>
-                  {hasLargeExtractorDifference && (
+                  {planetDetails.hasLargeExtractorDifference && (
                     <Typography 
                       fontSize={theme.custom.smallText}
                       color="error"
@@ -272,8 +249,8 @@ export const PlanetTableRow = ({
         <TableCell className="clickable-cell">{planet.upgrade_level}</TableCell>
         <TableCell className="clickable-cell">
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {extractors.length === 0 &&<Typography fontSize={theme.custom.smallText}>No extractors</Typography>}
+            {planetDetails.extractors.length === 0 &&<Typography fontSize={theme.custom.smallText}>No extractors</Typography>}
-            {extractors.map((e, idx) => {
+            {planetDetails.extractors.map((e, idx) => {
               return (
                 <div
                   key={`${e}-${idx}-${character.character.characterId}`}
@@ -285,10 +262,14 @@ export const PlanetTableRow = ({
                     paddingRight={1}
                   >
                     {e ? (
-                      <Countdown
+                      extractionTimeMode ? (
-                        overtime={true}
+                        DateTime.fromISO(e.expiry_time ?? "").toFormat('yyyy-MM-dd HH:mm:ss')
-                        date={DateTime.fromISO(e.expiry_time ?? "").toMillis()}
+                      ) : (
-                      />
+                        <Countdown
+                          overtime={true}
+                          date={DateTime.fromISO(e.expiry_time ?? "").toMillis()}
+                        />
+                      )
                     ) : (
                       "STOPPED"
                     )}
@@ -301,7 +282,7 @@ export const PlanetTableRow = ({
         </TableCell>
         <TableCell className="clickable-cell">
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {Array.from(localProduction).map((schematic, idx) => {
+            {Array.from(planetDetails.localProduction).map((schematic, idx) => {
               return (
                 <div
                   key={`prod-${character.character.characterId}-${planet.planet_id}-${idx}`}
@@ -315,33 +296,54 @@ export const PlanetTableRow = ({
         </TableCell>
         <TableCell className="clickable-cell">
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {localImports.map((i) => (
+            {planetDetails.localImports.map((i) => {
-              <div
+              const depletionTime = planetDetails.importDepletionTimes.find(d => d.typeId === i.type_id);
-                key={`import-${character.character.characterId}-${planet.planet_id}-${i.type_id}`}
+              return (
-                style={{ display: "flex", alignItems: "center" }}
+                <div
-              >
+                  key={`import-${character.character.characterId}-${planet.planet_id}-${i.type_id}`}
-                {renderProductDisplay(i.type_id, i.quantity * i.factoryCount)}
+                  style={{ display: "flex", alignItems: "center" }}
-              </div>
+                >
-            ))}
+                  <Tooltip title={
+                    <>
+                      <div>Will be depleted in {depletionTime?.hoursUntilDepletion.toFixed(1)} hours</div>
+                      <div>Monthly cost: {depletionTime?.monthlyCost.toFixed(2)}M ISK</div>
+                    </>
+                  }>
+                    <div style={{ display: "flex", alignItems: "center" }}>
+                      {renderProductDisplay(i.type_id, i.quantity * i.factoryCount)}
+                      {depletionTime && (
+                        <Typography 
+                          fontSize={theme.custom.smallText} 
+                          color={depletionTime.hoursUntilDepletion < 24 ? 'error' : depletionTime.hoursUntilDepletion < 48 ? 'warning' : 'success'}
+                          sx={{ ml: 1 }}
+                        >
+                          ({depletionTime.hoursUntilDepletion.toFixed(1)}h)
+                        </Typography>
+                      )}
+                    </div>
+                  </Tooltip>
+                </div>
+              );
+            })}
           </div>
         </TableCell>
         <TableCell className="clickable-cell">
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
               <div
-                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                 style={{ display: "flex", alignItems: "center" }}
               >
-                {renderProductDisplay(exports.typeId, exports.amount)}
+                {renderProductDisplay(exports.type_id, exports.quantity * exports.factoryCount)}
               </div>
             ))}
           </div>
         </TableCell>
         <TableCell>
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
               <FormControlLabel
-                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-excluded-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                 control={
                   <Checkbox
                     checked={planetConfig.excludeFromTotals}
@@ -356,12 +358,12 @@ export const PlanetTableRow = ({
         </TableCell>
         <TableCell className="clickable-cell">
           <div style={{ display: "flex", flexDirection: "column" }}>
-            {localExports.map((exports) => (
+            {planetDetails.localExports.map((exports) => (
               <Typography
-                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.typeId}`}
+                key={`export-uph-${character.character.characterId}-${planet.planet_id}-${exports.type_id}`}
                 fontSize={theme.custom.smallText}
               >
-                {exports.amount}
+                {exports.quantity * exports.factoryCount}
               </Typography>
             ))}
           </div>
@@ -375,11 +377,11 @@ export const PlanetTableRow = ({
               textAlign: "end",
             }}
           >
-            {localExports.map((e) => {
+            {planetDetails.localExports.map((e) => {
               const valueInMillions =
-                (((piPrices?.appraisal.items.find((a) => a.typeID === e.typeId)
+                (((piPrices?.appraisal.items.find((a) => a.typeID === e.type_id)
                   ?.prices.sell.min ?? 0) *
-                  e.amount) /
+                  e.quantity * e.factoryCount) /
                   1000000) *
                 24 *
                 30;
@@ -390,7 +392,7 @@ export const PlanetTableRow = ({
 
               return (
                 <Typography
-                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.typeId}`}
+                  key={`export-praisal-${character.character.characterId}-${planet.planet_id}-${e.type_id}`}
                   fontSize={theme.custom.smallText}
                 >
                   {displayValue}
@@ -400,47 +402,109 @@ export const PlanetTableRow = ({
           </div>
         </TableCell>
         <TableCell className="clickable-cell">
-          <div style={{ display: "flex", flexDirection: "column" }}>
+          <Tooltip
-            {storageFacilities.length === 0 &&<Typography fontSize={theme.custom.smallText}>No storage</Typography>}
+            title={
-            {storageFacilities
+              <Box sx={{ p: 1 }}>
-              .sort((a, b) => {
+                <Typography variant="subtitle2" sx={{ mb: 1 }}>
-                const isALaunchpad = a.type_id === 2256 || a.type_id === 2542 || a.type_id === 2543 || a.type_id === 2544 || a.type_id === 2552 || a.type_id === 2555 || a.type_id === 2556 || a.type_id === 2557;
+                  Storage Facilities
-                const isBLaunchpad = b.type_id === 2256 || b.type_id === 2542 || b.type_id === 2543 || b.type_id === 2544 || b.type_id === 2552 || b.type_id === 2555 || b.type_id === 2556 || b.type_id === 2557;
+                </Typography>
-                return isALaunchpad === isBLaunchpad ? 0 : isALaunchpad ? -1 : 1;
+                <Table size="small">
-              })
+                  <TableHead>
-              .map((storage) => {
+                    <TableRow>
-                const storageInfo = getStorageInfo(storage);
+                      <TableCell>Type</TableCell>
-                if (!storageInfo) return null;
+                      <TableCell align="right">Capacity</TableCell>
+                      <TableCell align="right">Used</TableCell>
+                      <TableCell align="right">Fill Rate</TableCell>
+                      <TableCell align="right">Value</TableCell>
+                    </TableRow>
+                  </TableHead>
+                  <TableBody>
+                    {planetDetails.storageInfo.map((storage: StorageInfo, idx: number) => {
+                      const isLaunchpad = LAUNCHPAD_IDS.includes(storage.type_id);
+                      const fillRate = storage.fillRate;
+                      const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
+                      const contents = planet.info.pins.find(p => p.type_id === storage.type_id)?.contents || [];
                       
-                const isLaunchpad = storage.type_id === 2256 || 
+                      return (
-                                  storage.type_id === 2542 || 
+                        <React.Fragment key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`}>
-                                  storage.type_id === 2543 || 
+                          <TableRow>
-                                  storage.type_id === 2544 || 
+                            <TableCell>{isLaunchpad ? 'Launchpad' : 'Storage'}</TableCell>
-                                  storage.type_id === 2552 || 
+                            <TableCell align="right">{storage.capacity.toFixed(1)} m³</TableCell>
-                                  storage.type_id === 2555 || 
+                            <TableCell align="right">{storage.used.toFixed(1)} m³</TableCell>
-                                  storage.type_id === 2556 || 
+                            <TableCell align="right" sx={{ color }}>{fillRate.toFixed(1)}%</TableCell>
-                                  storage.type_id === 2557;
+                            <TableCell align="right">
-                
+                              {storage.value > 0 ? (
-                const fillRate = storageInfo.fillRate;
+                                storage.value >= 1000000000 
-                const color = fillRate > 95 ? '#ff0000' : fillRate > 80 ? '#ffd700' : 'inherit';
+                                  ? `${(storage.value / 1000000000).toFixed(2)} B` 
+                                  : `${(storage.value / 1000000).toFixed(0)} M`
+                              ) : '-'} ISK
+                            </TableCell>
+                          </TableRow>
+                          {contents.length > 0 && (
+                            <TableRow>
+                              <TableCell colSpan={5} sx={{ pt: 0, pb: 0 }}>
+                                <Table size="small">
+                                  <TableBody>
+                                    {contents.map((content, idy) => (
+                                      <TableRow key={`content-${character.character.characterId}-${planet.planet_id}-${storage.type}-${content.type_id}-${idx}-${idy}`}>
+                                        <TableCell sx={{ pl: 2 }}>
+                                          {PI_TYPES_MAP[content.type_id]?.name}
+                                        </TableCell>
+                                        <TableCell align="right" colSpan={4}>
+                                          {content.amount.toFixed(1)} units
+                                        </TableCell>
+                                      </TableRow>
+                                    ))}
+                                  </TableBody>
+                                </Table>
+                              </TableCell>
+                            </TableRow>
+                          )}
+                        </React.Fragment>
+                      );
+                    })}
+                  </TableBody>
+                </Table>
+              </Box>
+            }
+            componentsProps={{
+              tooltip: {
+                sx: {
+                  bgcolor: 'background.paper',
+                  '& .MuiTooltip-arrow': {
+                    color: 'background.paper',
+                  },
+                  maxWidth: 'none',
+                  width: 'fit-content'
+                }
+              }
+            }}
+          >
+            <div style={{ display: "flex", flexDirection: "column" }}>
+              {planetDetails.storageInfo.length === 0 &&<Typography fontSize={theme.custom.smallText}>No storage</Typography>}
+              {planetDetails.storageInfo.map((storage: StorageInfo, idx: number) => {
+                const isLaunchpad = LAUNCHPAD_IDS.includes(storage.type_id);
+                const fillRate = storage.fillRate;
+                const color = fillRate > 90 ? '#ff0000' : fillRate > 80 ? '#ffa500' : fillRate > 60 ? '#ffd700' : 'inherit';
                 
                 return (
-                  <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.pin_id}`} style={{ display: "flex", alignItems: "center" }}>
+                  <div key={`storage-${character.character.characterId}-${planet.planet_id}-${storage.type}-${idx}`} style={{ display: "flex", alignItems: "center" }}>
                     <Typography fontSize={theme.custom.smallText} style={{ marginRight: "5px" }}>
                       {isLaunchpad ? 'L' : 'S'}
                     </Typography>
                     <Typography fontSize={theme.custom.smallText} style={{ color }}>
                       {fillRate.toFixed(1)}%
                     </Typography>
-                    {storageInfo.value > 0 && (
+                    {storage.value > 0 && (
                       <Typography fontSize={theme.custom.smallText} style={{ marginLeft: "5px" }}>
-                        ({Math.round(storageInfo.value / 1000000)}M)
+                        ({Math.round(storage.value / 1000000)}M)
                       </Typography>
                     )}
                   </div>
                 );
               })}
-          </div>
+            </div>
+          </Tooltip>
         </TableCell>
         <TableCell className="menu-cell">
           <IconButton
@@ -478,7 +542,7 @@ export const PlanetTableRow = ({
           <Collapse in={simulationOpen} timeout="auto" unmountOnExit>
             <Box sx={{ my: 2 }}>
               <ExtractionSimulationDisplay
-                extractors={extractors
+                extractors={planetDetails.extractors
                   .filter(e => e.extractor_details?.product_type_id && e.extractor_details?.qty_per_cycle)
                   .map(e => ({
                     typeId: e.extractor_details!.product_type_id!,
@@ -487,7 +551,21 @@ export const PlanetTableRow = ({
                     installTime: e.install_time ?? "",
                     expiryTime: e.expiry_time ?? ""
                   }))}
-                productionNodes={productionNodes}
+                productionNodes={Array.from(planetDetails.localProduction).map(([schematicId, schematic]) => ({
+                  schematicId: schematicId,
+                  typeId: schematic.outputs[0].type_id,
+                  name: schematic.name,
+                  inputs: schematic.inputs.map((input: SchematicInput) => ({
+                    typeId: input.type_id,
+                    quantity: input.quantity
+                  })),
+                  outputs: schematic.outputs.map((output: SchematicOutput) => ({
+                    typeId: output.type_id,
+                    quantity: output.quantity
+                  })),
+                  cycleTime: schematic.cycle_time,
+                  factoryCount: schematic.factoryCount || 1
+                }))}
               />
             </Box>
           </Collapse>

src/app/components/PlanetaryInteraction/PlanetaryInteractionRow.tsx

@@ -1,5 +1,5 @@
 import { AccessToken } from "@/types";
-import { Icon, IconButton, Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
+import { IconButton, Stack, Tooltip, Typography, styled, useTheme } from "@mui/material";
 import { PlanetCard } from "./PlanetCard";
 import { NoPlanetCard } from "./NoPlanetCard";
 import Table from "@mui/material/Table";
@@ -11,6 +11,7 @@ import TableRow from "@mui/material/TableRow";
 import Paper from "@mui/material/Paper";
 import { PlanetTableRow } from "./PlanetTableRow";
 import { Settings } from "@mui/icons-material";
+import { PlanetCalculations } from "@/types/planet";
 
 const StackItem = styled(Stack)(({ theme }) => ({
   ...theme.typography.body2,
@@ -22,8 +23,10 @@ const StackItem = styled(Stack)(({ theme }) => ({
 
 const PlanetaryIteractionTable = ({
   character,
+  planetDetails,
 }: {
   character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
   const theme = useTheme();
 
@@ -117,6 +120,7 @@ const PlanetaryIteractionTable = ({
                 key={`${character.character.characterId}-${planet.planet_id}`}
                 planet={planet}
                 character={character}
+                planetDetails={planetDetails[planet.planet_id]}
               />
             ))}
           </TableBody>
@@ -128,8 +132,10 @@ const PlanetaryIteractionTable = ({
 
 const PlanetaryInteractionIconsRow = ({
   character,
+  planetDetails,
 }: {
   character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
   return (
     <StackItem>
@@ -139,6 +145,7 @@ const PlanetaryInteractionIconsRow = ({
             key={`${character.character.characterId}-${planet.planet_id}`}
             planet={planet}
             character={character}
+            planetDetails={planetDetails[planet.planet_id]}
           />
         ))}
         {Array.from(Array(6 - character.planets.length).keys()).map((i, id) => (
@@ -153,14 +160,16 @@ const PlanetaryInteractionIconsRow = ({
 
 export const PlanetaryInteractionRow = ({
   character,
+  planetDetails,
 }: {
   character: AccessToken;
+  planetDetails: Record<number, PlanetCalculations>;
 }) => {
   const theme = useTheme();
 
   return theme.custom.compactMode ? (
-    <div style={{ marginTop: "1.2rem" }}><PlanetaryInteractionIconsRow character={character} /></div>
+    <div style={{ marginTop: "1.2rem" }}><PlanetaryInteractionIconsRow character={character} planetDetails={planetDetails} /></div>
   ) : (
-    <div style={{ marginTop: "1.4rem" }}><PlanetaryIteractionTable character={character} /></div>
+    <div style={{ marginTop: "1.4rem" }}><PlanetaryIteractionTable character={character} planetDetails={planetDetails} /></div>
   );
 };

src/app/context/Context.tsx

@@ -26,6 +26,8 @@ export const SessionContext = createContext<{
   togglePlanMode: () => void;
   alertMode: boolean;
   toggleAlertMode: () => void;
+  extractionTimeMode: boolean;
+  toggleExtractionTimeMode: () => void;
   piPrices: EvePraisalResult | undefined;
   updatePlanetConfig: (config: PlanetConfig) => void;
   readPlanetConfig: ({
@@ -51,6 +53,8 @@ export const SessionContext = createContext<{
   togglePlanMode: () => {},
   alertMode: false,
   toggleAlertMode: () => {},
+  extractionTimeMode: false,
+  toggleExtractionTimeMode: () => {},
   piPrices: undefined,
   updatePlanetConfig: () => {},
   readPlanetConfig: ({

src/app/page.tsx

@@ -31,6 +31,7 @@ const Home = () => {
   );
   const [balanceThreshold, setBalanceThreshold] = useState(1000);
   const [showProductIcons, setShowProductIcons] = useState(false);
+  const [extractionTimeMode, setExtractionTimeMode] = useState(false);
 
   const [colors, setColors] = useState<ColorSelectionType>(defaultColors);
   const [alertMode, setAlertMode] = useState(false);
@@ -149,6 +150,10 @@ const Home = () => {
     setAlertMode(!alertMode);
   };
 
+  const toggleExtractionTimeMode = () => {
+    setExtractionTimeMode(!extractionTimeMode);
+  };
+
   const updatePlanetConfig = (config: PlanetConfig) => {
     const charactersToSave = characters.map((c) => {
       if (c.character.characterId === config.characterId) {
@@ -224,6 +229,17 @@ const Home = () => {
     localStorage.setItem("colors", JSON.stringify(colors));
   }, [colors]);
 
+  useEffect(() => {
+    const savedMode = localStorage.getItem('extractionTimeMode');
+    if (savedMode) {
+      setExtractionTimeMode(savedMode === 'true');
+    }
+  }, []);
+
+  useEffect(() => {
+    localStorage.setItem('extractionTimeMode', extractionTimeMode.toString());
+  }, [extractionTimeMode]);
+
   useEffect(() => {
     fetch("api/env")
       .then((r) => r.json())
@@ -275,6 +291,8 @@ const Home = () => {
         piPrices,
         alertMode,
         toggleAlertMode,
+        extractionTimeMode,
+        toggleExtractionTimeMode,
         updatePlanetConfig,
         readPlanetConfig,
         balanceThreshold,

src/const.ts

@@ -1080,3 +1080,5 @@ export const STORAGE_CAPACITIES: Record<number, number> = {
   2556: 10000, // Plasma Launchpad
   2557: 10000, // Storm Launchpad
 };
+
+export const LAUNCHPAD_IDS = [2256, 2542, 2543, 2544, 2552, 2555, 2556, 2557];

src/pages/api/env.ts

@@ -1,11 +1,51 @@
 import { NextApiRequest, NextApiResponse } from "next";
+import logger from "@/utils/logger";
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === "GET") {
-    const EVE_SSO_CALLBACK_URL = process.env.EVE_SSO_CALLBACK_URL;
+    logger.info({ 
-    const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID;
+      event: 'env_request_start'
-    res.json({ EVE_SSO_CLIENT_ID, EVE_SSO_CALLBACK_URL });
+    });
+
+    try {
+      const EVE_SSO_CALLBACK_URL = process.env.EVE_SSO_CALLBACK_URL;
+      const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID;
+
+      if (!EVE_SSO_CALLBACK_URL || !EVE_SSO_CLIENT_ID) {
+        logger.error({ 
+          event: 'env_request_failed',
+          reason: 'missing_env_vars',
+          vars: {
+            hasCallbackUrl: !!EVE_SSO_CALLBACK_URL,
+            hasClientId: !!EVE_SSO_CLIENT_ID
+          }
+        });
+        return res.status(500).json({ error: 'Missing required environment variables' });
+      }
+
+      logger.info({ 
+        event: 'env_request_success',
+        vars: {
+          hasCallbackUrl: true,
+          hasClientId: true
+        }
+      });
+
+      return res.json({ EVE_SSO_CLIENT_ID, EVE_SSO_CALLBACK_URL });
+    } catch (e) {
+      logger.error({ 
+        event: 'env_request_failed',
+        reason: 'unexpected_error',
+        error: e
+      });
+      return res.status(500).json({ error: 'Internal server error' });
+    }
   } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
     res.status(404).end();
   }
 };

src/pages/api/praisal.ts

@@ -1,19 +1,45 @@
 import { getPraisal } from "@/eve-praisal";
 import { NextApiRequest, NextApiResponse } from "next";
+import logger from "@/utils/logger";
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === "POST") {
-    const praisalRequest: { quantity: number; type_id: number }[] = JSON.parse(
+    logger.info({ 
-      req.body
+      event: 'praisal_request_start'
-    );
+    });
+
     try {
+      const praisalRequest: { quantity: number; type_id: number }[] = JSON.parse(
+        req.body
+      );
+
+      logger.info({ 
+        event: 'praisal_request_parsed',
+        items: praisalRequest.length
+      });
+
       const praisal = await getPraisal(praisalRequest);
+
+      logger.info({ 
+        event: 'praisal_request_success',
+        items: praisalRequest.length
+      });
+
       return res.json(praisal);
     } catch (e) {
-      console.log(e);
+      logger.error({ 
-      res.status(404).end();
+        event: 'praisal_request_failed',
+        error: e,
+        body: req.body
+      });
+      return res.status(500).json({ error: 'Failed to get praisal' });
     }
   } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
     res.status(404).end();
   }
 };

src/pages/api/refresh.ts

@@ -1,7 +1,8 @@
 import { AccessToken } from "@/types";
-import { extractCharacterFromToken } from "@/utils";
+import { extractCharacterFromToken } from "@/utils/utils";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";
 
 const EVE_SSO_TOKEN_URL = "https://login.eveonline.com/v2/oauth/token";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -10,6 +11,14 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === "POST") {
     const accessToken: AccessToken = req.body;
+    logger.info({ 
+      event: 'token_refresh_start',
+      character: {
+        name: accessToken.character.name,
+        characterId: accessToken.character.characterId
+      }
+    });
+
     const params = new URLSearchParams({
       grant_type: "refresh_token",
       refresh_token: crypto.AES.decrypt(
@@ -33,7 +42,20 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         body: params,
         headers,
       }).then((res) => res.json());
+
       const character = extractCharacterFromToken(response);
+      if (!character) {
+        logger.error({ 
+          event: 'token_refresh_failed',
+          reason: 'character_extraction_failed',
+          character: {
+            name: accessToken.character.name,
+            characterId: accessToken.character.characterId
+          }
+        });
+        return res.json({ ...accessToken, needsLogin: true });
+      }
+
       const token: AccessToken = {
         access_token: response.access_token,
         token_type: response.token_type,
@@ -51,12 +73,26 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
         planetConfig: accessToken.planetConfig ?? [],
       };
 
-      console.log("Refresh", character.name, character.characterId);
+      logger.info({ 
+        event: 'token_refresh_success',
+        character: {
+          name: character.name,
+          characterId: character.characterId
+        }
+      });
 
       return res.json(token);
     } catch (e) {
-      console.log(e);
+      logger.error({ 
-      res.json({ ...accessToken, needsLogin: true });
+        event: 'token_refresh_failed',
+        reason: 'api_error',
+        error: e,
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });
+      return res.json({ ...accessToken, needsLogin: true });
     }
   } else {
     res.status(404).end();

src/pages/api/revoke.ts

@@ -1,6 +1,7 @@
 import { AccessToken } from "@/types";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";
 
 const EVE_SSO_REVOKE_URL = "https://login.eveonline.com/v2/oauth/revoke";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -9,6 +10,14 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === "POST") {
     const accessToken: AccessToken = req.body;
+    logger.info({ 
+      event: 'token_revoke_start',
+      character: {
+        name: accessToken.character.name,
+        characterId: accessToken.character.characterId
+      }
+    });
+
     const params = new URLSearchParams({
       grant_type: "refresh_token",
       refresh_token: crypto.AES.decrypt(
@@ -27,24 +36,42 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     };
 
     try {
-      await fetch(EVE_SSO_REVOKE_URL, {
+      const response = await fetch(EVE_SSO_REVOKE_URL, {
         method: "POST",
         body: params,
         headers,
-      }).then((res) => res.json());
+      });
 
-      console.log(
+      if (!response.ok) {
-        "Revoke",
+        throw new Error(`HTTP error! status: ${response.status}`);
-        accessToken.character.name,
+      }
-        accessToken.character.characterId
+
-      );
+      logger.info({ 
+        event: 'token_revoke_success',
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });
 
       return res.end();
     } catch (e) {
-      console.log(e);
+      logger.error({ 
+        event: 'token_revoke_failed',
+        error: e,
+        character: {
+          name: accessToken.character.name,
+          characterId: accessToken.character.characterId
+        }
+      });
       return res.status(500).end();
     }
   } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
     res.status(404).end();
   }
 };

src/pages/api/token.ts

@@ -1,7 +1,8 @@
 import { AccessToken } from "@/types";
-import { extractCharacterFromToken } from "@/utils";
+import { extractCharacterFromToken } from "@/utils/utils";
 import { NextApiRequest, NextApiResponse } from "next";
 import crypto from "crypto-js";
+import logger from "@/utils/logger";
 
 const EVE_SSO_TOKEN_URL = "https://login.eveonline.com/v2/oauth/token";
 const EVE_SSO_CLIENT_ID = process.env.EVE_SSO_CLIENT_ID ?? "";
@@ -10,7 +11,19 @@ const EVE_SSO_SECRET = process.env.EVE_SSO_SECRET ?? "";
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   if (req.method === "GET") {
     const code = req.query.code as string;
-    if (!code || code === undefined) return res.status(404).end();
+    if (!code || code === undefined) {
+      logger.warn({ 
+        event: 'token_request_failed',
+        reason: 'missing_code',
+        query: req.query
+      });
+      return res.status(404).end();
+    }
+
+    logger.info({ 
+      event: 'token_request_start',
+      code: code
+    });
 
     const params = new URLSearchParams({
       grant_type: "authorization_code",
@@ -26,34 +39,69 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       "User-Agent": "https://github.com/calli-eve/eve-pi",
     };
 
-    const response = await fetch(EVE_SSO_TOKEN_URL, {
+    try {
-      method: "POST",
+      const response = await fetch(EVE_SSO_TOKEN_URL, {
-      body: params,
+        method: "POST",
-      headers,
+        body: params,
-    }).then((res) => res.json());
+        headers,
+      });
 
-    const character = extractCharacterFromToken(response);
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
 
-    console.log("Login", character.name, character.characterId);
+      const data = await response.json();
+      const character = extractCharacterFromToken(data);
 
-    const token: AccessToken = {
+      if (!character) {
-      access_token: response.access_token,
+        logger.error({ 
-      token_type: response.token_type,
+          event: 'token_request_failed',
-      refresh_token: crypto.AES.encrypt(
+          reason: 'character_extraction_failed',
-        response.refresh_token,
+          data
-        EVE_SSO_SECRET,
+        });
-      ).toString(),
+        return res.status(500).end();
-      expires_at: Date.now() + response.expires_in * 1000,
+      }
-      character,
+
-      needsLogin: false,
+      logger.info({ 
-      account: "-",
+        event: 'token_request_success',
-      comment: "",
+        character: {
-      system: "",
+          name: character.name,
-      planets: [],
+          characterId: character.characterId
-      planetConfig: [],
+        }
-    };
+      });
-    res.json(token);
+
+      const token: AccessToken = {
+        access_token: data.access_token,
+        token_type: data.token_type,
+        refresh_token: crypto.AES.encrypt(
+          data.refresh_token,
+          EVE_SSO_SECRET,
+        ).toString(),
+        expires_at: Date.now() + data.expires_in * 1000,
+        character,
+        needsLogin: false,
+        account: "-",
+        comment: "",
+        system: "",
+        planets: [],
+        planetConfig: [],
+      };
+      return res.json(token);
+    } catch (e) {
+      logger.error({ 
+        event: 'token_request_failed',
+        reason: 'api_error',
+        error: e,
+        code: code
+      });
+      return res.status(500).end();
+    }
   } else {
+    logger.warn({ 
+      event: 'invalid_method',
+      method: req.method,
+      path: req.url
+    });
     res.status(404).end();
   }
 };

src/planets.ts

@@ -7,7 +7,7 @@ import {
 } from "@/types";
 import { Api } from "@/esi-api";
 import { EXTRACTOR_TYPE_IDS, FACTORY_IDS, PI_SCHEMATICS } from "@/const";
-import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/timeColors";
+import { extractorsHaveExpired } from "./app/components/PlanetaryInteraction/alerts";
 
 export const getPlanets = async (character: AccessToken): Promise<Planet[]> => {
   const api = new Api();

src/types/planet.ts

@@ -0,0 +1,83 @@
+import { Pin, PlanetWithInfo } from '../types';
+
+export interface StorageContent {
+  type_id: number;
+  amount: number;
+}
+
+export interface StorageInfo {
+  type: string;
+  type_id: number;
+  capacity: number;
+  used: number;
+  fillRate: number;
+  value: number;
+}
+
+export interface PlanetCalculations {
+  expired: boolean;
+  extractors: Pin[];
+  localProduction: Map<number, LocalProductionInfo>;
+  localImports: LocalImport[];
+  localExports: LocalExport[];
+  storageInfo: StorageInfo[];
+  extractorAverages: ExtractorAverage[];
+  hasLargeExtractorDifference: boolean;
+  importDepletionTimes: ImportDepletionTime[];
+  visibility: 'visible' | 'hidden';
+}
+
+export interface AlertState {
+  expired: boolean;
+  hasLowStorage: boolean;
+  hasLowImports: boolean;
+  hasLargeExtractorDifference: boolean;
+}
+
+export interface ExtractorAverage {
+  typeId: number;
+  averagePerHour: number;
+}
+
+export interface ImportDepletionTime {
+  typeId: number;
+  hoursUntilDepletion: number;
+  monthlyCost: number;
+}
+
+export interface LocalProductionInfo {
+  name: string;
+  cycle_time: number;
+  schematic_id: number;
+  inputs: SchematicInput[];
+  outputs: SchematicOutput[];
+  factoryCount: number;
+}
+
+export interface LocalImport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface LocalExport {
+  type_id: number;
+  schematic_id: number;
+  quantity: number;
+  factoryCount: number;
+}
+
+export interface SchematicInput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+}
+
+export interface SchematicOutput {
+  schematic_id: number;
+  type_id: number;
+  quantity: number;
+  is_input: number;
+} 

src/utils.ts

@@ -1,13 +0,0 @@
-import { AccessToken, Character } from "./types";
-
-export const extractCharacterFromToken = (token: AccessToken): Character => {
-  const decodedToken = parseJwt(token.access_token);
-  return {
-    name: decodedToken.name,
-    characterId: decodedToken.sub.split(":")[2],
-  };
-};
-
-const parseJwt = (token: string) => {
-  return JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
-};

src/utils/logger.ts

@@ -0,0 +1,16 @@
+import pino from 'pino';
+
+const logger = pino({
+  level: process.env.LOG_LEVEL || 'info',
+  formatters: {
+    level: (label) => {
+      return { level: label };
+    },
+  },
+  timestamp: () => `,"time":"${new Date().toISOString()}"`,
+  base: {
+    env: process.env.NODE_ENV,
+  },
+});
+
+export default logger; 

src/utils/utils.ts

@@ -0,0 +1,22 @@
+import { AccessToken, Character } from "../types";
+
+export const extractCharacterFromToken = (token: AccessToken): Character | null => {
+  const decodedToken = parseJwt(token.access_token);
+  if (!decodedToken || !decodedToken.name || !decodedToken.sub) {
+    return null;
+  }
+  return {
+    name: decodedToken.name,
+    characterId: decodedToken.sub.split(":")[2],
+  };
+};
+
+const parseJwt = (token: string | undefined) => {
+  if (!token) return null;
+  try {
+    return JSON.parse(Buffer.from(token.split(".")[1], "base64").toString());
+  } catch (error) {
+    console.error('Failed to parse JWT token:', error);
+    return null;
+  }
+};