diff --git a/src/app/components/Account/AccountCard.tsx b/src/app/components/Account/AccountCard.tsx index 249d26f..e6ead58 100644 --- a/src/app/components/Account/AccountCard.tsx +++ b/src/app/components/Account/AccountCard.tsx @@ -2,9 +2,13 @@ import { AccessToken } from "@/types"; import { Box, Stack, Typography, useTheme } from "@mui/material"; import { CharacterRow } from "../Characters/CharacterRow"; import { PlanetaryInteractionRow } from "../PlanetaryInteraction/PlanetaryInteractionRow"; - +import { SessionContext } from "@/app/context/Context"; +import { useContext } from "react"; +import { PlanRow } from "./PlanRow"; export const AccountCard = ({ characters }: { characters: AccessToken[] }) => { const theme = useTheme(); + + const { planMode } = useContext(SessionContext); return ( { alignItems="flex-start" > - + {planMode ? ( + + ) : ( + + )} ))} diff --git a/src/app/components/Account/PlanRow.tsx b/src/app/components/Account/PlanRow.tsx new file mode 100644 index 0000000..4df632a --- /dev/null +++ b/src/app/components/Account/PlanRow.tsx @@ -0,0 +1,16 @@ +import { AccessToken } from "@/types"; +import { Stack, Typography, styled } from "@mui/material"; +const StackItem = styled(Stack)(({ theme }) => ({ + ...theme.typography.body2, + padding: theme.custom.compactMode ? theme.spacing(1) : theme.spacing(2), + textAlign: "left", + justifyContent: "center", + alignItems: "center", +})); +export const PlanRow = ({ character }: { character: AccessToken }) => { + return ( + + {character.comment} + + ); +}; diff --git a/src/app/components/AppBar/AppBar.tsx b/src/app/components/AppBar/AppBar.tsx index f42e3a8..e200a8e 100644 --- a/src/app/components/AppBar/AppBar.tsx +++ b/src/app/components/AppBar/AppBar.tsx @@ -1,25 +1,26 @@ -import * as React from "react"; +import MenuIcon from "@mui/icons-material/Menu"; +import PublicIcon from "@mui/icons-material/Public"; import AppBar from "@mui/material/AppBar"; import Box from "@mui/material/Box"; -import Toolbar from "@mui/material/Toolbar"; -import IconButton from "@mui/material/IconButton"; -import Typography from "@mui/material/Typography"; -import Menu from "@mui/material/Menu"; -import MenuIcon from "@mui/icons-material/Menu"; import Container from "@mui/material/Container"; +import IconButton from "@mui/material/IconButton"; +import Menu from "@mui/material/Menu"; import MenuItem from "@mui/material/MenuItem"; -import PublicIcon from "@mui/icons-material/Public"; -import { LoginButton } from "../Login/LoginButton"; +import Toolbar from "@mui/material/Toolbar"; +import Typography from "@mui/material/Typography"; +import * as React from "react"; import { DowloadButton } from "../Backup/DowloadButton"; import { UploadButton } from "../Backup/UploadButton"; -import { DiscordButton } from "../Discord/DiscordButton"; -import { GitHubButton } from "../Github/GitHubButton"; import { CCPButton } from "../CCP/CCPButton"; import { CompactModeButton } from "../CompactModeButton/CompactModeButton"; +import { DiscordButton } from "../Discord/DiscordButton"; +import { GitHubButton } from "../Github/GitHubButton"; +import { LoginButton } from "../Login/LoginButton"; +import { PlanModeButton } from "../PlanModeButton/PlanModeButton"; function ResponsiveAppBar() { const [anchorElNav, setAnchorElNav] = React.useState( - null + null, ); const handleOpenNavMenu = (event: React.MouseEvent) => { @@ -103,6 +104,9 @@ function ResponsiveAppBar() { + + + @@ -129,6 +133,7 @@ function ResponsiveAppBar() { flexGrow: 1, display: { xs: "none", md: "flex" }, alignItems: "center", + gap: "0.2rem" }} > @@ -138,6 +143,7 @@ function ResponsiveAppBar() { + diff --git a/src/app/components/Characters/CharacterDialog.tsx b/src/app/components/Characters/CharacterDialog.tsx index 65822b7..4c275a0 100644 --- a/src/app/components/Characters/CharacterDialog.tsx +++ b/src/app/components/Characters/CharacterDialog.tsx @@ -37,7 +37,11 @@ export const CharacterDialog = ({ }; return ( - + {character && character.character.name} setComment(event.target.value)} - onKeyDown={handleKeyDown} />