From 76d0ed6da11b514c25178e5769e51d4a9198cf0d Mon Sep 17 00:00:00 2001
From: Calli <calli-eve@proton.me>
Date: Mon, 3 Jul 2023 23:13:08 +0300
Subject: [PATCH] color countdown timers and compact more

---
 .../components/Characters/CharacterRow.tsx    |  8 ++--
 .../PlanetaryInteraction/NoPlanetCard.tsx     | 16 +++++---
 .../PlanetaryInteraction/PlanetCard.tsx       | 39 ++++++++++++-------
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/app/components/Characters/CharacterRow.tsx b/src/app/components/Characters/CharacterRow.tsx
index d7276a8..7a91a84 100644
--- a/src/app/components/Characters/CharacterRow.tsx
+++ b/src/app/components/Characters/CharacterRow.tsx
@@ -9,7 +9,7 @@ import { CharacterDialog } from "./CharacterDialog";
 import { AccessToken } from "@/types";
 import { Box, Button } from "@mui/material";
 import { EVE_IMAGE_URL } from "@/const";
-import { CharacterContext } from "@/app/context/Context";
+import { CharacterContext, SessionContext } from "@/app/context/Context";
 
 const StackItem = styled(Stack)(({ theme }) => ({
   ...theme.typography.body2,
@@ -25,7 +25,7 @@ export const CharacterRow = ({ character }: { character: AccessToken }) => {
   >(undefined);
 
   const { deleteCharacter, updateCharacter } = useContext(CharacterContext);
-
+  const { compactMode } = useContext(SessionContext);
   return (
     <StackItem
       key={character.character.characterId}
@@ -47,8 +47,8 @@ export const CharacterRow = ({ character }: { character: AccessToken }) => {
         <Image
           src={`${EVE_IMAGE_URL}/characters/${character.character.characterId}/portrait?size=128`}
           alt=""
-          width={120}
-          height={120}
+          width={compactMode ? 80 : 120}
+          height={compactMode ? 80 : 120}
           style={{ marginBottom: "0.2rem", borderRadius: 8 }}
         />
         <Button style={{ padding: 3, fontSize: "0.6rem" }} variant="outlined">
diff --git a/src/app/components/PlanetaryInteraction/NoPlanetCard.tsx b/src/app/components/PlanetaryInteraction/NoPlanetCard.tsx
index 86e0146..a30f069 100644
--- a/src/app/components/PlanetaryInteraction/NoPlanetCard.tsx
+++ b/src/app/components/PlanetaryInteraction/NoPlanetCard.tsx
@@ -1,4 +1,6 @@
+import { SessionContext } from "@/app/context/Context";
 import { Box, Stack, Typography, styled } from "@mui/material";
+import { useContext } from "react";
 
 const StackItem = styled(Stack)(({ theme }) => ({
   ...theme.typography.body2,
@@ -7,19 +9,23 @@ const StackItem = styled(Stack)(({ theme }) => ({
   textAlign: "left",
   justifyContent: "flex-start",
   alignItems: "center",
-  minHeight: "170px",
 }));
 
 export const NoPlanetCard = ({}: {}) => {
+  const { compactMode } = useContext(SessionContext);
   return (
-    <StackItem alignItems="flex-start" height="100%">
+    <StackItem
+      alignItems="flex-start"
+      height="100%"
+      minHeight={compactMode ? "100px" : "170px"}
+    >
       <Box
-        width={120}
-        height={120}
+        width={compactMode ? 80 : 120}
+        height={compactMode ? 80 : 120}
         border="solid 1px black"
         style={{ borderRadius: 8, marginRight: 4 }}
       />
-      <Typography>No planet</Typography>
+      <Typography fontSize="0.8rem">No planet</Typography>
     </StackItem>
   );
 };
diff --git a/src/app/components/PlanetaryInteraction/PlanetCard.tsx b/src/app/components/PlanetaryInteraction/PlanetCard.tsx
index b2b501e..3d46f34 100644
--- a/src/app/components/PlanetaryInteraction/PlanetCard.tsx
+++ b/src/app/components/PlanetaryInteraction/PlanetCard.tsx
@@ -1,8 +1,8 @@
-import { Stack, Tooltip, Typography, styled } from "@mui/material";
+import { Stack, Typography, styled } from "@mui/material";
 import Image from "next/image";
 import { AccessToken, Planet } from "@/types";
 import { Api } from "@/esi-api";
-import { forwardRef, useEffect, useState } from "react";
+import { forwardRef, useContext, useEffect, useState } from "react";
 import { DateTime } from "luxon";
 import { EXTRACTOR_TYPE_IDS } from "@/const";
 import Countdown from "react-countdown";
@@ -15,6 +15,7 @@ import Toolbar from "@mui/material/Toolbar";
 import IconButton from "@mui/material/IconButton";
 import CloseIcon from "@mui/icons-material/Close";
 import Button from "@mui/material/Button";
+import { SessionContext } from "@/app/context/Context";
 
 const StackItem = styled(Stack)(({ theme }) => ({
   ...theme.typography.body2,
@@ -23,7 +24,6 @@ const StackItem = styled(Stack)(({ theme }) => ({
   textAlign: "left",
   justifyContent: "flex-start",
   alignItems: "center",
-  minHeight: "170px",
 }));
 
 export interface Pin {
@@ -110,6 +110,8 @@ export const PlanetCard = ({
 
   const [planetRenderOpen, setPlanetRenderOpen] = useState(false);
 
+  const { compactMode } = useContext(SessionContext);
+
   const handle3DrenderOpen = () => {
     setPlanetRenderOpen(true);
   };
@@ -150,17 +152,32 @@ export const PlanetCard = ({
     ).data;
     return planetInfo;
   };
+
+  const timeColor = (extractorDate: string | undefined): string => {
+    if (!extractorDate) return "red";
+    const dateExtractor = DateTime.fromISO(extractorDate);
+    const dateNow = DateTime.now();
+    if (dateExtractor < dateNow) return "red";
+    if (dateExtractor.minus({ hours: 24 }) < dateNow) return "yellow";
+    return "green";
+  };
+
   useEffect(() => {
     getPlanet(character, planet).then(setPlanetInfo);
     getPlanetUniverse(planet).then(setPlanetInfoUniverse);
   }, [planet, character]);
   return (
-    <StackItem alignItems="flex-start" height="100%" position="relative">
+    <StackItem
+      alignItems="flex-start"
+      height="100%"
+      position="relative"
+      minHeight={compactMode ? "100px" : "170px"}
+    >
       <Image
         src={`/${planet.planet_type}.png`}
         alt=""
-        width={120}
-        height={120}
+        width={compactMode ? 80 : 120}
+        height={compactMode ? 80 : 120}
         style={{ borderRadius: 8, marginRight: 4 }}
         onClick={handle3DrenderOpen}
       />
@@ -184,17 +201,11 @@ export const PlanetCard = ({
       </div>
 
       {extractors.map((e, idx) => {
-        const inPast = () => {
-          if (!e) return true;
-          const dateExtractor = DateTime.fromISO(e);
-          const dateNow = DateTime.now();
-          return dateExtractor < dateNow;
-        };
-
         return (
           <Typography
             key={`${e}-${idx}-${character.character.characterId}`}
-            color={inPast() ? "red" : "white"}
+            color={timeColor(e)}
+            fontSize="0.8rem"
           >
             {e ? (
               <Countdown